]> granicus.if.org Git - postgresql/blobdiff - src/backend/executor/execMain.c
Revert changes in execMain.c from commit 16828d5c0273b
[postgresql] / src / backend / executor / execMain.c
index 73b6ebd5ec240f916a4766b3ca53ea80ae09ad15..b797d064b7e046aa3c3ffff4aac73d7266be349d 100644 (file)
@@ -26,7 +26,7 @@
  *     before ExecutorEnd.  This can be omitted only in case of EXPLAIN,
  *     which should also omit ExecutorRun.
  *
- * Portions Copyright (c) 1996-2015, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -42,6 +42,7 @@
 #include "access/transam.h"
 #include "access/xact.h"
 #include "catalog/namespace.h"
+#include "catalog/pg_publication.h"
 #include "commands/matview.h"
 #include "commands/trigger.h"
 #include "executor/execdebug.h"
 #include "miscadmin.h"
 #include "optimizer/clauses.h"
 #include "parser/parsetree.h"
+#include "rewrite/rewriteManip.h"
 #include "storage/bufmgr.h"
 #include "storage/lmgr.h"
 #include "tcop/utility.h"
 #include "utils/acl.h"
 #include "utils/lsyscache.h"
 #include "utils/memutils.h"
+#include "utils/partcache.h"
+#include "utils/rls.h"
+#include "utils/ruleutils.h"
 #include "utils/snapmgr.h"
 #include "utils/tqual.h"
 
@@ -75,19 +80,37 @@ static void CheckValidRowMarkRel(Relation rel, RowMarkType markType);
 static void ExecPostprocessPlan(EState *estate);
 static void ExecEndPlan(PlanState *planstate, EState *estate);
 static void ExecutePlan(EState *estate, PlanState *planstate,
+                       bool use_parallel_mode,
                        CmdType operation,
                        bool sendTuples,
-                       long numberTuples,
+                       uint64 numberTuples,
                        ScanDirection direction,
-                       DestReceiver *dest);
+                       DestReceiver *dest,
+                       bool execute_once);
 static bool ExecCheckRTEPerms(RangeTblEntry *rte);
+static bool ExecCheckRTEPermsModified(Oid relOid, Oid userid,
+                                                 Bitmapset *modifiedCols,
+                                                 AclMode requiredPerms);
 static void ExecCheckXactReadOnly(PlannedStmt *plannedstmt);
-static char *ExecBuildSlotValueDescription(TupleTableSlot *slot,
+static char *ExecBuildSlotValueDescription(Oid reloid,
+                                                         TupleTableSlot *slot,
                                                          TupleDesc tupdesc,
+                                                         Bitmapset *modifiedCols,
                                                          int maxfieldlen);
 static void EvalPlanQualStart(EPQState *epqstate, EState *parentestate,
                                  Plan *planTree);
 
+/*
+ * Note that GetUpdatedColumns() also exists in commands/trigger.c.  There does
+ * not appear to be any good header to put it into, given the structures that
+ * it uses, so we let them be duplicated.  Be sure to update both if one needs
+ * to be changed, however.
+ */
+#define GetInsertedColumns(relinfo, estate) \
+       (rt_fetch((relinfo)->ri_RangeTableIndex, (estate)->es_range_table)->insertedCols)
+#define GetUpdatedColumns(relinfo, estate) \
+       (rt_fetch((relinfo)->ri_RangeTableIndex, (estate)->es_range_table)->updatedCols)
+
 /* end of local decls */
 
 
@@ -135,8 +158,20 @@ standard_ExecutorStart(QueryDesc *queryDesc, int eflags)
        /*
         * If the transaction is read-only, we need to check if any writes are
         * planned to non-temporary tables.  EXPLAIN is considered read-only.
+        *
+        * Don't allow writes in parallel mode.  Supporting UPDATE and DELETE
+        * would require (a) storing the combocid hash in shared memory, rather
+        * than synchronizing it just once at the start of parallelism, and (b) an
+        * alternative to heap_update()'s reliance on xmax for mutual exclusion.
+        * INSERT may have no such troubles, but we forbid it to simplify the
+        * checks.
+        *
+        * We have lower-level defenses in CommandCounterIncrement and elsewhere
+        * against performing unsafe operations in parallel mode, but this gives a
+        * more user-friendly error message.
         */
-       if (XactReadOnly && !(eflags & EXEC_FLAG_EXPLAIN_ONLY))
+       if ((XactReadOnly || IsInParallelMode()) &&
+               !(eflags & EXEC_FLAG_EXPLAIN_ONLY))
                ExecCheckXactReadOnly(queryDesc->plannedstmt);
 
        /*
@@ -153,9 +188,21 @@ standard_ExecutorStart(QueryDesc *queryDesc, int eflags)
         */
        estate->es_param_list_info = queryDesc->params;
 
-       if (queryDesc->plannedstmt->nParamExec > 0)
+       if (queryDesc->plannedstmt->paramExecTypes != NIL)
+       {
+               int                     nParamExec;
+
+               nParamExec = list_length(queryDesc->plannedstmt->paramExecTypes);
                estate->es_param_exec_vals = (ParamExecData *)
-                       palloc0(queryDesc->plannedstmt->nParamExec * sizeof(ParamExecData));
+                       palloc0(nParamExec * sizeof(ParamExecData));
+       }
+
+       estate->es_sourceText = queryDesc->sourceText;
+
+       /*
+        * Fill in the query environment, if any, from queryDesc.
+        */
+       estate->es_queryEnv = queryDesc->queryEnv;
 
        /*
         * If non-read-only query, set the command ID to mark output tuples with
@@ -201,11 +248,7 @@ standard_ExecutorStart(QueryDesc *queryDesc, int eflags)
        estate->es_crosscheck_snapshot = RegisterSnapshot(queryDesc->crosscheck_snapshot);
        estate->es_top_eflags = eflags;
        estate->es_instrument = queryDesc->instrument_options;
-
-       /*
-        * Initialize the plan state tree
-        */
-       InitPlan(queryDesc, eflags);
+       estate->es_jit_flags = queryDesc->plannedstmt->jitFlags;
 
        /*
         * Set up an AFTER-trigger statement context, unless told not to, or
@@ -214,6 +257,11 @@ standard_ExecutorStart(QueryDesc *queryDesc, int eflags)
        if (!(eflags & (EXEC_FLAG_SKIP_TRIGGERS | EXEC_FLAG_EXPLAIN_ONLY)))
                AfterTriggerBeginQuery();
 
+       /*
+        * Initialize the plan state tree
+        */
+       InitPlan(queryDesc, eflags);
+
        MemoryContextSwitchTo(oldcontext);
 }
 
@@ -248,17 +296,18 @@ standard_ExecutorStart(QueryDesc *queryDesc, int eflags)
  */
 void
 ExecutorRun(QueryDesc *queryDesc,
-                       ScanDirection direction, long count)
+                       ScanDirection direction, uint64 count,
+                       bool execute_once)
 {
        if (ExecutorRun_hook)
-               (*ExecutorRun_hook) (queryDesc, direction, count);
+               (*ExecutorRun_hook) (queryDesc, direction, count, execute_once);
        else
-               standard_ExecutorRun(queryDesc, direction, count);
+               standard_ExecutorRun(queryDesc, direction, count, execute_once);
 }
 
 void
 standard_ExecutorRun(QueryDesc *queryDesc,
-                                        ScanDirection direction, long count)
+                                        ScanDirection direction, uint64 count, bool execute_once)
 {
        EState     *estate;
        CmdType         operation;
@@ -299,25 +348,33 @@ standard_ExecutorRun(QueryDesc *queryDesc,
                                  queryDesc->plannedstmt->hasReturning);
 
        if (sendTuples)
-               (*dest->rStartup) (dest, operation, queryDesc->tupDesc);
+               dest->rStartup(dest, operation, queryDesc->tupDesc);
 
        /*
         * run plan
         */
        if (!ScanDirectionIsNoMovement(direction))
+       {
+               if (execute_once && queryDesc->already_executed)
+                       elog(ERROR, "can't re-execute query flagged for single execution");
+               queryDesc->already_executed = true;
+
                ExecutePlan(estate,
                                        queryDesc->planstate,
+                                       queryDesc->plannedstmt->parallelModeNeeded,
                                        operation,
                                        sendTuples,
                                        count,
                                        direction,
-                                       dest);
+                                       dest,
+                                       execute_once);
+       }
 
        /*
         * shutdown tuple receiver, if we started it
         */
        if (sendTuples)
-               (*dest->rShutdown) (dest);
+               dest->rShutdown(dest);
 
        if (queryDesc->totaltime)
                InstrStopNode(queryDesc->totaltime, estate->es_processed);
