NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit0f11129

committed

Code review for recent TRUNCATE changes. Tighten relation-kind check,

tighten foreign-key check (a self-reference should not prevent TRUNCATE),improve error message, cause a relation's TOAST table to be truncatedalong with the relation.

1 parentb4f24fe commit0f11129Copy full SHA for 0f11129

File tree

2 files changed

+27

-15

lines changed

src
- backend/commands
  - tablecmds.c
- test/regress/expected
  - truncate.out

2 files changed

+27

-15

lines changed

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

Lines changed: 26 additions & 14 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/commands/tablecmds.c,v 1.31 2002/08/2204:51:05 momjian Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/commands/tablecmds.c,v 1.32 2002/08/2214:23:36 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -332,6 +332,7 @@ TruncateRelation(const RangeVar *relation)`
`332`	`332`	`{`
`333`	`333`	`Relationrel;`
`334`	`334`	`Oidrelid;`
	`335`	`+Oidtoastrelid;`
`335`	`336`	`ScanKeyDatakey;`
`336`	`337`	`RelationfkeyRel;`
`337`	`338`	`SysScanDescfkeyScan;`
`@@ -341,17 +342,20 @@ TruncateRelation(const RangeVar *relation)`
`341`	`342`	`rel=heap_openrv(relation,AccessExclusiveLock);`
`342`	`343`	`relid=RelationGetRelid(rel);`
`343`	`344`
`344`		`-if (rel->rd_rel->relkind==RELKIND_SEQUENCE)`
`345`		`-elog(ERROR,"TRUNCATE cannot be used on sequences. '%s' is a sequence",`
`346`		`-RelationGetRelationName(rel));`
`347`		`-`
`348`		`-if (rel->rd_rel->relkind==RELKIND_VIEW)`
`349`		`-elog(ERROR,"TRUNCATE cannot be used on views. '%s' is a view",`
`350`		`-RelationGetRelationName(rel));`
`351`		`-`
`352`		`-if (rel->rd_rel->relkind==RELKIND_COMPOSITE_TYPE)`
`353`		`-elog(ERROR,"TRUNCATE cannot be used on type relations. '%s' is a type",`
	`345`	`+/* Only allow truncate on regular tables */`
	`346`	`+if (rel->rd_rel->relkind!=RELKIND_RELATION)`
	`347`	`+{`
	`348`	`+/* special errors for backwards compatibility */`
	`349`	`+if (rel->rd_rel->relkind==RELKIND_SEQUENCE)`
	`350`	`+elog(ERROR,"TRUNCATE cannot be used on sequences. '%s' is a sequence",`
	`351`	`+RelationGetRelationName(rel));`
	`352`	`+if (rel->rd_rel->relkind==RELKIND_VIEW)`
	`353`	`+elog(ERROR,"TRUNCATE cannot be used on views. '%s' is a view",`
	`354`	`+RelationGetRelationName(rel));`
	`355`	`+/* else a generic error message will do */`
	`356`	`+elog(ERROR,"TRUNCATE can only be used on tables. '%s' is not a table",`
`354`	`357`	`RelationGetRelationName(rel));`
	`358`	`+}`
`355`	`359`
`356`	`360`	`if (!allowSystemTableMods&&IsSystemRelation(rel))`
`357`	`361`	`elog(ERROR,"TRUNCATE cannot be used on system tables. '%s' is a system table",`
`@@ -375,25 +379,33 @@ TruncateRelation(const RangeVar *relation)`
`375`	`379`	`SnapshotNow,1,&key);`
`376`	`380`
`377`	`381`	`/*`
`378`		`- * Firstforiegn key found with us as the reference`
	`382`	`+ * Firstforeign key found with us as the reference`
`379`	`383`	`* should throw an error.`
`380`	`384`	`*/`
`381`	`385`	`while (HeapTupleIsValid(tuple=systable_getnext(fkeyScan)))`
`382`	`386`	`{`
`383`	`387`	`Form_pg_constraintcon= (Form_pg_constraint)GETSTRUCT(tuple);`
`384`	`388`
`385`		`-if (con->contype=='f')`
`386`		`-elog(ERROR,"TRUNCATE cannot be used as other tables reference this one via foreign key constraint %s",`
	`389`	`+if (con->contype=='f'&&con->conrelid!=relid)`
	`390`	`+elog(ERROR,"TRUNCATE cannot be used as table %s references this one via foreign key constraint %s",`
	`391`	`+get_rel_name(con->conrelid),`
`387`	`392`	`NameStr(con->conname));`
`388`	`393`	`}`
`389`	`394`
`390`	`395`	`systable_endscan(fkeyScan);`
`391`	`396`	`heap_close(fkeyRel,AccessShareLock);`
`392`	`397`
	`398`	`+toastrelid=rel->rd_rel->reltoastrelid;`
	`399`	`+`
`393`	`400`	`/* Keep the lock until transaction commit */`
`394`	`401`	`heap_close(rel,NoLock);`
`395`	`402`
	`403`	`+/* Truncate the table proper */`
`396`	`404`	`heap_truncate(relid);`
	`405`	`+`
	`406`	`+/* If it has a toast table, truncate that too */`
	`407`	`+if (OidIsValid(toastrelid))`
	`408`	`+heap_truncate(toastrelid);`
`397`	`409`	`}`
`398`	`410`
`399`	`411`	`/*----------`

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

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ SELECT * FROM truncate_a;`
`27`	`27`	`(1 row)`
`28`	`28`
`29`	`29`	`TRUNCATE truncate_a;`
`30`		`-ERROR: TRUNCATE cannot be used asother tables reference this one via foreign key constraint $1`
	`30`	`+ERROR: TRUNCATE cannot be used astable truncate_b references this one via foreign key constraint $1`
`31`	`31`	`SELECT * FROM truncate_a;`
`32`	`32`	`col1`
`33`	`33`	`------`

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!

Commit0f11129

File tree

2 files changed

2 files changed

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

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

0 commit comments