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

Reduce log level to avoid alternative output for PG15 (#6139)

pull/6140/head
Naisila Puka 2022-08-07 16:07:58 +03:00 committed by GitHub
parent 430c201d03
commit 9eedf6dcf8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/test/regress/expected/multi_modifying_xacts.out
View File

@ -351,6 +351,10 @@ ORDER BY nodeport, shardid;
-- hide postgresql version dependend messages for next test only -- hide postgresql version dependend messages for next test only
\set VERBOSITY terse \set VERBOSITY terse
-- reduce the log level for differences between PG14 and PG15
-- in PGconn->errorMessage
-- relevant PG commit b15f254466aefbabcbed001929f6e09db59fd158
SET client_min_messages to ERROR;
-- for replicated tables use 2PC even if multi-shard commit protocol -- for replicated tables use 2PC even if multi-shard commit protocol
-- is set to 2PC -- is set to 2PC
BEGIN; BEGIN;
@ -358,30 +362,20 @@ DELETE FROM researchers WHERE lab_id = 6;
\copy researchers FROM STDIN delimiter ',' \copy researchers FROM STDIN delimiter ','
\copy researchers FROM STDIN delimiter ',' \copy researchers FROM STDIN delimiter ','
COMMIT; COMMIT;
WARNING: illegal value
WARNING: connection to the remote node localhost:xxxxx failed with the following error: another command is already in progress
ERROR: illegal value ERROR: illegal value
-- single row, multi-row INSERTs should also fail -- single row, multi-row INSERTs should also fail
-- with or without transaction blocks on the COMMIT time -- with or without transaction blocks on the COMMIT time
INSERT INTO researchers VALUES (31, 6, 'Bjarne Stroustrup'); INSERT INTO researchers VALUES (31, 6, 'Bjarne Stroustrup');
WARNING: illegal value
WARNING: connection to the remote node localhost:xxxxx failed with the following error: another command is already in progress
ERROR: illegal value ERROR: illegal value
INSERT INTO researchers VALUES (31, 6, 'Bjarne Stroustrup'), (32, 7, 'Bjarne Stroustrup'); INSERT INTO researchers VALUES (31, 6, 'Bjarne Stroustrup'), (32, 7, 'Bjarne Stroustrup');
WARNING: illegal value
WARNING: connection to the remote node localhost:xxxxx failed with the following error: another command is already in progress
ERROR: illegal value ERROR: illegal value
BEGIN; BEGIN;
INSERT INTO researchers VALUES (31, 6, 'Bjarne Stroustrup'); INSERT INTO researchers VALUES (31, 6, 'Bjarne Stroustrup');
COMMIT; COMMIT;
WARNING: illegal value
WARNING: connection to the remote node localhost:xxxxx failed with the following error: another command is already in progress
ERROR: illegal value ERROR: illegal value
BEGIN; BEGIN;
INSERT INTO researchers VALUES (31, 6, 'Bjarne Stroustrup'), (32, 7, 'Bjarne Stroustrup'); INSERT INTO researchers VALUES (31, 6, 'Bjarne Stroustrup'), (32, 7, 'Bjarne Stroustrup');
COMMIT; COMMIT;
WARNING: illegal value
WARNING: connection to the remote node localhost:xxxxx failed with the following error: another command is already in progress
ERROR: illegal value ERROR: illegal value
-- and, rollback should be fine -- and, rollback should be fine
BEGIN; BEGIN;
@ -391,6 +385,7 @@ BEGIN;
INSERT INTO researchers VALUES (31, 6, 'Bjarne Stroustrup'), (32, 7, 'Bjarne Stroustrup'); INSERT INTO researchers VALUES (31, 6, 'Bjarne Stroustrup'), (32, 7, 'Bjarne Stroustrup');
ROLLBACK; ROLLBACK;
\unset VERBOSITY \unset VERBOSITY
RESET client_min_messages;
-- verify everyhing including delete is rolled back -- verify everyhing including delete is rolled back
SELECT * FROM researchers WHERE lab_id = 6; SELECT * FROM researchers WHERE lab_id = 6;
id | lab_id | name id | lab_id | name
@ -660,15 +655,18 @@ AFTER INSERT ON labs_1200002
DEFERRABLE INITIALLY DEFERRED DEFERRABLE INITIALLY DEFERRED
FOR EACH ROW EXECUTE PROCEDURE reject_bad(); FOR EACH ROW EXECUTE PROCEDURE reject_bad();
\c - - - :master_port \c - - - :master_port
-- reduce the log level for differences between PG14 and PG15
-- in PGconn->errorMessage
-- relevant PG commit b15f254466aefbabcbed001929f6e09db59fd158
SET client_min_messages to ERROR;
BEGIN; BEGIN;
INSERT INTO objects VALUES (1, 'apple'); INSERT INTO objects VALUES (1, 'apple');
INSERT INTO objects VALUES (2, 'BAD'); INSERT INTO objects VALUES (2, 'BAD');
INSERT INTO labs VALUES (8, 'Aperture Science'); INSERT INTO labs VALUES (8, 'Aperture Science');
INSERT INTO labs VALUES (9, 'BAD'); INSERT INTO labs VALUES (9, 'BAD');
COMMIT; COMMIT;
WARNING: illegal value
WARNING: connection to the remote node localhost:xxxxx failed with the following error: another command is already in progress
ERROR: illegal value ERROR: illegal value
RESET client_min_messages;
-- data should NOT be persisted -- data should NOT be persisted
SELECT * FROM objects WHERE id = 1; SELECT * FROM objects WHERE id = 1;
id | name id | name

14
src/test/regress/sql/multi_modifying_xacts.sql
View File

@ -299,6 +299,12 @@ ORDER BY nodeport, shardid;
-- hide postgresql version dependend messages for next test only -- hide postgresql version dependend messages for next test only
\set VERBOSITY terse \set VERBOSITY terse
-- reduce the log level for differences between PG14 and PG15
-- in PGconn->errorMessage
-- relevant PG commit b15f254466aefbabcbed001929f6e09db59fd158
SET client_min_messages to ERROR;
-- for replicated tables use 2PC even if multi-shard commit protocol -- for replicated tables use 2PC even if multi-shard commit protocol
-- is set to 2PC -- is set to 2PC
BEGIN; BEGIN;
@ -334,6 +340,7 @@ BEGIN;
ROLLBACK; ROLLBACK;
\unset VERBOSITY \unset VERBOSITY
RESET client_min_messages;
-- verify everyhing including delete is rolled back -- verify everyhing including delete is rolled back
SELECT * FROM researchers WHERE lab_id = 6; SELECT * FROM researchers WHERE lab_id = 6;
@ -550,6 +557,11 @@ FOR EACH ROW EXECUTE PROCEDURE reject_bad();
\c - - - :master_port \c - - - :master_port
-- reduce the log level for differences between PG14 and PG15
-- in PGconn->errorMessage
-- relevant PG commit b15f254466aefbabcbed001929f6e09db59fd158
SET client_min_messages to ERROR;
BEGIN; BEGIN;
INSERT INTO objects VALUES (1, 'apple'); INSERT INTO objects VALUES (1, 'apple');
INSERT INTO objects VALUES (2, 'BAD'); INSERT INTO objects VALUES (2, 'BAD');
@ -557,6 +569,8 @@ INSERT INTO labs VALUES (8, 'Aperture Science');
INSERT INTO labs VALUES (9, 'BAD'); INSERT INTO labs VALUES (9, 'BAD');
COMMIT; COMMIT;
RESET client_min_messages;
-- data should NOT be persisted -- data should NOT be persisted
SELECT * FROM objects WHERE id = 1; SELECT * FROM objects WHERE id = 1;
SELECT * FROM labs WHERE id = 8; SELECT * FROM labs WHERE id = 8;