From 70f27c10e5cdc485a8cae93e94f3e459b1450707 Mon Sep 17 00:00:00 2001 From: Sait Talha Nisanci Date: Wed, 3 Jun 2020 20:25:33 +0300 Subject: [PATCH] Add some normalization rules for tests The not-null constraint message changed with pg13 slightly hence a normalization rule is added for that, which converts it to pg < 13 output. Commit on postgres: 05f18c6b6b6e4b44302ee20a042cedc664532aa2 An extra debug message is added related to indexes on postgres, these are safe to be ignored, so we can delete them from tests. Commit on Postgres side: 612a1ab76724aa1514b6509269342649f8cab375 varnoold is renamed as varnosyn and varoattno is renamed as varattnosyn so in the output we normalize the values as the old ones to simply pass the tests. --- src/test/regress/bin/normalize.sed | 10 ++++++++++ src/test/regress/expected/local_shard_copy.out | 3 --- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/test/regress/bin/normalize.sed b/src/test/regress/bin/normalize.sed index 4d5a5f611..80dfe2122 100644 --- a/src/test/regress/bin/normalize.sed +++ b/src/test/regress/bin/normalize.sed @@ -86,6 +86,16 @@ s/_ref_id_id_fkey_/_ref_id_fkey_/g s/fk_test_2_col1_col2_fkey/fk_test_2_col1_fkey/g s/_id_other_column_ref_fkey/_id_fkey/g +# pg13 changes +s/of relation ".*" violates not-null constraint/violates not-null constraint/g +s/varnosyn/varnoold/g +s/varattnosyn/varoattno/g +/DEBUG: index ".*" can safely use deduplication.*$/d +/DEBUG: index ".*" cannot use deduplication.*$/d +/DEBUG: building index ".*" on table ".*" serially.*$/d + + + # intermediate_results s/(ERROR.*)pgsql_job_cache\/([0-9]+_[0-9]+_[0-9]+)\/(.*).data/\1pgsql_job_cache\/xx_x_xxx\/\3.data/g diff --git a/src/test/regress/expected/local_shard_copy.out b/src/test/regress/expected/local_shard_copy.out index 92c3f8ee8..8fdba05df 100644 --- a/src/test/regress/expected/local_shard_copy.out +++ b/src/test/regress/expected/local_shard_copy.out @@ -14,7 +14,6 @@ SET citus.shard_replication_factor TO 1; SET citus.replication_model TO 'streaming'; CREATE TABLE reference_table (key int PRIMARY KEY); DEBUG: CREATE TABLE / PRIMARY KEY will create implicit index "reference_table_pkey" for table "reference_table" -DEBUG: building index "reference_table_pkey" on table "reference_table" serially SELECT create_reference_table('reference_table'); create_reference_table --------------------------------------------------------------------- @@ -23,7 +22,6 @@ SELECT create_reference_table('reference_table'); CREATE TABLE distributed_table (key int PRIMARY KEY, age bigint CHECK (age >= 10)); DEBUG: CREATE TABLE / PRIMARY KEY will create implicit index "distributed_table_pkey" for table "distributed_table" -DEBUG: building index "distributed_table_pkey" on table "distributed_table" serially SELECT create_distributed_table('distributed_table','key'); create_distributed_table --------------------------------------------------------------------- @@ -38,7 +36,6 @@ DEBUG: distributed INSERT ... SELECT can only select from distributed tables DEBUG: Collecting INSERT ... SELECT results on coordinator CREATE TABLE local_table (key int PRIMARY KEY); DEBUG: CREATE TABLE / PRIMARY KEY will create implicit index "local_table_pkey" for table "local_table" -DEBUG: building index "local_table_pkey" on table "local_table" serially INSERT INTO local_table SELECT * from generate_series(1, 10); -- partitioned table CREATE TABLE collections_list (