@@ -523,7 +580,7 @@ ExecCheckRTPerms(List *rangeTable, bool ereport_on_violation)
                {
                        Assert(rte->rtekind == RTE_RELATION);
                        if (ereport_on_violation)
-                               aclcheck_error(ACLCHECK_NO_PRIV, ACL_KIND_CLASS,
+                               aclcheck_error(ACLCHECK_NO_PRIV, get_relkind_objtype(get_rel_relkind(rte->relid)),
                                                           get_rel_name(rte->relid));
                        return false;
                }
@@ -547,12 +604,11 @@ ExecCheckRTEPerms(RangeTblEntry *rte)
        AclMode         remainingPerms;
        Oid                     relOid;
        Oid                     userid;
-       int                     col;
 
        /*
         * Only plain-relation RTEs need to be checked here.  Function RTEs are
-        * checked by init_fcache when the function is prepared for execution.
-        * Join, subquery, and special RTEs need no checks.
+        * checked when the function is prepared for execution.  Join, subquery,
+        * and special RTEs need no checks.
         */
        if (rte->rtekind != RTE_RELATION)
                return true;
@@ -585,6 +641,8 @@ ExecCheckRTEPerms(RangeTblEntry *rte)
        remainingPerms = requiredPerms & ~relPerms;
        if (remainingPerms != 0)
        {
+               int                     col = -1;
+
                /*
                 * If we lack any permissions that exist only as relation permissions,
                 * we can fail straight away.
@@ -613,7 +671,6 @@ ExecCheckRTEPerms(RangeTblEntry *rte)
                                        return false;
                        }
 
-                       col = -1;
                        while ((col = bms_next_member(rte->selectedCols, col)) >= 0)
                        {
                                /* bit #s are offset by FirstLowInvalidHeapAttributeNumber */
@@ -636,61 +693,85 @@ ExecCheckRTEPerms(RangeTblEntry *rte)
                }
 
                /*
-                * Basically the same for the mod columns, with either INSERT or
-                * UPDATE privilege as specified by remainingPerms.
+                * Basically the same for the mod columns, for both INSERT and UPDATE
+                * privilege as specified by remainingPerms.
                 */
-               remainingPerms &= ~ACL_SELECT;
-               if (remainingPerms != 0)
-               {
-                       /*
-                        * When the query doesn't explicitly change any columns, allow the
-                        * query if we have permission on any column of the rel.  This is
-                        * to handle SELECT FOR UPDATE as well as possible corner cases in
-                        * INSERT and UPDATE.
-                        */
-                       if (bms_is_empty(rte->modifiedCols))
-                       {
-                               if (pg_attribute_aclcheck_all(relOid, userid, remainingPerms,
-                                                                                         ACLMASK_ANY) != ACLCHECK_OK)
-                                       return false;
-                       }
+               if (remainingPerms & ACL_INSERT && !ExecCheckRTEPermsModified(relOid,
+                                                                                                                                         userid,
+                                                                                                                                         rte->insertedCols,
+                                                                                                                                         ACL_INSERT))
+                       return false;
 
-                       col = -1;
-                       while ((col = bms_next_member(rte->modifiedCols, col)) >= 0)
-                       {
-                               /* bit #s are offset by FirstLowInvalidHeapAttributeNumber */
-                               AttrNumber      attno = col + FirstLowInvalidHeapAttributeNumber;
+               if (remainingPerms & ACL_UPDATE && !ExecCheckRTEPermsModified(relOid,
+                                                                                                                                         userid,
+                                                                                                                                         rte->updatedCols,
+                                                                                                                                         ACL_UPDATE))
+                       return false;
+       }
+       return true;
+}
 
-                               if (attno == InvalidAttrNumber)
-                               {
-                                       /* whole-row reference can't happen here */
-                                       elog(ERROR, "whole-row update is not implemented");
-                               }
-                               else
-                               {
-                                       if (pg_attribute_aclcheck(relOid, attno, userid,
-                                                                                         remainingPerms) != ACLCHECK_OK)
-                                               return false;
-                               }
-                       }
+/*
+ * ExecCheckRTEPermsModified
+ *             Check INSERT or UPDATE access permissions for a single RTE (these
+ *             are processed uniformly).
+ */
+static bool
+ExecCheckRTEPermsModified(Oid relOid, Oid userid, Bitmapset *modifiedCols,
+                                                 AclMode requiredPerms)
+{
+       int                     col = -1;
+
+       /*
+        * When the query doesn't explicitly update any columns, allow the query
+        * if we have permission on any column of the rel.  This is to handle
+        * SELECT FOR UPDATE as well as possible corner cases in UPDATE.
+        */
+       if (bms_is_empty(modifiedCols))
+       {
+               if (pg_attribute_aclcheck_all(relOid, userid, requiredPerms,
+                                                                         ACLMASK_ANY) != ACLCHECK_OK)
+                       return false;
+       }
+
+       while ((col = bms_next_member(modifiedCols, col)) >= 0)
+       {
+               /* bit #s are offset by FirstLowInvalidHeapAttributeNumber */
+               AttrNumber      attno = col + FirstLowInvalidHeapAttributeNumber;
+
+               if (attno == InvalidAttrNumber)
+               {
+                       /* whole-row reference can't happen here */
+                       elog(ERROR, "whole-row update is not implemented");
+               }
+               else
+               {
+                       if (pg_attribute_aclcheck(relOid, attno, userid,
+                                                                         requiredPerms) != ACLCHECK_OK)
+                               return false;
                }
        }
        return true;
 }
 
 /*
- * Check that the query does not imply any writes to non-temp tables.
+ * Check that the query does not imply any writes to non-temp tables;
+ * unless we're in parallel mode, in which case don't even allow writes
+ * to temp tables.
  *
- * Note: in a Hot Standby slave this would need to reject writes to temp
- * tables as well; but an HS slave can't have created any temp tables
- * in the first place, so no need to check that.
+ * Note: in a Hot Standby this would need to reject writes to temp
+ * tables just as we do in parallel mode; but an HS standby can't have created
+ * any temp tables in the first place, so no need to check that.
  */
 static void
 ExecCheckXactReadOnly(PlannedStmt *plannedstmt)
 {
        ListCell   *l;
 
-       /* Fail if write permissions are requested on any non-temp table */
+       /*
+        * Fail if write permissions are requested in parallel mode for table
+        * (temp or non-temp), otherwise fail for any non-temp table.
+        */
        foreach(l, plannedstmt->rtable)
        {
                RangeTblEntry *rte = (RangeTblEntry *) lfirst(l);
@@ -706,6 +787,9 @@ ExecCheckXactReadOnly(PlannedStmt *plannedstmt)
 
                PreventCommandIfReadOnly(CreateCommandTag((Node *) plannedstmt));
        }
+
+       if (plannedstmt->commandType != CMD_SELECT || plannedstmt->hasModifyingCTE)
+               PreventCommandIfParallelMode(CreateCommandTag((Node *) plannedstmt));
 }
 
 
@@ -764,9 +848,11 @@ InitPlan(QueryDesc *queryDesc, int eflags)
 
                        resultRelationOid = getrelid(resultRelationIndex, rangeTable);
                        resultRelation = heap_open(resultRelationOid, RowExclusiveLock);
+
                        InitResultRelInfo(resultRelInfo,
                                                          resultRelation,
                                                          resultRelationIndex,
+                                                         NULL,
                                                          estate->es_instrument);
                        resultRelInfo++;
                }
@@ -774,6 +860,57 @@ InitPlan(QueryDesc *queryDesc, int eflags)
                estate->es_num_result_relations = numResultRelations;
                /* es_result_relation_info is NULL except when within ModifyTable */
                estate->es_result_relation_info = NULL;
+
+               /*
+                * In the partitioned result relation case, lock the non-leaf result
+                * relations too.  A subset of these are the roots of respective
+                * partitioned tables, for which we also allocate ResultRelInfos.
+                */
+               estate->es_root_result_relations = NULL;
+               estate->es_num_root_result_relations = 0;
+               if (plannedstmt->nonleafResultRelations)
+               {
+                       int                     num_roots = list_length(plannedstmt->rootResultRelations);
+
+                       /*
+                        * Firstly, build ResultRelInfos for all the partitioned table
+                        * roots, because we will need them to fire the statement-level
+                        * triggers, if any.
+                        */
+                       resultRelInfos = (ResultRelInfo *)
+                               palloc(num_roots * sizeof(ResultRelInfo));
+                       resultRelInfo = resultRelInfos;
+                       foreach(l, plannedstmt->rootResultRelations)
+                       {
+                               Index           resultRelIndex = lfirst_int(l);
+                               Oid                     resultRelOid;
+                               Relation        resultRelDesc;
+
+                               resultRelOid = getrelid(resultRelIndex, rangeTable);
+                               resultRelDesc = heap_open(resultRelOid, RowExclusiveLock);
+                               InitResultRelInfo(resultRelInfo,
+                                                                 resultRelDesc,
+                                                                 lfirst_int(l),
+                                                                 NULL,
+                                                                 estate->es_instrument);
+                               resultRelInfo++;
+                       }
+
+                       estate->es_root_result_relations = resultRelInfos;
+                       estate->es_num_root_result_relations = num_roots;
+
+                       /* Simply lock the rest of them. */
+                       foreach(l, plannedstmt->nonleafResultRelations)
+                       {
+                               Index           resultRelIndex = lfirst_int(l);
+
+                               /* We locked the roots above. */
+                               if (!list_member_int(plannedstmt->rootResultRelations,
+                                                                        resultRelIndex))
+                                       LockRelationOid(getrelid(resultRelIndex, rangeTable),
+                                                                       RowExclusiveLock);
+                       }
+               }
        }
        else
        {
@@ -783,12 +920,18 @@ InitPlan(QueryDesc *queryDesc, int eflags)
                estate->es_result_relations = NULL;
                estate->es_num_result_relations = 0;
                estate->es_result_relation_info = NULL;
+               estate->es_root_result_relations = NULL;
+               estate->es_num_root_result_relations = 0;
        }
 
        /*
         * Similarly, we have to lock relations selected FOR [KEY] UPDATE/SHARE
         * before we initialize the plan tree, else we'd be risking lock upgrades.
-        * While we are at it, build the ExecRowMark list.
+        * While we are at it, build the ExecRowMark list.  Any partitioned child
+        * tables are ignored here (because isParent=true) and will be locked by
+        * the first Append or MergeAppend node that references them.  (Note that
+        * the RowMarks corresponding to partitioned child tables are present in
+        * the same list as the rest, i.e., plannedstmt->rowMarks.)
         */
        estate->es_rowMarks = NIL;
        foreach(l, plannedstmt->rowMarks)
@@ -802,21 +945,26 @@ InitPlan(QueryDesc *queryDesc, int eflags)
                if (rc->isParent)
                        continue;
 
