Change some expected output files to reflect change in error message

This accounts for the change in the error message introduced in
305ad92ae05a7a367501be3f68cde9ff9f827622.

diff --git a/src/test/regress/expected/alter_table.out b/src/test/regress/expected/alter_table.out
index 36df9bb956080ee9b32b6c491dbb1c8af474e531..78204af9a93590b82c217eadfdae4d7db0a13647 100644 (file)
--- a/src/test/regress/expected/alter_table.out
+++ b/src/test/regress/expected/alter_table.out
@@ -2880,7 +2880,7 @@ CREATE TABLE tt8(a int);
 CREATE SCHEMA alter2;
 ALTER TABLE IF EXISTS tt8 ADD COLUMN f int;
 ALTER TABLE IF EXISTS tt8 ADD CONSTRAINT xxx PRIMARY KEY(f);
-ERROR:  Unique index of partitioned table must contain the hash distribution column.
+ERROR:  Unique index of distributed table must contain the hash distribution column.
 ALTER TABLE IF EXISTS tt8 ADD CHECK (f BETWEEN 0 AND 10);
 ALTER TABLE IF EXISTS tt8 ALTER COLUMN f SET DEFAULT 0;
 ALTER TABLE IF EXISTS tt8 RENAME COLUMN f TO f1;

diff --git a/src/test/regress/expected/create_index.out b/src/test/regress/expected/create_index.out
index 375b0fcfa36c4cdcbb2d5ec84d77308713b5bbf2..811f08e6edc597e423b16d8b19e7f8d464c9f9e0 100644 (file)
--- a/src/test/regress/expected/create_index.out
+++ b/src/test/regress/expected/create_index.out
@@ -2503,7 +2503,7 @@ RESET maintenance_work_mem;
 --
 CREATE TABLE func_index_heap (f1 text, f2 text);
 CREATE UNIQUE INDEX func_index_index on func_index_heap (textcat(f1,f2));
-ERROR:  Unique index of partitioned table must contain the hash/modulo distribution column.
+ERROR:  Unique index of distributed table must contain the hash/modulo distribution column.
 INSERT INTO func_index_heap VALUES('ABC','DEF');
 INSERT INTO func_index_heap VALUES('AB','CDEFG');
 INSERT INTO func_index_heap VALUES('QWE','RTY');
@@ -2517,7 +2517,7 @@ INSERT INTO func_index_heap VALUES('QWERTY');
 DROP TABLE func_index_heap;
 CREATE TABLE func_index_heap (f1 text, f2 text);
 CREATE UNIQUE INDEX func_index_index on func_index_heap ((f1 || f2) text_ops);
-ERROR:  Unique index of partitioned table must contain the hash/modulo distribution column.
+ERROR:  Unique index of distributed table must contain the hash/modulo distribution column.
 INSERT INTO func_index_heap VALUES('ABC','DEF');
 INSERT INTO func_index_heap VALUES('AB','CDEFG');
 INSERT INTO func_index_heap VALUES('QWE','RTY');
@@ -2823,7 +2823,7 @@ SELECT count(*) FROM onek_with_null WHERE unique1 IS NULL AND unique2 IS NOT NUL
 DROP INDEX onek_nulltest;
 -- Check initial-positioning logic too
 CREATE UNIQUE INDEX onek_nulltest ON onek_with_null (unique2);
-ERROR:  Unique index of partitioned table must contain the hash/modulo distribution column.
+ERROR:  Unique index of distributed table must contain the hash/modulo distribution column.
 SET enable_seqscan = OFF;
 SET enable_indexscan = ON;
 SET enable_bitmapscan = OFF;

diff --git a/src/test/regress/expected/equivclass.out b/src/test/regress/expected/equivclass.out
index cfa96c4264b96f50ad16d26a661e45eb3847e064..ea75baf666d9c838d40de500fa3649824de37a61 100644 (file)
--- a/src/test/regress/expected/equivclass.out
+++ b/src/test/regress/expected/equivclass.out
@@ -217,13 +217,13 @@ explain (costs off)
 (8 rows)
 
 create unique index ec1_expr1 on ec1((ff + 1));
-ERROR:  Unique index of partitioned table must contain the hash/modulo distribution column.
+ERROR:  Unique index of distributed table must contain the hash/modulo distribution column.
 create unique index ec1_expr2 on ec1((ff + 2 + 1));
-ERROR:  Unique index of partitioned table must contain the hash/modulo distribution column.
+ERROR:  Unique index of distributed table must contain the hash/modulo distribution column.
 create unique index ec1_expr3 on ec1((ff + 3 + 1));
-ERROR:  Unique index of partitioned table must contain the hash/modulo distribution column.
+ERROR:  Unique index of distributed table must contain the hash/modulo distribution column.
 create unique index ec1_expr4 on ec1((ff + 4));
