Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit2b59274

Browse files
committed
check_exclusion_constraint didn't actually work correctly for index
expressions: FormIndexDatum requires the estate's scantuple to already pointat the tuple the values are supposedly being extracted from. Adjust testcase so that this type of confusion will be exposed.Per report from hubert depesz lubaczewski.
1 parent0239800 commit2b59274

File tree

3 files changed

+30
-16
lines changed

3 files changed

+30
-16
lines changed

‎src/backend/executor/execUtils.c

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/executor/execUtils.c,v 1.168 2010/01/0216:57:41 momjian Exp $
11+
* $PostgreSQL: pgsql/src/backend/executor/execUtils.c,v 1.169 2010/01/0217:53:56 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -1167,7 +1167,9 @@ check_exclusion_constraint(Relation heap, Relation index, IndexInfo *indexInfo,
11671167
inti;
11681168
boolconflict;
11691169
boolfound_self;
1170+
ExprContext*econtext;
11701171
TupleTableSlot*existing_slot;
1172+
TupleTableSlot*save_scantuple;
11711173

11721174
/*
11731175
* If any of the input values are NULL, the constraint check is assumed
@@ -1194,9 +1196,19 @@ check_exclusion_constraint(Relation heap, Relation index, IndexInfo *indexInfo,
11941196
values[i]);
11951197
}
11961198

1197-
/* Need a TupleTableSlot to put existing tuples in */
1199+
/*
1200+
* Need a TupleTableSlot to put existing tuples in.
1201+
*
1202+
* To use FormIndexDatum, we have to make the econtext's scantuple point
1203+
* to this slot. Be sure to save and restore caller's value for
1204+
* scantuple.
1205+
*/
11981206
existing_slot=MakeSingleTupleTableSlot(RelationGetDescr(heap));
11991207

1208+
econtext=GetPerTupleExprContext(estate);
1209+
save_scantuple=econtext->ecxt_scantuple;
1210+
econtext->ecxt_scantuple=existing_slot;
1211+
12001212
/*
12011213
* May have to restart scan from this point if a potential
12021214
* conflict is found.
@@ -1311,6 +1323,8 @@ check_exclusion_constraint(Relation heap, Relation index, IndexInfo *indexInfo,
13111323
RelationGetRelationName(index)),
13121324
errhint("This may be because of a non-immutable index expression.")));
13131325

1326+
econtext->ecxt_scantuple=save_scantuple;
1327+
13141328
ExecDropSingleTupleTableSlot(existing_slot);
13151329

13161330
return !conflict;

‎src/test/regress/input/constraints.source

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -376,26 +376,26 @@ CREATE TABLE circles (
376376
c1 CIRCLE,
377377
c2 TEXT,
378378
EXCLUDE USING gist
379-
(c1 WITH &&, (c2::circle) WITH~=)
379+
(c1 WITH &&, (c2::circle) WITH&&)
380380
WHERE (circle_center(c1) <> '(0,0)')
381381
);
382382

383383
-- these should succeed because they don't match the index predicate
384384
INSERT INTO circles VALUES('<(0,0), 5>', '<(0,0), 5>');
385-
INSERT INTO circles VALUES('<(0,0), 5>', '<(0,0),5>');
385+
INSERT INTO circles VALUES('<(0,0), 5>', '<(0,0),4>');
386386

387387
-- succeed
388388
INSERT INTO circles VALUES('<(10,10), 10>', '<(0,0), 5>');
389389
-- fail, overlaps
390-
INSERT INTO circles VALUES('<(20,20), 10>', '<(0,0),5>');
390+
INSERT INTO circles VALUES('<(20,20), 10>', '<(0,0),4>');
391391
-- succeed because c1 doesn't overlap
392392
INSERT INTO circles VALUES('<(20,20), 1>', '<(0,0), 5>');
393-
-- succeed because c2is not the same
394-
INSERT INTO circles VALUES('<(20,20), 10>', '<(1,1), 5>');
393+
-- succeed because c2doesn't overlap
394+
INSERT INTO circles VALUES('<(20,20), 10>', '<(10,10), 5>');
395395

396396
-- should fail on existing data without the WHERE clause
397397
ALTER TABLE circles ADD EXCLUDE USING gist
398-
(c1 WITH &&, (c2::circle) WITH~=);
398+
(c1 WITH &&, (c2::circle) WITH&&);
399399

400400
DROP TABLE circles;
401401

‎src/test/regress/output/constraints.source

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -520,29 +520,29 @@ CREATE TABLE circles (
520520
c1 CIRCLE,
521521
c2 TEXT,
522522
EXCLUDE USING gist
523-
(c1 WITH &&, (c2::circle) WITH~=)
523+
(c1 WITH &&, (c2::circle) WITH&&)
524524
WHERE (circle_center(c1) <> '(0,0)')
525525
);
526526
NOTICE: CREATE TABLE / EXCLUDE will create implicit index "circles_c1_c2_exclusion" for table "circles"
527527
-- these should succeed because they don't match the index predicate
528528
INSERT INTO circles VALUES('<(0,0), 5>', '<(0,0), 5>');
529-
INSERT INTO circles VALUES('<(0,0), 5>', '<(0,0),5>');
529+
INSERT INTO circles VALUES('<(0,0), 5>', '<(0,0),4>');
530530
-- succeed
531531
INSERT INTO circles VALUES('<(10,10), 10>', '<(0,0), 5>');
532532
-- fail, overlaps
533-
INSERT INTO circles VALUES('<(20,20), 10>', '<(0,0),5>');
533+
INSERT INTO circles VALUES('<(20,20), 10>', '<(0,0),4>');
534534
ERROR: conflicting key value violates exclusion constraint "circles_c1_c2_exclusion"
535-
DETAIL: Key (c1, (c2::circle))=(<(20,20),10>, <(0,0),5>) conflicts with existing key (c1, (c2::circle))=(<(10,10),10>, <(0,0),5>).
535+
DETAIL: Key (c1, (c2::circle))=(<(20,20),10>, <(0,0),4>) conflicts with existing key (c1, (c2::circle))=(<(10,10),10>, <(0,0),5>).
536536
-- succeed because c1 doesn't overlap
537537
INSERT INTO circles VALUES('<(20,20), 1>', '<(0,0), 5>');
538-
-- succeed because c2is not the same
539-
INSERT INTO circles VALUES('<(20,20), 10>', '<(1,1), 5>');
538+
-- succeed because c2doesn't overlap
539+
INSERT INTO circles VALUES('<(20,20), 10>', '<(10,10), 5>');
540540
-- should fail on existing data without the WHERE clause
541541
ALTER TABLE circles ADD EXCLUDE USING gist
542-
(c1 WITH &&, (c2::circle) WITH~=);
542+
(c1 WITH &&, (c2::circle) WITH&&);
543543
NOTICE: ALTER TABLE / ADD EXCLUDE will create implicit index "circles_c1_c2_exclusion1" for table "circles"
544544
ERROR: could not create exclusion constraint "circles_c1_c2_exclusion1"
545-
DETAIL: Key (c1, (c2::circle))=(<(0,0),5>, <(0,0),5>) conflicts with key (c1, (c2::circle))=(<(0,0),5>, <(0,0),5>).
545+
DETAIL: Key (c1, (c2::circle))=(<(0,0),5>, <(0,0),5>) conflicts with key (c1, (c2::circle))=(<(0,0),5>, <(0,0),4>).
546546
DROP TABLE circles;
547547
-- Check deferred exclusion constraint
548548
CREATE TABLE deferred_excl (

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp