Commit1f023f9

committed

Optimize COPY FREEZE with CREATE TABLE also.

Jeff Davis, additional test by me

1 parent1eb6cee commit1f023f9Copy full SHA for 1f023f9

File tree

+19

-4

lines changed

+19

-4

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2002,7 +2002,8 @@ CopyFrom(CopyState cstate)`
`2002`	`2002`	`if (cstate->freeze&&`
`2003`	`2003`	`ThereAreNoPriorRegisteredSnapshots()&&`
`2004`	`2004`	`ThereAreNoReadyPortals()&&`
`2005`		`-cstate->rel->rd_newRelfilenodeSubid==GetCurrentSubTransactionId())`
	`2005`	`+(cstate->rel->rd_newRelfilenodeSubid==GetCurrentSubTransactionId()\|\|`
	`2006`	`+cstate->rel->rd_createSubid==GetCurrentSubTransactionId()))`
`2006`	`2007`	`hi_options \|=HEAP_INSERT_FROZEN;`
`2007`	`2008`	`}`
`2008`	`2009`

Lines changed: 10 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -254,7 +254,17 @@ SELECT * FROM testnull;`
`254`	`254`	`\|`
`255`	`255`	`(4 rows)`
`256`	`256`
	`257`	`+BEGIN;`
`257`	`258`	`CREATE TABLE vistest (LIKE testeoc);`
	`259`	`+COPY vistest FROM stdin CSV;`
	`260`	`+COMMIT;`
	`261`	`+SELECT xmax, * FROM vistest;`
	`262`	`+ xmax \| a`
	`263`	`+------+----`
	`264`	`+ 0 \| a0`
	`265`	`+ 0 \| b`
	`266`	`+(2 rows)`
	`267`	`+`
`258`	`268`	`BEGIN;`
`259`	`269`	`TRUNCATE vistest;`
`260`	`270`	`COPY vistest FROM stdin CSV;`
`@@ -324,14 +334,12 @@ SELECT * FROM vistest;`
`324`	`334`	`COMMIT;`
`325`	`335`	`TRUNCATE vistest;`
`326`	`336`	`COPY vistest FROM stdin CSV FREEZE;`
`327`		`-NOTICE: FREEZE option specified but pre-conditions not met`
`328`	`337`	`BEGIN;`
`329`	`338`	`INSERT INTO vistest VALUES ('z');`
`330`	`339`	`SAVEPOINT s1;`
`331`	`340`	`TRUNCATE vistest;`
`332`	`341`	`ROLLBACK TO SAVEPOINT s1;`
`333`	`342`	`COPY vistest FROM stdin CSV FREEZE;`
`334`		`-NOTICE: FREEZE option specified but pre-conditions not met`
`335`	`343`	`SELECT * FROM vistest;`
`336`	`344`	`a`
`337`	`345`	`----`

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -178,8 +178,14 @@ COPY testnull FROM stdin WITH NULL AS E'\\0';`
`178`	`178`
`179`	`179`	`SELECT*FROM testnull;`
`180`	`180`
`181`		`-`
	`181`	`+BEGIN;`
`182`	`182`	`CREATETABLEvistest (LIKE testeoc);`
	`183`	`+COPY vistestFROM stdin CSV;`
	`184`	`+a0`
	`185`	`+b`
	`186`	`+\.`
	`187`	`+COMMIT;`
	`188`	`+SELECT*FROM vistest;`
`183`	`189`	`BEGIN;`
`184`	`190`	`TRUNCATE vistest;`
`185`	`191`	`COPY vistestFROM stdin CSV;`

Comments

(0)