diff options
| author | Robert Haas <rhaas@postgresql.org> | 2018-01-05 15:18:03 -0500 |
|---|---|---|
| committer | Robert Haas <rhaas@postgresql.org> | 2018-01-05 15:22:33 -0500 |
| commit | 19c47e7c820241e1befd975cb4411af7d43e1309 (patch) | |
| tree | af3f82cd3f4a470f6a223d3c5bd3d336e4c35322 /src/backend/executor/execPartition.c | |
| parent | 84a6f63e32dbefe3dc76cbe628fab6cbfc26141e (diff) | |
Factor error generation out of ExecPartitionCheck.
At present, we always raise an ERROR if the partition constraint
is violated, but a pending patch for UPDATE tuple routing will
consider instead moving the tuple to the correct partition.
Refactor to make that simpler.
Amit Khandekar, reviewed by Amit Langote, David Rowley, and me.
Discussion: http://postgr.es/m/CAJ3gD9cue54GbEzfV-61nyGpijvjZgCcghvLsB0_nL8Nm8HzCA@mail.gmail.com
Diffstat (limited to 'src/backend/executor/execPartition.c')
| -rw-r--r-- | src/backend/executor/execPartition.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/backend/executor/execPartition.c b/src/backend/executor/execPartition.c index 115be026353..8c0d2df63c7 100644 --- a/src/backend/executor/execPartition.c +++ b/src/backend/executor/execPartition.c @@ -167,8 +167,9 @@ ExecFindPartition(ResultRelInfo *resultRelInfo, PartitionDispatch *pd, * First check the root table's partition constraint, if any. No point in * routing the tuple if it doesn't belong in the root table itself. */ - if (resultRelInfo->ri_PartitionCheck) - ExecPartitionCheck(resultRelInfo, slot, estate); + if (resultRelInfo->ri_PartitionCheck && + !ExecPartitionCheck(resultRelInfo, slot, estate)) + ExecPartitionCheckEmitError(resultRelInfo, slot, estate); /* start with the root partitioned table */ parent = pd[0]; |