-ERROR:  Unique index of partitioned table must contain the hash/modulo distribution column.
+ERROR:  Unique index of distributed table must contain the hash/modulo distribution column.
 explain (costs off)
   select * from ec1,
     (select ff + 1 as x from

diff --git a/src/test/regress/expected/insert_conflict.out b/src/test/regress/expected/insert_conflict.out
index d316b34470a5362bc625d0ea2ff16866abed6b1a..ab6993539c8f68dddc01fc0abab40d9e82a8e202 100644 (file)
--- a/src/test/regress/expected/insert_conflict.out
+++ b/src/test/regress/expected/insert_conflict.out
@@ -155,7 +155,7 @@ drop index both_index_expr_key;
 -- In XL, table is distributed by HASH( key ) by default.
 -- unique index contains fruit and not key, so this fails.
 create unique index cross_match on insertconflicttest(lower(fruit) collate "C", upper(fruit) text_pattern_ops);
-ERROR:  Unique index of partitioned table must contain the hash/modulo distribution column.
+ERROR:  Unique index of distributed table must contain the hash/modulo distribution column.
 -- fails:
 explain (costs off) insert into insertconflicttest values(0, 'Crowberry') on conflict (lower(fruit) text_pattern_ops, upper(fruit) collate "C") do nothing;
 ERROR:  there is no unique or exclusion constraint matching the ON CONFLICT specification
@@ -332,7 +332,7 @@ drop index expr_part_comp_key_index;
 -- Expression index tests
 --
 create unique index expr_key_index on insertconflicttest(lower(fruit));
-ERROR:  Unique index of partitioned table must contain the hash/modulo distribution column.
+ERROR:  Unique index of distributed table must contain the hash/modulo distribution column.
 -- inference succeeds:
 insert into insertconflicttest values (20, 'Quince') on conflict (lower(fruit)) do update set fruit = excluded.fruit;
 ERROR:  there is no unique or exclusion constraint matching the ON CONFLICT specification
@@ -378,7 +378,7 @@ drop index tricky_expr_comp_key_index;
 --
 create unique index key_index on insertconflicttest(key);
 create unique index fruit_index on insertconflicttest(fruit);
-ERROR:  Unique index of partitioned table must contain the hash/modulo distribution column.
+ERROR:  Unique index of distributed table must contain the hash/modulo distribution column.
 -- succeeds, since UPDATE happens to update "fruit" to existing value:
 insert into insertconflicttest values (26, 'Fig') on conflict (key) do update set fruit = excluded.fruit;
 -- fails, since UPDATE is to row with key value 26, and we're updating "fruit"

diff --git a/src/test/regress/expected/xl_primary_key.out b/src/test/regress/expected/xl_primary_key.out
index 5e356dc8e6b4e5dfbb9c8651992002d9ee844811..5e31bf36d02e4a0e3c68eafcaa616adda7b303fe 100644 (file)
--- a/src/test/regress/expected/xl_primary_key.out
+++ b/src/test/regress/expected/xl_primary_key.out
@@ -6,11 +6,11 @@
 CREATE TABLE xl_pk_products ( product_no integer, product_uid integer, name text, price numeric, primary key (product_uid, product_no) ) DISTRIBUTE BY HASH(product_no);
 CREATE TABLE xl_pk_products1 ( product_no integer, product_uid integer, name text, price numeric, primary key (product_uid, product_no) ) DISTRIBUTE BY HASH(product_uid);
 CREATE TABLE xl_pk_products2 ( product_no integer, product_uid integer, name text, price numeric, primary key (product_uid) ) DISTRIBUTE BY HASH(product_no); 
-ERROR:  Unique index of partitioned table must contain the hash distribution column.
+ERROR:  Unique index of distributed table must contain the hash distribution column.
 CREATE TABLE xl_pk_products3 ( product_no integer, product_uid integer, name text, price numeric, primary key (product_no, product_uid) ) DISTRIBUTE BY MODULO(product_no);
 CREATE TABLE xl_pk_products4 ( product_no integer, product_uid integer, name text, price numeric, primary key (product_uid, product_no) ) DISTRIBUTE BY MODULO(product_no);
 CREATE TABLE xl_pk_products5 ( product_no integer, product_uid integer, name text, price numeric, primary key (product_uid) ) DISTRIBUTE BY MODULO(product_no);
-ERROR:  Unique index of partitioned table must contain the hash distribution column.
+ERROR:  Unique index of distributed table must contain the hash distribution column.
 --For roundrobin distributed table, PRIMARY KEY or UNIQUE INDEX is not supported
 CREATE TABLE xl_pk_products6 ( product_no integer, product_uid integer, name text, price numeric, primary key (product_uid) ) DISTRIBUTE BY ROUNDROBIN;
 ERROR:  Cannot locally enforce a unique index on round robin distributed table.