sharpetronics/PostgreSQL
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-29 00:03:09 -04:00
Code Issues Projects Releases Wiki Activity

Adjust COPY FREEZE error message to be more accurate and consistent.

Browse Source 
Per suggestions from Noah and Tom.
This commit is contained in:
Bruce Momjian 2013-02-02 12:56:14 -05:00
parent f4987049ef
commit e8ae019661
2 changed files with 28 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/backend/commands/copy.c
View File

@ -1996,36 +1996,32 @@ CopyFrom(CopyState cstate)
hi_options |= HEAP_INSERT_SKIP_FSM; hi_options |= HEAP_INSERT_SKIP_FSM;
if (!XLogIsNeeded()) if (!XLogIsNeeded())
hi_options |= HEAP_INSERT_SKIP_WAL; hi_options |= HEAP_INSERT_SKIP_WAL;
/*
* Optimize if new relfilenode was created in this subxact or
* one of its committed children and we won't see those rows later
* as part of an earlier scan or command. This ensures that if this
* subtransaction aborts then the frozen rows won't be visible
* after xact cleanup. Note that the stronger test of exactly
* which subtransaction created it is crucial for correctness
* of this optimisation.
*/
if (cstate->freeze)
{
if (!ThereAreNoPriorRegisteredSnapshots() || !ThereAreNoReadyPortals())
ereport(ERROR,
(ERRCODE_INVALID_TRANSACTION_STATE,
errmsg("cannot perform FREEZE because of prior transaction activity")));
if (cstate->rel->rd_createSubid == GetCurrentSubTransactionId() ||
cstate->rel->rd_newRelfilenodeSubid == GetCurrentSubTransactionId())
hi_options |= HEAP_INSERT_FROZEN;
else
ereport(ERROR,
(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE,
errmsg("cannot perform FREEZE because of transaction activity after table creation or truncation")));
}
} }
else if (cstate->freeze)
ereport(ERROR, /*
(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE, * Optimize if new relfilenode was created in this subxact or
errmsg("cannot perform FREEZE because the table was not created or truncated in the current transaction"))); * one of its committed children and we won't see those rows later
* as part of an earlier scan or command. This ensures that if this
* subtransaction aborts then the frozen rows won't be visible
* after xact cleanup. Note that the stronger test of exactly
* which subtransaction created it is crucial for correctness
* of this optimisation.
*/
if (cstate->freeze)
{
if (!ThereAreNoPriorRegisteredSnapshots() || !ThereAreNoReadyPortals())
ereport(ERROR,
(ERRCODE_INVALID_TRANSACTION_STATE,
errmsg("cannot perform FREEZE because of prior transaction activity")));
if (cstate->rel->rd_createSubid != GetCurrentSubTransactionId() &&
cstate->rel->rd_newRelfilenodeSubid != GetCurrentSubTransactionId())
ereport(ERROR,
(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE,
errmsg("cannot perform FREEZE because the table was not created or truncated in the current subtransaction")));
hi_options |= HEAP_INSERT_FROZEN;
}
/* /*
* We need a ResultRelInfo so we can use the regular executor's * We need a ResultRelInfo so we can use the regular executor's

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

@ -334,12 +334,12 @@ SELECT * FROM vistest;
COMMIT; COMMIT;
TRUNCATE vistest; TRUNCATE vistest;
COPY vistest FROM stdin CSV FREEZE; COPY vistest FROM stdin CSV FREEZE;
ERROR: cannot perform FREEZE because the table was not created or truncated in the current transaction ERROR: cannot perform FREEZE because the table was not created or truncated in the current subtransaction
BEGIN; BEGIN;
TRUNCATE vistest; TRUNCATE vistest;
SAVEPOINT s1; SAVEPOINT s1;
COPY vistest FROM stdin CSV FREEZE; COPY vistest FROM stdin CSV FREEZE;
ERROR: cannot perform FREEZE because of transaction activity after table creation or truncation ERROR: cannot perform FREEZE because the table was not created or truncated in the current subtransaction
COMMIT; COMMIT;
BEGIN; BEGIN;
INSERT INTO vistest VALUES ('z'); INSERT INTO vistest VALUES ('z');
@ -347,7 +347,7 @@ SAVEPOINT s1;
TRUNCATE vistest; TRUNCATE vistest;
ROLLBACK TO SAVEPOINT s1; ROLLBACK TO SAVEPOINT s1;
COPY vistest FROM stdin CSV FREEZE; COPY vistest FROM stdin CSV FREEZE;
ERROR: cannot perform FREEZE because the table was not created or truncated in the current transaction ERROR: cannot perform FREEZE because the table was not created or truncated in the current subtransaction
COMMIT; COMMIT;
CREATE FUNCTION truncate_in_subxact() RETURNS VOID AS CREATE FUNCTION truncate_in_subxact() RETURNS VOID AS
$$ $$