Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 5 additions & 15 deletions glam/api/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -530,36 +530,26 @@ def get_glean_aggregations_from_bq(bqClient, request, req_data):
build_id_filter = 'AND build_id != "*"'
# Build the SQL query with parameters
query = f"""
WITH versions AS (
SELECT
ARRAY_AGG(DISTINCT version
ORDER BY
version DESC
LIMIT
@num_versions) AS selected_versions
FROM
`{GLAM_BQ_PROD_PROJECT}.glam_etl.{table_id}`
WHERE
metric = @metric
)
SELECT
* EXCEPT(selected_versions)
* EXCEPT(latest_version)
FROM
`{GLAM_BQ_PROD_PROJECT}.glam_etl.{table_id}`,
versions
`moz-fx-data-shared-prod.telemetry_derived.latest_versions` lv
WHERE
metric = @metric
AND ping_type = @ping_type
AND os = @os
{build_id_filter}
AND version IN UNNEST(versions.selected_versions)
AND lv.channel = @channel
AND version BETWEEN latest_version - @num_versions AND latest_version
"""
job_config = bigquery.QueryJobConfig(
query_parameters=[
bigquery.ScalarQueryParameter("metric", "STRING", probe),
bigquery.ScalarQueryParameter("ping_type", "STRING", ping_type),
bigquery.ScalarQueryParameter("os", "STRING", os),
bigquery.ScalarQueryParameter("num_versions", "INT64", num_versions),
bigquery.ScalarQueryParameter("channel", "STRING", channel),
]
)
with bqClient as client:
Expand Down