Fix partialize_finalize test output

In a409065 the output of the partialize_finalize test was updated and doesn't match the actual test output. Therefore, the test fails in several environments. In addition, this PR removes the binary data part of the test to make it compatible with PG >= 15.
timescale · Oct 26, 2023 · 50578e4 · 50578e4
1 parent 53e9747
commit 50578e4
Show file tree

Hide file tree

Showing 8 changed files with 914 additions and 40 deletions.
diff --git a/.github/gh_matrix_builder.py b/.github/gh_matrix_builder.py
@@ -160,15 +160,12 @@ def macos_config(overrides):
 
 
 # common ignored tests for all scheduled pg15 tests
-# partialize_finalize is ignored due to #4937
-ignored_tests = {"partialize_finalize"}
+ignored_tests = {}
 
 # common ignored tests for all non-scheduled pg15 tests (e.g. PRs)
-# partialize_finalize is ignored due to #4937
 # dist_move_chunk, dist_param, dist_insert, and remote_txn ignored due to flakiness
 if pull_request:
     ignored_tests = {
-        "partialize_finalize",
         "telemetry",
     }
 

diff --git a/.github/workflows/abi.yaml b/.github/workflows/abi.yaml
@@ -64,12 +64,10 @@ jobs:
             pg: 15
             builder: ${{ fromJson(needs.config.outputs.pg15_latest) }}
             tester: ${{ fromJson(needs.config.outputs.pg15_abi_min) }}
-            ignores: partialize_finalize
           - test: 15forward
             pg: 15
             builder: ${{ fromJson(needs.config.outputs.pg15_abi_min) }}
             tester: ${{ fromJson(needs.config.outputs.pg15_latest) }}
-            ignores: partialize_finalize
 
     steps:
 

diff --git a/.github/workflows/linux-32bit-build-and-test.yaml b/.github/workflows/linux-32bit-build-and-test.yaml
@@ -42,7 +42,7 @@ jobs:
         CXX: clang++-14
         DEBIAN_FRONTEND: noninteractive
         IGNORES: "append-* debug_notice transparent_decompression-*
-          transparent_decompress_chunk-* pg_dump partialize_finalize
+          transparent_decompress_chunk-* pg_dump
           dist_move_chunk dist_param dist_insert remote_txn telemetry"
         SKIPS: chunk_adaptive histogram_test-*
     strategy:

diff --git a/.github/workflows/sanitizer-build-and-test.yaml b/.github/workflows/sanitizer-build-and-test.yaml
@@ -76,8 +76,6 @@ jobs:
         pg: ${{ fromJson(needs.config.outputs.pg_latest) }}
         include:
           - pg: ${{ fromJson(needs.config.outputs.pg15_latest) }}
-            # partialize_finalize is ignored in PG15 due to #4937
-            ignores_version: partialize_finalize
             skips_version: 002_replication_telemetry 003_connections_privs 004_multinode_rdwr_1pc
     steps:
     - name: Install Linux Dependencies

diff --git a/.github/workflows/windows-build-and-test.yaml b/.github/workflows/windows-build-and-test.yaml
@@ -56,7 +56,7 @@ jobs:
         os: [ windows-2022 ]
         build_type: ${{ fromJson(needs.config.outputs.build_type) }}
         ignores: ["chunk_adaptive metadata telemetry"]
-        tsl_ignores: ["compression_algos remote_connection telemetry_stats dist_move_chunk dist_param dist_insert dist_backup dist_cagg partialize_finalize"]
+        tsl_ignores: ["compression_algos remote_connection telemetry_stats dist_move_chunk dist_param dist_insert dist_backup dist_cagg"]
         tsl_skips: ["bgw_db_scheduler bgw_db_scheduler_fixed cagg_ddl_dist_ht
           data_fetcher dist_compression dist_remote_error remote_txn"]
         pg_config: ["-cfsync=off -cstatement_timeout=60s"]

diff --git a/tsl/test/expected/partialize_finalize.out b/tsl/test/expected/partialize_finalize.out
diff --git a/tsl/test/sql/data/partialize_finalize_data.csv b/tsl/test/sql/data/partialize_finalize_data.csv
diff --git a/tsl/test/sql/partialize_finalize.sql b/tsl/test/sql/partialize_finalize.sql
@@ -157,16 +157,6 @@ from t1 group by a order by a ;
 SELECT * FROM vfinal;
 CREATE TABLE vfinal_res AS SELECT * FROM vfinal;
 
--- overwrite partials with dumped binary values from PostrgeSQL 13 --
-TRUNCATE TABLE t1;
-\COPY t1 FROM data/partialize_finalize_data.csv WITH CSV HEADER
-
---repeat query to verify partial serialization sanitization works for versions PG >= 14
-CREATE TABLE vfinal_dump_res AS SELECT * FROM vfinal;
-
--- compare results to verify there is no difference
-(SELECT * FROM vfinal_res) EXCEPT (SELECT * FROM vfinal_dump_res);
-
 --with having clause --
 select a, b ,  _timescaledb_functions.finalize_agg( 'min(text)', 'pg_catalog', 'default', null, partialc, null::text ) minc, _timescaledb_functions.finalize_agg( 'max(timestamp with time zone)', null, null, null, partiald, null::timestamptz ) maxd from t1  where b is not null group by a, b having _timescaledb_functions.finalize_agg( 'max(timestamp with time zone)', null, null, null, partiald, null::timestamptz ) is not null order by a, b;