Make dist_partial_agg output pg version specific

The plan output of the dist_partial_agg test is different on PG14 so we need to make it PG version specific. On PG14 sorts are pushed down more often leading to better plans in some cases.
timescale · Oct 12, 2021 · c421d30 · c421d30
1 parent 8d12b28
commit c421d30
Show file tree

Hide file tree

Showing 7 changed files with 987 additions and 3 deletions.
diff --git a/scripts/gh_matrix_builder.py b/scripts/gh_matrix_builder.py
@@ -113,7 +113,7 @@ def macos_config(overrides):
   "pg": PG14_LATEST,
   "tsdb_build_args": "-DWARNINGS_AS_ERRORS=OFF -DEXPERIMENTAL=ON",
   "coverage": False,
-  "installcheck_args": "IGNORES='dist_hypertable-14 dist_partial_agg dist_query'"
+  "installcheck_args": "IGNORES='dist_hypertable-14 dist_query'"
 }
 m["include"].append(build_debug_config(pg14_debug_latest))
 

diff --git a/tsl/test/expected/dist_partial_agg.out → tsl/test/expected/dist_partial_agg-12.out b/tsl/test/expected/dist_partial_agg.out → tsl/test/expected/dist_partial_agg-12.out
diff --git a/tsl/test/expected/dist_partial_agg-13.out b/tsl/test/expected/dist_partial_agg-13.out
diff --git a/tsl/test/expected/dist_partial_agg-14.out b/tsl/test/expected/dist_partial_agg-14.out
diff --git a/tsl/test/sql/.gitignore b/tsl/test/sql/.gitignore
@@ -8,6 +8,7 @@
 /compression_permissions-*.sql
 /hypertable_distributed-*.sql
 /dist_hypertable-*.sql
+/dist_partial_agg-*.sql
 /plan_skip_scan-*.sql
 /remote_copy-*.sql
 /jit-*.sql
diff --git a/tsl/test/sql/CMakeLists.txt b/tsl/test/sql/CMakeLists.txt
@@ -51,7 +51,6 @@ set(TEST_FILES_DEBUG
     dist_compression.sql
     dist_ddl.sql
     dist_grant.sql
-    dist_partial_agg.sql
     dist_policy.sql
     dist_query.sql
     dist_util.sql
@@ -77,7 +76,7 @@ set(TEST_TEMPLATES
 
 if(CMAKE_BUILD_TYPE MATCHES Debug)
   list(APPEND TEST_TEMPLATES continuous_aggs_query.sql.in
-       dist_hypertable.sql.in remote_copy.sql.in)
+       dist_partial_agg.sql.in dist_hypertable.sql.in remote_copy.sql.in)
 endif(CMAKE_BUILD_TYPE MATCHES Debug)
 
 # Check if PostgreSQL was compiled with JIT support

diff --git a/tsl/test/sql/dist_partial_agg.sql → tsl/test/sql/dist_partial_agg.sql.in b/tsl/test/sql/dist_partial_agg.sql → tsl/test/sql/dist_partial_agg.sql.in