Add ooni_run_link_id to analysis table

ooni · Nov 21, 2024 · 911ec82 · 911ec82
1 parent 1692f6e
commit 911ec82
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git 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,15 +312,14 @@ 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,
         position(ip, '.') != 0 as ip_is_v4
 
         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
@@ -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,