]> granicus.if.org Git - postgresql/blobdiff - src/backend/executor/execMain.c
Prevent adding relations to a concurrently dropped schema.
[postgresql] / src / backend / executor / execMain.c
index 87ca2a1b4b8b40c0c74b997d36749866bcecca8f..422f737e82dcb1202d3f9e927fe87f06f6b33c7b 100644 (file)
@@ -6,27 +6,32 @@
  * INTERFACE ROUTINES
  *     ExecutorStart()
  *     ExecutorRun()
+ *     ExecutorFinish()
  *     ExecutorEnd()
  *
- *     The old ExecutorMain() has been replaced by ExecutorStart(),
- *     ExecutorRun() and ExecutorEnd()
- *
- *     These three procedures are the external interfaces to the executor.
+ *     These four procedures are the external interface to the executor.
  *     In each case, the query descriptor is required as an argument.
  *
- *     ExecutorStart() must be called at the beginning of execution of any
- *     query plan and ExecutorEnd() should always be called at the end of
- *     execution of a plan.
+ *     ExecutorStart must be called at the beginning of execution of any
+ *     query plan and ExecutorEnd must always be called at the end of
+ *     execution of a plan (unless it is aborted due to error).
  *
  *     ExecutorRun accepts direction and count arguments that specify whether
  *     the plan is to be executed forwards, backwards, and for how many tuples.
+ *     In some cases ExecutorRun may be called multiple times to process all
+ *     the tuples for a plan.  It is also acceptable to stop short of executing
+ *     the whole plan (but only if it is a SELECT).
+ *
+ *     ExecutorFinish must be called after the final ExecutorRun call and
+ *     before ExecutorEnd.  This can be omitted only in case of EXPLAIN,
+ *     which should also omit ExecutorRun.
  *
- * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2012, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
  * IDENTIFICATION
- *       $PostgreSQL: pgsql/src/backend/executor/execMain.c,v 1.352 2010/07/22 00:47:52 rhaas Exp $
+ *       src/backend/executor/execMain.c
  *
  *-------------------------------------------------------------------------
  */
@@ -42,7 +47,7 @@
 #include "commands/tablespace.h"
 #include "commands/trigger.h"
 #include "executor/execdebug.h"
-#include "executor/instrument.h"
+#include "mb/pg_wchar.h"
 #include "miscadmin.h"
 #include "optimizer/clauses.h"
 #include "parser/parse_clause.h"
 #include "storage/smgr.h"
 #include "tcop/utility.h"
 #include "utils/acl.h"
+#include "utils/builtins.h"
 #include "utils/lsyscache.h"
 #include "utils/memutils.h"
 #include "utils/snapmgr.h"
 #include "utils/tqual.h"
 
 
-/* Hooks for plugins to get control in ExecutorStart/Run/End() */
+/* Hooks for plugins to get control in ExecutorStart/Run/Finish/End */
 ExecutorStart_hook_type ExecutorStart_hook = NULL;
 ExecutorRun_hook_type ExecutorRun_hook = NULL;
+ExecutorFinish_hook_type ExecutorFinish_hook = NULL;
 ExecutorEnd_hook_type ExecutorEnd_hook = NULL;
 
 /* Hook for plugin to get control in ExecCheckRTPerms() */
@@ -68,6 +75,8 @@ ExecutorCheckPerms_hook_type ExecutorCheckPerms_hook = NULL;
 
 /* decls for local routines only used within this module */
 static void InitPlan(QueryDesc *queryDesc, int eflags);
+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,
                        CmdType operation,
@@ -77,6 +86,8 @@ static void ExecutePlan(EState *estate, PlanState *planstate,
                        DestReceiver *dest);
 static bool ExecCheckRTEPerms(RangeTblEntry *rte);
 static void ExecCheckXactReadOnly(PlannedStmt *plannedstmt);
+static char *ExecBuildSlotValueDescription(TupleTableSlot *slot,
+                                                                                  int maxfieldlen);
 static void EvalPlanQualStart(EPQState *epqstate, EState *parentestate,
                                  Plan *planTree);
 static void OpenIntoRel(QueryDesc *queryDesc);
@@ -95,8 +106,8 @@ static void intorel_destroy(DestReceiver *self);
  *             This routine must be called at the beginning of any execution of any
  *             query plan
  *
- * Takes a QueryDesc previously created by CreateQueryDesc (it's not real
- * clear why we bother to separate the two functions, but...). The tupDesc
+ * Takes a QueryDesc previously created by CreateQueryDesc (which is separate
+ * only because some places use QueryDescs for utility commands).  The tupDesc
  * field of the QueryDesc is filled in to describe the tuples that will be
  * returned, and the internal fields (estate and planstate) are set up.
  *
@@ -161,10 +172,24 @@ standard_ExecutorStart(QueryDesc *queryDesc, int eflags)
        switch (queryDesc->operation)
        {
                case CMD_SELECT:
-                       /* SELECT INTO and SELECT FOR UPDATE/SHARE need to mark tuples */
+
+                       /*
+                        * SELECT INTO, SELECT FOR UPDATE/SHARE and modifying CTEs need to
+                        * mark tuples
+                        */
                        if (queryDesc->plannedstmt->intoClause != NULL ||
-                               queryDesc->plannedstmt->rowMarks != NIL)
+                               queryDesc->plannedstmt->rowMarks != NIL ||
+                               queryDesc->plannedstmt->hasModifyingCTE)
                                estate->es_output_cid = GetCurrentCommandId(true);