+               /* get relation's OID (will produce InvalidOid if subquery) */
+               relid = getrelid(rc->rti, rangeTable);
+
+               /*
+                * If you change the conditions under which rel locks are acquired
+                * here, be sure to adjust ExecOpenScanRelation to match.
+                */
                switch (rc->markType)
                {
                        case ROW_MARK_EXCLUSIVE:
                        case ROW_MARK_NOKEYEXCLUSIVE:
                        case ROW_MARK_SHARE:
                        case ROW_MARK_KEYSHARE:
-                               relid = getrelid(rc->rti, rangeTable);
                                relation = heap_open(relid, RowShareLock);
                                break;
                        case ROW_MARK_REFERENCE:
-                               relid = getrelid(rc->rti, rangeTable);
                                relation = heap_open(relid, AccessShareLock);
                                break;
                        case ROW_MARK_COPY:
-                               /* there's no real table here ... */
+                               /* no physical table access is required */
                                relation = NULL;
                                break;
                        default:
@@ -831,12 +979,16 @@ InitPlan(QueryDesc *queryDesc, int eflags)
 
                erm = (ExecRowMark *) palloc(sizeof(ExecRowMark));
                erm->relation = relation;
+               erm->relid = relid;
                erm->rti = rc->rti;
                erm->prti = rc->prti;
                erm->rowmarkId = rc->rowmarkId;
                erm->markType = rc->markType;
+               erm->strength = rc->strength;
                erm->waitPolicy = rc->waitPolicy;
+               erm->ermActive = false;
                ItemPointerSetInvalid(&(erm->curCtid));
+               erm->ermExtra = NULL;
                estate->es_rowMarks = lappend(estate->es_rowMarks, erm);
        }
 
@@ -922,7 +1074,7 @@ InitPlan(QueryDesc *queryDesc, int eflags)
 
                        j = ExecInitJunkFilter(planstate->plan->targetlist,
                                                                   tupType->tdhasoid,
-                                                                  ExecInitExtraTupleSlot(estate));
+                                                                  ExecInitExtraTupleSlot(estate, NULL));
                        estate->es_junkFilter = j;
 
                        /* Want to return the cleaned tuple type */
@@ -944,15 +1096,17 @@ InitPlan(QueryDesc *queryDesc, int eflags)
  * CheckValidRowMarkRel.
  */
 void
-CheckValidResultRel(Relation resultRel, CmdType operation)
+CheckValidResultRel(ResultRelInfo *resultRelInfo, CmdType operation)
 {
+       Relation        resultRel = resultRelInfo->ri_RelationDesc;
        TriggerDesc *trigDesc = resultRel->trigdesc;
        FdwRoutine *fdwroutine;
 
        switch (resultRel->rd_rel->relkind)
        {
                case RELKIND_RELATION:
-                       /* OK */
+               case RELKIND_PARTITIONED_TABLE:
+                       CheckCmdReplicaIdentity(resultRel, operation);
                        break;
                case RELKIND_SEQUENCE:
                        ereport(ERROR,
@@ -980,26 +1134,26 @@ CheckValidResultRel(Relation resultRel, CmdType operation)
                                case CMD_INSERT:
                                        if (!trigDesc || !trigDesc->trig_insert_instead_row)
                                                ereport(ERROR,
-                                                 (errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
-                                                  errmsg("cannot insert into view \"%s\"",
-                                                                 RelationGetRelationName(resultRel)),
-                                                  errhint("To enable inserting into the view, provide an INSTEAD OF INSERT trigger or an unconditional ON INSERT DO INSTEAD rule.")));
+                                                               (errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
+                                                                errmsg("cannot insert into view \"%s\"",
+                                                                               RelationGetRelationName(resultRel)),
+                                                                errhint("To enable inserting into the view, provide an INSTEAD OF INSERT trigger or an unconditional ON INSERT DO INSTEAD rule.")));
                                        break;
                                case CMD_UPDATE:
                                        if (!trigDesc || !trigDesc->trig_update_instead_row)
                                                ereport(ERROR,
-                                                 (errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
-                                                  errmsg("cannot update view \"%s\"",
-                                                                 RelationGetRelationName(resultRel)),
-                                                  errhint("To enable updating the view, provide an INSTEAD OF UPDATE trigger or an unconditional ON UPDATE DO INSTEAD rule.")));
+                                                               (errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
+                                                                errmsg("cannot update view \"%s\"",
+                                                                               RelationGetRelationName(resultRel)),
+                                                                errhint("To enable updating the view, provide an INSTEAD OF UPDATE trigger or an unconditional ON UPDATE DO INSTEAD rule.")));
                                        break;
                                case CMD_DELETE:
                                        if (!trigDesc || !trigDesc->trig_delete_instead_row)
                                                ereport(ERROR,
-                                                 (errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
-                                                  errmsg("cannot delete from view \"%s\"",
-                                                                 RelationGetRelationName(resultRel)),
-                                                  errhint("To enable deleting from the view, provide an INSTEAD OF DELETE trigger or an unconditional ON DELETE DO INSTEAD rule.")));
+                                                               (errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
+                                                                errmsg("cannot delete from view \"%s\"",
+                                                                               RelationGetRelationName(resultRel)),
+                                                                errhint("To enable deleting from the view, provide an INSTEAD OF DELETE trigger or an unconditional ON DELETE DO INSTEAD rule.")));
                                        break;
                                default:
                                        elog(ERROR, "unrecognized CmdType: %d", (int) operation);
@@ -1015,21 +1169,21 @@ CheckValidResultRel(Relation resultRel, CmdType operation)
                        break;
                case RELKIND_FOREIGN_TABLE:
                        /* Okay only if the FDW supports it */
-                       fdwroutine = GetFdwRoutineForRelation(resultRel, false);
+                       fdwroutine = resultRelInfo->ri_FdwRoutine;
                        switch (operation)
                        {
                                case CMD_INSERT:
                                        if (fdwroutine->ExecForeignInsert == NULL)
                                                ereport(ERROR,
                                                                (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-                                                       errmsg("cannot insert into foreign table \"%s\"",
-                                                                  RelationGetRelationName(resultRel))));
+                                                                errmsg("cannot insert into foreign table \"%s\"",
+                                                                               RelationGetRelationName(resultRel))));
                                        if (fdwroutine->IsForeignRelUpdatable != NULL &&
                                                (fdwroutine->IsForeignRelUpdatable(resultRel) & (1 << CMD_INSERT)) == 0)
                                                ereport(ERROR,
-                                                 (errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
-                                               errmsg("foreign table \"%s\" does not allow inserts",
-                                                          RelationGetRelationName(resultRel))));
+                                                               (errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
+                                                                errmsg("foreign table \"%s\" does not allow inserts",
+                                                                               RelationGetRelationName(resultRel))));
                                        break;
                                case CMD_UPDATE:
                                        if (fdwroutine->ExecForeignUpdate == NULL)
@@ -1040,22 +1194,22 @@ CheckValidResultRel(Relation resultRel, CmdType operation)
                                        if (fdwroutine->IsForeignRelUpdatable != NULL &&
                                                (fdwroutine->IsForeignRelUpdatable(resultRel) & (1 << CMD_UPDATE)) == 0)
                                                ereport(ERROR,
-                                                 (errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
-                                               errmsg("foreign table \"%s\" does not allow updates",
-                                                          RelationGetRelationName(resultRel))));
+                                                               (errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
+                                                                errmsg("foreign table \"%s\" does not allow updates",
+                                                                               RelationGetRelationName(resultRel))));
                                        break;
                                case CMD_DELETE:
                                        if (fdwroutine->ExecForeignDelete == NULL)
                                                ereport(ERROR,
                                                                (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-                                                       errmsg("cannot delete from foreign table \"%s\"",
-                                                                  RelationGetRelationName(resultRel))));
+                                                                errmsg("cannot delete from foreign table \"%s\"",
+                                                                               RelationGetRelationName(resultRel))));
                                        if (fdwroutine->IsForeignRelUpdatable != NULL &&
                                                (fdwroutine->IsForeignRelUpdatable(resultRel) & (1 << CMD_DELETE)) == 0)
                                                ereport(ERROR,
-                                                 (errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
-                                               errmsg("foreign table \"%s\" does not allow deletes",
-                                                          RelationGetRelationName(resultRel))));
+                                                               (errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
+                                                                errmsg("foreign table \"%s\" does not allow deletes",
+                                                                               RelationGetRelationName(resultRel))));
                                        break;
                                default:
                                        elog(ERROR, "unrecognized CmdType: %d", (int) operation);
@@ -1080,9 +1234,12 @@ CheckValidResultRel(Relation resultRel, CmdType operation)
 static void
 CheckValidRowMarkRel(Relation rel, RowMarkType markType)
 {
+       FdwRoutine *fdwroutine;
+
        switch (rel->rd_rel->relkind)
        {
                case RELKIND_RELATION:
+               case RELKIND_PARTITIONED_TABLE:
                        /* OK */
                        break;
                case RELKIND_SEQUENCE:
@@ -1111,15 +1268,17 @@ CheckValidRowMarkRel(Relation rel, RowMarkType markType)
                        if (markType != ROW_MARK_REFERENCE)
                                ereport(ERROR,
                                                (errcode(ERRCODE_WRONG_OBJECT_TYPE),
-                                          errmsg("cannot lock rows in materialized view \"%s\"",
-                                                         RelationGetRelationName(rel))));
+                                                errmsg("cannot lock rows in materialized view \"%s\"",
+                                                               RelationGetRelationName(rel))));
                        break;
                case RELKIND_FOREIGN_TABLE:
