Merge pull request #4541 from citusdata/normalize_tests

Normalize citus_local_tables

src/test/regress/bin/normalize.sed

@@ -193,3 +193,10 @@ s/relation with OID [0-9]+ does not exist/relation with OID XXXX does not exist/
 
 # normalize storage id of columnar tables
 s/^storage id: [0-9]+$/storage id: xxxxx/g
+
+# normalize notice messages in citus_local_tables
+s/(NOTICE:  executing.*)citus_local_tables_test_schema.citus_local_table_4_[0-9]+(.*)/\1citus_local_tables_test_schema.citus_local_table_4_xxxx\2/g
+s/(NOTICE:  executing.*)\([0-9]+, 'citus_local_tables_test_schema', [0-9]+(.*)/\1\(xxxxx, 'citus_local_tables_test_schema', xxxxx\2/g
+s/citus_local_table_4_idx_[0-9]+/citus_local_table_4_idx_xxxxxx/g
+s/citus_local_table_4_[0-9]+/citus_local_table_4_xxxxxx/g
+s/ERROR:  cannot append to shardId [0-9]+/ERROR:  cannot append to shardId xxxxxx/g

src/test/regress/expected/citus_local_tables.out

@@ -420,7 +420,7 @@ ALTER TABLE distributed_table ADD CONSTRAINT fkey_dist_to_c FOREIGN KEY(a) refer
 ERROR:  cannot create foreign key constraint since relations are not colocated or not referencing a reference table
 -- between citus local tables and local tables
 ALTER TABLE citus_local_table_1 ADD CONSTRAINT fkey_c_to_local FOREIGN KEY(a) references local_table(a);
-NOTICE:  executing the command locally: SELECT worker_apply_inter_shard_ddl_command (1504027, 'citus_local_tables_test_schema', 1504037, 'citus_local_tables_test_schema', 'ALTER TABLE citus_local_table_1 ADD CONSTRAINT fkey_c_to_local FOREIGN KEY(a) references local_table(a);')
+NOTICE:  executing the command locally: SELECT worker_apply_inter_shard_ddl_command (xxxxx, 'citus_local_tables_test_schema', xxxxx, 'citus_local_tables_test_schema', 'ALTER TABLE citus_local_table_1 ADD CONSTRAINT fkey_c_to_local FOREIGN KEY(a) references local_table(a);')
 ALTER TABLE local_table
   ADD CONSTRAINT fkey_local_to_c FOREIGN KEY(a) references citus_local_table_1(a),
   ADD CONSTRAINT fkey_self FOREIGN KEY(a) references local_table(a);
@@ -432,7 +432,7 @@ ERROR:  cannot execute ADD COLUMN command with PRIMARY KEY, UNIQUE, FOREIGN and
 CREATE TABLE local_table_4 (
   a int unique references citus_local_table_1(a),
   b int references local_table_4(a));
-NOTICE:  executing the command locally: SELECT worker_apply_inter_shard_ddl_command (1504038, 'citus_local_tables_test_schema', 1504027, 'citus_local_tables_test_schema', 'ALTER TABLE citus_local_tables_test_schema.local_table_4 ADD CONSTRAINT local_table_4_a_fkey FOREIGN KEY (a) REFERENCES citus_local_tables_test_schema.citus_local_table_1(a)')
+NOTICE:  executing the command locally: SELECT worker_apply_inter_shard_ddl_command (xxxxx, 'citus_local_tables_test_schema', xxxxx, 'citus_local_tables_test_schema', 'ALTER TABLE citus_local_tables_test_schema.local_table_4 ADD CONSTRAINT local_table_4_a_fkey FOREIGN KEY (a) REFERENCES citus_local_tables_test_schema.citus_local_table_1(a)')
 ALTER TABLE citus_local_table_1 ADD COLUMN b int NOT NULL;
 NOTICE:  executing the command locally: SELECT worker_apply_shard_ddl_command (1504027, 'citus_local_tables_test_schema', 'ALTER TABLE citus_local_table_1 ADD COLUMN b int NOT NULL;')
 -- show that we added column with NOT NULL
@@ -504,9 +504,9 @@ SELECT create_citus_local_table('citus_local_table_4');
 -- should work --
 -- insert some data & create an index for table size udf's
 INSERT INTO citus_local_table_4 VALUES (1), (2), (3);
-NOTICE:  executing the command locally: INSERT INTO citus_local_tables_test_schema.citus_local_table_4_1504039 AS citus_table_alias (a) VALUES (1), (2), (3)
+NOTICE:  executing the command locally: INSERT INTO citus_local_tables_test_schema.citus_local_table_4_xxxx AS citus_table_alias (a) VALUES (1), (2), (3)
 CREATE INDEX citus_local_table_4_idx ON citus_local_table_4(a);
-NOTICE:  executing the command locally: CREATE  INDEX   citus_local_table_4_idx_1504039 ON citus_local_tables_test_schema.citus_local_table_4_1504039 USING btree (a )
+NOTICE:  executing the command locally: CREATE  INDEX   citus_local_table_4_idx_xxxxxx ON citus_local_tables_test_schema.citus_local_table_4_xxxx USING btree (a )
 SELECT citus_table_size('citus_local_table_4');
  citus_table_size
 ---------------------------------------------------------------------
@@ -593,16 +593,16 @@ BEGIN;
   SELECT tableName FROM pg_catalog.pg_tables WHERE tablename LIKE 'citus_local_table_4%';
           tablename
 ---------------------------------------------------------------------
- citus_local_table_4_1504039
+ citus_local_table_4_xxxxxx
 (1 row)
 
 ROLLBACK;
 -- should return a single element array that only includes its own shard id
-SELECT shardid, get_colocated_shard_array(shardid)
+SELECT shardid=unnest(get_colocated_shard_array(shardid))
 FROM (SELECT shardid FROM pg_dist_shard WHERE logicalrelid='citus_local_table_4'::regclass) as shardid;
- shardid | get_colocated_shard_array
+ ?column?
 ---------------------------------------------------------------------
- 1504039 | {1504039}
+ t
 (1 row)
 
 BEGIN;
@@ -630,7 +630,7 @@ ERROR:  cannot delete from table
 CREATE TABLE postgres_local_table (a int);
 SELECT master_append_table_to_shard(shardId, 'postgres_local_table', 'localhost', :master_port)
 FROM (SELECT shardid FROM pg_dist_shard WHERE logicalrelid='citus_local_table_4'::regclass) as shardid;
-ERROR:  cannot append to shardId 1504039
+ERROR:  cannot append to shardId xxxxxx
 -- return true
 SELECT citus_table_is_visible('citus_local_table_4'::regclass::oid);
  citus_table_is_visible
@@ -671,7 +671,7 @@ SELECT create_citus_local_table('referenced_table');
 (1 row)
 
 ALTER TABLE referencing_table ADD CONSTRAINT fkey_cl_to_cl FOREIGN KEY (a) REFERENCES referenced_table(a);
-NOTICE:  executing the command locally: SELECT worker_apply_inter_shard_ddl_command (1504040, 'citus_local_tables_test_schema', 1504041, 'citus_local_tables_test_schema', 'ALTER TABLE referencing_table ADD CONSTRAINT fkey_cl_to_cl FOREIGN KEY (a) REFERENCES referenced_table(a);')
+NOTICE:  executing the command locally: SELECT worker_apply_inter_shard_ddl_command (xxxxx, 'citus_local_tables_test_schema', xxxxx, 'citus_local_tables_test_schema', 'ALTER TABLE referencing_table ADD CONSTRAINT fkey_cl_to_cl FOREIGN KEY (a) REFERENCES referenced_table(a);')
 -- observe the debug messages telling that we switch to sequential
 -- execution when truncating a citus local table that is referenced
 -- by another table

src/test/regress/expected/multi_reference_table.out

@@ -1433,7 +1433,7 @@ SELECT master_update_shard_statistics(:a_shard_id);
 
 CREATE TABLE append_reference_tmp_table (id INT);
 SELECT  master_append_table_to_shard(:a_shard_id, 'append_reference_tmp_table', 'localhost', :master_port);
-ERROR:  cannot append to shardId 1250019
+ERROR:  cannot append to shardId xxxxxx
 DETAIL:  We currently don't support appending to shards in hash-partitioned, reference and citus local tables
 SELECT master_get_table_ddl_events('reference_schema.reference_table_ddl');
                                                                                 master_get_table_ddl_events

src/test/regress/sql/citus_local_tables.sql

@@ -404,7 +404,7 @@ BEGIN;
 ROLLBACK;
 
 -- should return a single element array that only includes its own shard id
-SELECT shardid, get_colocated_shard_array(shardid)
+SELECT shardid=unnest(get_colocated_shard_array(shardid))
 FROM (SELECT shardid FROM pg_dist_shard WHERE logicalrelid='citus_local_table_4'::regclass) as shardid;
 
 BEGIN;