+
+                       /*
+                        * A SELECT without modifying CTEs can't possibly queue triggers,
+                        * so force skip-triggers mode. This is just a marginal efficiency
+                        * hack, since AfterTriggerBeginQuery/AfterTriggerEndQuery aren't
+                        * all that expensive, but we might as well do it.
+                        */
+                       if (!queryDesc->plannedstmt->hasModifyingCTE)
+                               eflags |= EXEC_FLAG_SKIP_TRIGGERS;
                        break;
 
                case CMD_INSERT:
@@ -184,6 +209,7 @@ standard_ExecutorStart(QueryDesc *queryDesc, int eflags)
         */
        estate->es_snapshot = RegisterSnapshot(queryDesc->snapshot);
        estate->es_crosscheck_snapshot = RegisterSnapshot(queryDesc->crosscheck_snapshot);
+       estate->es_top_eflags = eflags;
        estate->es_instrument = queryDesc->instrument_options;
 
        /*
@@ -191,6 +217,13 @@ standard_ExecutorStart(QueryDesc *queryDesc, int eflags)
         */
        InitPlan(queryDesc, eflags);
 
+       /*
+        * Set up an AFTER-trigger statement context, unless told not to, or
+        * unless it's EXPLAIN-only mode (when ExecutorFinish won't be called).
+        */
+       if (!(eflags & (EXEC_FLAG_SKIP_TRIGGERS | EXEC_FLAG_EXPLAIN_ONLY)))
+               AfterTriggerBeginQuery();
+
        MemoryContextSwitchTo(oldcontext);
 }
 
@@ -247,13 +280,14 @@ standard_ExecutorRun(QueryDesc *queryDesc,
        estate = queryDesc->estate;
 
        Assert(estate != NULL);
+       Assert(!(estate->es_top_eflags & EXEC_FLAG_EXPLAIN_ONLY));
 
        /*
         * Switch into per-query memory context
         */
        oldcontext = MemoryContextSwitchTo(estate->es_query_cxt);
 
-       /* Allow instrumentation of ExecutorRun overall runtime */
+       /* Allow instrumentation of Executor overall runtime */
        if (queryDesc->totaltime)
                InstrStartNode(queryDesc->totaltime);
 
@@ -275,6 +309,13 @@ standard_ExecutorRun(QueryDesc *queryDesc,
        if (sendTuples)
                (*dest->rStartup) (dest, operation, queryDesc->tupDesc);
 
+       /*
+        * if it's CREATE TABLE AS ... WITH NO DATA, skip plan execution
+        */
+       if (estate->es_select_into &&
+               queryDesc->plannedstmt->intoClause->skipData)
+               direction = NoMovementScanDirection;
+
        /*
         * run plan
         */
@@ -299,6 +340,68 @@ standard_ExecutorRun(QueryDesc *queryDesc,
        MemoryContextSwitchTo(oldcontext);
 }
 
+/* ----------------------------------------------------------------
+ *             ExecutorFinish
+ *
+ *             This routine must be called after the last ExecutorRun call.
+ *             It performs cleanup such as firing AFTER triggers.      It is
+ *             separate from ExecutorEnd because EXPLAIN ANALYZE needs to
+ *             include these actions in the total runtime.
+ *
+ *             We provide a function hook variable that lets loadable plugins
+ *             get control when ExecutorFinish is called.      Such a plugin would
+ *             normally call standard_ExecutorFinish().
+ *
+ * ----------------------------------------------------------------
+ */
+void
+ExecutorFinish(QueryDesc *queryDesc)
+{
+       if (ExecutorFinish_hook)
+               (*ExecutorFinish_hook) (queryDesc);
+       else
+               standard_ExecutorFinish(queryDesc);
+}
+
+void
+standard_ExecutorFinish(QueryDesc *queryDesc)
+{
+       EState     *estate;
+       MemoryContext oldcontext;
+
+       /* sanity checks */
+       Assert(queryDesc != NULL);
+
+       estate = queryDesc->estate;
+
+       Assert(estate != NULL);
+       Assert(!(estate->es_top_eflags & EXEC_FLAG_EXPLAIN_ONLY));
+
+       /* This should be run once and only once per Executor instance */
+       Assert(!estate->es_finished);
+
+       /* Switch into per-query memory context */
+       oldcontext = MemoryContextSwitchTo(estate->es_query_cxt);
+
+       /* Allow instrumentation of Executor overall runtime */
+       if (queryDesc->totaltime)
+               InstrStartNode(queryDesc->totaltime);
+
+       /* Run ModifyTable nodes to completion */
+       ExecPostprocessPlan(estate);
+
+       /* Execute queued AFTER triggers, unless told not to */
+       if (!(estate->es_top_eflags & EXEC_FLAG_SKIP_TRIGGERS))
+               AfterTriggerEndQuery(estate);
+
+       if (queryDesc->totaltime)
+               InstrStopNode(queryDesc->totaltime, 0);
+
+       MemoryContextSwitchTo(oldcontext);
+
+       estate->es_finished = true;
+}
+
 /* ----------------------------------------------------------------
  *             ExecutorEnd
  *
@@ -333,6 +436,14 @@ standard_ExecutorEnd(QueryDesc *queryDesc)
 
        Assert(estate != NULL);
 
+       /*
+        * Check that ExecutorFinish was called, unless in EXPLAIN-only mode. This
+        * Assert is needed because ExecutorFinish is new as of 9.1, and callers
+        * might forget to call it.
+        */
+       Assert(estate->es_finished ||
+                  (estate->es_top_eflags & EXEC_FLAG_EXPLAIN_ONLY));
+
        /*
         * Switch into per-query memory context to run ExecEndPlan
         */
@@ -420,7 +531,7 @@ ExecCheckRTPerms(List *rangeTable, bool ereport_on_violation)
 
        foreach(l, rangeTable)
        {
-               RangeTblEntry  *rte = (RangeTblEntry *) lfirst(l);
+               RangeTblEntry *rte = (RangeTblEntry *) lfirst(l);
 
                result = ExecCheckRTEPerms(rte);
                if (!result)
@@ -434,8 +545,8 @@ ExecCheckRTPerms(List *rangeTable, bool ereport_on_violation)
        }
 
        if (ExecutorCheckPerms_hook)
-               result = (*ExecutorCheckPerms_hook)(rangeTable,
-                                                                                       ereport_on_violation);
+               result = (*ExecutorCheckPerms_hook) (rangeTable,
+                                                                                        ereport_on_violation);
        return result;
 }
 
@@ -681,7 +792,6 @@ InitPlan(QueryDesc *queryDesc, int eflags)
                        InitResultRelInfo(resultRelInfo,
                                                          resultRelation,
                                                          resultRelationIndex,
-                                                         operation,
                                                          estate->es_instrument);
                        resultRelInfo++;
                }