-                       /* Should not get here; planner should have used ROW_MARK_COPY */
-                       ereport(ERROR,
-                                       (errcode(ERRCODE_WRONG_OBJECT_TYPE),
-                                        errmsg("cannot lock rows in foreign table \"%s\"",
-                                                       RelationGetRelationName(rel))));
+                       /* Okay only if the FDW supports it */
+                       fdwroutine = GetFdwRoutineForRelation(rel, false);
+                       if (fdwroutine->RefetchForeignRow == NULL)
+                               ereport(ERROR,
+                                               (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+                                                errmsg("cannot lock rows in foreign table \"%s\"",
+                                                               RelationGetRelationName(rel))));
                        break;
                default:
                        ereport(ERROR,
@@ -1141,8 +1300,11 @@ void
 InitResultRelInfo(ResultRelInfo *resultRelInfo,
                                  Relation resultRelationDesc,
                                  Index resultRelationIndex,
+                                 Relation partition_root,
                                  int instrument_options)
 {
+       List       *partition_check = NIL;
+
        MemSet(resultRelInfo, 0, sizeof(ResultRelInfo));
        resultRelInfo->type = T_ResultRelInfo;
        resultRelInfo->ri_RangeTableIndex = resultRelationIndex;
@@ -1158,8 +1320,8 @@ InitResultRelInfo(ResultRelInfo *resultRelInfo,
 
                resultRelInfo->ri_TrigFunctions = (FmgrInfo *)
                        palloc0(n * sizeof(FmgrInfo));
-               resultRelInfo->ri_TrigWhenExprs = (List **)
-                       palloc0(n * sizeof(List *));
+               resultRelInfo->ri_TrigWhenExprs = (ExprState **)
+                       palloc0(n * sizeof(ExprState *));
                if (instrument_options)
                        resultRelInfo->ri_TrigInstrument = InstrAlloc(n, instrument_options);
        }
@@ -1173,10 +1335,34 @@ InitResultRelInfo(ResultRelInfo *resultRelInfo,
                resultRelInfo->ri_FdwRoutine = GetFdwRoutineForRelation(resultRelationDesc, true);
        else
                resultRelInfo->ri_FdwRoutine = NULL;
+
+       /* The following fields are set later if needed */
        resultRelInfo->ri_FdwState = NULL;
+       resultRelInfo->ri_usesFdwDirectModify = false;
        resultRelInfo->ri_ConstraintExprs = NULL;
        resultRelInfo->ri_junkFilter = NULL;
        resultRelInfo->ri_projectReturning = NULL;
+       resultRelInfo->ri_onConflictArbiterIndexes = NIL;
+       resultRelInfo->ri_onConflict = NULL;
+
+       /*
+        * Partition constraint, which also includes the partition constraint of
+        * all the ancestors that are partitions.  Note that it will be checked
+        * even in the case of tuple-routing where this table is the target leaf
+        * partition, if there any BR triggers defined on the table.  Although
+        * tuple-routing implicitly preserves the partition constraint of the
+        * target partition for a given row, the BR triggers may change the row
+        * such that the constraint is no longer satisfied, which we must fail for
+        * by checking it explicitly.
+        *
+        * If this is a partitioned table, the partition constraint (if any) of a
+        * given row will be checked just before performing tuple-routing.
+        */
+       partition_check = RelationGetPartitionQual(resultRelationDesc);
+
+       resultRelInfo->ri_PartitionCheck = partition_check;
+       resultRelInfo->ri_PartitionRoot = partition_root;
+       resultRelInfo->ri_PartitionReadyForRouting = false;
 }
 
 /*
@@ -1184,16 +1370,18 @@ InitResultRelInfo(ResultRelInfo *resultRelInfo,
  *
  * Get a ResultRelInfo for a trigger target relation.  Most of the time,
  * triggers are fired on one of the result relations of the query, and so
- * we can just return a member of the es_result_relations array.  (Note: in
- * self-join situations there might be multiple members with the same OID;
- * if so it doesn't matter which one we pick.)  However, it is sometimes
- * necessary to fire triggers on other relations; this happens mainly when an
- * RI update trigger queues additional triggers on other relations, which will
- * be processed in the context of the outer query.  For efficiency's sake,
- * we want to have a ResultRelInfo for those triggers too; that can avoid
- * repeated re-opening of the relation.  (It also provides a way for EXPLAIN
- * ANALYZE to report the runtimes of such triggers.)  So we make additional
- * ResultRelInfo's as needed, and save them in es_trig_target_relations.
+ * we can just return a member of the es_result_relations array, the
+ * es_root_result_relations array (if any), or the es_leaf_result_relations
+ * list (if any).  (Note: in self-join situations there might be multiple
+ * members with the same OID; if so it doesn't matter which one we pick.)
+ * However, it is sometimes necessary to fire triggers on other relations;
+ * this happens mainly when an RI update trigger queues additional triggers
+ * on other relations, which will be processed in the context of the outer
+ * query.  For efficiency's sake, we want to have a ResultRelInfo for those
+ * triggers too; that can avoid repeated re-opening of the relation.  (It
+ * also provides a way for EXPLAIN ANALYZE to report the runtimes of such
+ * triggers.)  So we make additional ResultRelInfo's as needed, and save them
+ * in es_trig_target_relations.
  */
 ResultRelInfo *
 ExecGetTriggerResultRel(EState *estate, Oid relid)
@@ -1214,6 +1402,27 @@ ExecGetTriggerResultRel(EState *estate, Oid relid)
                rInfo++;
                nr--;
        }
+       /* Second, search through the root result relations, if any */
+       rInfo = estate->es_root_result_relations;
+       nr = estate->es_num_root_result_relations;
+       while (nr > 0)
+       {
+               if (RelationGetRelid(rInfo->ri_RelationDesc) == relid)
+                       return rInfo;
+               rInfo++;
+               nr--;
+       }
+
+       /*
+        * Third, search through the result relations that were created during
+        * tuple routing, if any.
+        */
+       foreach(l, estate->es_tuple_routing_result_relations)
+       {
+               rInfo = (ResultRelInfo *) lfirst(l);
+               if (RelationGetRelid(rInfo->ri_RelationDesc) == relid)
+                       return rInfo;
+       }
        /* Nope, but maybe we already made an extra ResultRelInfo for it */
        foreach(l, estate->es_trig_target_relations)
        {
@@ -1239,6 +1448,7 @@ ExecGetTriggerResultRel(EState *estate, Oid relid)
        InitResultRelInfo(rInfo,
                                          rel,
                                          0,            /* dummy rangetable index */
+                                         NULL,
                                          estate->es_instrument);
        estate->es_trig_target_relations =
                lappend(estate->es_trig_target_relations, rInfo);
@@ -1252,6 +1462,24 @@ ExecGetTriggerResultRel(EState *estate, Oid relid)
        return rInfo;
 }
 
+/*
+ * Close any relations that have been opened by ExecGetTriggerResultRel().
+ */
+void
+ExecCleanUpTriggerState(EState *estate)
+{
+       ListCell   *l;
+
+       foreach(l, estate->es_trig_target_relations)
+       {
+               ResultRelInfo *resultRelInfo = (ResultRelInfo *) lfirst(l);
+
+               /* Close indices and then the relation itself */
+               ExecCloseIndices(resultRelInfo);
+               heap_close(resultRelInfo->ri_RelationDesc, NoLock);
+       }
+}
+
 /*
  *             ExecContextForcesOids
  *
@@ -1260,8 +1488,8 @@ ExecGetTriggerResultRel(EState *estate, Oid relid)
  * going to be stored into a relation that has OIDs.  In other contexts
  * we are free to choose whether to leave space for OIDs in result tuples
  * (we generally don't want to, but we do if a physical-tlist optimization
- * is possible).  This routine checks the plan context and returns TRUE if the
- * choice is forced, FALSE if the choice is not forced.  In the TRUE case,
+ * is possible).  This routine checks the plan context and returns true if the
+ * choice is forced, false if the choice is not forced.  In the true case,
  * *hasoids is set to the required value.
  *
  * One reason this is ugly is that all plan nodes in the plan tree will emit
@@ -1408,17 +1636,17 @@ ExecEndPlan(PlanState *planstate, EState *estate)
                resultRelInfo++;
        }
 
-       /*
-        * likewise close any trigger target relations
-        */
-       foreach(l, estate->es_trig_target_relations)
+       /* Close the root target relation(s). */
+       resultRelInfo = estate->es_root_result_relations;
+       for (i = estate->es_num_root_result_relations; i > 0; i--)
        {
-               resultRelInfo = (ResultRelInfo *) lfirst(l);
-               /* Close indices and then the relation itself */
-               ExecCloseIndices(resultRelInfo);
                heap_close(resultRelInfo->ri_RelationDesc, NoLock);
+               resultRelInfo++;
        }
 
+       /* likewise close any trigger target relations */
+       ExecCleanUpTriggerState(estate);
+
        /*
         * close any relations selected FOR [KEY] UPDATE/SHARE, again keeping
         * locks
@@ -1447,14 +1675,16 @@ ExecEndPlan(PlanState *planstate, EState *estate)
 static void
 ExecutePlan(EState *estate,
                        PlanState *planstate,
+                       bool use_parallel_mode,
                        CmdType operation,
                        bool sendTuples,
-                       long numberTuples,
+                       uint64 numberTuples,
                        ScanDirection direction,
-                       DestReceiver *dest)
+                       DestReceiver *dest,
+                       bool execute_once)
 {
        TupleTableSlot *slot;
-       long            current_tuple_count;
+       uint64          current_tuple_count;
 
        /*
         * initialize local variables
@@ -1466,6 +1696,17 @@ ExecutePlan(EState *estate,
         */
        estate->es_direction = direction;
 
+       /*
+        * If the plan might potentially be executed multiple times, we must force
+        * it to run without parallelism, because we might exit early.
+        */
+       if (!execute_once)
+               use_parallel_mode = false;
+
+       estate->es_use_parallel_mode = use_parallel_mode;
+       if (use_parallel_mode)
+               EnterParallelMode();
+
        /*
         * Loop until we've processed the proper number of tuples from the plan.
         */
@@ -1484,7 +1725,11 @@ ExecutePlan(EState *estate,
                 * process so we just end the loop...
                 */
                if (TupIsNull(slot))
+               {
+                       /* Allow nodes to release or shut down resources. */
+                       (void) ExecShutdownNode(planstate);
                        break;
+               }
 
                /*
                 * If we have a junk filter, then project a new tuple with the junk
@@ -1502,7 +1747,15 @@ ExecutePlan(EState *estate,
                 * practice, this is probably always the case at this point.)
                 */
                if (sendTuples)
-                       (*dest->receiveSlot) (slot, dest);
+               {
+                       /*
+                        * If we are not able to send the tuple, we assume the destination
+                        * has closed and no more tuples can be sent. If that's the case,
+                        * end the loop.
+                        */
+                       if (!dest->receiveSlot(slot, dest))
+                               break;
+               }
 
                /*
                 * Count tuples processed, if this is a SELECT.  (For other operation
@@ -1519,8 +1772,15 @@ ExecutePlan(EState *estate,
                 */
                current_tuple_count++;
                if (numberTuples && numberTuples == current_tuple_count)
+               {
+                       /* Allow nodes to release or shut down resources. */
+                       (void) ExecShutdownNode(planstate);
                        break;
+               }
        }
+
+       if (use_parallel_mode)
+               ExitParallelMode();
 }
 
 
