From 2127f8ad891e3967f00bb821331ae16ad29a342e Mon Sep 17 00:00:00 2001 From: amit Date: Tue, 13 Dec 2016 15:07:41 +0900 Subject: [PATCH 4/5] Fix a bug of insertion into an internal partition. Since implicit partition constraints are not inherited, an internal partition's constraint was not being enforced when targeted directly. So, include such constraint when setting up leaf partition result relations for tuple-routing. --- src/backend/commands/copy.c | 19 +++++++++++++++++-- src/backend/commands/tablecmds.c | 2 +- src/backend/executor/execMain.c | 22 +++++++++++++++------- src/backend/executor/nodeModifyTable.c | 12 +++++++++++- src/include/executor/executor.h | 3 +-- 5 files changed, 45 insertions(+), 13 deletions(-) diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c index e9177491e2..b05055808f 100644 --- a/src/backend/commands/copy.c +++ b/src/backend/commands/copy.c @@ -1411,6 +1411,7 @@ BeginCopy(ParseState *pstate, int i, num_parted; ResultRelInfo *leaf_part_rri; + List *partcheck = NIL; /* Get the tuple-routing information and lock partitions */ cstate->partition_dispatch_info = @@ -1426,6 +1427,15 @@ BeginCopy(ParseState *pstate, palloc0(cstate->num_partitions * sizeof(TupleConversionMap *)); + /* + * If the main target rel is a partition, ExecConstraints() as + * applied to each leaf partition must consider its partition + * constraint, because unlike explicit constraints, an implicit + * partition constraint is not inherited. + */ + if (rel->rd_rel->relispartition) + partcheck = RelationGetPartitionQual(rel, true); + leaf_part_rri = cstate->partitions; i = 0; foreach(cell, leaf_parts) @@ -1449,7 +1459,7 @@ BeginCopy(ParseState *pstate, InitResultRelInfo(leaf_part_rri, partrel, 1, /* dummy */ - false, /* no partition constraint check */ + partcheck, 0); /* Open partition indices */ @@ -2335,6 +2345,7 @@ CopyFrom(CopyState cstate) uint64 processed = 0; bool useHeapMultiInsert; int nBufferedTuples = 0; + List *partcheck = NIL; #define MAX_BUFFERED_TUPLES 1000 HeapTuple *bufferedTuples = NULL; /* initialize to silence warning */ @@ -2451,6 +2462,10 @@ CopyFrom(CopyState cstate) hi_options |= HEAP_INSERT_FROZEN; } + /* Don't forget the partition constraints */ + if (cstate->rel->rd_rel->relispartition) + partcheck = RelationGetPartitionQual(cstate->rel, true); + /* * We need a ResultRelInfo so we can use the regular executor's * index-entry-making machinery. (There used to be a huge amount of code @@ -2460,7 +2475,7 @@ CopyFrom(CopyState cstate) InitResultRelInfo(resultRelInfo, cstate->rel, 1, /* dummy rangetable index */ - true, /* do load partition check expression */ + partcheck, 0); ExecOpenIndices(resultRelInfo, false); diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c index f94cab60a3..48adeedbe0 100644 --- a/src/backend/commands/tablecmds.c +++ b/src/backend/commands/tablecmds.c @@ -1329,7 +1329,7 @@ ExecuteTruncate(TruncateStmt *stmt) InitResultRelInfo(resultRelInfo, rel, 0, /* dummy rangetable index */ - false, + NIL, /* No need for partition constraints */ 0); resultRelInfo++; } diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c index d43a204808..963cd2ae43 100644 --- a/src/backend/executor/execMain.c +++ b/src/backend/executor/execMain.c @@ -820,13 +820,19 @@ InitPlan(QueryDesc *queryDesc, int eflags) Index resultRelationIndex = lfirst_int(l); Oid resultRelationOid; Relation resultRelation; + List *partcheck = NIL; resultRelationOid = getrelid(resultRelationIndex, rangeTable); resultRelation = heap_open(resultRelationOid, RowExclusiveLock); + + /* Don't forget the partition constraint */ + if (resultRelation->rd_rel->relispartition) + partcheck = RelationGetPartitionQual(resultRelation, true); + InitResultRelInfo(resultRelInfo, resultRelation, resultRelationIndex, - true, + partcheck, estate->es_instrument); resultRelInfo++; } @@ -1216,7 +1222,7 @@ void InitResultRelInfo(ResultRelInfo *resultRelInfo, Relation resultRelationDesc, Index resultRelationIndex, - bool load_partition_check, + List *partition_check, int instrument_options) { MemSet(resultRelInfo, 0, sizeof(ResultRelInfo)); @@ -1254,10 +1260,7 @@ InitResultRelInfo(ResultRelInfo *resultRelInfo, resultRelInfo->ri_ConstraintExprs = NULL; resultRelInfo->ri_junkFilter = NULL; resultRelInfo->ri_projectReturning = NULL; - if (load_partition_check) - resultRelInfo->ri_PartitionCheck = - RelationGetPartitionQual(resultRelationDesc, - true); + resultRelInfo->ri_PartitionCheck = partition_check; } /* @@ -1284,6 +1287,7 @@ ExecGetTriggerResultRel(EState *estate, Oid relid) ListCell *l; Relation rel; MemoryContext oldcontext; + List *partcheck = NIL; /* First, search through the query result relations */ rInfo = estate->es_result_relations; @@ -1312,6 +1316,10 @@ ExecGetTriggerResultRel(EState *estate, Oid relid) */ rel = heap_open(relid, NoLock); + /* Don't forget the partition constraint */ + if (rel->rd_rel->relispartition) + partcheck = RelationGetPartitionQual(rel, true); + /* * Make the new entry in the right context. */ @@ -1320,7 +1328,7 @@ ExecGetTriggerResultRel(EState *estate, Oid relid) InitResultRelInfo(rInfo, rel, 0, /* dummy rangetable index */ - true, + partcheck, estate->es_instrument); estate->es_trig_target_relations = lappend(estate->es_trig_target_relations, rInfo); diff --git a/src/backend/executor/nodeModifyTable.c b/src/backend/executor/nodeModifyTable.c index ec440b353d..e236c0e0a7 100644 --- a/src/backend/executor/nodeModifyTable.c +++ b/src/backend/executor/nodeModifyTable.c @@ -1724,6 +1724,7 @@ ExecInitModifyTable(ModifyTable *node, EState *estate, int eflags) List *leaf_parts; ListCell *cell; ResultRelInfo *leaf_part_rri; + List *partcheck = NIL; /* Get the tuple-routing information and lock partitions */ mtstate->mt_partition_dispatch_info = @@ -1739,6 +1740,15 @@ ExecInitModifyTable(ModifyTable *node, EState *estate, int eflags) palloc0(mtstate->mt_num_partitions * sizeof(TupleConversionMap *)); + /* + * If the main target rel is a partition, ExecConstraints() as + * applied to each leaf partition must consider its partition + * constraint, because unlike explicit constraints, an implicit + * partition constraint is not inherited. + */ + if (rel->rd_rel->relispartition) + partcheck = RelationGetPartitionQual(rel, true); + leaf_part_rri = mtstate->mt_partitions; i = j = 0; foreach(cell, leaf_parts) @@ -1762,7 +1772,7 @@ ExecInitModifyTable(ModifyTable *node, EState *estate, int eflags) InitResultRelInfo(leaf_part_rri, partrel, 1, /* dummy */ - false, /* no partition constraint checks */ + partcheck, eflags); /* Open partition indices (note: ON CONFLICT unsupported)*/ diff --git a/src/include/executor/executor.h b/src/include/executor/executor.h index b4d09f9564..74213da078 100644 --- a/src/include/executor/executor.h +++ b/src/include/executor/executor.h @@ -73,7 +73,6 @@ #define ExecEvalExpr(expr, econtext, isNull, isDone) \ ((*(expr)->evalfunc) (expr, econtext, isNull, isDone)) - /* Hook for plugins to get control in ExecutorStart() */ typedef void (*ExecutorStart_hook_type) (QueryDesc *queryDesc, int eflags); extern PGDLLIMPORT ExecutorStart_hook_type ExecutorStart_hook; @@ -189,7 +188,7 @@ extern void CheckValidResultRel(Relation resultRel, CmdType operation); extern void InitResultRelInfo(ResultRelInfo *resultRelInfo, Relation resultRelationDesc, Index resultRelationIndex, - bool load_partition_check, + List *partition_check, int instrument_options); extern ResultRelInfo *ExecGetTriggerResultRel(EState *estate, Oid relid); extern bool ExecContextForcesOids(PlanState *planstate, bool *hasoids); -- 2.11.0