external
/
citus
mirror of https://github.com/citusdata/citus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2298 from citusdata/fix/error-msg-tablein 

fix missing space for tablein in error
pull/2297/head
Nils Dijk 2018-07-23 12:18:40 +02:00 committed by GitHub
parent 29edbae152 df98900f80
commit 5b02e139e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/backend/distributed/executor/multi_utility.c
View File

@ -4086,7 +4086,7 @@ SetupExecutionModeForAlterTable(Oid relationId, AlterTableCmd *command)
char *relationName = get_rel_name(relationId); char *relationName = get_rel_name(relationId);
ereport(ERROR, (errmsg("cannot modify table \"%s\" because there " ereport(ERROR, (errmsg("cannot modify table \"%s\" because there "
"was a parallel operation on a distributed table" "was a parallel operation on a distributed table "
"in the transaction", relationName), "in the transaction", relationName),
errdetail("When there is a foreign key to a reference " errdetail("When there is a foreign key to a reference "
"table, Citus needs to perform all operations " "table, Citus needs to perform all operations "

8
src/test/regress/expected/foreign_key_restriction_enforcement.out
View File

@ -161,7 +161,7 @@ BEGIN;
(1 row) (1 row)
ALTER TABLE on_update_fkey_table DROP COLUMN value_1 CASCADE; ALTER TABLE on_update_fkey_table DROP COLUMN value_1 CASCADE;
ERROR: cannot modify table "on_update_fkey_table" because there was a parallel operation on a distributed tablein the transaction ERROR: cannot modify table "on_update_fkey_table" because there was a parallel operation on a distributed table in the transaction
DETAIL: When there is a foreign key to a reference table, Citus needs to perform all operations over a single connection per node to ensure consistency. DETAIL: When there is a foreign key to a reference table, Citus needs to perform all operations over a single connection per node to ensure consistency.
HINT: Try re-running the transaction with "SET LOCAL citus.multi_shard_modify_mode TO 'sequential';" HINT: Try re-running the transaction with "SET LOCAL citus.multi_shard_modify_mode TO 'sequential';"
ROLLBACK; ROLLBACK;
@ -549,7 +549,7 @@ ROLLBACK;
BEGIN; BEGIN;
ALTER TABLE on_update_fkey_table ADD COLUMN X int; ALTER TABLE on_update_fkey_table ADD COLUMN X int;
ALTER TABLE on_update_fkey_table ALTER COLUMN value_1 SET DATA TYPE smallint; ALTER TABLE on_update_fkey_table ALTER COLUMN value_1 SET DATA TYPE smallint;
ERROR: cannot modify table "on_update_fkey_table" because there was a parallel operation on a distributed tablein the transaction ERROR: cannot modify table "on_update_fkey_table" because there was a parallel operation on a distributed table in the transaction
DETAIL: When there is a foreign key to a reference table, Citus needs to perform all operations over a single connection per node to ensure consistency. DETAIL: When there is a foreign key to a reference table, Citus needs to perform all operations over a single connection per node to ensure consistency.
HINT: Try re-running the transaction with "SET LOCAL citus.multi_shard_modify_mode TO 'sequential';" HINT: Try re-running the transaction with "SET LOCAL citus.multi_shard_modify_mode TO 'sequential';"
ROLLBACK; ROLLBACK;
@ -796,7 +796,7 @@ DETAIL: NOTICE from localhost:57638
(1 row) (1 row)
ALTER TABLE test_table_2 ADD CONSTRAINT c_check FOREIGN KEY (value_1) REFERENCES test_table_1(id); ALTER TABLE test_table_2 ADD CONSTRAINT c_check FOREIGN KEY (value_1) REFERENCES test_table_1(id);
ERROR: cannot modify table "test_table_2" because there was a parallel operation on a distributed tablein the transaction ERROR: cannot modify table "test_table_2" because there was a parallel operation on a distributed table in the transaction
DETAIL: When there is a foreign key to a reference table, Citus needs to perform all operations over a single connection per node to ensure consistency. DETAIL: When there is a foreign key to a reference table, Citus needs to perform all operations over a single connection per node to ensure consistency.
HINT: Try re-running the transaction with "SET LOCAL citus.multi_shard_modify_mode TO 'sequential';" HINT: Try re-running the transaction with "SET LOCAL citus.multi_shard_modify_mode TO 'sequential';"
-- make sure that the output isn't too verbose -- make sure that the output isn't too verbose
@ -895,7 +895,7 @@ DETAIL: NOTICE from localhost:57638
(1 row) (1 row)
ALTER TABLE test_table_2 ADD CONSTRAINT c_check FOREIGN KEY (value_1) REFERENCES test_table_1(id); ALTER TABLE test_table_2 ADD CONSTRAINT c_check FOREIGN KEY (value_1) REFERENCES test_table_1(id);
ERROR: cannot modify table "test_table_2" because there was a parallel operation on a distributed tablein the transaction ERROR: cannot modify table "test_table_2" because there was a parallel operation on a distributed table in the transaction
DETAIL: When there is a foreign key to a reference table, Citus needs to perform all operations over a single connection per node to ensure consistency. DETAIL: When there is a foreign key to a reference table, Citus needs to perform all operations over a single connection per node to ensure consistency.
HINT: Try re-running the transaction with "SET LOCAL citus.multi_shard_modify_mode TO 'sequential';" HINT: Try re-running the transaction with "SET LOCAL citus.multi_shard_modify_mode TO 'sequential';"
-- make sure that the output isn't too verbose -- make sure that the output isn't too verbose

6
src/test/regress/expected/foreign_key_to_reference_table.out
View File

@ -1283,7 +1283,7 @@ BEGIN;
(1 row) (1 row)
ALTER TABLE test_table_2 ADD CONSTRAINT c_check FOREIGN KEY (value_1) REFERENCES test_table_1(id); ALTER TABLE test_table_2 ADD CONSTRAINT c_check FOREIGN KEY (value_1) REFERENCES test_table_1(id);
ERROR: cannot modify table "test_table_2" because there was a parallel operation on a distributed tablein the transaction ERROR: cannot modify table "test_table_2" because there was a parallel operation on a distributed table in the transaction
DETAIL: When there is a foreign key to a reference table, Citus needs to perform all operations over a single connection per node to ensure consistency. DETAIL: When there is a foreign key to a reference table, Citus needs to perform all operations over a single connection per node to ensure consistency.
HINT: Try re-running the transaction with "SET LOCAL citus.multi_shard_modify_mode TO 'sequential';" HINT: Try re-running the transaction with "SET LOCAL citus.multi_shard_modify_mode TO 'sequential';"
DROP TABLE test_table_1, test_table_2; DROP TABLE test_table_1, test_table_2;
@ -1306,7 +1306,7 @@ BEGIN;
(1 row) (1 row)
ALTER TABLE test_table_1 ADD CONSTRAINT c_check FOREIGN KEY (value_1) REFERENCES test_table_2(id); ALTER TABLE test_table_1 ADD CONSTRAINT c_check FOREIGN KEY (value_1) REFERENCES test_table_2(id);
ERROR: cannot modify table "test_table_1" because there was a parallel operation on a distributed tablein the transaction ERROR: cannot modify table "test_table_1" because there was a parallel operation on a distributed table in the transaction
DETAIL: When there is a foreign key to a reference table, Citus needs to perform all operations over a single connection per node to ensure consistency. DETAIL: When there is a foreign key to a reference table, Citus needs to perform all operations over a single connection per node to ensure consistency.
HINT: Try re-running the transaction with "SET LOCAL citus.multi_shard_modify_mode TO 'sequential';" HINT: Try re-running the transaction with "SET LOCAL citus.multi_shard_modify_mode TO 'sequential';"
DROP TABLE test_table_2 CASCADE; DROP TABLE test_table_2 CASCADE;
@ -1399,7 +1399,7 @@ BEGIN;
(1 row) (1 row)
ALTER TABLE test_table_2 ADD CONSTRAINT foreign_key FOREIGN KEY(value_1) REFERENCES test_table_1(id); ALTER TABLE test_table_2 ADD CONSTRAINT foreign_key FOREIGN KEY(value_1) REFERENCES test_table_1(id);
ERROR: cannot modify table "test_table_2" because there was a parallel operation on a distributed tablein the transaction ERROR: cannot modify table "test_table_2" because there was a parallel operation on a distributed table in the transaction
DETAIL: When there is a foreign key to a reference table, Citus needs to perform all operations over a single connection per node to ensure consistency. DETAIL: When there is a foreign key to a reference table, Citus needs to perform all operations over a single connection per node to ensure consistency.
HINT: Try re-running the transaction with "SET LOCAL citus.multi_shard_modify_mode TO 'sequential';" HINT: Try re-running the transaction with "SET LOCAL citus.multi_shard_modify_mode TO 'sequential';"
ALTER TABLE test_table_2 DROP CONSTRAINT test_table_2_value_1_fkey; ALTER TABLE test_table_2 DROP CONSTRAINT test_table_2_value_1_fkey;

6
src/test/regress/expected/foreign_key_to_reference_table_0.out
View File

@ -1283,7 +1283,7 @@ BEGIN;
(1 row) (1 row)
ALTER TABLE test_table_2 ADD CONSTRAINT c_check FOREIGN KEY (value_1) REFERENCES test_table_1(id); ALTER TABLE test_table_2 ADD CONSTRAINT c_check FOREIGN KEY (value_1) REFERENCES test_table_1(id);
ERROR: cannot modify table "test_table_2" because there was a parallel operation on a distributed tablein the transaction ERROR: cannot modify table "test_table_2" because there was a parallel operation on a distributed table in the transaction
DETAIL: When there is a foreign key to a reference table, Citus needs to perform all operations over a single connection per node to ensure consistency. DETAIL: When there is a foreign key to a reference table, Citus needs to perform all operations over a single connection per node to ensure consistency.
HINT: Try re-running the transaction with "SET LOCAL citus.multi_shard_modify_mode TO 'sequential';" HINT: Try re-running the transaction with "SET LOCAL citus.multi_shard_modify_mode TO 'sequential';"
DROP TABLE test_table_1, test_table_2; DROP TABLE test_table_1, test_table_2;
@ -1306,7 +1306,7 @@ BEGIN;
(1 row) (1 row)
ALTER TABLE test_table_1 ADD CONSTRAINT c_check FOREIGN KEY (value_1) REFERENCES test_table_2(id); ALTER TABLE test_table_1 ADD CONSTRAINT c_check FOREIGN KEY (value_1) REFERENCES test_table_2(id);
ERROR: cannot modify table "test_table_1" because there was a parallel operation on a distributed tablein the transaction ERROR: cannot modify table "test_table_1" because there was a parallel operation on a distributed table in the transaction
DETAIL: When there is a foreign key to a reference table, Citus needs to perform all operations over a single connection per node to ensure consistency. DETAIL: When there is a foreign key to a reference table, Citus needs to perform all operations over a single connection per node to ensure consistency.
HINT: Try re-running the transaction with "SET LOCAL citus.multi_shard_modify_mode TO 'sequential';" HINT: Try re-running the transaction with "SET LOCAL citus.multi_shard_modify_mode TO 'sequential';"
DROP TABLE test_table_2 CASCADE; DROP TABLE test_table_2 CASCADE;
@ -1399,7 +1399,7 @@ BEGIN;
(1 row) (1 row)
ALTER TABLE test_table_2 ADD CONSTRAINT foreign_key FOREIGN KEY(value_1) REFERENCES test_table_1(id); ALTER TABLE test_table_2 ADD CONSTRAINT foreign_key FOREIGN KEY(value_1) REFERENCES test_table_1(id);
ERROR: cannot modify table "test_table_2" because there was a parallel operation on a distributed tablein the transaction ERROR: cannot modify table "test_table_2" because there was a parallel operation on a distributed table in the transaction
DETAIL: When there is a foreign key to a reference table, Citus needs to perform all operations over a single connection per node to ensure consistency. DETAIL: When there is a foreign key to a reference table, Citus needs to perform all operations over a single connection per node to ensure consistency.
HINT: Try re-running the transaction with "SET LOCAL citus.multi_shard_modify_mode TO 'sequential';" HINT: Try re-running the transaction with "SET LOCAL citus.multi_shard_modify_mode TO 'sequential';"
ALTER TABLE test_table_2 DROP CONSTRAINT test_table_2_value_1_fkey; ALTER TABLE test_table_2 DROP CONSTRAINT test_table_2_value_1_fkey;