Fix explain table JOIN test.

Author: cristianberneanu

src/hooks.c

@@ -59,7 +59,7 @@ static AnonQueryLinks *prepare_query(Query *query, ParamListInfo bound_params)
     return NULL;
 
   /* At this point we have an anonymizing query. */
-  DEBUG_LOG("Anonymizing query (Query ID=%lu) (User ID=%u) %s", query->queryId, GetSessionUserId(), nodeToString(query));
+  DEBUG_LOG("Anonymizing query (User ID=%u) %s", GetSessionUserId(), nodeToString(query));
 
   /* We load OIDs lazily because experimentation shows that UDFs may return INVALIDOID (0) during _PG_init. */
   oid_cache_init();
@@ -72,7 +72,7 @@ static AnonQueryLinks *prepare_query(Query *query, ParamListInfo bound_params)
 
   AnonQueryLinks *links = compile_query(query, personal_relations, bound_params);
 
-  DEBUG_LOG("Compiled query (Query ID=%lu) (User ID=%u) %s", query->queryId, GetSessionUserId(), nodeToString(query));
+  DEBUG_LOG("Compiled query (User ID=%u) %s", GetSessionUserId(), nodeToString(query));
 
   return links;
 }
@@ -83,10 +83,7 @@ static PlannedStmt *pg_diffix_planner(
     int cursorOptions,
     ParamListInfo boundParams)
 {
-  static uint64 next_query_id = 1;
-  query->queryId = next_query_id++;
-
-  DEBUG_LOG("Statement (Query ID=%lu) (User ID=%u): %s", query->queryId, GetSessionUserId(), query_string);
+  DEBUG_LOG("Statement (User ID=%u): %s", GetSessionUserId(), query_string);
 
   AnonQueryLinks *links = prepare_query(query, boundParams);
 

src/query/anonymization.c

@@ -731,7 +731,7 @@ static AnonymizationContext *make_query_anonymizing(Query *query, List *personal
   /* Only simple select queries require implicit grouping. */
   if (!initial_has_aggs && !initial_has_group_clause)
   {
-    DEBUG_LOG("Rewriting query to group and expand implicit buckets (Query ID=%lu).", query->queryId);
+    DEBUG_LOG("Rewriting query to group and expand implicit buckets.");
     group_implicit_buckets(query);
     add_junk_count_star(query);
     anon_context->expand_buckets = true;

test/expected/misc.out

@@ -212,6 +212,26 @@ SELECT id FROM test_customers WHERE NULL = NULL;
 ----
 (0 rows)
 
+-- JOIN between personal tables produces multiple AIDs
+EXPLAIN VERBOSE SELECT COUNT(*) FROM test_customers c JOIN test_purchases pur ON c.id = cid;
+                         QUERY PLAN                          
+-------------------------------------------------------------
+ Custom Scan (BucketScan)
+   Output: (diffix.anon_count_star(c.id, pur.cid))
+   ->  Aggregate
+         Output: diffix.anon_count_star(c.id, pur.cid)
+         ->  Hash Join
+               Output: c.id, pur.cid
+               Inner Unique: true
+               Hash Cond: (pur.cid = c.id)
+               ->  Seq Scan on public.test_purchases pur
+                     Output: pur.cid, pur.pid
+               ->  Hash
+                     Output: c.id
+                     ->  Seq Scan on public.test_customers c
+                           Output: c.id
+(14 rows)
+
 -- Tolerate `diffix.agg_noise` in direct access level
 SET pg_diffix.session_access_level = 'direct';
 SELECT diffix.sum_noise(discount), diffix.count_noise(*) FROM test_customers;
@@ -231,21 +251,3 @@ ERROR:  Column `id` is already marked as an AID.
 CONTEXT:  PL/pgSQL function diffix.assert_column_is_not_aid(text,text) line 20 at RAISE
 SQL statement "CALL diffix.assert_column_is_not_aid(table_name, column_name)"
 PL/pgSQL function diffix.mark_filterable(text,text) line 3 at CALL
--- JOIN between personal tables produces multiple AIDs
-EXPLAIN VERBOSE SELECT COUNT(*) FROM test_customers c JOIN test_purchases pur ON c.id = cid;
-                                         QUERY PLAN                                         
---------------------------------------------------------------------------------------------
- Aggregate  (cost=72.44..72.45 rows=1 width=8)
-   Output: count(*)
-   ->  Hash Join  (cost=28.23..66.79 rows=2260 width=0)
-         Inner Unique: true
-         Hash Cond: (pur.cid = c.id)
-         ->  Seq Scan on public.test_purchases pur  (cost=0.00..32.60 rows=2260 width=4)
-               Output: pur.cid, pur.pid
-         ->  Hash  (cost=18.10..18.10 rows=810 width=4)
-               Output: c.id
-               ->  Seq Scan on public.test_customers c  (cost=0.00..18.10 rows=810 width=4)
-                     Output: c.id
- Query Identifier: 31
-(12 rows)
-

test/sql/misc.sql

@@ -101,13 +101,13 @@ SELECT FROM test_customers WHERE FALSE;
 SELECT TRUE AS "_" FROM test_customers WHERE 1 <> 1 LIMIT 0;
 SELECT id FROM test_customers WHERE NULL = NULL;
 
+-- JOIN between personal tables produces multiple AIDs
+EXPLAIN VERBOSE SELECT COUNT(*) FROM test_customers c JOIN test_purchases pur ON c.id = cid;
+
 -- Tolerate `diffix.agg_noise` in direct access level
 SET pg_diffix.session_access_level = 'direct';
 SELECT diffix.sum_noise(discount), diffix.count_noise(*) FROM test_customers;
 
 -- Rejects marking an AID column.
 CALL diffix.mark_not_filterable('test_customers', 'id');
 CALL diffix.mark_filterable('test_customers', 'id');
-
--- JOIN between personal tables produces multiple AIDs
-EXPLAIN VERBOSE SELECT COUNT(*) FROM test_customers c JOIN test_purchases pur ON c.id = cid;