@@ -1538,7 +1798,6 @@ ExecRelCheck(ResultRelInfo *resultRelInfo,
        ConstrCheck *check = rel->rd_att->constr->check;
        ExprContext *econtext;
        MemoryContext oldContext;
-       List       *qual;
        int                     i;
 
        /*
@@ -1550,13 +1809,14 @@ ExecRelCheck(ResultRelInfo *resultRelInfo,
        {
                oldContext = MemoryContextSwitchTo(estate->es_query_cxt);
                resultRelInfo->ri_ConstraintExprs =
-                       (List **) palloc(ncheck * sizeof(List *));
+                       (ExprState **) palloc(ncheck * sizeof(ExprState *));
                for (i = 0; i < ncheck; i++)
                {
-                       /* ExecQual wants implicit-AND form */
-                       qual = make_ands_implicit(stringToNode(check[i].ccbin));
-                       resultRelInfo->ri_ConstraintExprs[i] = (List *)
-                               ExecPrepareExpr((Expr *) qual, estate);
+                       Expr       *checkconstr;
+
+                       checkconstr = stringToNode(check[i].ccbin);
+                       resultRelInfo->ri_ConstraintExprs[i] =
+                               ExecPrepareExpr(checkconstr, estate);
                }
                MemoryContextSwitchTo(oldContext);
        }
@@ -1573,14 +1833,14 @@ ExecRelCheck(ResultRelInfo *resultRelInfo,
        /* And evaluate the constraints */
        for (i = 0; i < ncheck; i++)
        {
-               qual = resultRelInfo->ri_ConstraintExprs[i];
+               ExprState  *checkconstr = resultRelInfo->ri_ConstraintExprs[i];
 
                /*
                 * NOTE: SQL specifies that a NULL result from a constraint expression
-                * is not to be treated as a failure.  Therefore, tell ExecQual to
-                * return TRUE for NULL.
+                * is not to be treated as a failure.  Therefore, use ExecCheck not
+                * ExecQual.
                 */
-               if (!ExecQual(qual, econtext, true))
+               if (!ExecCheck(checkconstr, econtext))
                        return check[i].ccname;
        }
 
@@ -1588,6 +1848,120 @@ ExecRelCheck(ResultRelInfo *resultRelInfo,
        return NULL;
 }
 
+/*
+ * ExecPartitionCheck --- check that tuple meets the partition constraint.
+ *
+ * Returns true if it meets the partition constraint.  If the constraint
+ * fails and we're asked to emit to error, do so and don't return; otherwise
+ * return false.
+ */
+bool
+ExecPartitionCheck(ResultRelInfo *resultRelInfo, TupleTableSlot *slot,
+                                  EState *estate, bool emitError)
+{
+       ExprContext *econtext;
+       bool            success;
+
+       /*
+        * If first time through, build expression state tree for the partition
+        * check expression.  Keep it in the per-query memory context so they'll
+        * survive throughout the query.
+        */
+       if (resultRelInfo->ri_PartitionCheckExpr == NULL)
+       {
+               List       *qual = resultRelInfo->ri_PartitionCheck;
+
+               resultRelInfo->ri_PartitionCheckExpr = ExecPrepareCheck(qual, estate);
+       }
+
+       /*
+        * We will use the EState's per-tuple context for evaluating constraint
+        * expressions (creating it if it's not already there).
+        */
+       econtext = GetPerTupleExprContext(estate);
+
+       /* Arrange for econtext's scan tuple to be the tuple under test */
+       econtext->ecxt_scantuple = slot;
+
+       /*
+        * As in case of the catalogued constraints, we treat a NULL result as
+        * success here, not a failure.
+        */
+       success = ExecCheck(resultRelInfo->ri_PartitionCheckExpr, econtext);
+
+       /* if asked to emit error, don't actually return on failure */
+       if (!success && emitError)
+               ExecPartitionCheckEmitError(resultRelInfo, slot, estate);
+
+       return success;
+}
+
+/*
+ * ExecPartitionCheckEmitError - Form and emit an error message after a failed
+ * partition constraint check.
+ */
+void
+ExecPartitionCheckEmitError(ResultRelInfo *resultRelInfo,
+                                                       TupleTableSlot *slot,
+                                                       EState *estate)
+{
+       Relation        rel = resultRelInfo->ri_RelationDesc;
+       Relation        orig_rel = rel;
+       TupleDesc       tupdesc = RelationGetDescr(rel);
+       char       *val_desc;
+       Bitmapset  *modifiedCols;
+       Bitmapset  *insertedCols;
+       Bitmapset  *updatedCols;
+
+       /*
+        * Need to first convert the tuple to the root partitioned table's row
+        * type. For details, check similar comments in ExecConstraints().
+        */
+       if (resultRelInfo->ri_PartitionRoot)
+       {
+               HeapTuple       tuple = ExecFetchSlotTuple(slot);
+               TupleDesc       old_tupdesc = RelationGetDescr(rel);
+               TupleConversionMap *map;
+
+               rel = resultRelInfo->ri_PartitionRoot;
+               tupdesc = RelationGetDescr(rel);
+               /* a reverse map */
+               map = convert_tuples_by_name(old_tupdesc, tupdesc,
+                                                                        gettext_noop("could not convert row type"));
+               if (map != NULL)
+               {
+                       tuple = do_convert_tuple(tuple, map);
+                       ExecSetSlotDescriptor(slot, tupdesc);
+                       ExecStoreTuple(tuple, slot, InvalidBuffer, false);
+               }
+       }
+
+       insertedCols = GetInsertedColumns(resultRelInfo, estate);
+       updatedCols = GetUpdatedColumns(resultRelInfo, estate);
+       modifiedCols = bms_union(insertedCols, updatedCols);
+       val_desc = ExecBuildSlotValueDescription(RelationGetRelid(rel),
+                                                                                        slot,
+                                                                                        tupdesc,
+                                                                                        modifiedCols,
+                                                                                        64);
+       ereport(ERROR,
+                       (errcode(ERRCODE_CHECK_VIOLATION),
+                        errmsg("new row for relation \"%s\" violates partition constraint",
+                                       RelationGetRelationName(orig_rel)),
+                        val_desc ? errdetail("Failing row contains %s.", val_desc) : 0));
+}
+
+/*
+ * ExecConstraints - check constraints of the tuple in 'slot'
+ *
+ * This checks the traditional NOT NULL and check constraints.
+ *
+ * The partition constraint is *NOT* checked.
+ *
+ * Note: 'slot' contains the tuple to check the constraints of, which may
+ * have been converted from the original input tuple after tuple routing.
+ * 'resultRelInfo' is the final result relation, after tuple routing.
+ */
 void
 ExecConstraints(ResultRelInfo *resultRelInfo,
                                TupleTableSlot *slot, EState *estate)
@@ -1595,54 +1969,133 @@ ExecConstraints(ResultRelInfo *resultRelInfo,
        Relation        rel = resultRelInfo->ri_RelationDesc;
        TupleDesc       tupdesc = RelationGetDescr(rel);
        TupleConstr *constr = tupdesc->constr;
+       Bitmapset  *modifiedCols;
+       Bitmapset  *insertedCols;
+       Bitmapset  *updatedCols;
 
-       Assert(constr);
+       Assert(constr || resultRelInfo->ri_PartitionCheck);
 
-       if (constr->has_not_null)
+       if (constr && constr->has_not_null)
        {
                int                     natts = tupdesc->natts;
                int                     attrChk;
 
                for (attrChk = 1; attrChk <= natts; attrChk++)
                {
-                       if (tupdesc->attrs[attrChk - 1]->attnotnull &&
-                               slot_attisnull(slot, attrChk))
+                       Form_pg_attribute att = TupleDescAttr(tupdesc, attrChk - 1);
+
+                       if (att->attnotnull && slot_attisnull(slot, attrChk))
+                       {
+                               char       *val_desc;
+                               Relation        orig_rel = rel;
+                               TupleDesc       orig_tupdesc = RelationGetDescr(rel);
+
+                               /*
+                                * If the tuple has been routed, it's been converted to the
+                                * partition's rowtype, which might differ from the root
+                                * table's.  We must convert it back to the root table's
+                                * rowtype so that val_desc shown error message matches the
+                                * input tuple.
+                                */
+                               if (resultRelInfo->ri_PartitionRoot)
+                               {
+                                       HeapTuple       tuple = ExecFetchSlotTuple(slot);
+                                       TupleConversionMap *map;
+
+                                       rel = resultRelInfo->ri_PartitionRoot;
+                                       tupdesc = RelationGetDescr(rel);
+                                       /* a reverse map */
+                                       map = convert_tuples_by_name(orig_tupdesc, tupdesc,
+                                                                                                gettext_noop("could not convert row type"));
+                                       if (map != NULL)
+                                       {
+                                               tuple = do_convert_tuple(tuple, map);
+                                               ExecSetSlotDescriptor(slot, tupdesc);
+                                               ExecStoreTuple(tuple, slot, InvalidBuffer, false);
+                                       }
+                               }
+
+                               insertedCols = GetInsertedColumns(resultRelInfo, estate);
+                               updatedCols = GetUpdatedColumns(resultRelInfo, estate);
+                               modifiedCols = bms_union(insertedCols, updatedCols);
+                               val_desc = ExecBuildSlotValueDescription(RelationGetRelid(rel),
+                                                                                                                slot,
+                                                                                                                tupdesc,
+                                                                                                                modifiedCols,
+                                                                                                                64);
+
                                ereport(ERROR,
                                                (errcode(ERRCODE_NOT_NULL_VIOLATION),
                                                 errmsg("null value in column \"%s\" violates not-null constraint",
-                                                         NameStr(tupdesc->attrs[attrChk - 1]->attname)),
-                                                errdetail("Failing row contains %s.",
-                                                                  ExecBuildSlotValueDescription(slot,
-                                                                                                                                tupdesc,
-                                                                                                                                64)),
-                                                errtablecol(rel, attrChk)));
+                                                               NameStr(att->attname)),
+                                                val_desc ? errdetail("Failing row contains %s.", val_desc) : 0,
+                                                errtablecol(orig_rel, attrChk)));
+                       }
                }
        }
 
