NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commite8ae019

committed

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

Per suggestions from Noah and Tom.

1 parentf498704 commite8ae019Copy full SHA for e8ae019

File tree

2 files changed

+26

-30

lines changed

src
- backend/commands
  - copy.c
- test/regress/expected
  - copy2.out

2 files changed

+26

-30

lines changed

`‎src/backend/commands/copy.c`

Lines changed: 23 additions & 27 deletions

Original file line number	Diff line number	Diff line change
`@@ -1996,36 +1996,32 @@ CopyFrom(CopyState cstate)`
`1996`	`1996`	`hi_options \|=HEAP_INSERT_SKIP_FSM;`
`1997`	`1997`	`if (!XLogIsNeeded())`
`1998`	`1998`	`hi_options \|=HEAP_INSERT_SKIP_WAL;`
	`1999`	`+}`
`1999`	`2000`
`2000`		`-/*`
`2001`		`- * Optimize if new relfilenode was created in this subxact or`
`2002`		`- * one of its committed children and we won't see those rows later`
`2003`		`- * as part of an earlier scan or command. This ensures that if this`
`2004`		`- * subtransaction aborts then the frozen rows won't be visible`
`2005`		`- * after xact cleanup. Note that the stronger test of exactly`
`2006`		`- * which subtransaction created it is crucial for correctness`
`2007`		`- * of this optimisation.`
`2008`		`- */`
`2009`		`-if (cstate->freeze)`
`2010`		`-{`
`2011`		`-if (!ThereAreNoPriorRegisteredSnapshots()\|\| !ThereAreNoReadyPortals())`
`2012`		`-ereport(ERROR,`
`2013`		`-(ERRCODE_INVALID_TRANSACTION_STATE,`
`2014`		`-errmsg("cannot perform FREEZE because of prior transaction activity")));`
	`2001`	`+/*`
	`2002`	`+ * Optimize if new relfilenode was created in this subxact or`
	`2003`	`+ * one of its committed children and we won't see those rows later`
	`2004`	`+ * as part of an earlier scan or command. This ensures that if this`
	`2005`	`+ * subtransaction aborts then the frozen rows won't be visible`
	`2006`	`+ * after xact cleanup. Note that the stronger test of exactly`
	`2007`	`+ * which subtransaction created it is crucial for correctness`
	`2008`	`+ * of this optimisation.`
	`2009`	`+ */`
	`2010`	`+if (cstate->freeze)`
	`2011`	`+{`
	`2012`	`+if (!ThereAreNoPriorRegisteredSnapshots()\|\| !ThereAreNoReadyPortals())`
	`2013`	`+ereport(ERROR,`
	`2014`	`+(ERRCODE_INVALID_TRANSACTION_STATE,`
	`2015`	`+errmsg("cannot perform FREEZE because of prior transaction activity")));`
`2015`	`2016`
`2016`		`-if (cstate->rel->rd_createSubid==GetCurrentSubTransactionId()\|\|`
`2017`		`-cstate->rel->rd_newRelfilenodeSubid==GetCurrentSubTransactionId())`
`2018`		`-hi_options \|=HEAP_INSERT_FROZEN;`
`2019`		`-else`
`2020`		`-ereport(ERROR,`
`2021`		`-(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE,`
`2022`		`-errmsg("cannot perform FREEZE because of transaction activity after table creation or truncation")));`
`2023`		`-}`
	`2017`	`+if (cstate->rel->rd_createSubid!=GetCurrentSubTransactionId()&&`
	`2018`	`+cstate->rel->rd_newRelfilenodeSubid!=GetCurrentSubTransactionId())`
	`2019`	`+ereport(ERROR,`
	`2020`	`+(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE,`
	`2021`	`+errmsg("cannot perform FREEZE because the table was not created or truncated in the current subtransaction")));`
	`2022`	`+`
	`2023`	`+hi_options \|=HEAP_INSERT_FROZEN;`
`2024`	`2024`	`}`
`2025`		`-elseif (cstate->freeze)`
`2026`		`-ereport(ERROR,`
`2027`		`-(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE,`
`2028`		`-errmsg("cannot perform FREEZE because the table was not created or truncated in the current transaction")));`
`2029`	`2025`
`2030`	`2026`	`/*`
`2031`	`2027`	`* We need a ResultRelInfo so we can use the regular executor's`

`‎src/test/regress/expected/copy2.out`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -334,20 +334,20 @@ SELECT * FROM vistest;`
`334`	`334`	`COMMIT;`
`335`	`335`	`TRUNCATE vistest;`
`336`	`336`	`COPY vistest FROM stdin CSV FREEZE;`
`337`		`-ERROR: cannot perform FREEZE because the table was not created or truncated in the currenttransaction`
	`337`	`+ERROR: cannot perform FREEZE because the table was not created or truncated in the currentsubtransaction`
`338`	`338`	`BEGIN;`
`339`	`339`	`TRUNCATE vistest;`
`340`	`340`	`SAVEPOINT s1;`
`341`	`341`	`COPY vistest FROM stdin CSV FREEZE;`
`342`		`-ERROR: cannot perform FREEZE becauseof transaction activity after table creationortruncation`
	`342`	`+ERROR: cannot perform FREEZE becausethe table was not createdortruncated in the current subtransaction`
`343`	`343`	`COMMIT;`
`344`	`344`	`BEGIN;`
`345`	`345`	`INSERT INTO vistest VALUES ('z');`
`346`	`346`	`SAVEPOINT s1;`
`347`	`347`	`TRUNCATE vistest;`
`348`	`348`	`ROLLBACK TO SAVEPOINT s1;`
`349`	`349`	`COPY vistest FROM stdin CSV FREEZE;`
`350`		`-ERROR: cannot perform FREEZE because the table was not created or truncated in the currenttransaction`
	`350`	`+ERROR: cannot perform FREEZE because the table was not created or truncated in the currentsubtransaction`
`351`	`351`	`COMMIT;`
`352`	`352`	`CREATE FUNCTION truncate_in_subxact() RETURNS VOID AS`
`353`	`353`	`$$`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commite8ae019

File tree

2 files changed

2 files changed

`‎src/backend/commands/copy.c`

`‎src/test/regress/expected/copy2.out`

0 commit comments