NotificationsYou must be signed in to change notification settings
Fork5.2k
Star19k

Commitbd17896

committed

Need to do CommandCounterIncrement after StoreAttrMissingVal.

Without this, an additional change to the same pg_attribute rowwithin the same command will fail. This is possible at least withALTER TABLE ADD COLUMN on a multiple-inheritance-pathway structure.(Another potential hazard is that immediately-following operationsmight not see the missingval.)Introduced by95f6506, which split the former coding thatused a single pg_attribute update to change both atthasdef andatthasmissing/attmissingval into two updates, but missed thatthis should entail two CommandCounterIncrements as well. Likethat fix, back-patch through v13.Reported-by: Alexander Lakhin <exclusion@gmail.com>Author: Tender Wang <tndrwang@gmail.com>Reviewed-by: Tom Lane <tgl@sss.pgh.pa.us>Discussion:https://postgr.es/m/025a3ffa-5eff-4a88-97fb-8f583b015965@gmail.comBackpatch-through: 13

1 parentb057512 commitbd17896Copy full SHA for bd17896

File tree

3 files changed

+18

-2

lines changed

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

3 files changed

+18

-2

lines changed

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

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -7533,6 +7533,8 @@ ATExecAddColumn(List *wqueue, AlteredTableInfo tab, Relation rel,`
`7533`	`7533`	`if (!missingIsNull)`
`7534`	`7534`	`{`
`7535`	`7535`	`StoreAttrMissingVal(rel, attribute->attnum, missingval);`
	`7536`	`+/* Make the additional catalog change visible */`
	`7537`	`+CommandCounterIncrement();`
`7536`	`7538`	`has_missing = true;`
`7537`	`7539`	`}`
`7538`	`7540`	`FreeExecutorState(estate);`

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

Lines changed: 14 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1096,17 +1096,30 @@ CREATE TABLE inhta ();`
`1096`	`1096`	`CREATE TABLE inhtb () INHERITS (inhta);`
`1097`	`1097`	`CREATE TABLE inhtc () INHERITS (inhtb);`
`1098`	`1098`	`CREATE TABLE inhtd () INHERITS (inhta, inhtb, inhtc);`
`1099`		`-ALTER TABLE inhta ADD COLUMN i int;`
	`1099`	`+ALTER TABLE inhta ADD COLUMN i int, ADD COLUMN j bigint DEFAULT 1;`
`1100`	`1100`	`NOTICE: merging definition of column "i" for child "inhtd"`
`1101`	`1101`	`NOTICE: merging definition of column "i" for child "inhtd"`
	`1102`	`+NOTICE: merging definition of column "j" for child "inhtd"`
	`1103`	`+NOTICE: merging definition of column "j" for child "inhtd"`
`1102`	`1104`	`\d+ inhta`
`1103`	`1105`	`Table "public.inhta"`
`1104`	`1106`	`Column \| Type \| Collation \| Nullable \| Default \| Storage \| Stats target \| Description`
`1105`	`1107`	`--------+---------+-----------+----------+---------+---------+--------------+-------------`
`1106`	`1108`	`i \| integer \| \| \| \| plain \| \|`
	`1109`	`+ j \| bigint \| \| \| 1 \| plain \| \|`
`1107`	`1110`	`Child tables: inhtb,`
`1108`	`1111`	`inhtd`
`1109`	`1112`
	`1113`	`+\d+ inhtd`
	`1114`	`+ Table "public.inhtd"`
	`1115`	`+ Column \| Type \| Collation \| Nullable \| Default \| Storage \| Stats target \| Description`
	`1116`	`+--------+---------+-----------+----------+---------+---------+--------------+-------------`
	`1117`	`+ i \| integer \| \| \| \| plain \| \|`
	`1118`	`+ j \| bigint \| \| \| 1 \| plain \| \|`
	`1119`	`+Inherits: inhta,`
	`1120`	`+ inhtb,`
	`1121`	`+ inhtc`
	`1122`	`+`
`1110`	`1123`	`DROP TABLE inhta, inhtb, inhtc, inhtd;`
`1111`	`1124`	`-- Test for renaming in diamond inheritance`
`1112`	`1125`	`CREATE TABLE inht2 (x int) INHERITS (inht1);`

`‎src/test/regress/sql/inherit.sql‎`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -380,8 +380,9 @@ CREATE TABLE inhta ();`
`380`	`380`	`CREATETABLEinhtb () INHERITS (inhta);`
`381`	`381`	`CREATETABLEinhtc () INHERITS (inhtb);`
`382`	`382`	`CREATETABLEinhtd () INHERITS (inhta, inhtb, inhtc);`
`383`		`-ALTERTABLE inhta ADD COLUMN iint;`
	`383`	`+ALTERTABLE inhta ADD COLUMN iint, ADD COLUMN jbigint DEFAULT1;`
`384`	`384`	`\d+ inhta`
	`385`	`+\d+ inhtd`
`385`	`386`	`DROPTABLE inhta, inhtb, inhtc, inhtd;`
`386`	`387`
`387`	`388`	`-- Test for renaming in diamond inheritance`

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!

Commitbd17896

File tree

3 files changed

3 files changed

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

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

`‎src/test/regress/sql/inherit.sql‎`

0 commit comments