BigQuery: Remove "Job ID" metadata on annotaton to avoid cache misses (#7541)

redash/query_runner/big_query.py

@@ -156,6 +156,11 @@ class BigQuery(BaseSQLQueryRunner):
             "secret": ["jsonKeyFile"],
         }
 
+    def annotate_query(self, query, metadata):
+        # Remove "Job ID" before annotating the query to avoid cache misses
+        metadata = {k: v for k, v in metadata.items() if k != "Job ID"}
+        return super().annotate_query(query, metadata)
+
     def _get_bigquery_service(self):
         socket.setdefaulttimeout(settings.BIGQUERY_HTTP_TIMEOUT)
 

tests/query_runner/test_bigquery.py

@@ -20,7 +20,7 @@ class TestBigQueryQueryRunner(unittest.TestCase):
         query = "SELECT a FROM tbl"
         expect = (
             "/* Username: username, query_id: adhoc, "
-            "Job ID: job-id, Query Hash: query-hash, "
+            "Query Hash: query-hash, "
             "Scheduled: False */ SELECT a FROM tbl"
         )