Handling review comments

timescale · Nov 22, 2024 · 2744c4f · 2744c4f
1 parent 12c4c0a
commit 2744c4f
Show file tree

Hide file tree

Showing 16 changed files with 73 additions and 126 deletions.
diff --git a/tsl/src/hypercore/arrow_cache_explain.c b/tsl/src/hypercore/arrow_cache_explain.c
@@ -61,12 +61,12 @@ standard_ExplainOneQuery(Query *query, int cursorOptions, IntoClause *into, Expl
 }
 #endif
 
-#define APPEND_IF_POSITIVE(INFO, FMT, VAL)                                                         \
-	do                                                                                             \
-	{                                                                                              \
-		if ((VAL) > 0)                                                                             \
-			appendStringInfo((INFO), " " FMT, (long long) (VAL));                                  \
-	} while (0)
+static inline void
+append_if_positive(StringInfo info, const char *key, long long val)
+{
+	if (val > 0)
+		appendStringInfo(info, " %s=%lld", key, val);
+}
 
 static void
 explain_decompression(Query *query, int cursorOptions, IntoClause *into, ExplainState *es,
@@ -87,13 +87,13 @@ explain_decompression(Query *query, int cursorOptions, IntoClause *into, Explain
 				appendStringInfoString(es->str, "Array:");
 				if (has_cache_data)
 					appendStringInfoString(es->str, " cache");
-				APPEND_IF_POSITIVE(es->str, "hits=%lld", decompress_cache_stats.hits);
-				APPEND_IF_POSITIVE(es->str, "misses=%lld", decompress_cache_stats.misses);
-				APPEND_IF_POSITIVE(es->str, "evictions=%lld", decompress_cache_stats.evictions);
+				append_if_positive(es->str, "hits", decompress_cache_stats.hits);
+				append_if_positive(es->str, "misses", decompress_cache_stats.misses);
+				append_if_positive(es->str, "evictions", decompress_cache_stats.evictions);
 				if (has_decompress_data)
 					appendStringInfoString(es->str, ", decompress");
-				APPEND_IF_POSITIVE(es->str, "count=%lld", decompress_cache_stats.decompressions);
-				APPEND_IF_POSITIVE(es->str, "calls=%lld", decompress_cache_stats.decompress_calls);
+				append_if_positive(es->str, "count", decompress_cache_stats.decompressions);
+				append_if_positive(es->str, "calls", decompress_cache_stats.decompress_calls);
 				appendStringInfoChar(es->str, '\n');
 			}
 			else

diff --git a/tsl/test/expected/hypercore_columnar.out b/tsl/test/expected/hypercore_columnar.out
@@ -35,10 +35,6 @@ begin
     for ln in
         execute format('explain (analyze, costs off, summary off, timing off, decompress_cache_stats) %s', $1)
     loop
-	if trim(both from ln) like 'Group Key:%' then
-       	   continue;
-        end if;
-
         return next anonymize(ln);
     end loop;
 end;
@@ -52,9 +48,6 @@ begin
     for ln in
         execute format('explain (costs off, summary off, timing off) %s', $1)
     loop
-	if trim(both from ln) like 'Group Key:%' then
-       	   continue;
-        end if;
         return next anonymize(ln);
     end loop;
 end;

diff --git a/tsl/test/expected/hypercore_copy.out b/tsl/test/expected/hypercore_copy.out
@@ -40,10 +40,6 @@ begin
     for ln in
         execute format('explain (analyze, costs off, summary off, timing off, decompress_cache_stats) %s', $1)
     loop
-	if trim(both from ln) like 'Group Key:%' then
-       	   continue;
-        end if;
-
         return next anonymize(ln);
     end loop;
 end;
@@ -57,9 +53,6 @@ begin
     for ln in
         execute format('explain (costs off, summary off, timing off) %s', $1)
     loop
-	if trim(both from ln) like 'Group Key:%' then
-       	   continue;
-        end if;
         return next anonymize(ln);
     end loop;
 end;

diff --git a/tsl/test/expected/hypercore_create.out b/tsl/test/expected/hypercore_create.out
@@ -35,10 +35,6 @@ begin
     for ln in
         execute format('explain (analyze, costs off, summary off, timing off, decompress_cache_stats) %s', $1)
     loop
-	if trim(both from ln) like 'Group Key:%' then
-       	   continue;
-        end if;
-
         return next anonymize(ln);
     end loop;
 end;
@@ -52,9 +48,6 @@ begin
     for ln in
         execute format('explain (costs off, summary off, timing off) %s', $1)
     loop
-	if trim(both from ln) like 'Group Key:%' then
-       	   continue;
-        end if;
         return next anonymize(ln);
     end loop;
 end;

diff --git a/tsl/test/expected/hypercore_cursor.out b/tsl/test/expected/hypercore_cursor.out
@@ -40,10 +40,6 @@ begin
     for ln in
         execute format('explain (analyze, costs off, summary off, timing off, decompress_cache_stats) %s', $1)
     loop
-	if trim(both from ln) like 'Group Key:%' then
-       	   continue;
-        end if;
-
         return next anonymize(ln);
     end loop;
 end;
@@ -57,9 +53,6 @@ begin
     for ln in
         execute format('explain (costs off, summary off, timing off) %s', $1)
     loop
-	if trim(both from ln) like 'Group Key:%' then
-       	   continue;
-        end if;
         return next anonymize(ln);
     end loop;
 end;

diff --git a/tsl/test/expected/hypercore_index_btree.out b/tsl/test/expected/hypercore_index_btree.out
diff --git a/tsl/test/expected/hypercore_index_hash.out b/tsl/test/expected/hypercore_index_hash.out
@@ -40,10 +40,6 @@ begin
     for ln in
         execute format('explain (analyze, costs off, summary off, timing off, decompress_cache_stats) %s', $1)
     loop
-	if trim(both from ln) like 'Group Key:%' then
-       	   continue;
-        end if;
-
         return next anonymize(ln);
     end loop;
 end;
@@ -57,9 +53,6 @@ begin
     for ln in
         execute format('explain (costs off, summary off, timing off) %s', $1)
     loop
-	if trim(both from ln) like 'Group Key:%' then
-       	   continue;
-        end if;
         return next anonymize(ln);
     end loop;
 end;
@@ -137,38 +130,45 @@ $$, :'hypertable'));
                                     explain_anonymize                                     
 ------------------------------------------------------------------------------------------
  Finalize HashAggregate
