git.postgresql.org Git - postgresql.git/commitdiff

git projects / postgresql.git / commitdiff

summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: bcd5b4b)

Fix ALTER TABLE .. ADD COLUMN with complex inheritance trees

author Michael Paquier <michael@paquier.xyz>

2024年1月24日 05:20:01 +0000 (14:20 +0900)

committer Michael Paquier <michael@paquier.xyz>

2024年1月24日 05:20:01 +0000 (14:20 +0900)

This command, when used to add a column on a parent table with a complex
inheritance tree, tried to update multiple times the same tuple in
pg_attribute for a child table when incrementing attinhcount, causing
failures with "tuple already updated by self" because of a missing
CommandCounterIncrement() between two updates.

This exists for a rather long time, so backpatch all the way down.

Reported-by: Alexander Lakhin
Author: Tender Wang
Reviewed-by: Richard Guo
Discussion: https://postgr.es/m/18297-b04cd83a55b51e35@postgresql.org
Backpatch-through: 12

src/backend/commands/tablecmds.c patch | blob | blame | history

src/test/regress/expected/inherit.out patch | blob | blame | history

src/test/regress/sql/inherit.sql patch | blob | blame | history

diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c

index 2a56a4357c9b73ebc196ad9cd0c55c31bae2345b..5ccd0eec1c7223dad3216cb4721acfd053622e01 100644 (file)

--- a/src/backend/commands/tablecmds.c

+++ b/src/backend/commands/tablecmds.c

@@ -7077,6 +7077,10 @@ ATExecAddColumn(List **wqueue, AlteredTableInfo *tab, Relation rel,

colDef->colname, RelationGetRelationName(rel))));

table_close(attrdesc, RowExclusiveLock);

+

+ /* Make the child column change visible */

+ CommandCounterIncrement();

+

return InvalidObjectAddress;

}

}

diff --git a/src/test/regress/expected/inherit.out b/src/test/regress/expected/inherit.out

index 0f1aa831f643251bdfb3390df31ed04ec79d369b..56a40d50f906374be5054dc15e22fc33d01230e3 100644 (file)

--- a/src/test/regress/expected/inherit.out

+++ b/src/test/regress/expected/inherit.out

@@ -1088,6 +1088,23 @@ Inherits: inht1,

inhs1

DROP TABLE inhts;

+-- Test for adding a column to a parent table with complex inheritance

+CREATE TABLE inhta ();

+CREATE TABLE inhtb () INHERITS (inhta);

+CREATE TABLE inhtc () INHERITS (inhtb);

+CREATE TABLE inhtd () INHERITS (inhta, inhtb, inhtc);

+ALTER TABLE inhta ADD COLUMN i int;

+NOTICE: merging definition of column "i" for child "inhtd"

+NOTICE: merging definition of column "i" for child "inhtd"

+\d+ inhta

+ Table "public.inhta"

+ Column | Type | Collation | Nullable | Default | Storage | Stats target | Description

+--------+---------+-----------+----------+---------+---------+--------------+-------------

+ i | integer | | | | plain | |

+Child tables: inhtb,

+ inhtd

+

+DROP TABLE inhta, inhtb, inhtc, inhtd;

-- Test for renaming in diamond inheritance

CREATE TABLE inht2 (x int) INHERITS (inht1);

CREATE TABLE inht3 (y int) INHERITS (inht1);

diff --git a/src/test/regress/sql/inherit.sql b/src/test/regress/sql/inherit.sql

index f7b4062ce51464f1209c845e0d26149e23b107a3..971aac54fda5be8f24502798756c9f9039d52de4 100644 (file)

--- a/src/test/regress/sql/inherit.sql

+++ b/src/test/regress/sql/inherit.sql

@@ -372,6 +372,15 @@ ALTER TABLE inhts RENAME d TO dd;

DROP TABLE inhts;

+-- Test for adding a column to a parent table with complex inheritance

+CREATE TABLE inhta ();

+CREATE TABLE inhtb () INHERITS (inhta);

+CREATE TABLE inhtc () INHERITS (inhtb);

+CREATE TABLE inhtd () INHERITS (inhta, inhtb, inhtc);

+ALTER TABLE inhta ADD COLUMN i int;

+\d+ inhta

+DROP TABLE inhta, inhtb, inhtc, inhtd;

+

-- Test for renaming in diamond inheritance

CREATE TABLE inht2 (x int) INHERITS (inht1);

CREATE TABLE inht3 (y int) INHERITS (inht1);

This is the main PostgreSQL git repository.