-       if (constr->num_check > 0)
+       if (constr && constr->num_check > 0)
        {
                const char *failed;
 
                if ((failed = ExecRelCheck(resultRelInfo, slot, estate)) != NULL)
+               {
+                       char       *val_desc;
+                       Relation        orig_rel = rel;
+
+                       /* See the comment above. */
+                       if (resultRelInfo->ri_PartitionRoot)
+                       {
+                               HeapTuple       tuple = ExecFetchSlotTuple(slot);
+                               TupleDesc       old_tupdesc = RelationGetDescr(rel);
+                               TupleConversionMap *map;
+
+                               rel = resultRelInfo->ri_PartitionRoot;
+                               tupdesc = RelationGetDescr(rel);
+                               /* a reverse map */
+                               map = convert_tuples_by_name(old_tupdesc, tupdesc,
+                                                                                        gettext_noop("could not convert row type"));
+                               if (map != NULL)
+                               {
+                                       tuple = do_convert_tuple(tuple, map);
+                                       ExecSetSlotDescriptor(slot, tupdesc);
+                                       ExecStoreTuple(tuple, slot, InvalidBuffer, false);
+                               }
+                       }
+
+                       insertedCols = GetInsertedColumns(resultRelInfo, estate);
+                       updatedCols = GetUpdatedColumns(resultRelInfo, estate);
+                       modifiedCols = bms_union(insertedCols, updatedCols);
+                       val_desc = ExecBuildSlotValueDescription(RelationGetRelid(rel),
+                                                                                                        slot,
+                                                                                                        tupdesc,
+                                                                                                        modifiedCols,
+                                                                                                        64);
                        ereport(ERROR,
                                        (errcode(ERRCODE_CHECK_VIOLATION),
                                         errmsg("new row for relation \"%s\" violates check constraint \"%s\"",
-                                                       RelationGetRelationName(rel), failed),
-                                        errdetail("Failing row contains %s.",
-                                                          ExecBuildSlotValueDescription(slot,
-                                                                                                                        tupdesc,
-                                                                                                                        64)),
-                                        errtableconstraint(rel, failed)));
+                                                       RelationGetRelationName(orig_rel), failed),
+                                        val_desc ? errdetail("Failing row contains %s.", val_desc) : 0,
+                                        errtableconstraint(orig_rel, failed)));
+               }
        }
 }
 
 /*
  * ExecWithCheckOptions -- check that tuple satisfies any WITH CHECK OPTIONs
+ * of the specified kind.
+ *
+ * Note that this needs to be called multiple times to ensure that all kinds of
+ * WITH CHECK OPTIONs are handled (both those from views which have the WITH
+ * CHECK OPTION set and from row level security policies).  See ExecInsert()
+ * and ExecUpdate().
  */
 void