+   Group Key: _hyper_I_N_chunk.location_id
    ->  Append
          ->  Partial HashAggregate
+               Group Key: _hyper_I_N_chunk.location_id
                ->  Bitmap Heap Scan on _hyper_I_N_chunk
                      Recheck Cond: (location_id = ANY ('{3,4,5}'::integer[]))
                      ->  Bitmap Index Scan on _hyper_I_N_chunk_hypertable_location_id_idx
                            Index Cond: (location_id = ANY ('{3,4,5}'::integer[]))
          ->  Partial HashAggregate
+               Group Key: _hyper_I_N_chunk.location_id
                ->  Bitmap Heap Scan on _hyper_I_N_chunk
                      Recheck Cond: (location_id = ANY ('{3,4,5}'::integer[]))
                      ->  Bitmap Index Scan on _hyper_I_N_chunk_hypertable_location_id_idx
                            Index Cond: (location_id = ANY ('{3,4,5}'::integer[]))
          ->  Partial HashAggregate
+               Group Key: _hyper_I_N_chunk.location_id
                ->  Bitmap Heap Scan on _hyper_I_N_chunk
                      Recheck Cond: (location_id = ANY ('{3,4,5}'::integer[]))
                      ->  Bitmap Index Scan on _hyper_I_N_chunk_hypertable_location_id_idx
                            Index Cond: (location_id = ANY ('{3,4,5}'::integer[]))
          ->  Partial HashAggregate