@@ -738,15 +848,17 @@ InitPlan(QueryDesc *queryDesc, int eflags)
                                break;
                }
 
+               /* Check that relation is a legal target for marking */
+               if (relation)
+                       CheckValidRowMarkRel(relation, rc->markType);
+
                erm = (ExecRowMark *) palloc(sizeof(ExecRowMark));
                erm->relation = relation;
                erm->rti = rc->rti;
                erm->prti = rc->prti;
+               erm->rowmarkId = rc->rowmarkId;
                erm->markType = rc->markType;
                erm->noWait = rc->noWait;
-               erm->ctidAttNo = rc->ctidAttNo;
-               erm->toidAttNo = rc->toidAttNo;
-               erm->wholeAttNo = rc->wholeAttNo;
                ItemPointerSetInvalid(&(erm->curCtid));
                estate->es_rowMarks = lappend(estate->es_rowMarks, erm);
        }
@@ -769,6 +881,7 @@ InitPlan(QueryDesc *queryDesc, int eflags)
        estate->es_tupleTable = NIL;
        estate->es_trig_tuple_slot = NULL;
        estate->es_trig_oldtup_slot = NULL;
+       estate->es_trig_newtup_slot = NULL;
 
        /* mark EvalPlanQual not active */
        estate->es_epqTuple = NULL;
@@ -868,20 +981,21 @@ InitPlan(QueryDesc *queryDesc, int eflags)
 }
 
 /*
- * Initialize ResultRelInfo data for one result relation
+ * Check that a proposed result relation is a legal target for the operation
+ *
+ * In most cases parser and/or planner should have noticed this already, but
+ * let's make sure.  In the view case we do need a test here, because if the
+ * view wasn't rewritten by a rule, it had better have an INSTEAD trigger.
+ *
+ * Note: when changing this function, you probably also need to look at
+ * CheckValidRowMarkRel.
  */
 void
-InitResultRelInfo(ResultRelInfo *resultRelInfo,
-                                 Relation resultRelationDesc,
-                                 Index resultRelationIndex,
-                                 CmdType operation,
-                                 int instrument_options)
+CheckValidResultRel(Relation resultRel, CmdType operation)
 {
-       /*
-        * Check valid relkind ... parser and/or planner should have noticed this
-        * already, but let's make sure.
-        */
-       switch (resultRelationDesc->rd_rel->relkind)
+       TriggerDesc *trigDesc = resultRel->trigdesc;
+
+       switch (resultRel->rd_rel->relkind)
        {
                case RELKIND_RELATION:
                        /* OK */
@@ -890,29 +1004,125 @@ InitResultRelInfo(ResultRelInfo *resultRelInfo,
                        ereport(ERROR,
                                        (errcode(ERRCODE_WRONG_OBJECT_TYPE),
                                         errmsg("cannot change sequence \"%s\"",
-                                                       RelationGetRelationName(resultRelationDesc))));
+                                                       RelationGetRelationName(resultRel))));
                        break;
                case RELKIND_TOASTVALUE:
                        ereport(ERROR,
                                        (errcode(ERRCODE_WRONG_OBJECT_TYPE),
                                         errmsg("cannot change TOAST relation \"%s\"",
-                                                       RelationGetRelationName(resultRelationDesc))));
+                                                       RelationGetRelationName(resultRel))));
                        break;
                case RELKIND_VIEW:
+                       switch (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("You need an unconditional ON INSERT DO INSTEAD rule or an INSTEAD OF INSERT trigger.")));
+                                       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("You need an unconditional ON UPDATE DO INSTEAD rule or an INSTEAD OF UPDATE trigger.")));
+                                       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("You need an unconditional ON DELETE DO INSTEAD rule or an INSTEAD OF DELETE trigger.")));
+                                       break;
+                               default:
+                                       elog(ERROR, "unrecognized CmdType: %d", (int) operation);
+                                       break;
+                       }
+                       break;
+               case RELKIND_FOREIGN_TABLE:
                        ereport(ERROR,
                                        (errcode(ERRCODE_WRONG_OBJECT_TYPE),
-                                        errmsg("cannot change view \"%s\"",
-                                                       RelationGetRelationName(resultRelationDesc))));
+                                        errmsg("cannot change foreign table \"%s\"",
+                                                       RelationGetRelationName(resultRel))));
                        break;
                default:
                        ereport(ERROR,
                                        (errcode(ERRCODE_WRONG_OBJECT_TYPE),
                                         errmsg("cannot change relation \"%s\"",
-                                                       RelationGetRelationName(resultRelationDesc))));
+                                                       RelationGetRelationName(resultRel))));
                        break;
        }
+}
 
-       /* OK, fill in the node */
+/*
+ * Check that a proposed rowmark target relation is a legal target
+ *
+ * In most cases parser and/or planner should have noticed this already, but
+ * they don't cover all cases.
+ */
+static void
+CheckValidRowMarkRel(Relation rel, RowMarkType markType)
+{
+       switch (rel->rd_rel->relkind)
+       {
+               case RELKIND_RELATION:
+                       /* OK */
+                       break;
+               case RELKIND_SEQUENCE:
+                       /* Must disallow this because we don't vacuum sequences */
+                       ereport(ERROR,
+                                       (errcode(ERRCODE_WRONG_OBJECT_TYPE),
+                                        errmsg("cannot lock rows in sequence \"%s\"",
+                                                       RelationGetRelationName(rel))));
+                       break;
+               case RELKIND_TOASTVALUE:
+                       /* We could allow this, but there seems no good reason to */
+                       ereport(ERROR,
+                                       (errcode(ERRCODE_WRONG_OBJECT_TYPE),
+                                        errmsg("cannot lock rows in TOAST relation \"%s\"",
+                                                       RelationGetRelationName(rel))));
+                       break;
+               case RELKIND_VIEW:
+                       /* Should not get here */
+                       ereport(ERROR,
+                                       (errcode(ERRCODE_WRONG_OBJECT_TYPE),
+                                        errmsg("cannot lock rows in view \"%s\"",
+                                                       RelationGetRelationName(rel))));
+                       break;
+               case RELKIND_FOREIGN_TABLE:
+                       /* Perhaps we can support this someday, but not today */
+                       ereport(ERROR,
+                                       (errcode(ERRCODE_WRONG_OBJECT_TYPE),
+                                        errmsg("cannot lock rows in foreign table \"%s\"",
+                                                       RelationGetRelationName(rel))));
+                       break;
+               default:
+                       ereport(ERROR,
+                                       (errcode(ERRCODE_WRONG_OBJECT_TYPE),
+                                        errmsg("cannot lock rows in relation \"%s\"",
+                                                       RelationGetRelationName(rel))));
+                       break;
+       }
+}
+
+/*
+ * Initialize ResultRelInfo data for one result relation
+ *
+ * Caution: before Postgres 9.1, this function included the relkind checking
+ * that's now in CheckValidResultRel, and it also did ExecOpenIndices if
+ * appropriate.  Be sure callers cover those needs.
+ */
+void
+InitResultRelInfo(ResultRelInfo *resultRelInfo,
+                                 Relation resultRelationDesc,
+                                 Index resultRelationIndex,
+                                 int instrument_options)
+{
        MemSet(resultRelInfo, 0, sizeof(ResultRelInfo));
        resultRelInfo->type = T_ResultRelInfo;
        resultRelInfo->ri_RangeTableIndex = resultRelationIndex;
@@ -942,16 +1152,6 @@ InitResultRelInfo(ResultRelInfo *resultRelInfo,
        resultRelInfo->ri_ConstraintExprs = NULL;
        resultRelInfo->ri_junkFilter = NULL;
        resultRelInfo->ri_projectReturning = NULL;
-
-       /*
-        * If there are indices on the result relation, open them and save
-        * descriptors in the result relation info, so that we can add new index
-        * entries for the tuples we add/update.  We need not do this for a
-        * DELETE, however, since deletion doesn't affect indexes.
-        */
-       if (resultRelationDesc->rd_rel->relhasindex &&
-               operation != CMD_DELETE)
-               ExecOpenIndices(resultRelInfo);
 }
 
 /*
@@ -1001,26 +1201,29 @@ ExecGetTriggerResultRel(EState *estate, Oid relid)
        /*
         * Open the target relation's relcache entry.  We assume that an
         * appropriate lock is still held by the backend from whenever the trigger
-        * event got queued, so we need take no new lock here.
+        * event got queued, so we need take no new lock here.  Also, we need not
+        * recheck the relkind, so no need for CheckValidResultRel.
         */
        rel = heap_open(relid, NoLock);
 
        /*
-        * Make the new entry in the right context.  Currently, we don't need any
-        * index information in ResultRelInfos used only for triggers, so tell
-        * InitResultRelInfo it's a DELETE.
+        * Make the new entry in the right context.
         */
        oldcontext = MemoryContextSwitchTo(estate->es_query_cxt);
        rInfo = makeNode(ResultRelInfo);
        InitResultRelInfo(rInfo,
                                          rel,
                                          0,            /* dummy rangetable index */
-                                         CMD_DELETE,
                                          estate->es_instrument);
        estate->es_trig_target_relations =
                lappend(estate->es_trig_target_relations, rInfo);
        MemoryContextSwitchTo(oldcontext);
 
+       /*
+        * Currently, we don't need any index information in ResultRelInfos used
+        * only for triggers, so no need to call ExecOpenIndices.
+        */
+
        return rInfo;
 }
 
@@ -1081,6 +1284,46 @@ ExecContextForcesOids(PlanState *planstate, bool *hasoids)
        return false;
 }
 