-ExecWithCheckOptions(ResultRelInfo *resultRelInfo,
+ExecWithCheckOptions(WCOKind kind, ResultRelInfo *resultRelInfo,
                                         TupleTableSlot *slot, EState *estate)
 {
+       Relation        rel = resultRelInfo->ri_RelationDesc;
+       TupleDesc       tupdesc = RelationGetDescr(rel);
        ExprContext *econtext;
        ListCell   *l1,
                           *l2;
@@ -1663,24 +2116,105 @@ ExecWithCheckOptions(ResultRelInfo *resultRelInfo,
                WithCheckOption *wco = (WithCheckOption *) lfirst(l1);
                ExprState  *wcoExpr = (ExprState *) lfirst(l2);
 
+               /*
+                * Skip any WCOs which are not the kind we are looking for at this
+                * time.
+                */
+               if (wco->kind != kind)
+                       continue;
+
                /*
                 * WITH CHECK OPTION checks are intended to ensure that the new tuple
                 * is visible (in the case of a view) or that it passes the
-                * 'with-check' policy (in the case of row security).
-                * If the qual evaluates to NULL or FALSE, then the new tuple won't be
-                * included in the view or doesn't pass the 'with-check' policy for the
-                * table.  We need ExecQual to return FALSE for NULL to handle the view
-                * case (the opposite of what we do above for CHECK constraints).
+                * 'with-check' policy (in the case of row security). If the qual
+                * evaluates to NULL or FALSE, then the new tuple won't be included in
+                * the view or doesn't pass the 'with-check' policy for the table.
                 */
-               if (!ExecQual((List *) wcoExpr, econtext, false))
-                       ereport(ERROR,
-                                       (errcode(ERRCODE_WITH_CHECK_OPTION_VIOLATION),
-                                errmsg("new row violates WITH CHECK OPTION for \"%s\"",
-                                               wco->viewname),
-                                        errdetail("Failing row contains %s.",
-                                                          ExecBuildSlotValueDescription(slot,
-                                                       RelationGetDescr(resultRelInfo->ri_RelationDesc),
-                                                                                                                        64))));
+               if (!ExecQual(wcoExpr, econtext))
+               {
+                       char       *val_desc;
+                       Bitmapset  *modifiedCols;
+                       Bitmapset  *insertedCols;
+                       Bitmapset  *updatedCols;
+
+                       switch (wco->kind)
+                       {
+                                       /*
+                                        * For WITH CHECK OPTIONs coming from views, we might be
+                                        * able to provide the details on the row, depending on
+                                        * the permissions on the relation (that is, if the user
+                                        * could view it directly anyway).  For RLS violations, we
+                                        * don't include the data since we don't know if the user
+                                        * should be able to view the tuple as that depends on the
+                                        * USING policy.
+                                        */
+                               case WCO_VIEW_CHECK:
+                                       /* See the comment in ExecConstraints(). */
+                                       if (resultRelInfo->ri_PartitionRoot)
+                                       {
+                                               HeapTuple       tuple = ExecFetchSlotTuple(slot);
+                                               TupleDesc       old_tupdesc = RelationGetDescr(rel);
+                                               TupleConversionMap *map;
+
+                                               rel = resultRelInfo->ri_PartitionRoot;
+                                               tupdesc = RelationGetDescr(rel);
+                                               /* a reverse map */
+                                               map = convert_tuples_by_name(old_tupdesc, tupdesc,
+                                                                                                        gettext_noop("could not convert row type"));
+                                               if (map != NULL)
+                                               {
+                                                       tuple = do_convert_tuple(tuple, map);
+                                                       ExecSetSlotDescriptor(slot, tupdesc);
+                                                       ExecStoreTuple(tuple, slot, InvalidBuffer, false);
+                                               }
+                                       }
+
+                                       insertedCols = GetInsertedColumns(resultRelInfo, estate);
+                                       updatedCols = GetUpdatedColumns(resultRelInfo, estate);
+                                       modifiedCols = bms_union(insertedCols, updatedCols);
+                                       val_desc = ExecBuildSlotValueDescription(RelationGetRelid(rel),
+                                                                                                                        slot,
+                                                                                                                        tupdesc,
+                                                                                                                        modifiedCols,
+                                                                                                                        64);
+
+                                       ereport(ERROR,
+                                                       (errcode(ERRCODE_WITH_CHECK_OPTION_VIOLATION),
+                                                        errmsg("new row violates check option for view \"%s\"",
+                                                                       wco->relname),
+                                                        val_desc ? errdetail("Failing row contains %s.",
+                                                                                                 val_desc) : 0));
+                                       break;
+                               case WCO_RLS_INSERT_CHECK:
+                               case WCO_RLS_UPDATE_CHECK:
+                                       if (wco->polname != NULL)
+                                               ereport(ERROR,
+                                                               (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
+                                                                errmsg("new row violates row-level security policy \"%s\" for table \"%s\"",
+                                                                               wco->polname, wco->relname)));
+                                       else
+                                               ereport(ERROR,
+                                                               (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
+                                                                errmsg("new row violates row-level security policy for table \"%s\"",
+                                                                               wco->relname)));
+                                       break;
+                               case WCO_RLS_CONFLICT_CHECK:
+                                       if (wco->polname != NULL)
+                                               ereport(ERROR,
+                                                               (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
+                                                                errmsg("new row violates row-level security policy \"%s\" (USING expression) for table \"%s\"",
+                                                                               wco->polname, wco->relname)));
+                                       else
+                                               ereport(ERROR,
+                                                               (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
+                                                                errmsg("new row violates row-level security policy (USING expression) for table \"%s\"",
+                                                                               wco->relname)));
+                                       break;
+                               default:
+                                       elog(ERROR, "unrecognized WCO kind: %u", wco->kind);
+                                       break;
+                       }
+               }
        }
 }
 
@@ -1696,72 +2230,178 @@ ExecWithCheckOptions(ResultRelInfo *resultRelInfo,
  * dropped columns.  We used to use the slot's tuple descriptor to decode the
  * data, but the slot's descriptor doesn't identify dropped columns, so we
  * now need to be passed the relation's descriptor.
+ *
+ * Note that, like BuildIndexValueDescription, if the user does not have
+ * permission to view any of the columns involved, a NULL is returned.  Unlike
+ * BuildIndexValueDescription, if the user has access to view a subset of the
+ * column involved, that subset will be returned with a key identifying which
+ * columns they are.
  */
 static char *
-ExecBuildSlotValueDescription(TupleTableSlot *slot,
+ExecBuildSlotValueDescription(Oid reloid,
+                                                         TupleTableSlot *slot,
                                                          TupleDesc tupdesc,
+                                                         Bitmapset *modifiedCols,
                                                          int maxfieldlen)
 {
        StringInfoData buf;
+       StringInfoData collist;
        bool            write_comma = false;
+       bool            write_comma_collist = false;
        int                     i;
+       AclResult       aclresult;
+       bool            table_perm = false;
+       bool            any_perm = false;
 
-       /* Make sure the tuple is fully deconstructed */
-       slot_getallattrs(slot);
+       /*
+        * Check if RLS is enabled and should be active for the relation; if so,
+        * then don't return anything.  Otherwise, go through normal permission
+        * checks.
+        */
+       if (check_enable_rls(reloid, InvalidOid, true) == RLS_ENABLED)
+               return NULL;
 
        initStringInfo(&buf);
 
        appendStringInfoChar(&buf, '(');
 
+       /*
+        * Check if the user has permissions to see the row.  Table-level SELECT
+        * allows access to all columns.  If the user does not have table-level
+        * SELECT then we check each column and include those the user has SELECT
+        * rights on.  Additionally, we always include columns the user provided
+        * data for.
+        */
+       aclresult = pg_class_aclcheck(reloid, GetUserId(), ACL_SELECT);
+       if (aclresult != ACLCHECK_OK)
+       {
+               /* Set up the buffer for the column list */
+               initStringInfo(&collist);
+               appendStringInfoChar(&collist, '(');
+       }
+       else
+               table_perm = any_perm = true;
+
+       /* Make sure the tuple is fully deconstructed */
+       slot_getallattrs(slot);
+
        for (i = 0; i < tupdesc->natts; i++)
        {
+               bool            column_perm = false;
                char       *val;
                int                     vallen;
+               Form_pg_attribute att = TupleDescAttr(tupdesc, i);
 
                /* ignore dropped columns */
-               if (tupdesc->attrs[i]->attisdropped)
+               if (att->attisdropped)
                        continue;
 
-               if (slot->tts_isnull[i])
-                       val = "null";
-               else
+               if (!table_perm)
                {
-                       Oid                     foutoid;
-                       bool            typisvarlena;
+                       /*
+                        * No table-level SELECT, so need to make sure they either have
+                        * SELECT rights on the column or that they have provided the data
+                        * for the column.  If not, omit this column from the error
+                        * message.
+                        */
+                       aclresult = pg_attribute_aclcheck(reloid, att->attnum,
+                                                                                         GetUserId(), ACL_SELECT);
+                       if (bms_is_member(att->attnum - FirstLowInvalidHeapAttributeNumber,
+                                                         modifiedCols) || aclresult == ACLCHECK_OK)
+                       {
+                               column_perm = any_perm = true;
 
-                       getTypeOutputInfo(tupdesc->attrs[i]->atttypid,
-                                                         &foutoid, &typisvarlena);
-                       val = OidOutputFunctionCall(foutoid, slot->tts_values[i]);
-               }
+                               if (write_comma_collist)
+                                       appendStringInfoString(&collist, ", ");
+                               else
+                                       write_comma_collist = true;
 
-               if (write_comma)
-                       appendStringInfoString(&buf, ", ");
-               else
-                       write_comma = true;
+                               appendStringInfoString(&collist, NameStr(att->attname));
+                       }
+               }
 
-               /* truncate if needed */
-               vallen = strlen(val);
-               if (vallen <= maxfieldlen)
-                       appendStringInfoString(&buf, val);
-               else
+               if (table_perm || column_perm)
                {
-                       vallen = pg_mbcliplen(val, vallen, maxfieldlen);
-                       appendBinaryStringInfo(&buf, val, vallen);
-                       appendStringInfoString(&buf, "...");
+                       if (slot->tts_isnull[i])
+                               val = "null";
+                       else
+                       {
+                               Oid                     foutoid;
+                               bool            typisvarlena;
+
+                               getTypeOutputInfo(att->atttypid,
+                                                                 &foutoid, &typisvarlena);
+                               val = OidOutputFunctionCall(foutoid, slot->tts_values[i]);
+                       }
+
+                       if (write_comma)
+                               appendStringInfoString(&buf, ", ");
+                       else
+                               write_comma = true;
+
+                       /* truncate if needed */
+                       vallen = strlen(val);
+                       if (vallen <= maxfieldlen)
+                               appendStringInfoString(&buf, val);
+                       else
+                       {
+                               vallen = pg_mbcliplen(val, vallen, maxfieldlen);
+                               appendBinaryStringInfo(&buf, val, vallen);
+                               appendStringInfoString(&buf, "...");
+                       }
                }
        }
 
+       /* If we end up with zero columns being returned, then return NULL. */
+       if (!any_perm)
+               return NULL;
+
        appendStringInfoChar(&buf, ')');
 
+       if (!table_perm)
+       {
+               appendStringInfoString(&collist, ") = ");
+               appendStringInfoString(&collist, buf.data);
+
+               return collist.data;
+       }
+
        return buf.data;
 }
 
 
+/*
+ * ExecUpdateLockMode -- find the appropriate UPDATE tuple lock mode for a
+ * given ResultRelInfo
+ */
+LockTupleMode
+ExecUpdateLockMode(EState *estate, ResultRelInfo *relinfo)
+{
+       Bitmapset  *keyCols;
+       Bitmapset  *updatedCols;
+
+       /*
+        * Compute lock mode to use.  If columns that are part of the key have not
+        * been modified, then we can use a weaker lock, allowing for better
+        * concurrency.
+        */
+       updatedCols = GetUpdatedColumns(relinfo, estate);
+       keyCols = RelationGetIndexAttrBitmap(relinfo->ri_RelationDesc,
+                                                                                INDEX_ATTR_BITMAP_KEY);
+
+       if (bms_overlap(keyCols, updatedCols))
+               return LockTupleExclusive;
+
+       return LockTupleNoKeyExclusive;
+}
+
 /*
  * ExecFindRowMark -- find the ExecRowMark struct for given rangetable index
+ *
+ * If no such struct, either return NULL or throw error depending on missing_ok
  */
 ExecRowMark *
-ExecFindRowMark(EState *estate, Index rti)
+ExecFindRowMark(EState *estate, Index rti, bool missing_ok)
 {
        ListCell   *lc;
 
@@ -1772,8 +2412,9 @@ ExecFindRowMark(EState *estate, Index rti)
                if (erm->rti == rti)
                        return erm;
        }
-       elog(ERROR, "failed to find ExecRowMark for rangetable index %u", rti);
-       return NULL;                            /* keep compiler quiet */
+       if (!missing_ok)
+               elog(ERROR, "failed to find ExecRowMark for rangetable index %u", rti);
+       return NULL;
 }
 
 /*
@@ -1792,21 +2433,9 @@ ExecBuildAuxRowMark(ExecRowMark *erm, List *targetlist)
        aerm->rowmark = erm;
 
        /* Look up the resjunk columns associated with this rowmark */
-       if (erm->relation)
+       if (erm->markType != ROW_MARK_COPY)
        {
-               Assert(erm->markType != ROW_MARK_COPY);
-
-               /* if child rel, need tableoid */
-               if (erm->rti != erm->prti)
-               {
-                       snprintf(resname, sizeof(resname), "tableoid%u", erm->rowmarkId);
-                       aerm->toidAttNo = ExecFindJunkAttributeInTlist(targetlist,
-                                                                                                                  resname);
-                       if (!AttributeNumberIsValid(aerm->toidAttNo))
-                               elog(ERROR, "could not find junk %s column", resname);
-               }
-
-               /* always need ctid for real relations */
+               /* need ctid for all methods other than COPY */
                snprintf(resname, sizeof(resname), "ctid%u", erm->rowmarkId);
                aerm->ctidAttNo = ExecFindJunkAttributeInTlist(targetlist,
                                                                                                           resname);
@@ -1815,8 +2444,7 @@ ExecBuildAuxRowMark(ExecRowMark *erm, List *targetlist)
        }
        else
        {
-               Assert(erm->markType == ROW_MARK_COPY);
-
+               /* need wholerow if COPY */
                snprintf(resname, sizeof(resname), "wholerow%u", erm->rowmarkId);
                aerm->wholeAttNo = ExecFindJunkAttributeInTlist(targetlist,
                                                                                                                resname);
@@ -1824,6 +2452,16 @@ ExecBuildAuxRowMark(ExecRowMark *erm, List *targetlist)
                        elog(ERROR, "could not find junk %s column", resname);
        }
 
+       /* if child rel, need tableoid */
+       if (erm->rti != erm->prti)
+       {
+               snprintf(resname, sizeof(resname), "tableoid%u", erm->rowmarkId);
+               aerm->toidAttNo = ExecFindJunkAttributeInTlist(targetlist,
+                                                                                                          resname);
+               if (!AttributeNumberIsValid(aerm->toidAttNo))
+                       elog(ERROR, "could not find junk %s column", resname);
+       }
+
        return aerm;
 }
 
@@ -1974,8 +2612,9 @@ EvalPlanQualFetch(EState *estate, Relation relation, int lockmode,
                         * recycled and reused for an unrelated tuple.  This implies that
                         * the latest version of the row was deleted, so we need do
                         * nothing.  (Should be safe to examine xmin without getting
-                        * buffer's content lock, since xmin never changes in an existing
-                        * tuple.)
+                        * buffer's content lock.  We assume reading a TransactionId to be
+                        * atomic, and Xmin never changes in an existing tuple, except to
+                        * invalid or frozen, and neither of those can match priorXmax.)
                         */
                        if (!TransactionIdEquals(HeapTupleHeaderGetXmin(tuple.t_data),
                                                                         priorXmax))
