database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2026-10-23 13:29:09 +03:00
Code Activity

Fix restore of partitions with exclusion constraints

Browse Source 
Commit 8c852ba9a4 allowed exclusion constraints to be added to
partitioned tables, but wasn't careful to verify that pg_restore worked
correctly for them.  Fix that by making CompareIndexInfo() more
selective about what needs to be rejected.

Author: Japin Li <japinli@hotmail.com>
Reported-by: Keith Paskett <keith.paskett@logansw.com>
Discussion: https://postgr.es/m/2A40921D-83AB-411E-ADA6-7E509A46F1E4@logansw.com
This commit is contained in:
Álvaro Herrera
2026-07-20 17:21:20 +02:00
parent 10389a7e15
commit 2b2c2492c2
3 changed files with 43 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/backend/catalog/index.c
View File

@@ -2663,9 +2663,21 @@ CompareIndexInfo(const IndexInfo *info1, const IndexInfo *info2,
return false;
}
/* No support currently for comparing exclusion indexes. */
if (info1->ii_ExclusionOps != NULL || info2->ii_ExclusionOps != NULL)
/* If they're exclusion indexes, their properties must be identical */
if ((info1->ii_ExclusionOps == NULL) != (info2->ii_ExclusionOps == NULL))
return false;
if (info1->ii_ExclusionOps != NULL)
{
for (i = 0; i < info1->ii_NumIndexKeyAttrs; i++)
{
if (info1->ii_ExclusionOps[i] != info2->ii_ExclusionOps[i])
return false;
if (info1->ii_ExclusionProcs[i] != info2->ii_ExclusionProcs[i])
return false;
if (info1->ii_ExclusionStrats[i] != info2->ii_ExclusionStrats[i])
return false;
}
}
return true;
}

15
src/test/regress/expected/indexing.out
View File

@@ -1785,3 +1785,18 @@ insert into test_pg_wholerow_index values (2, 'addition', 0);
drop index row_image_index;
drop function row_image(test_pg_wholerow_index);
drop table test_pg_wholerow_index;
-- Test of a partitioned index attach, when there are exclusion constraints.
create table idx_excl_part (a int4range, b int4range) partition by list (a);
create table idx_excl_part_1 (a int4range, b int4range);
alter table only idx_excl_part attach partition idx_excl_part_1 for values in ('[0,1)'::int4range);
alter table only idx_excl_part add constraint idxpart_id_data_excl exclude using gist (a with =, b with &&);
alter table idx_excl_part_1 add constraint idxpart_1_id_data_excl exclude using gist (a with &&, b with &&);
-- This should be disallowed, because the constraints don't match.
alter index idxpart_id_data_excl attach partition idxpart_1_id_data_excl;
ERROR: cannot attach index "idxpart_1_id_data_excl" as a partition of index "idxpart_id_data_excl"
DETAIL: The index definitions do not match.
-- but if we recreate the constraint differently, it's allowed:
alter table idx_excl_part_1 drop constraint idxpart_1_id_data_excl;
alter table idx_excl_part_1 add constraint idxpart_1_id_data_excl exclude using gist (a with =, b with &&);
alter index idxpart_id_data_excl attach partition idxpart_1_id_data_excl;
-- leave these tables around, for pg_upgrade testing

14
src/test/regress/sql/indexing.sql
View File

@@ -1005,3 +1005,17 @@ insert into test_pg_wholerow_index values (2, 'addition', 0);
drop index row_image_index;
drop function row_image(test_pg_wholerow_index);
drop table test_pg_wholerow_index;
-- Test of a partitioned index attach, when there are exclusion constraints.
create table idx_excl_part (a int4range, b int4range) partition by list (a);
create table idx_excl_part_1 (a int4range, b int4range);
alter table only idx_excl_part attach partition idx_excl_part_1 for values in ('[0,1)'::int4range);
alter table only idx_excl_part add constraint idxpart_id_data_excl exclude using gist (a with =, b with &&);
alter table idx_excl_part_1 add constraint idxpart_1_id_data_excl exclude using gist (a with &&, b with &&);
-- This should be disallowed, because the constraints don't match.
alter index idxpart_id_data_excl attach partition idxpart_1_id_data_excl;
-- but if we recreate the constraint differently, it's allowed:
alter table idx_excl_part_1 drop constraint idxpart_1_id_data_excl;
alter table idx_excl_part_1 add constraint idxpart_1_id_data_excl exclude using gist (a with =, b with &&);
alter index idxpart_id_data_excl attach partition idxpart_1_id_data_excl;
-- leave these tables around, for pg_upgrade testing