+/* ----------------------------------------------------------------
+ *             ExecPostprocessPlan
+ *
+ *             Give plan nodes a final chance to execute before shutdown
+ * ----------------------------------------------------------------
+ */
+static void
+ExecPostprocessPlan(EState *estate)
+{
+       ListCell   *lc;
+
+       /*
+        * Make sure nodes run forward.
+        */
+       estate->es_direction = ForwardScanDirection;
+
+       /*
+        * Run any secondary ModifyTable nodes to completion, in case the main
+        * query did not fetch all rows from them.      (We do this to ensure that
+        * such nodes have predictable results.)
+        */
+       foreach(lc, estate->es_auxmodifytables)
+       {
+               PlanState  *ps = (PlanState *) lfirst(lc);
+
+               for (;;)
+               {
+                       TupleTableSlot *slot;
+
+                       /* Reset the per-output-tuple exprcontext each time */
+                       ResetPerTupleExprContext(estate);
+
+                       slot = ExecProcNode(ps);
+
+                       if (TupIsNull(slot))
+                               break;
+               }
+       }
+}
+
 /* ----------------------------------------------------------------
  *             ExecEndPlan
  *
@@ -1333,7 +1576,9 @@ ExecConstraints(ResultRelInfo *resultRelInfo,
                                ereport(ERROR,
                                                (errcode(ERRCODE_NOT_NULL_VIOLATION),
                                                 errmsg("null value in column \"%s\" violates not-null constraint",
-                                               NameStr(rel->rd_att->attrs[attrChk - 1]->attname))));
+                                               NameStr(rel->rd_att->attrs[attrChk - 1]->attname)),
+                                                errdetail("Failing row contains %s.",
+                                                                  ExecBuildSlotValueDescription(slot, 64))));
                }
        }
 
@@ -1345,8 +1590,140 @@ ExecConstraints(ResultRelInfo *resultRelInfo,
                        ereport(ERROR,
                                        (errcode(ERRCODE_CHECK_VIOLATION),
                                         errmsg("new row for relation \"%s\" violates check constraint \"%s\"",
-                                                       RelationGetRelationName(rel), failed)));
+                                                       RelationGetRelationName(rel), failed),
+                                        errdetail("Failing row contains %s.",
+                                                          ExecBuildSlotValueDescription(slot, 64))));
+       }
+}
+
+/*
+ * ExecBuildSlotValueDescription -- construct a string representing a tuple
+ *
+ * This is intentionally very similar to BuildIndexValueDescription, but
+ * unlike that function, we truncate long field values.  That seems necessary
+ * here since heap field values could be very long, whereas index entries
+ * typically aren't so wide.
+ */
+static char *
+ExecBuildSlotValueDescription(TupleTableSlot *slot, int maxfieldlen)
+{
+       StringInfoData buf;
+       TupleDesc       tupdesc = slot->tts_tupleDescriptor;
+       int                     i;
+
+       /* Make sure the tuple is fully deconstructed */
+       slot_getallattrs(slot);
+
+       initStringInfo(&buf);
+
+       appendStringInfoChar(&buf, '(');
+
+       for (i = 0; i < tupdesc->natts; i++)
+       {
+               char       *val;
+               int                     vallen;
+
+               if (slot->tts_isnull[i])
+                       val = "null";
+               else
+               {
+                       Oid                     foutoid;
+                       bool            typisvarlena;
+
+                       getTypeOutputInfo(tupdesc->attrs[i]->atttypid,
+                                                         &foutoid, &typisvarlena);
+                       val = OidOutputFunctionCall(foutoid, slot->tts_values[i]);
+               }
+
+               if (i > 0)
+                       appendStringInfoString(&buf, ", ");
+
+               /* 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, "...");
+               }
+       }
+
+       appendStringInfoChar(&buf, ')');
+
+       return buf.data;
+}
+
+
+/*
+ * ExecFindRowMark -- find the ExecRowMark struct for given rangetable index
+ */
+ExecRowMark *
+ExecFindRowMark(EState *estate, Index rti)
+{
+       ListCell   *lc;
+
+       foreach(lc, estate->es_rowMarks)
+       {
+               ExecRowMark *erm = (ExecRowMark *) lfirst(lc);
+
+               if (erm->rti == rti)
+                       return erm;
+       }
+       elog(ERROR, "failed to find ExecRowMark for rangetable index %u", rti);
+       return NULL;                            /* keep compiler quiet */
+}
+
+/*
+ * ExecBuildAuxRowMark -- create an ExecAuxRowMark struct
+ *
+ * Inputs are the underlying ExecRowMark struct and the targetlist of the
+ * input plan node (not planstate node!).  We need the latter to find out
+ * the column numbers of the resjunk columns.
+ */
+ExecAuxRowMark *
+ExecBuildAuxRowMark(ExecRowMark *erm, List *targetlist)
+{
+       ExecAuxRowMark *aerm = (ExecAuxRowMark *) palloc0(sizeof(ExecAuxRowMark));
+       char            resname[32];
+
+       aerm->rowmark = erm;
+
+       /* Look up the resjunk columns associated with this rowmark */
+       if (erm->relation)
+       {
+               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 */
+               snprintf(resname, sizeof(resname), "ctid%u", erm->rowmarkId);
+               aerm->ctidAttNo = ExecFindJunkAttributeInTlist(targetlist,
+                                                                                                          resname);
+               if (!AttributeNumberIsValid(aerm->ctidAttNo))
+                       elog(ERROR, "could not find junk %s column", resname);
+       }
+       else
+       {
+               Assert(erm->markType == ROW_MARK_COPY);
+
+               snprintf(resname, sizeof(resname), "wholerow%u", erm->rowmarkId);
+               aerm->wholeAttNo = ExecFindJunkAttributeInTlist(targetlist,
+                                                                                                               resname);
+               if (!AttributeNumberIsValid(aerm->wholeAttNo))
+                       elog(ERROR, "could not find junk %s column", resname);
        }
+
+       return aerm;
 }
 
 
@@ -1554,7 +1931,7 @@ EvalPlanQualFetch(EState *estate, Relation relation, int lockmode,
 
                                case HeapTupleUpdated:
                                        ReleaseBuffer(buffer);
-                                       if (IsXactIsoLevelSerializable)
+                                       if (IsolationUsesXactSnapshot())
                                                ereport(ERROR,
                                                                (errcode(ERRCODE_T_R_SERIALIZATION_FAILURE),
                                                                 errmsg("could not serialize access due to concurrent update")));
@@ -1640,11 +2017,13 @@ EvalPlanQualFetch(EState *estate, Relation relation, int lockmode,
 /*
  * EvalPlanQualInit -- initialize during creation of a plan state node
  * that might need to invoke EPQ processing.
- * Note: subplan can be NULL if it will be set later with EvalPlanQualSetPlan.
+ *
+ * Note: subplan/auxrowmarks can be NULL/NIL if they will be set later
+ * with EvalPlanQualSetPlan.
  */
 void
 EvalPlanQualInit(EPQState *epqstate, EState *estate,
-                                Plan *subplan, int epqParam)
+                                Plan *subplan, List *auxrowmarks, int epqParam)
 {
        /* Mark the EPQ state inactive */
        epqstate->estate = NULL;
@@ -1652,7 +2031,7 @@ EvalPlanQualInit(EPQState *epqstate, EState *estate,
        epqstate->origslot = NULL;
        /* ... and remember data that EvalPlanQualBegin will need */
        epqstate->plan = subplan;
-       epqstate->rowMarks = NIL;
+       epqstate->arowMarks = auxrowmarks;
        epqstate->epqParam = epqParam;
 }
 
@@ -1662,25 +2041,14 @@ EvalPlanQualInit(EPQState *epqstate, EState *estate,
  * We need this so that ModifyTuple can deal with multiple subplans.
  */
 void
-EvalPlanQualSetPlan(EPQState *epqstate, Plan *subplan)
+EvalPlanQualSetPlan(EPQState *epqstate, Plan *subplan, List *auxrowmarks)
 {
        /* If we have a live EPQ query, shut it down */
        EvalPlanQualEnd(epqstate);
        /* And set/change the plan pointer */
        epqstate->plan = subplan;
-}
-
-/*
- * EvalPlanQualAddRowMark -- add an ExecRowMark that EPQ needs to handle.
- *
- * Currently, only non-locking RowMarks are supported.
- */
-void
-EvalPlanQualAddRowMark(EPQState *epqstate, ExecRowMark *erm)
-{
-       if (RowMarkRequiresRowShareLock(erm->markType))
-               elog(ERROR, "EvalPlanQual doesn't support locking rowmarks");
-       epqstate->rowMarks = lappend(epqstate->rowMarks, erm);
+       /* The rowmarks depend on the plan, too */
+       epqstate->arowMarks = auxrowmarks;
 }
 
 /*
@@ -1730,13 +2098,17 @@ EvalPlanQualFetchRowMarks(EPQState *epqstate)
 
        Assert(epqstate->origslot != NULL);
 
-       foreach(l, epqstate->rowMarks)
+       foreach(l, epqstate->arowMarks)
        {
-               ExecRowMark *erm = (ExecRowMark *) lfirst(l);
+               ExecAuxRowMark *aerm = (ExecAuxRowMark *) lfirst(l);
+               ExecRowMark *erm = aerm->rowmark;
                Datum           datum;
                bool            isNull;
                HeapTupleData tuple;
 
+               if (RowMarkRequiresRowShareLock(erm->markType))
+                       elog(ERROR, "EvalPlanQual doesn't support locking rowmarks");
+
                /* clear any leftover test tuple for this rel */
                EvalPlanQualSetTuple(epqstate, erm->rti, NULL);
 
@@ -1752,7 +2124,7 @@ EvalPlanQualFetchRowMarks(EPQState *epqstate)
                                Oid                     tableoid;
 
                                datum = ExecGetJunkAttribute(epqstate->origslot,
-                                                                                        erm->toidAttNo,
+                                                                                        aerm->toidAttNo,
                                                                                         &isNull);
                                /* non-locked rels could be on the inside of outer joins */
                                if (isNull)
@@ -1768,7 +2140,7 @@ EvalPlanQualFetchRowMarks(EPQState *epqstate)
 
                        /* fetch the tuple's ctid */
                        datum = ExecGetJunkAttribute(epqstate->origslot,
-                                                                                erm->ctidAttNo,
+                                                                                aerm->ctidAttNo,
                                                                                 &isNull);
                        /* non-locked rels could be on the inside of outer joins */
                        if (isNull)
@@ -1793,7 +2165,7 @@ EvalPlanQualFetchRowMarks(EPQState *epqstate)
 
                        /* fetch the whole-row Var for the relation */
                        datum = ExecGetJunkAttribute(epqstate->origslot,
-                                                                                erm->wholeAttNo,
+                                                                                aerm->wholeAttNo,
                                                                                 &isNull);
                        /* non-locked rels could be on the inside of outer joins */
                        if (isNull)
@@ -1916,9 +2288,11 @@ EvalPlanQualStart(EPQState *epqstate, EState *parentestate, Plan *planTree)
        estate->es_result_relation_info = parentestate->es_result_relation_info;
        /* es_trig_target_relations must NOT be copied */
        estate->es_rowMarks = parentestate->es_rowMarks;
+       estate->es_top_eflags = parentestate->es_top_eflags;
        estate->es_instrument = parentestate->es_instrument;
        estate->es_select_into = parentestate->es_select_into;
        estate->es_into_oids = parentestate->es_into_oids;
+       /* es_auxmodifytables must NOT be copied */
 
        /*
         * The external param list is simply shared from parent.  The internal
@@ -1973,7 +2347,11 @@ EvalPlanQualStart(EPQState *epqstate, EState *parentestate, Plan *planTree)
         * ExecInitSubPlan expects to be able to find these entries. Some of the
         * SubPlans might not be used in the part of the plan tree we intend to
         * run, but since it's not easy to tell which, we just initialize them
-        * all.
+        * all.  (However, if the subplan is headed by a ModifyTable node, then it
+        * must be a data-modifying CTE, which we will certainly not need to
+        * re-run, so we can skip initializing it.      This is just an efficiency
+        * hack; it won't skip data-modifying CTEs for which the ModifyTable node
+        * is not at the top.)
         */
        Assert(estate->es_subplanstates == NIL);
        foreach(l, parentestate->es_plannedstmt->subplans)
@@ -1981,7 +2359,11 @@ EvalPlanQualStart(EPQState *epqstate, EState *parentestate, Plan *planTree)
                Plan       *subplan = (Plan *) lfirst(l);
                PlanState  *subplanstate;
 
-               subplanstate = ExecInitNode(subplan, estate, 0);
+               /* Don't initialize ModifyTable subplans, per comment above */
+               if (IsA(subplan, ModifyTable))
+                       subplanstate = NULL;
+               else
+                       subplanstate = ExecInitNode(subplan, estate, 0);
 
                estate->es_subplanstates = lappend(estate->es_subplanstates,
                                                                                   subplanstate);
@@ -2063,6 +2445,7 @@ typedef struct
 {
        DestReceiver pub;                       /* publicly-known function pointers */
        EState     *estate;                     /* EState we are working with */
+       DestReceiver *origdest;         /* QueryDesc's original receiver */
        Relation        rel;                    /* Relation to write to */
        int                     hi_options;             /* heap_insert performance options */
        BulkInsertState bistate;        /* bulk insert state */
@@ -2080,15 +2463,16 @@ OpenIntoRel(QueryDesc *queryDesc)
 {
        IntoClause *into = queryDesc->plannedstmt->intoClause;
        EState     *estate = queryDesc->estate;
+       TupleDesc       intoTupDesc = queryDesc->tupDesc;
        Relation        intoRelationDesc;
        char       *intoName;
        Oid                     namespaceId;
        Oid                     tablespaceId;
        Datum           reloptions;
-       AclResult       aclresult;
        Oid                     intoRelationId;
-       TupleDesc       tupdesc;
        DR_intorel *myState;
+       RangeTblEntry  *rte;
+       AttrNumber              attnum;
        static char *validnsps[] = HEAP_RELOPT_NAMESPACES;
 
        Assert(into);
@@ -2101,49 +2485,83 @@ OpenIntoRel(QueryDesc *queryDesc)
        /*
         * Check consistency of arguments
         */
-       if (into->onCommit != ONCOMMIT_NOOP && !into->rel->istemp)
+       if (into->onCommit != ONCOMMIT_NOOP
+               && into->rel->relpersistence != RELPERSISTENCE_TEMP)
                ereport(ERROR,
                                (errcode(ERRCODE_INVALID_TABLE_DEFINITION),
                                 errmsg("ON COMMIT can only be used on temporary tables")));
 
+       {
+               AclResult aclresult;
+               int i;
+
+               for (i = 0; i < intoTupDesc->natts; i++)
+               {
+                       Oid atttypid = intoTupDesc->attrs[i]->atttypid;
+
+                       aclresult = pg_type_aclcheck(atttypid, GetUserId(), ACL_USAGE);
+                       if (aclresult != ACLCHECK_OK)
+                               aclcheck_error(aclresult, ACL_KIND_TYPE,
+                                                          format_type_be(atttypid));
+               }
+       }
+
+       /*
+        * If a column name list was specified in CREATE TABLE AS, override the
+        * column names derived from the query.  (Too few column names are OK, too
+        * many are not.)  It would probably be all right to scribble directly on
+        * the query's result tupdesc, but let's be safe and make a copy.
+        */
+       if (into->colNames)
+       {
+               ListCell   *lc;
+
+               intoTupDesc = CreateTupleDescCopy(intoTupDesc);
+               attnum = 1;
+               foreach(lc, into->colNames)
+               {
+                       char       *colname = strVal(lfirst(lc));
+
+                       if (attnum > intoTupDesc->natts)
+                               ereport(ERROR,
+                                               (errcode(ERRCODE_SYNTAX_ERROR),
+                                                errmsg("CREATE TABLE AS specifies too many column names")));
+                       namestrcpy(&(intoTupDesc->attrs[attnum - 1]->attname), colname);
+                       attnum++;
+               }
+       }
+
+       /*
+        * Find namespace to create in, check its permissions, lock it against
+        * concurrent drop, and mark into->rel as RELPERSISTENCE_TEMP if the
+        * selected namespace is temporary.
+        */
+       intoName = into->rel->relname;
+       namespaceId = RangeVarGetAndCheckCreationNamespace(into->rel, NoLock,
+                                                                                                          NULL);
+
        /*
         * Security check: disallow creating temp tables from security-restricted
         * code.  This is needed because calling code might not expect untrusted
         * tables to appear in pg_temp at the front of its search path.
         */
-       if (into->rel->istemp && InSecurityRestrictedOperation())
+       if (into->rel->relpersistence == RELPERSISTENCE_TEMP
+               && InSecurityRestrictedOperation())
                ereport(ERROR,
                                (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
                                 errmsg("cannot create temporary table within security-restricted operation")));
 
-       /*
-        * Find namespace to create in, check its permissions
-        */
-       intoName = into->rel->relname;
-       namespaceId = RangeVarGetCreationNamespace(into->rel);
-
-       aclresult = pg_namespace_aclcheck(namespaceId, GetUserId(),
-                                                                         ACL_CREATE);
-       if (aclresult != ACLCHECK_OK)
-               aclcheck_error(aclresult, ACL_KIND_NAMESPACE,
-                                          get_namespace_name(namespaceId));
-
        /*
         * Select tablespace to use.  If not specified, use default tablespace
         * (which may in turn default to database's default).
         */
        if (into->tableSpaceName)
        {
-               tablespaceId = get_tablespace_oid(into->tableSpaceName);
-               if (!OidIsValid(tablespaceId))
-                       ereport(ERROR,
-                                       (errcode(ERRCODE_UNDEFINED_OBJECT),
-                                        errmsg("tablespace \"%s\" does not exist",
-                                                       into->tableSpaceName)));
+               tablespaceId = get_tablespace_oid(into->tableSpaceName, false);
        }
        else
        {
-               tablespaceId = GetDefaultTablespace(into->rel->istemp);
+               tablespaceId = GetDefaultTablespace(into->rel->relpersistence);
                /* note InvalidOid is OK in this case */
        }
 
@@ -2169,9 +2587,6 @@ OpenIntoRel(QueryDesc *queryDesc)
                                                                         false);
        (void) heap_reloptions(RELKIND_RELATION, reloptions, true);
 
-       /* Copy the tupdesc because heap_create_with_catalog modifies it */
-       tupdesc = CreateTupleDescCopy(queryDesc->tupDesc);
-
        /* Now we can actually create the new relation */
        intoRelationId = heap_create_with_catalog(intoName,
                                                                                          namespaceId,
@@ -2180,9 +2595,10 @@ OpenIntoRel(QueryDesc *queryDesc)
                                                                                          InvalidOid,
                                                                                          InvalidOid,
                                                                                          GetUserId(),
-                                                                                         tupdesc,
+                                                                                         intoTupDesc,
                                                                                          NIL,
                                                                                          RELKIND_RELATION,
+                                                                                         into->rel->relpersistence,
                                                                                          false,
                                                                                          false,
                                                                                          true,
@@ -2191,8 +2607,7 @@ OpenIntoRel(QueryDesc *queryDesc)
                                                                                          reloptions,
                                                                                          true,
                                                                                          allowSystemTableMods);
-
-       FreeTupleDesc(tupdesc);
+       Assert(intoRelationId != InvalidOid);
 
        /*
         * Advance command counter so that the newly-created relation's catalog
@@ -2221,15 +2636,32 @@ OpenIntoRel(QueryDesc *queryDesc)
         */
        intoRelationDesc = heap_open(intoRelationId, AccessExclusiveLock);
 
+       /*
+        * Check INSERT permission on the constructed table.
+        */
+       rte = makeNode(RangeTblEntry);
+       rte->rtekind = RTE_RELATION;
+       rte->relid = intoRelationId;
+       rte->relkind = RELKIND_RELATION;
+       rte->requiredPerms = ACL_INSERT;
+
+       for (attnum = 1; attnum <= intoTupDesc->natts; attnum++)
+               rte->modifiedCols = bms_add_member(rte->modifiedCols,
+                               attnum - FirstLowInvalidHeapAttributeNumber);
+
+       ExecCheckRTPerms(list_make1(rte), true);
+
        /*
         * Now replace the query's DestReceiver with one for SELECT INTO
         */
-       queryDesc->dest = CreateDestReceiver(DestIntoRel);
-       myState = (DR_intorel *) queryDesc->dest;
+       myState = (DR_intorel *) CreateDestReceiver(DestIntoRel);
        Assert(myState->pub.mydest == DestIntoRel);
        myState->estate = estate;
+       myState->origdest = queryDesc->dest;
        myState->rel = intoRelationDesc;
 
+       queryDesc->dest = (DestReceiver *) myState;
+
        /*
         * We can skip WAL-logging the insertions, unless PITR or streaming
         * replication is in use. We can skip the FSM in any case.
@@ -2250,8 +2682,11 @@ CloseIntoRel(QueryDesc *queryDesc)
 {
        DR_intorel *myState = (DR_intorel *) queryDesc->dest;
 
-       /* OpenIntoRel might never have gotten called */
-       if (myState && myState->pub.mydest == DestIntoRel && myState->rel)
+       /*
+        * OpenIntoRel might never have gotten called, and we also want to guard
+        * against double destruction.
+        */
+       if (myState && myState->pub.mydest == DestIntoRel)
        {
                FreeBulkInsertState(myState->bistate);
 
@@ -2262,7 +2697,11 @@ CloseIntoRel(QueryDesc *queryDesc)
                /* close rel, but keep lock until commit */
                heap_close(myState->rel, NoLock);
 
-               myState->rel = NULL;
+               /* restore the receiver belonging to executor's caller */
+               queryDesc->dest = myState->origdest;
+
+               /* might as well invoke my destructor */
+               intorel_destroy((DestReceiver *) myState);
        }
 }