Draft PR

timescale · Oct 2, 2023 · 1302e30 · 1302e30
1 parent c1b500f
commit 1302e30
Show file tree

Hide file tree

Showing 13 changed files with 13,110 additions and 12 deletions.
diff --git a/tsl/test/expected/cagg_ddl.out → tsl/test/expected/cagg_ddl-13.out b/tsl/test/expected/cagg_ddl.out → tsl/test/expected/cagg_ddl-13.out
diff --git a/tsl/test/expected/cagg_ddl-14.out b/tsl/test/expected/cagg_ddl-14.out
diff --git a/tsl/test/expected/cagg_ddl-15.out b/tsl/test/expected/cagg_ddl-15.out
diff --git a/tsl/test/expected/cagg_ddl-16.out b/tsl/test/expected/cagg_ddl-16.out
diff --git a/tsl/test/expected/cagg_ddl_dist_ht.out → tsl/test/expected/cagg_ddl_dist_ht-13.out b/tsl/test/expected/cagg_ddl_dist_ht.out → tsl/test/expected/cagg_ddl_dist_ht-13.out
diff --git a/tsl/test/expected/cagg_ddl_dist_ht-14.out b/tsl/test/expected/cagg_ddl_dist_ht-14.out
diff --git a/tsl/test/expected/cagg_ddl_dist_ht-15.out b/tsl/test/expected/cagg_ddl_dist_ht-15.out
diff --git a/tsl/test/expected/cagg_ddl_dist_ht-16.out b/tsl/test/expected/cagg_ddl_dist_ht-16.out
diff --git a/tsl/test/isolation/specs/compression_chunk_race.spec b/tsl/test/isolation/specs/compression_chunk_race.spec
@@ -28,7 +28,7 @@ setup {
    ORDER BY time;
 
    SELECT count(*) FROM sensor_data;
-   
+
    ALTER TABLE sensor_data SET (timescaledb.compress, timescaledb.compress_segmentby = 'sensor_id');
 }
 
@@ -38,9 +38,9 @@ teardown {
 
 
 session "s1"
-setup {
-   SET client_min_messages=ERROR; -- Suppress chunk "_hyper_XXX_chunk" is not compressed messages 
-}
+# setup {
+#    SET client_min_messages=ERROR; -- Suppress chunk "_hyper_XXX_chunk" is not compressed messages
+# }
 
 step "s1_compress" {
    SELECT compression_status FROM chunk_compression_stats('sensor_data');
@@ -56,9 +56,9 @@ step "s1_decompress" {
 }
 
 session "s2"
-setup {
-   SET client_min_messages=ERROR; -- Suppress chunk "_hyper_XXX_chunk" is not compressed messages 
-}
+# setup {
+#    SET client_min_messages=ERROR; -- Suppress chunk "_hyper_XXX_chunk" is not compressed messages
+# }
 
 step "s2_compress" {
    SELECT compression_status FROM chunk_compression_stats('sensor_data');
@@ -102,5 +102,5 @@ step "s3_unlock_decompression" {
     SELECT debug_waitpoint_release('decompress_chunk_impl_start');
 }
 
-permutation "s3_lock_compression" "s3_lock_decompression" "s1_compress" "s2_compress" (s1_compress) "s3_unlock_compression" "s1_decompress" "s2_decompress" (s1_decompress) "s3_unlock_decompression" 
+permutation "s3_lock_compression" "s3_lock_decompression" "s1_compress" "s2_compress" (s1_compress) "s3_unlock_compression" "s1_decompress" "s2_decompress" (s1_decompress) "s3_unlock_decompression"
 
diff --git a/tsl/test/sql/.gitignore b/tsl/test/sql/.gitignore
@@ -1,5 +1,6 @@
 /*.pgbinary
 /cagg_ddl-*.sql
+/cagg_ddl_dist_ht-*.sql
 /cagg_invalidation_dist_ht-*.sql
 /cagg_permissions-*.sql
 /cagg_query-*.sql

diff --git a/tsl/test/sql/CMakeLists.txt b/tsl/test/sql/CMakeLists.txt
@@ -63,7 +63,6 @@ if(CMAKE_BUILD_TYPE MATCHES Debug)
     compress_table.sql
     cagg_bgw_drop_chunks.sql
     cagg_bgw.sql
-    cagg_ddl.sql
     cagg_drop_chunks.sql
     cagg_dump.sql
     cagg_errors_deprecated.sql
@@ -101,7 +100,6 @@ if(CMAKE_BUILD_TYPE MATCHES Debug)
       TEST_FILES
       cagg_bgw_dist_ht.sql
       cagg_migrate_dist_ht.sql
-      cagg_ddl_dist_ht.sql
       cagg_on_cagg_dist_ht.sql
       cagg_on_cagg_joins_dist_ht.sql
       dist_api_calls.sql
@@ -185,12 +183,13 @@ if((${PG_VERSION_MAJOR} GREATER_EQUAL "14"))
 endif()
 
 if(CMAKE_BUILD_TYPE MATCHES Debug)
-  list(APPEND TEST_TEMPLATES cagg_query.sql.in continuous_aggs.sql.in
-       continuous_aggs_deprecated.sql.in)
+  list(APPEND TEST_TEMPLATES cagg_ddl.sql.in cagg_query.sql.in
+       continuous_aggs.sql.in continuous_aggs_deprecated.sql.in)
   if(ENABLE_MULTINODE_TESTS)
     list(
       APPEND
       TEST_TEMPLATES
+      cagg_ddl_dist_ht.sql.in
       cagg_invalidation_dist_ht.sql.in
       dist_hypertable.sql.in
       dist_grant.sql.in

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