diff --git a/oonipipeline/src/oonipipeline/analysis/web_analysis.py b/oonipipeline/src/oonipipeline/analysis/web_analysis.py index 76501176..35317c02 100644 --- a/oonipipeline/src/oonipipeline/analysis/web_analysis.py +++ b/oonipipeline/src/oonipipeline/analysis/web_analysis.py @@ -288,6 +288,7 @@ def format_query_analysis_web_fuzzy_logic( network_type, measurement_start_time, measurement_uid, + ooni_run_link_id, anyHeavy(probe_analysis) as top_probe_analysis, @@ -311,8 +312,6 @@ def format_query_analysis_web_fuzzy_logic( max(tls_down) as tls_down_max, max(tls_ok) as tls_ok_max - --report_id - FROM ( WITH position(ip, '.') = 0 as ip_is_v6, @@ -320,6 +319,7 @@ def format_query_analysis_web_fuzzy_logic( SELECT measurement_uid, + ooni_run_link_id, report_id, hostname, input, @@ -508,7 +508,8 @@ def format_query_analysis_web_fuzzy_logic( resolver_asn, resolver_as_cc, network_type, test_name, measurement_start_time, - measurement_uid + measurement_uid, + ooni_run_link_id """ return SQL, q_params diff --git a/oonipipeline/src/oonipipeline/db/create_tables.py b/oonipipeline/src/oonipipeline/db/create_tables.py index a2487943..a8a6518d 100644 --- a/oonipipeline/src/oonipipeline/db/create_tables.py +++ b/oonipipeline/src/oonipipeline/db/create_tables.py @@ -192,7 +192,9 @@ def make_create_queries(): `probe_cc` String, `resolver_asn` UInt32, `resolver_as_cc` String, `network_type` String, `measurement_start_time` DateTime64(3, 'UTC'), - `measurement_uid` String, `top_probe_analysis` Nullable(String), + `measurement_uid` String, + `ooni_run_link_id` String, + `top_probe_analysis` Nullable(String), `top_dns_failure` Nullable(String), `top_tcp_failure` Nullable(String), `top_tls_failure` Nullable(String), `dns_blocked_max` Float32, `dns_down_max` Float32, `dns_ok_max` Float32,