diff --git a/jobs/webcompat-kb/data/metrics/rescores.toml b/jobs/webcompat-kb/data/metrics/rescores.toml index 619f936e..dc82abe3 100644 --- a/jobs/webcompat-kb/data/metrics/rescores.toml +++ b/jobs/webcompat-kb/data/metrics/rescores.toml @@ -10,4 +10,3 @@ routine_updates = [ "moz-fx-dev-dschubert-wckb.webcompat_knowledge_base.WEBCOMPAT_METRIC_SCORE_SITE_RANK_MODIFIER", "moz-fx-dev-dschubert-wckb.webcompat_knowledge_base.WEBCOMPAT_METRIC_YYYYMM", ] -stage = true diff --git a/jobs/webcompat-kb/data/sql/webcompat_knowledge_base/routines/RESCORE_SITE_RANKS_UPDATE_202603_WEBCOMPAT_METRIC_SCORE_SITE_RANK_MODIFIER/meta.toml b/jobs/webcompat-kb/data/sql/webcompat_knowledge_base/routines/RESCORE_SITE_RANKS_UPDATE_202603_WEBCOMPAT_METRIC_SCORE_SITE_RANK_MODIFIER/meta.toml deleted file mode 100644 index 879ce9c7..00000000 --- a/jobs/webcompat-kb/data/sql/webcompat_knowledge_base/routines/RESCORE_SITE_RANKS_UPDATE_202603_WEBCOMPAT_METRIC_SCORE_SITE_RANK_MODIFIER/meta.toml +++ /dev/null @@ -1 +0,0 @@ -name = "RESCORE_SITE_RANKS_UPDATE_202603_WEBCOMPAT_METRIC_SCORE_SITE_RANK_MODIFIER" diff --git a/jobs/webcompat-kb/data/sql/webcompat_knowledge_base/routines/RESCORE_SITE_RANKS_UPDATE_202603_WEBCOMPAT_METRIC_SCORE_SITE_RANK_MODIFIER/routine.sql b/jobs/webcompat-kb/data/sql/webcompat_knowledge_base/routines/RESCORE_SITE_RANKS_UPDATE_202603_WEBCOMPAT_METRIC_SCORE_SITE_RANK_MODIFIER/routine.sql deleted file mode 100644 index 7d3145e9..00000000 --- a/jobs/webcompat-kb/data/sql/webcompat_knowledge_base/routines/RESCORE_SITE_RANKS_UPDATE_202603_WEBCOMPAT_METRIC_SCORE_SITE_RANK_MODIFIER/routine.sql +++ /dev/null @@ -1,36 +0,0 @@ -CREATE OR REPLACE FUNCTION `{{ ref(name) }}`(url STRING, crux_yyyymm INT64) RETURNS NUMERIC AS ( - ( - SELECT - CAST(CASE - WHEN MIN(host_ranks.global_rank) <= 1000 THEN 15 - WHEN - MIN(host_ranks.core_rank) <= 1000 OR - MIN(host_ranks.india_rank) <= 1000 OR - MIN(host_ranks.brazil_rank) <= 1000 OR - MIN(host_ranks.indonesia_rank) <= 1000 OR - MIN(host_ranks.mexico_rank) <= 1000 OR - MIN(host_ranks.italy_rank) <= 1000 OR - MIN(host_ranks.spain_rank) <= 1000 OR - MIN(host_ranks.netherlands_rank) <= 1000 - THEN 10 - WHEN MIN(host_ranks.global_rank) <= 10000 THEN 7.5 - WHEN MIN(host_ranks.local_rank) <= 1000 THEN 5 - WHEN - MIN(host_ranks.core_rank) <= 10000 OR - MIN(host_ranks.india_rank) <= 10000 OR - MIN(host_ranks.brazil_rank) <= 10000 OR - MIN(host_ranks.indonesia_rank) <= 10000 OR - MIN(host_ranks.mexico_rank) <= 10000 OR - MIN(host_ranks.italy_rank) <= 10000 OR - MIN(host_ranks.spain_rank) <= 10000 OR - MIN(host_ranks.netherlands_rank) <= 10000 - THEN 5 - WHEN MIN(host_ranks.local_rank) <= 10000 THEN 2.5 - ELSE 1 - END AS NUMERIC) - FROM - `{{ ref ('crux_imported.host_min_ranks') }}` AS host_ranks - WHERE - host_ranks.yyyymm = crux_yyyymm AND `{{ ref('WEBCOMPAT_HOST') }}`(host_ranks.host) = `{{ ref('WEBCOMPAT_HOST') }}`(url) - ) -); diff --git a/jobs/webcompat-kb/data/sql/webcompat_knowledge_base/routines/RESCORE_SITE_RANKS_UPDATE_202603_WEBCOMPAT_METRIC_YYYYMM/meta.toml b/jobs/webcompat-kb/data/sql/webcompat_knowledge_base/routines/RESCORE_SITE_RANKS_UPDATE_202603_WEBCOMPAT_METRIC_YYYYMM/meta.toml deleted file mode 100644 index 97a7bf9d..00000000 --- a/jobs/webcompat-kb/data/sql/webcompat_knowledge_base/routines/RESCORE_SITE_RANKS_UPDATE_202603_WEBCOMPAT_METRIC_YYYYMM/meta.toml +++ /dev/null @@ -1 +0,0 @@ -name = "RESCORE_SITE_RANKS_UPDATE_202603_WEBCOMPAT_METRIC_YYYYMM" diff --git a/jobs/webcompat-kb/data/sql/webcompat_knowledge_base/routines/WEBCOMPAT_METRIC_SCORE_SITE_RANK_MODIFIER/meta.toml b/jobs/webcompat-kb/data/sql/webcompat_knowledge_base/routines/WEBCOMPAT_METRIC_SCORE_SITE_RANK_MODIFIER/meta.toml index 8090ba19..71ffe9e1 100644 --- a/jobs/webcompat-kb/data/sql/webcompat_knowledge_base/routines/WEBCOMPAT_METRIC_SCORE_SITE_RANK_MODIFIER/meta.toml +++ b/jobs/webcompat-kb/data/sql/webcompat_knowledge_base/routines/WEBCOMPAT_METRIC_SCORE_SITE_RANK_MODIFIER/meta.toml @@ -1 +1 @@ -name = "WEBCOMPAT_METRIC_SCORE_SITE_RANK_MODIFIER" \ No newline at end of file +name = "WEBCOMPAT_METRIC_SCORE_SITE_RANK_MODIFIER" diff --git a/jobs/webcompat-kb/data/sql/webcompat_knowledge_base/routines/WEBCOMPAT_METRIC_SCORE_SITE_RANK_MODIFIER/routine.sql b/jobs/webcompat-kb/data/sql/webcompat_knowledge_base/routines/WEBCOMPAT_METRIC_SCORE_SITE_RANK_MODIFIER/routine.sql index 61763a21..7d3145e9 100644 --- a/jobs/webcompat-kb/data/sql/webcompat_knowledge_base/routines/WEBCOMPAT_METRIC_SCORE_SITE_RANK_MODIFIER/routine.sql +++ b/jobs/webcompat-kb/data/sql/webcompat_knowledge_base/routines/WEBCOMPAT_METRIC_SCORE_SITE_RANK_MODIFIER/routine.sql @@ -1,11 +1,36 @@ CREATE OR REPLACE FUNCTION `{{ ref(name) }}`(url STRING, crux_yyyymm INT64) RETURNS NUMERIC AS ( -(SELECT - IFNULL(IF(MIN(host_ranks.global_rank) <= MIN(IFNULL(host_ranks.local_rank, host_ranks.global_rank)), MAX(1.5 * global_scores.score), MAX(local_scores.score)), 1) - FROM - `{{ ref ('crux_imported.host_min_ranks') }}` AS host_ranks - LEFT JOIN `{{ ref('dim_bug_score') }}` AS local_scores ON local_scores.lookup_type = 'site_rank' AND host_ranks.local_rank <= cast(local_scores.lookup_value as int64) - LEFT JOIN `{{ ref('dim_bug_score') }}` AS global_scores ON global_scores.lookup_type = 'site_rank' AND host_ranks.global_rank <= cast(global_scores.lookup_value as int64) - WHERE - host_ranks.yyyymm = crux_yyyymm AND `{{ ref('WEBCOMPAT_HOST') }}`(host_ranks.host) = `{{ ref('WEBCOMPAT_HOST') }}`(url) + ( + SELECT + CAST(CASE + WHEN MIN(host_ranks.global_rank) <= 1000 THEN 15 + WHEN + MIN(host_ranks.core_rank) <= 1000 OR + MIN(host_ranks.india_rank) <= 1000 OR + MIN(host_ranks.brazil_rank) <= 1000 OR + MIN(host_ranks.indonesia_rank) <= 1000 OR + MIN(host_ranks.mexico_rank) <= 1000 OR + MIN(host_ranks.italy_rank) <= 1000 OR + MIN(host_ranks.spain_rank) <= 1000 OR + MIN(host_ranks.netherlands_rank) <= 1000 + THEN 10 + WHEN MIN(host_ranks.global_rank) <= 10000 THEN 7.5 + WHEN MIN(host_ranks.local_rank) <= 1000 THEN 5 + WHEN + MIN(host_ranks.core_rank) <= 10000 OR + MIN(host_ranks.india_rank) <= 10000 OR + MIN(host_ranks.brazil_rank) <= 10000 OR + MIN(host_ranks.indonesia_rank) <= 10000 OR + MIN(host_ranks.mexico_rank) <= 10000 OR + MIN(host_ranks.italy_rank) <= 10000 OR + MIN(host_ranks.spain_rank) <= 10000 OR + MIN(host_ranks.netherlands_rank) <= 10000 + THEN 5 + WHEN MIN(host_ranks.local_rank) <= 10000 THEN 2.5 + ELSE 1 + END AS NUMERIC) + FROM + `{{ ref ('crux_imported.host_min_ranks') }}` AS host_ranks + WHERE + host_ranks.yyyymm = crux_yyyymm AND `{{ ref('WEBCOMPAT_HOST') }}`(host_ranks.host) = `{{ ref('WEBCOMPAT_HOST') }}`(url) ) ); diff --git a/jobs/webcompat-kb/data/sql/webcompat_knowledge_base/routines/WEBCOMPAT_METRIC_YYYYMM/routine.sql b/jobs/webcompat-kb/data/sql/webcompat_knowledge_base/routines/WEBCOMPAT_METRIC_YYYYMM/routine.sql index 7fd2032f..91234b3b 100644 --- a/jobs/webcompat-kb/data/sql/webcompat_knowledge_base/routines/WEBCOMPAT_METRIC_YYYYMM/routine.sql +++ b/jobs/webcompat-kb/data/sql/webcompat_knowledge_base/routines/WEBCOMPAT_METRIC_YYYYMM/routine.sql @@ -1,3 +1,3 @@ CREATE OR REPLACE FUNCTION `{{ ref(name) }}`() RETURNS INT64 AS ( -202512 -); \ No newline at end of file +202603 +); diff --git a/jobs/webcompat-kb/data/sql/webcompat_knowledge_base/views/rescore_site_ranks_update_202603_delta/meta.toml b/jobs/webcompat-kb/data/sql/webcompat_knowledge_base/views/rescore_site_ranks_update_202603_delta/meta.toml deleted file mode 100644 index 01626672..00000000 --- a/jobs/webcompat-kb/data/sql/webcompat_knowledge_base/views/rescore_site_ranks_update_202603_delta/meta.toml +++ /dev/null @@ -1,2 +0,0 @@ -name = "rescore_site_ranks_update_202603_delta" -description = "Score delta for rescore rescore_site_ranks_update_202603_delta" diff --git a/jobs/webcompat-kb/data/sql/webcompat_knowledge_base/views/rescore_site_ranks_update_202603_delta/view.sql b/jobs/webcompat-kb/data/sql/webcompat_knowledge_base/views/rescore_site_ranks_update_202603_delta/view.sql deleted file mode 100644 index fa8c2640..00000000 --- a/jobs/webcompat-kb/data/sql/webcompat_knowledge_base/views/rescore_site_ranks_update_202603_delta/view.sql +++ /dev/null @@ -1,144 +0,0 @@ - -with scores as ( - SELECT - number, - old_scored_site_reports.score AS old_score, - new_scored_site_reports.score AS new_score, - old_scored_site_reports.is_global_1000 AS is_global_1000_old, - new_scored_site_reports.is_global_1000 AS is_global_1000_new, - old_scored_site_reports.is_sightline AS is_sightline_old, - new_scored_site_reports.is_sightline AS is_sightline_new, - old_scored_site_reports.is_japan_1000 AS is_japan_1000_old, - new_scored_site_reports.is_japan_1000 AS is_japan_1000_new, - old_scored_site_reports.is_japan_1000_mobile AS is_japan_1000_mobile_old, - new_scored_site_reports.is_japan_1000_mobile AS is_japan_1000_mobile_new, - old_scored_site_reports.is_core AS is_core_old, - new_scored_site_reports.is_core AS is_core_new, - old_scored_site_reports.is_global_5000 AS is_global_5000_old, - new_scored_site_reports.is_global_5000 AS is_global_5000_new, - old_scored_site_reports.is_us_1000 AS is_us_1000_old, - new_scored_site_reports.is_us_1000 AS is_us_1000_new, - old_scored_site_reports.is_us_1000_mobile AS is_us_1000_mobile_old, - new_scored_site_reports.is_us_1000_mobile AS is_us_1000_mobile_new, - old_scored_site_reports.is_germany_1000 AS is_germany_1000_old, - new_scored_site_reports.is_germany_1000 AS is_germany_1000_new, - old_scored_site_reports.is_germany_1000_mobile AS is_germany_1000_mobile_old, - new_scored_site_reports.is_germany_1000_mobile AS is_germany_1000_mobile_new, - old_scored_site_reports.is_france_1000 AS is_france_1000_old, - new_scored_site_reports.is_france_1000 AS is_france_1000_new, - old_scored_site_reports.is_france_1000_mobile AS is_france_1000_mobile_old, - new_scored_site_reports.is_france_1000_mobile AS is_france_1000_mobile_new, - old_scored_site_reports.is_uk_1000 AS is_uk_1000_old, - new_scored_site_reports.is_uk_1000 AS is_uk_1000_new, - old_scored_site_reports.is_uk_1000_mobile AS is_uk_1000_mobile_old, - new_scored_site_reports.is_uk_1000_mobile AS is_uk_1000_mobile_new, - old_scored_site_reports.is_canada_1000 AS is_canada_1000_old, - new_scored_site_reports.is_canada_1000 AS is_canada_1000_new, - old_scored_site_reports.is_canada_1000_mobile AS is_canada_1000_mobile_old, - new_scored_site_reports.is_canada_1000_mobile AS is_canada_1000_mobile_new, - old_scored_site_reports.is_poland_1000 AS is_poland_1000_old, - new_scored_site_reports.is_poland_1000 AS is_poland_1000_new, - old_scored_site_reports.is_poland_1000_mobile AS is_poland_1000_mobile_old, - new_scored_site_reports.is_poland_1000_mobile AS is_poland_1000_mobile_new, - old_scored_site_reports.is_india_1000 AS is_india_1000_old, - new_scored_site_reports.is_india_1000 AS is_india_1000_new, - old_scored_site_reports.is_india_1000_mobile AS is_india_1000_mobile_old, - new_scored_site_reports.is_india_1000_mobile AS is_india_1000_mobile_new, - old_scored_site_reports.is_brazil_1000 AS is_brazil_1000_old, - new_scored_site_reports.is_brazil_1000 AS is_brazil_1000_new, - old_scored_site_reports.is_brazil_1000_mobile AS is_brazil_1000_mobile_old, - new_scored_site_reports.is_brazil_1000_mobile AS is_brazil_1000_mobile_new, - old_scored_site_reports.is_indonesia_1000 AS is_indonesia_1000_old, - new_scored_site_reports.is_indonesia_1000 AS is_indonesia_1000_new, - old_scored_site_reports.is_indonesia_1000_mobile AS is_indonesia_1000_mobile_old, - new_scored_site_reports.is_indonesia_1000_mobile AS is_indonesia_1000_mobile_new, - old_scored_site_reports.is_mexico_1000 AS is_mexico_1000_old, - new_scored_site_reports.is_mexico_1000 AS is_mexico_1000_new, - old_scored_site_reports.is_mexico_1000_mobile AS is_mexico_1000_mobile_old, - new_scored_site_reports.is_mexico_1000_mobile AS is_mexico_1000_mobile_new, - old_scored_site_reports.is_italy_1000 AS is_italy_1000_old, - new_scored_site_reports.is_italy_1000 AS is_italy_1000_new, - old_scored_site_reports.is_italy_1000_mobile AS is_italy_1000_mobile_old, - new_scored_site_reports.is_italy_1000_mobile AS is_italy_1000_mobile_new, - old_scored_site_reports.is_spain_1000 AS is_spain_1000_old, - new_scored_site_reports.is_spain_1000 AS is_spain_1000_new, - old_scored_site_reports.is_spain_1000_mobile AS is_spain_1000_mobile_old, - new_scored_site_reports.is_spain_1000_mobile AS is_spain_1000_mobile_new, - old_scored_site_reports.is_netherlands_1000 AS is_netherlands_1000_old, - new_scored_site_reports.is_netherlands_1000 AS is_netherlands_1000_new, - old_scored_site_reports.is_netherlands_1000_mobile AS is_netherlands_1000_mobile_old, - new_scored_site_reports.is_netherlands_1000_mobile AS is_netherlands_1000_mobile_new - FROM `{{ ref('rescore_site_ranks_update_202603_scored_site_reports') }}` as new_scored_site_reports - FULL OUTER JOIN `{{ ref('scored_site_reports') }}` AS old_scored_site_reports USING(number) - WHERE new_scored_site_reports.resolution = "" -) -SELECT - number, - old_score, - new_score, - is_global_1000_old, - is_global_1000_new, - is_sightline_old, - is_sightline_new, - is_japan_1000_old, - is_japan_1000_new, - is_japan_1000_mobile_old, - is_japan_1000_mobile_new, - is_core_old, - is_core_new, - is_global_5000_old, - is_global_5000_new, - is_us_1000_old, - is_us_1000_new, - is_us_1000_mobile_old, - is_us_1000_mobile_new, - is_germany_1000_old, - is_germany_1000_new, - is_germany_1000_mobile_old, - is_germany_1000_mobile_new, - is_france_1000_old, - is_france_1000_new, - is_france_1000_mobile_old, - is_france_1000_mobile_new, - is_uk_1000_old, - is_uk_1000_new, - is_uk_1000_mobile_old, - is_uk_1000_mobile_new, - is_canada_1000_old, - is_canada_1000_new, - is_canada_1000_mobile_old, - is_canada_1000_mobile_new, - is_poland_1000_old, - is_poland_1000_new, - is_poland_1000_mobile_old, - is_poland_1000_mobile_new, - is_india_1000_old, - is_india_1000_new, - is_india_1000_mobile_old, - is_india_1000_mobile_new, - is_brazil_1000_old, - is_brazil_1000_new, - is_brazil_1000_mobile_old, - is_brazil_1000_mobile_new, - is_indonesia_1000_old, - is_indonesia_1000_new, - is_indonesia_1000_mobile_old, - is_indonesia_1000_mobile_new, - is_mexico_1000_old, - is_mexico_1000_new, - is_mexico_1000_mobile_old, - is_mexico_1000_mobile_new, - is_italy_1000_old, - is_italy_1000_new, - is_italy_1000_mobile_old, - is_italy_1000_mobile_new, - is_spain_1000_old, - is_spain_1000_new, - is_spain_1000_mobile_old, - is_spain_1000_mobile_new, - is_netherlands_1000_old, - is_netherlands_1000_new, - is_netherlands_1000_mobile_old, - is_netherlands_1000_mobile_new, - new_score - old_score AS delta -FROM scores diff --git a/jobs/webcompat-kb/data/sql/webcompat_knowledge_base/views/rescore_site_ranks_update_202603_scored_site_reports/meta.toml b/jobs/webcompat-kb/data/sql/webcompat_knowledge_base/views/rescore_site_ranks_update_202603_scored_site_reports/meta.toml deleted file mode 100644 index fef81fc4..00000000 --- a/jobs/webcompat-kb/data/sql/webcompat_knowledge_base/views/rescore_site_ranks_update_202603_scored_site_reports/meta.toml +++ /dev/null @@ -1 +0,0 @@ -name = "rescore_site_ranks_update_202603_scored_site_reports" diff --git a/jobs/webcompat-kb/data/sql/webcompat_knowledge_base_archive/routines/WEBCOMPAT_METRIC_SCORE_SITE_RANK_MODIFIER_BEFORE_RESCORE_SITE_RANKS_UPDATE_202603/meta.toml b/jobs/webcompat-kb/data/sql/webcompat_knowledge_base_archive/routines/WEBCOMPAT_METRIC_SCORE_SITE_RANK_MODIFIER_BEFORE_RESCORE_SITE_RANKS_UPDATE_202603/meta.toml new file mode 100644 index 00000000..fd8f8e4b --- /dev/null +++ b/jobs/webcompat-kb/data/sql/webcompat_knowledge_base_archive/routines/WEBCOMPAT_METRIC_SCORE_SITE_RANK_MODIFIER_BEFORE_RESCORE_SITE_RANKS_UPDATE_202603/meta.toml @@ -0,0 +1 @@ +name = "WEBCOMPAT_METRIC_SCORE_SITE_RANK_MODIFIER_BEFORE_RESCORE_SITE_RANKS_UPDATE_202603" diff --git a/jobs/webcompat-kb/data/sql/webcompat_knowledge_base_archive/routines/WEBCOMPAT_METRIC_SCORE_SITE_RANK_MODIFIER_BEFORE_RESCORE_SITE_RANKS_UPDATE_202603/routine.sql b/jobs/webcompat-kb/data/sql/webcompat_knowledge_base_archive/routines/WEBCOMPAT_METRIC_SCORE_SITE_RANK_MODIFIER_BEFORE_RESCORE_SITE_RANKS_UPDATE_202603/routine.sql new file mode 100644 index 00000000..61763a21 --- /dev/null +++ b/jobs/webcompat-kb/data/sql/webcompat_knowledge_base_archive/routines/WEBCOMPAT_METRIC_SCORE_SITE_RANK_MODIFIER_BEFORE_RESCORE_SITE_RANKS_UPDATE_202603/routine.sql @@ -0,0 +1,11 @@ +CREATE OR REPLACE FUNCTION `{{ ref(name) }}`(url STRING, crux_yyyymm INT64) RETURNS NUMERIC AS ( +(SELECT + IFNULL(IF(MIN(host_ranks.global_rank) <= MIN(IFNULL(host_ranks.local_rank, host_ranks.global_rank)), MAX(1.5 * global_scores.score), MAX(local_scores.score)), 1) + FROM + `{{ ref ('crux_imported.host_min_ranks') }}` AS host_ranks + LEFT JOIN `{{ ref('dim_bug_score') }}` AS local_scores ON local_scores.lookup_type = 'site_rank' AND host_ranks.local_rank <= cast(local_scores.lookup_value as int64) + LEFT JOIN `{{ ref('dim_bug_score') }}` AS global_scores ON global_scores.lookup_type = 'site_rank' AND host_ranks.global_rank <= cast(global_scores.lookup_value as int64) + WHERE + host_ranks.yyyymm = crux_yyyymm AND `{{ ref('WEBCOMPAT_HOST') }}`(host_ranks.host) = `{{ ref('WEBCOMPAT_HOST') }}`(url) + ) +); diff --git a/jobs/webcompat-kb/data/sql/webcompat_knowledge_base_archive/routines/WEBCOMPAT_METRIC_YYYYMM_BEFORE_RESCORE_SITE_RANKS_UPDATE_202603/meta.toml b/jobs/webcompat-kb/data/sql/webcompat_knowledge_base_archive/routines/WEBCOMPAT_METRIC_YYYYMM_BEFORE_RESCORE_SITE_RANKS_UPDATE_202603/meta.toml new file mode 100644 index 00000000..3ffcee40 --- /dev/null +++ b/jobs/webcompat-kb/data/sql/webcompat_knowledge_base_archive/routines/WEBCOMPAT_METRIC_YYYYMM_BEFORE_RESCORE_SITE_RANKS_UPDATE_202603/meta.toml @@ -0,0 +1 @@ +name = "WEBCOMPAT_METRIC_YYYYMM_BEFORE_RESCORE_SITE_RANKS_UPDATE_202603" diff --git a/jobs/webcompat-kb/data/sql/webcompat_knowledge_base/routines/RESCORE_SITE_RANKS_UPDATE_202603_WEBCOMPAT_METRIC_YYYYMM/routine.sql b/jobs/webcompat-kb/data/sql/webcompat_knowledge_base_archive/routines/WEBCOMPAT_METRIC_YYYYMM_BEFORE_RESCORE_SITE_RANKS_UPDATE_202603/routine.sql similarity index 86% rename from jobs/webcompat-kb/data/sql/webcompat_knowledge_base/routines/RESCORE_SITE_RANKS_UPDATE_202603_WEBCOMPAT_METRIC_YYYYMM/routine.sql rename to jobs/webcompat-kb/data/sql/webcompat_knowledge_base_archive/routines/WEBCOMPAT_METRIC_YYYYMM_BEFORE_RESCORE_SITE_RANKS_UPDATE_202603/routine.sql index 91234b3b..7fd2032f 100644 --- a/jobs/webcompat-kb/data/sql/webcompat_knowledge_base/routines/RESCORE_SITE_RANKS_UPDATE_202603_WEBCOMPAT_METRIC_YYYYMM/routine.sql +++ b/jobs/webcompat-kb/data/sql/webcompat_knowledge_base_archive/routines/WEBCOMPAT_METRIC_YYYYMM_BEFORE_RESCORE_SITE_RANKS_UPDATE_202603/routine.sql @@ -1,3 +1,3 @@ CREATE OR REPLACE FUNCTION `{{ ref(name) }}`() RETURNS INT64 AS ( -202603 -); +202512 +); \ No newline at end of file diff --git a/jobs/webcompat-kb/data/sql/webcompat_knowledge_base_archive/views/scored_site_reports_before_rescore_site_ranks_update_202603/meta.toml b/jobs/webcompat-kb/data/sql/webcompat_knowledge_base_archive/views/scored_site_reports_before_rescore_site_ranks_update_202603/meta.toml new file mode 100644 index 00000000..c94751f7 --- /dev/null +++ b/jobs/webcompat-kb/data/sql/webcompat_knowledge_base_archive/views/scored_site_reports_before_rescore_site_ranks_update_202603/meta.toml @@ -0,0 +1 @@ +name = "scored_site_reports_before_rescore_site_ranks_update_202603" diff --git a/jobs/webcompat-kb/data/sql/webcompat_knowledge_base/views/rescore_site_ranks_update_202603_scored_site_reports/view.sql b/jobs/webcompat-kb/data/sql/webcompat_knowledge_base_archive/views/scored_site_reports_before_rescore_site_ranks_update_202603/view.sql similarity index 78% rename from jobs/webcompat-kb/data/sql/webcompat_knowledge_base/views/rescore_site_ranks_update_202603_scored_site_reports/view.sql rename to jobs/webcompat-kb/data/sql/webcompat_knowledge_base_archive/views/scored_site_reports_before_rescore_site_ranks_update_202603/view.sql index 66ad7df9..c8a843a2 100644 --- a/jobs/webcompat-kb/data/sql/webcompat_knowledge_base/views/rescore_site_ranks_update_202603_scored_site_reports/view.sql +++ b/jobs/webcompat-kb/data/sql/webcompat_knowledge_base_archive/views/scored_site_reports_before_rescore_site_ranks_update_202603/view.sql @@ -1,14 +1,14 @@ WITH host_categories AS ( SELECT - `{{ ref('WEBCOMPAT_HOST') }}`(host) as webcompat_host, + `{{ ref('webcompat_knowledge_base.WEBCOMPAT_HOST') }}`(host) as webcompat_host, {% for metric in metrics.values() if metric.host_min_ranks_condition() -%} {{ metric.host_min_ranks_condition() }} AS is_{{ metric.name }}{{ ',' if not loop.last }} {% endfor %} FROM `{{ ref('crux_imported.host_min_ranks') }}` WHERE - yyyymm = `{{ ref('RESCORE_SITE_RANKS_UPDATE_202603_WEBCOMPAT_METRIC_YYYYMM') }}`() + yyyymm = `{{ ref('WEBCOMPAT_METRIC_YYYYMM_BEFORE_RESCORE_SITE_RANKS_UPDATE_202603') }}`() GROUP BY webcompat_host), /* Individual score components for each bug. @@ -50,9 +50,9 @@ WITH (weights.lookup_type = "branch" AND weights.lookup_value = IFNULL(JSON_VALUE(site_reports.user_story, "$.branch"), "release"), weights.score, 0)) AS branch_score, FROM - `{{ ref('site_reports') }}` AS site_reports + `{{ ref('webcompat_knowledge_base.site_reports') }}` AS site_reports CROSS JOIN - `{{ ref('dim_bug_score') }}` AS weights + `{{ ref('webcompat_knowledge_base.dim_bug_score') }}` AS weights GROUP BY number), @@ -62,12 +62,12 @@ These could be inlined, but it's slightly easier to read if they're computed in computed_scores AS ( SELECT number, - `{{ ref('WEBCOMPAT_METRIC_SCORE_NO_SITE_RANK') }}`(keywords, + `{{ ref('webcompat_knowledge_base.WEBCOMPAT_METRIC_SCORE_NO_SITE_RANK') }}`(keywords, user_story) AS triage_score_no_rank, - `{{ ref('RESCORE_SITE_RANKS_UPDATE_202603_WEBCOMPAT_METRIC_SCORE_SITE_RANK_MODIFIER') }}`(url, - `{{ ref('RESCORE_SITE_RANKS_UPDATE_202603_WEBCOMPAT_METRIC_YYYYMM') }}`()) AS site_rank_score + `{{ ref('WEBCOMPAT_METRIC_SCORE_SITE_RANK_MODIFIER_BEFORE_RESCORE_SITE_RANKS_UPDATE_202603') }}`(url, + `{{ ref('WEBCOMPAT_METRIC_YYYYMM_BEFORE_RESCORE_SITE_RANKS_UPDATE_202603') }}`()) AS site_rank_score FROM - `{{ ref('site_reports') }}` AS site_reports + `{{ ref('webcompat_knowledge_base.site_reports') }}` AS site_reports ), site_report_scores AS ( @@ -86,7 +86,7 @@ site_report_scores AS ( {{ metric.site_reports_condition('host_categories') }} AS is_{{ metric.name }}{{ ',' if not loop.last }} {% endfor %} FROM - `{{ ref('site_reports') }}` AS site_reports + `{{ ref('webcompat_knowledge_base.site_reports') }}` AS site_reports JOIN scores USING @@ -98,7 +98,7 @@ site_report_scores AS ( LEFT JOIN host_categories ON - host_categories.webcompat_host = `{{ ref('WEBCOMPAT_HOST') }}`(site_reports.url)) + host_categories.webcompat_host = `{{ ref('webcompat_knowledge_base.WEBCOMPAT_HOST') }}`(site_reports.url)) SELECT site_report_scores.*, diff --git a/jobs/webcompat-kb/webcompat_kb/commands/metric_rescore.py b/jobs/webcompat-kb/webcompat_kb/commands/metric_rescore.py index d7c377d3..ab3bb9d8 100644 --- a/jobs/webcompat-kb/webcompat_kb/commands/metric_rescore.py +++ b/jobs/webcompat-kb/webcompat_kb/commands/metric_rescore.py @@ -343,7 +343,7 @@ def argument_parser(self) -> argparse.ArgumentParser: return parser def main(self, args: argparse.Namespace) -> Optional[int]: - if args.reason is None: + if args.reason is None and args.phase == "create-schemas": raise ValueError("Missing --reason") config = Config(write=args.write, stage=args.stage)