Skip to content

Completing reports migration #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 18 commits into
base: main
Choose a base branch
from
Draft

Completing reports migration #41

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
8854387
fix discrepancies
max-ostapenko Dec 28, 2024
bf90fd8
lenses
max-ostapenko Jan 7, 2025
65062af
Merge branch 'main' into standard_reports
max-ostapenko Jan 7, 2025
5637e83
sql updated
max-ostapenko Jan 7, 2025
55adcf4
lenses path
max-ostapenko Jan 7, 2025
385e426
spelling fix
max-ostapenko Jan 7, 2025
1b3678c
all metrics in the same table
max-ostapenko Jan 12, 2025
e2ce0dd
aggregated tables
max-ostapenko Jan 14, 2025
6bb7ce4
storage sync script
max-ostapenko Jan 14, 2025
28cebce
Merge branch 'main' into standard_reports
max-ostapenko Jan 21, 2025
00a4b4e
Merge branch 'main' into standard_reports
max-ostapenko Jan 26, 2025
044c9c7
conditional path
max-ostapenko Jan 26, 2025
633895c
Merge branch 'main' into standard_reports
max-ostapenko Feb 16, 2025
c26f79e
Merge remote-tracking branch 'origin/main' into standard_reports
max-ostapenko Jun 16, 2025
727c3c6
common lenses
max-ostapenko Jun 16, 2025
a816f79
Merge branch 'main' into standard_reports
max-ostapenko Jun 18, 2025
9b2e192
Merge branch 'main' into standard_reports
max-ostapenko Jun 18, 2025
8e9dc27
lint
max-ostapenko Jun 18, 2025
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
Prev Previous commit
Next Next commit
sql updated
  • Loading branch information
@max-ostapenko
max-ostapenko committed Jan 7, 2025
commit 5637e83a688217f78ff15664a1d035e2e3984ca3
10 changes: 5 additions & 5 deletions definitions/output/reports/reports_dynamic.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ for (
date,
metric,
sql,
lense: { key, value },
lense: { name: key, sql: value },
devRankFilter: constants.devRankFilter
})
}
Expand All @@ -43,7 +43,7 @@ for (

if (startDate === endDate) {
iterations.forEach((params, i) => {
publish(params.metric.id + '_' + params.sql.type + '_' + params.lense.key, {
publish(params.metric.id + '_' + params.sql.type + '_' + params.lense.name, {
type: 'incremental',
protected: true,
bigquery: params.sql.type === 'histogram' ? { partitionBy: 'date', clusterBy: ['client'] } : {},
Expand All @@ -53,20 +53,20 @@ if (startDate === endDate) {
--DELETE FROM ${ctx.self()}
--WHERE date = '${params.date}';
`).query(ctx => `
/* {"dataform_trigger": "report_complete", "date": "${params.date}", "name": "${params.metric.id}", "type": "${params.sql.type}", "lense": "${params.lense.key}"} */` +
/* {"dataform_trigger": "report_complete", "date": "${params.date}", "name": "${params.metric.id}", "type": "${params.sql.type}", "lense": "${params.lense.name}"} */` +
params.sql.query(ctx, params)
)
})
} else {
iterations.forEach((params, i) => {
operate(
params.metric.id + '_' + params.sql.type + '_' + params.lense.key + '_' + params.date)
params.metric.id + '_' + params.sql.type + '_' + params.lense.name + '_' + params.date)
.tags(['crawl_complete', 'reports'])
.queries(ctx => `
DELETE FROM reports.${params.metric.id}_${params.sql.type}
WHERE date = '${params.date}';

/* {"dataform_trigger": "report_complete", "date": "${params.date}", "name": "${params.metric.id}", "type": "${params.sql.type}", "lense": "${params.lense.key}"} */
/* {"dataform_trigger": "report_complete", "date": "${params.date}", "name": "${params.metric.id}", "type": "${params.sql.type}", "lense": "${params.lense.name}"} */
INSERT INTO reports.${params.metric.id}_${params.sql.type}` +
params.sql.query(ctx, params)
)
Expand Down
27 changes: 15 additions & 12 deletions includes/reports.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,14 @@ FROM (
COUNT(0) AS volume
FROM ${ctx.ref('crawl', 'pages')}
WHERE
date = '${params.date}' ${params.devRankFilter} AND
date = '${params.date}' ${params.devRankFilter} ${params.lense.sql} AND
is_root_page AND
INT64(summary.bytesTotal) > 0
GROUP BY
date,
client,
bin
HAVING bin IS NOT NULL
)
)
ORDER BY
Expand All @@ -40,26 +41,28 @@ ORDER BY
{
type: 'timeseries',
query: DataformTemplateBuilder.create((ctx, params) => `
SELECT
date,
client,
UNIX_SECONDS(TIMESTAMP(date)) AS timestamp,
ROUND(APPROX_QUANTILES(bytesTotal, 1001)[OFFSET(101)] / 1024, 2) AS p10,
ROUND(APPROX_QUANTILES(bytesTotal, 1001)[OFFSET(251)] / 1024, 2) AS p25,
ROUND(APPROX_QUANTILES(bytesTotal, 1001)[OFFSET(501)] / 1024, 2) AS p50,
ROUND(APPROX_QUANTILES(bytesTotal, 1001)[OFFSET(751)] / 1024, 2) AS p75,
ROUND(APPROX_QUANTILES(bytesTotal, 1001)[OFFSET(901)] / 1024, 2) AS p90
FROM (
WITH pages AS (
SELECT
date,
client,
INT64(summary.bytesTotal) AS bytesTotal
FROM ${ctx.ref('crawl', 'pages')}
WHERE
date = '${params.date}' ${params.devRankFilter} AND
date = '${params.date}' ${params.devRankFilter} ${params.lense.sql} AND
is_root_page AND
INT64(summary.bytesTotal) > 0
)

SELECT
date,
client,
UNIX_SECONDS(TIMESTAMP(date)) AS timestamp,
ROUND(APPROX_QUANTILES(bytesTotal, 1001)[OFFSET(101)] / 1024, 2) AS p10,
ROUND(APPROX_QUANTILES(bytesTotal, 1001)[OFFSET(251)] / 1024, 2) AS p25,
ROUND(APPROX_QUANTILES(bytesTotal, 1001)[OFFSET(501)] / 1024, 2) AS p50,
ROUND(APPROX_QUANTILES(bytesTotal, 1001)[OFFSET(751)] / 1024, 2) AS p75,
ROUND(APPROX_QUANTILES(bytesTotal, 1001)[OFFSET(901)] / 1024, 2) AS p90
FROM pages
GROUP BY
date,
client,
Expand Down
Loading