From 31a493af6a3a7788adea207ede7a63c9192a45a6 Mon Sep 17 00:00:00 2001 From: Alexander Korotkov Date: Thu, 18 Apr 2024 12:27:39 +0300 Subject: [PATCH v6 1/4] Add missing CommandCounterIncrement() to ATExecMergePartitions() During the MERGE PARTITIONS operation, increment the command counter before attaching the new partition to the parent. Otherwise, the new catalog tuple wouldn't be visible. In turn, that could lead to inappropriate index names. Reported-by: Alexander Lakhin Discussion: https://postgr.es/m/edfbd846-dcc1-42d1-ac26-715691b687d3%40postgrespro.ru Author: Dmitry Koval Reviewed-by: Alexander Korotkov, Robert Haas --- src/backend/commands/tablecmds.c | 20 +++++++++++++------ src/test/regress/expected/partition_merge.out | 18 +++++++++++++++++ src/test/regress/sql/partition_merge.sql | 18 +++++++++++++++++ 3 files changed, 50 insertions(+), 6 deletions(-) diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c index 027d68e5d2a..87427ad7d2e 100644 --- a/src/backend/commands/tablecmds.c +++ b/src/backend/commands/tablecmds.c @@ -21494,12 +21494,6 @@ ATExecMergePartitions(List **wqueue, AlteredTableInfo *tab, Relation rel, /* Copy data from merged partitions to new partition. */ moveMergedTablesRows(rel, mergingPartitionsList, newPartRel); - /* - * Attach a new partition to the partitioned table. wqueue = NULL: - * verification for each cloned constraint is not need. - */ - attachPartitionTable(NULL, rel, newPartRel, cmd->bound); - /* Unlock and drop merged partitions. */ foreach(listptr, mergingPartitionsList) { @@ -21526,10 +21520,24 @@ ATExecMergePartitions(List **wqueue, AlteredTableInfo *tab, Relation rel, * visible for rename. */ CommandCounterIncrement(); + /* Rename partition. */ RenameRelationInternal(RelationGetRelid(newPartRel), cmd->name->relname, false, false); + + /* + * Bump the command counter to make the tuple of renamed partition + * visible for attach partition operation. + */ + CommandCounterIncrement(); } + + /* + * Attach a new partition to the partitioned table. wqueue = NULL: + * verification for each cloned constraint is not needed. + */ + attachPartitionTable(NULL, rel, newPartRel, cmd->bound); + /* Keep the lock until commit. */ table_close(newPartRel, NoLock); } diff --git a/src/test/regress/expected/partition_merge.out b/src/test/regress/expected/partition_merge.out index 373d32948ca..3593720731c 100644 --- a/src/test/regress/expected/partition_merge.out +++ b/src/test/regress/expected/partition_merge.out @@ -746,4 +746,22 @@ DROP TABLE t3; DROP TABLE t2; DROP TABLE t1; -- +-- Check the partition index name if the partition name is the same as one +-- of the merged partitions. +-- +CREATE TABLE t (i int) PARTITION BY RANGE (i); +CREATE TABLE tp_0_1 PARTITION OF t FOR VALUES FROM (0) TO (1); +CREATE TABLE tp_1_2 PARTITION OF t FOR VALUES FROM (1) TO (2); +CREATE INDEX tidx ON t(i); +ALTER TABLE t MERGE PARTITIONS (tp_1_2, tp_0_1) INTO tp_1_2; +-- Indexname value should be 'tp_1_2_i_idx'. +SELECT indexname FROM pg_indexes +WHERE tablename = 'tp_1_2' AND schemaname = 'partitions_merge_schema'; + indexname +-------------- + tp_1_2_i_idx +(1 row) + +DROP TABLE t; +-- DROP SCHEMA partitions_merge_schema; diff --git a/src/test/regress/sql/partition_merge.sql b/src/test/regress/sql/partition_merge.sql index 6a0b35b1799..940e6b5a9e5 100644 --- a/src/test/regress/sql/partition_merge.sql +++ b/src/test/regress/sql/partition_merge.sql @@ -444,5 +444,23 @@ DROP TABLE t3; DROP TABLE t2; DROP TABLE t1; +-- +-- Check the partition index name if the partition name is the same as one +-- of the merged partitions. +-- +CREATE TABLE t (i int) PARTITION BY RANGE (i); + +CREATE TABLE tp_0_1 PARTITION OF t FOR VALUES FROM (0) TO (1); +CREATE TABLE tp_1_2 PARTITION OF t FOR VALUES FROM (1) TO (2); + +CREATE INDEX tidx ON t(i); +ALTER TABLE t MERGE PARTITIONS (tp_1_2, tp_0_1) INTO tp_1_2; + +-- Indexname value should be 'tp_1_2_i_idx'. +SELECT indexname FROM pg_indexes +WHERE tablename = 'tp_1_2' AND schemaname = 'partitions_merge_schema'; + +DROP TABLE t; + -- DROP SCHEMA partitions_merge_schema; -- 2.39.3 (Apple Git-145)