@@ -1999,12 +2638,12 @@ EvalPlanQualFetch(EState *estate, Relation relation, int lockmode,
                                {
                                        case LockWaitBlock:
                                                XactLockTableWait(SnapshotDirty.xmax,
-                                                                                 relation, &tuple.t_data->t_ctid,
+                                                                                 relation, &tuple.t_self,
                                                                                  XLTW_FetchUpdated);
                                                break;
                                        case LockWaitSkip:
                                                if (!ConditionalXactLockTableWait(SnapshotDirty.xmax))
-                                                       return NULL; /* skip instead of waiting */
+                                                       return NULL;    /* skip instead of waiting */
                                                break;
                                        case LockWaitError:
                                                if (!ConditionalXactLockTableWait(SnapshotDirty.xmax))
@@ -2056,11 +2695,12 @@ EvalPlanQualFetch(EState *estate, Relation relation, int lockmode,
                                         * case, so as to avoid the "Halloween problem" of
                                         * repeated update attempts.  In the latter case it might
                                         * be sensible to fetch the updated tuple instead, but
-                                        * doing so would require changing heap_lock_tuple as well
-                                        * as heap_update and heap_delete to not complain about
-                                        * updating "invisible" tuples, which seems pretty scary.
-                                        * So for now, treat the tuple as deleted and do not
-                                        * process.
+                                        * doing so would require changing heap_update and
+                                        * heap_delete to not complain about updating "invisible"
+                                        * tuples, which seems pretty scary (heap_lock_tuple will
+                                        * not complain, but few callers expect
+                                        * HeapTupleInvisible, and we're not one of them).  So for
+                                        * now, treat the tuple as deleted and do not process.
                                         */
                                        ReleaseBuffer(buffer);
                                        return NULL;
@@ -2075,6 +2715,13 @@ EvalPlanQualFetch(EState *estate, Relation relation, int lockmode,
                                                ereport(ERROR,
                                                                (errcode(ERRCODE_T_R_SERIALIZATION_FAILURE),
                                                                 errmsg("could not serialize access due to concurrent update")));
+                                       if (ItemPointerIndicatesMovedPartitions(&hufd.ctid))
+                                               ereport(ERROR,
+                                                               (errcode(ERRCODE_T_R_SERIALIZATION_FAILURE),
+                                                                errmsg("tuple to be locked was already moved to another partition due to concurrent update")));
+
+                                       /* Should not encounter speculative tuple on recheck */
+                                       Assert(!HeapTupleHeaderIsSpeculative(tuple.t_data));
                                        if (!ItemPointerEquals(&hufd.ctid, &tuple.t_self))
                                        {
                                                /* it was updated, so look at the updated version */
@@ -2090,6 +2737,10 @@ EvalPlanQualFetch(EState *estate, Relation relation, int lockmode,
                                        ReleaseBuffer(buffer);
                                        return NULL;
 
+                               case HeapTupleInvisible:
+                                       elog(ERROR, "attempted to lock invisible tuple");
+                                       break;
+
                                default:
                                        ReleaseBuffer(buffer);
                                        elog(ERROR, "unrecognized heap_lock_tuple status: %u",
@@ -2137,6 +2788,14 @@ EvalPlanQualFetch(EState *estate, Relation relation, int lockmode,
                 * As above, it should be safe to examine xmax and t_ctid without the
                 * buffer content lock, because they can't be changing.
                 */
+
+               /* check whether next version would be in a different partition */
+               if (HeapTupleHeaderIndicatesMovedPartitions(tuple.t_data))
+                       ereport(ERROR,
+                                       (errcode(ERRCODE_T_R_SERIALIZATION_FAILURE),
+                                        errmsg("tuple to be locked was already moved to another partition due to concurrent update")));
+
+               /* check whether tuple has been deleted */
                if (ItemPointerEquals(&tuple.t_self, &tuple.t_data->t_ctid))
                {
                        /* deleted, so forget about it */
@@ -2182,7 +2841,7 @@ EvalPlanQualInit(EPQState *epqstate, EState *estate,
 /*
  * EvalPlanQualSetPlan -- set or change subplan of an EPQState.
  *
- * We need this so that ModifyTuple can deal with multiple subplans.
+ * We need this so that ModifyTable can deal with multiple subplans.
  */
 void
 EvalPlanQualSetPlan(EPQState *epqstate, Plan *subplan, List *auxrowmarks)
@@ -2256,31 +2915,32 @@ EvalPlanQualFetchRowMarks(EPQState *epqstate)
                /* clear any leftover test tuple for this rel */
                EvalPlanQualSetTuple(epqstate, erm->rti, NULL);
 
-               if (erm->relation)
+               /* if child rel, must check whether it produced this row */
+               if (erm->rti != erm->prti)
                {
-                       Buffer          buffer;
+                       Oid                     tableoid;
 
-                       Assert(erm->markType == ROW_MARK_REFERENCE);
+                       datum = ExecGetJunkAttribute(epqstate->origslot,
+                                                                                aerm->toidAttNo,
+                                                                                &isNull);
+                       /* non-locked rels could be on the inside of outer joins */
+                       if (isNull)
+                               continue;
+                       tableoid = DatumGetObjectId(datum);
 
-                       /* if child rel, must check whether it produced this row */
-                       if (erm->rti != erm->prti)
+                       Assert(OidIsValid(erm->relid));
+                       if (tableoid != erm->relid)
                        {
-                               Oid                     tableoid;
+                               /* this child is inactive right now */
+                               continue;
+                       }
+               }
 
-                               datum = ExecGetJunkAttribute(epqstate->origslot,
-                                                                                        aerm->toidAttNo,
-                                                                                        &isNull);
-                               /* non-locked rels could be on the inside of outer joins */
-                               if (isNull)
-                                       continue;
-                               tableoid = DatumGetObjectId(datum);
+               if (erm->markType == ROW_MARK_REFERENCE)
+               {
+                       HeapTuple       copyTuple;
 
-                               if (tableoid != RelationGetRelid(erm->relation))
-                               {
-                                       /* this child is inactive right now */
-                                       continue;
-                               }
-                       }
+                       Assert(erm->relation != NULL);
 
                        /* fetch the tuple's ctid */
                        datum = ExecGetJunkAttribute(epqstate->origslot,
@@ -2289,17 +2949,50 @@ EvalPlanQualFetchRowMarks(EPQState *epqstate)
                        /* non-locked rels could be on the inside of outer joins */
                        if (isNull)
                                continue;
-                       tuple.t_self = *((ItemPointer) DatumGetPointer(datum));
 
-                       /* okay, fetch the tuple */
-                       if (!heap_fetch(erm->relation, SnapshotAny, &tuple, &buffer,
-                                                       false, NULL))
-                               elog(ERROR, "failed to fetch tuple for EvalPlanQual recheck");
+                       /* fetch requests on foreign tables must be passed to their FDW */
+                       if (erm->relation->rd_rel->relkind == RELKIND_FOREIGN_TABLE)
+                       {
+                               FdwRoutine *fdwroutine;
+                               bool            updated = false;
+
+                               fdwroutine = GetFdwRoutineForRelation(erm->relation, false);
+                               /* this should have been checked already, but let's be safe */
+                               if (fdwroutine->RefetchForeignRow == NULL)
+                                       ereport(ERROR,
+                                                       (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+                                                        errmsg("cannot lock rows in foreign table \"%s\"",
+                                                                       RelationGetRelationName(erm->relation))));
+                               copyTuple = fdwroutine->RefetchForeignRow(epqstate->estate,
+                                                                                                                 erm,
+                                                                                                                 datum,
+                                                                                                                 &updated);
+                               if (copyTuple == NULL)
+                                       elog(ERROR, "failed to fetch tuple for EvalPlanQual recheck");
+
+                               /*
+                                * Ideally we'd insist on updated == false here, but that
+                                * assumes that FDWs can track that exactly, which they might
+                                * not be able to.  So just ignore the flag.
+                                */
+                       }
+                       else
+                       {
+                               /* ordinary table, fetch the tuple */
+                               Buffer          buffer;
 
-                       /* successful, copy and store tuple */
-                       EvalPlanQualSetTuple(epqstate, erm->rti,
-                                                                heap_copytuple(&tuple));
-                       ReleaseBuffer(buffer);
+                               tuple.t_self = *((ItemPointer) DatumGetPointer(datum));
+                               if (!heap_fetch(erm->relation, SnapshotAny, &tuple, &buffer,
+                                                               false, NULL))
+                                       elog(ERROR, "failed to fetch tuple for EvalPlanQual recheck");
+
+                               /* successful, copy tuple */
+                               copyTuple = heap_copytuple(&tuple);
+                               ReleaseBuffer(buffer);
+                       }
+
+                       /* store tuple */
+                       EvalPlanQualSetTuple(epqstate, erm->rti, copyTuple);
                }
                else
                {
@@ -2318,9 +3011,11 @@ EvalPlanQualFetchRowMarks(EPQState *epqstate)
 
                        /* build a temporary HeapTuple control structure */
                        tuple.t_len = HeapTupleHeaderGetDatumLength(td);
-                       ItemPointerSetInvalid(&(tuple.t_self));
-                       tuple.t_tableOid = InvalidOid;
                        tuple.t_data = td;
+                       /* relation might be a foreign table, if so provide tableoid */
+                       tuple.t_tableOid = erm->relid;
+                       /* also copy t_ctid in case there's valid data there */
+                       tuple.t_self = td->t_ctid;
 
                        /* copy and store tuple */
                        EvalPlanQualSetTuple(epqstate, erm->rti,
@@ -2371,9 +3066,11 @@ EvalPlanQualBegin(EPQState *epqstate, EState *parentestate)
                MemSet(estate->es_epqScanDone, 0, rtsize * sizeof(bool));
 
                /* Recopy current values of parent parameters */
-               if (parentestate->es_plannedstmt->nParamExec > 0)
+               if (parentestate->es_plannedstmt->paramExecTypes != NIL)
                {
-                       int                     i = parentestate->es_plannedstmt->nParamExec;
+                       int                     i;
+
+                       i = list_length(parentestate->es_plannedstmt->paramExecTypes);
 
                        while (--i >= 0)
                        {
@@ -2461,10 +3158,11 @@ EvalPlanQualStart(EPQState *epqstate, EState *parentestate, Plan *planTree)
         * already set from other parts of the parent's plan tree.
         */
        estate->es_param_list_info = parentestate->es_param_list_info;
-       if (parentestate->es_plannedstmt->nParamExec > 0)
+       if (parentestate->es_plannedstmt->paramExecTypes != NIL)
        {
-               int                     i = parentestate->es_plannedstmt->nParamExec;
+               int                     i;
 
+               i = list_length(parentestate->es_plannedstmt->paramExecTypes);
                estate->es_param_exec_vals = (ParamExecData *)
                        palloc0(i * sizeof(ParamExecData));
                while (--i >= 0)
@@ -2565,14 +3263,7 @@ EvalPlanQualEnd(EPQState *epqstate)
        ExecResetTupleTable(estate->es_tupleTable, false);
 
        /* close any trigger target relations attached to this EState */
-       foreach(l, estate->es_trig_target_relations)
-       {
-               ResultRelInfo *resultRelInfo = (ResultRelInfo *) lfirst(l);
-
-               /* Close indices and then the relation itself */
-               ExecCloseIndices(resultRelInfo);
-               heap_close(resultRelInfo->ri_RelationDesc, NoLock);
-       }
+       ExecCleanUpTriggerState(estate);
 
        MemoryContextSwitchTo(oldcontext);