From 42c799faee022165da0a338fec785acf1155295b Mon Sep 17 00:00:00 2001 From: Jason Petersen Date: Mon, 13 Mar 2017 15:24:12 -0600 Subject: [PATCH] Fix MX tests Missed some of these. One had a bad DDL statement to begin with (mixed up column type and column name) and other was just master/worker order. --- src/test/regress/expected/multi_mx_ddl.out | 2 +- src/test/regress/expected/multi_mx_modifying_xacts.out | 2 +- src/test/regress/sql/multi_mx_modifying_xacts.sql | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/regress/expected/multi_mx_ddl.out b/src/test/regress/expected/multi_mx_ddl.out index 132ed3e72..df9d775ae 100644 --- a/src/test/regress/expected/multi_mx_ddl.out +++ b/src/test/regress/expected/multi_mx_ddl.out @@ -142,9 +142,9 @@ Indexes: \c - - - :master_port SET client_min_messages TO debug2; CREATE INDEX ddl_test_index ON mx_ddl_table(value); +DEBUG: building index "ddl_test_index" on table "mx_ddl_table" NOTICE: using one-phase commit for distributed DDL commands HINT: You can enable two-phase commit for extra safety with: SET citus.multi_shard_commit_protocol TO '2pc' -DEBUG: building index "ddl_test_index" on table "mx_ddl_table" RESET client_min_messages; DROP INDEX ddl_test_index; -- show that sequences owned by mx tables result in unique values diff --git a/src/test/regress/expected/multi_mx_modifying_xacts.out b/src/test/regress/expected/multi_mx_modifying_xacts.out index cf45bb9e0..afac72f54 100644 --- a/src/test/regress/expected/multi_mx_modifying_xacts.out +++ b/src/test/regress/expected/multi_mx_modifying_xacts.out @@ -183,7 +183,7 @@ ABORT; -- applies to DDL BEGIN; INSERT INTO labs_mx VALUES (6, 'Bell labs_mx'); -ALTER TABLE labs_mx ADD COLUMN text motto; +ALTER TABLE labs_mx ADD COLUMN motto text; ERROR: distributed DDL commands must not appear within transaction blocks containing single-shard data modifications COMMIT; -- doesn't apply to COPY after modifications diff --git a/src/test/regress/sql/multi_mx_modifying_xacts.sql b/src/test/regress/sql/multi_mx_modifying_xacts.sql index aaf25c722..b7b482095 100644 --- a/src/test/regress/sql/multi_mx_modifying_xacts.sql +++ b/src/test/regress/sql/multi_mx_modifying_xacts.sql @@ -154,7 +154,7 @@ ABORT; -- applies to DDL BEGIN; INSERT INTO labs_mx VALUES (6, 'Bell labs_mx'); -ALTER TABLE labs_mx ADD COLUMN text motto; +ALTER TABLE labs_mx ADD COLUMN motto text; COMMIT; -- doesn't apply to COPY after modifications