+               Group Key: _hyper_I_N_chunk.location_id
                ->  Bitmap Heap Scan on _hyper_I_N_chunk
                      Recheck Cond: (location_id = ANY ('{3,4,5}'::integer[]))
                      ->  Bitmap Index Scan on _hyper_I_N_chunk_hypertable_location_id_idx
                            Index Cond: (location_id = ANY ('{3,4,5}'::integer[]))
          ->  Partial HashAggregate
+               Group Key: _hyper_I_N_chunk.location_id
                ->  Bitmap Heap Scan on _hyper_I_N_chunk
                      Recheck Cond: (location_id = ANY ('{3,4,5}'::integer[]))
                      ->  Bitmap Index Scan on _hyper_I_N_chunk_hypertable_location_id_idx
                            Index Cond: (location_id = ANY ('{3,4,5}'::integer[]))
          ->  Partial HashAggregate
+               Group Key: _hyper_I_N_chunk.location_id
                ->  Bitmap Heap Scan on _hyper_I_N_chunk
                      Recheck Cond: (location_id = ANY ('{3,4,5}'::integer[]))
                      ->  Bitmap Index Scan on _hyper_I_N_chunk_hypertable_location_id_idx
                            Index Cond: (location_id = ANY ('{3,4,5}'::integer[]))
-(32 rows)
+(39 rows)
 
 select location_id, count(*) into orig from :hypertable
 where location_id in (3,4,5) group by location_id;

diff --git a/tsl/test/expected/hypercore_insert.out b/tsl/test/expected/hypercore_insert.out
@@ -40,10 +40,6 @@ begin
     for ln in
         execute format('explain (analyze, costs off, summary off, timing off, decompress_cache_stats) %s', $1)
     loop
-	if trim(both from ln) like 'Group Key:%' then
-       	   continue;
-        end if;
-
         return next anonymize(ln);
     end loop;
 end;
@@ -57,9 +53,6 @@ begin
     for ln in
         execute format('explain (costs off, summary off, timing off) %s', $1)
     loop
-	if trim(both from ln) like 'Group Key:%' then
-       	   continue;
-        end if;
         return next anonymize(ln);
     end loop;
 end;

diff --git a/tsl/test/expected/hypercore_join.out b/tsl/test/expected/hypercore_join.out
@@ -40,10 +40,6 @@ begin
     for ln in
         execute format('explain (analyze, costs off, summary off, timing off, decompress_cache_stats) %s', $1)
     loop
-	if trim(both from ln) like 'Group Key:%' then
-       	   continue;
-        end if;
-
         return next anonymize(ln);
     end loop;
 end;
@@ -57,9 +53,6 @@ begin
     for ln in
         execute format('explain (costs off, summary off, timing off) %s', $1)
     loop
-	if trim(both from ln) like 'Group Key:%' then
-       	   continue;
-        end if;
         return next anonymize(ln);
     end loop;
 end;

diff --git a/tsl/test/expected/hypercore_merge.out b/tsl/test/expected/hypercore_merge.out
@@ -41,10 +41,6 @@ begin
     for ln in
         execute format('explain (analyze, costs off, summary off, timing off, decompress_cache_stats) %s', $1)
     loop
-	if trim(both from ln) like 'Group Key:%' then
-       	   continue;
-        end if;
-
         return next anonymize(ln);
     end loop;
 end;
@@ -58,9 +54,6 @@ begin
     for ln in
         execute format('explain (costs off, summary off, timing off) %s', $1)
     loop
-	if trim(both from ln) like 'Group Key:%' then
-       	   continue;
-        end if;
         return next anonymize(ln);
     end loop;
 end;

diff --git a/tsl/test/expected/hypercore_parallel.out b/tsl/test/expected/hypercore_parallel.out
@@ -40,10 +40,6 @@ begin
     for ln in
         execute format('explain (analyze, costs off, summary off, timing off, decompress_cache_stats) %s', $1)
     loop
-	if trim(both from ln) like 'Group Key:%' then
-       	   continue;
-        end if;
-
         return next anonymize(ln);
     end loop;
 end;
@@ -57,9 +53,6 @@ begin
     for ln in
         execute format('explain (costs off, summary off, timing off) %s', $1)
     loop
-	if trim(both from ln) like 'Group Key:%' then
-       	   continue;
-        end if;
         return next anonymize(ln);
     end loop;
 end;

diff --git a/tsl/test/expected/hypercore_stats.out b/tsl/test/expected/hypercore_stats.out
@@ -40,10 +40,6 @@ begin
     for ln in
         execute format('explain (analyze, costs off, summary off, timing off, decompress_cache_stats) %s', $1)
     loop
-	if trim(both from ln) like 'Group Key:%' then
-       	   continue;
-        end if;
-
         return next anonymize(ln);
     end loop;
 end;
@@ -57,9 +53,6 @@ begin
     for ln in
         execute format('explain (costs off, summary off, timing off) %s', $1)
     loop
-	if trim(both from ln) like 'Group Key:%' then
-       	   continue;
-        end if;
         return next anonymize(ln);
     end loop;
 end;

diff --git a/tsl/test/expected/hypercore_types.out b/tsl/test/expected/hypercore_types.out
@@ -35,10 +35,6 @@ begin
     for ln in
         execute format('explain (analyze, costs off, summary off, timing off, decompress_cache_stats) %s', $1)
     loop
-	if trim(both from ln) like 'Group Key:%' then
-       	   continue;
-        end if;
-
         return next anonymize(ln);
     end loop;
 end;
@@ -52,9 +48,6 @@ begin
     for ln in
         execute format('explain (costs off, summary off, timing off) %s', $1)
     loop
-	if trim(both from ln) like 'Group Key:%' then
-       	   continue;
-        end if;
         return next anonymize(ln);
     end loop;
 end;

diff --git a/tsl/test/expected/hypercore_update.out b/tsl/test/expected/hypercore_update.out
@@ -41,10 +41,6 @@ begin
     for ln in
         execute format('explain (analyze, costs off, summary off, timing off, decompress_cache_stats) %s', $1)
     loop
-	if trim(both from ln) like 'Group Key:%' then
-       	   continue;
-        end if;
-
         return next anonymize(ln);
     end loop;
 end;
@@ -58,9 +54,6 @@ begin
     for ln in
         execute format('explain (costs off, summary off, timing off) %s', $1)
     loop
-	if trim(both from ln) like 'Group Key:%' then
-       	   continue;
-        end if;
         return next anonymize(ln);
     end loop;
 end;

diff --git a/tsl/test/expected/hypercore_vacuum_full.out b/tsl/test/expected/hypercore_vacuum_full.out
@@ -40,10 +40,6 @@ begin
     for ln in
         execute format('explain (analyze, costs off, summary off, timing off, decompress_cache_stats) %s', $1)
     loop
-	if trim(both from ln) like 'Group Key:%' then
-       	   continue;
-        end if;
-
         return next anonymize(ln);
     end loop;
 end;
@@ -57,9 +53,6 @@ begin
     for ln in
         execute format('explain (costs off, summary off, timing off) %s', $1)
     loop
-	if trim(both from ln) like 'Group Key:%' then
-       	   continue;
-        end if;
         return next anonymize(ln);
     end loop;
 end;

diff --git a/tsl/test/sql/include/hypercore_helpers.sql b/tsl/test/sql/include/hypercore_helpers.sql
@@ -33,10 +33,6 @@ begin
     for ln in
         execute format('explain (analyze, costs off, summary off, timing off, decompress_cache_stats) %s', $1)
     loop
-	if trim(both from ln) like 'Group Key:%' then
-       	   continue;
-        end if;
-
         return next anonymize(ln);
     end loop;
 end;
@@ -51,9 +47,6 @@ begin
     for ln in
         execute format('explain (costs off, summary off, timing off) %s', $1)
     loop
-	if trim(both from ln) like 'Group Key:%' then
-       	   continue;
-        end if;
         return next anonymize(ln);
     end loop;
 end;