[WIP] Store "cache enabled" flag in EState instead of inventing a new…

… context

struct. This reverts most of commit
0791252

src/backend/catalog/index.c

@@ -2165,6 +2165,8 @@ IndexBuildHeapScan(Relation heapRelation,
 	 * predicates.	Also a slot to hold the current tuple.
 	 */
 	estate = CreateExecutorState();
+	estate->es_useCache = false;
+
 	econtext = GetPerTupleExprContext(estate);
 	slot = MakeSingleTupleTableSlot(RelationGetDescr(heapRelation));
 
@@ -2553,6 +2555,7 @@ IndexCheckExclusion(Relation heapRelation,
 	 * predicates.	Also a slot to hold the current tuple.
 	 */
 	estate = CreateExecutorState();
+	estate->es_useCache = false;
 	econtext = GetPerTupleExprContext(estate);
 	slot = MakeSingleTupleTableSlot(RelationGetDescr(heapRelation));
 
@@ -2823,6 +2826,7 @@ validate_index_heapscan(Relation heapRelation,
 	 * predicates.	Also a slot to hold the current tuple.
 	 */
 	estate = CreateExecutorState();
+	estate->es_useCache = false;
 	econtext = GetPerTupleExprContext(estate);
 	slot = MakeSingleTupleTableSlot(RelationGetDescr(heapRelation));
 

src/backend/commands/analyze.c

@@ -716,6 +716,8 @@ compute_index_stats(Relation onerel, double totalrows,
 		 * sure it gets cleaned up at the bottom of the loop.
 		 */
 		estate = CreateExecutorState();
+		estate->es_useCache = false;
+
 		econtext = GetPerTupleExprContext(estate);
 		/* Need a slot to hold the current heap tuple, too */
 		slot = MakeSingleTupleTableSlot(RelationGetDescr(onerel));

src/backend/commands/constraint.c

@@ -134,6 +134,7 @@ unique_key_recheck(PG_FUNCTION_ARGS)
 		indexInfo->ii_ExclusionOps != NULL)
 	{
 		estate = CreateExecutorState();
+		estate->es_useCache = false;
 		econtext = GetPerTupleExprContext(estate);
 		econtext->ecxt_scantuple = slot;
 	}

src/backend/commands/copy.c

@@ -1996,11 +1996,10 @@ CopyFrom(CopyState cstate)
 	Datum	   *values;
 	bool	   *nulls;
 	ResultRelInfo *resultRelInfo;
-	EState	   *estate = CreateExecutorState(); /* for ExecConstraints() */
+	EState	   *estate;
 	ExprContext *econtext;
 	TupleTableSlot *myslot;
 	MemoryContext oldcontext = CurrentMemoryContext;
-
 	ErrorContextCallback errcallback;
 	CommandId	mycid = GetCurrentCommandId(true);
 	int			hi_options = 0; /* start with default heap_insert options */
@@ -2013,6 +2012,9 @@ CopyFrom(CopyState cstate)
 	HeapTuple  *bufferedTuples = NULL;	/* initialize to silence warning */
 	Size		bufferedTuplesSize = 0;
 
+	estate = CreateExecutorState(); /* for ExecConstraints() */
+	estate->es_useCache = true;
+
 	Assert(cstate->rel);
 
 	if (cstate->rel->rd_rel->relkind != RELKIND_RELATION)
@@ -2481,10 +2483,10 @@ BeginCopyFrom(Relation rel,
 			if (defexpr != NULL)
 			{
 				/* Initialize expressions in copycontext. */
+				// XXX?
+				// Assert(estate->es_useCache == true);
 				defexprs[num_defaults] = ExecInitExpr(
-										expression_planner((Expr *) defexpr),
-													  NULL,
-													  true);
+								 expression_planner((Expr *) defexpr), NULL);
 				defmap[num_defaults] = attnum - 1;
 				num_defaults++;
 

src/backend/commands/prepare.c

@@ -217,6 +217,7 @@ ExecuteQuery(ExecuteStmt *stmt, IntoClause *intoClause,
 		 */
 		estate = CreateExecutorState();
 		estate->es_param_list_info = params;
+		estate->es_useCache = false;
 		paramLI = EvaluateParams(entry, stmt->params,
 								 queryString, estate);
 	}
@@ -650,6 +651,7 @@ ExplainExecuteQuery(ExecuteStmt *execstmt, IntoClause *into, ExplainState *es,
 		 */
 		estate = CreateExecutorState();
 		estate->es_param_list_info = params;
+		estate->es_useCache = false;
 		paramLI = EvaluateParams(entry, execstmt->params,
 								 queryString, estate);
 	}

src/backend/commands/tablecmds.c

@@ -1085,6 +1085,8 @@ ExecuteTruncate(TruncateStmt *stmt)
 	 * each relation.  We don't need to call ExecOpenIndices, though.
 	 */
 	estate = CreateExecutorState();
+	estate->es_useCache = false;
+
 	resultRelInfos = (ResultRelInfo *)
 		palloc(list_length(rels) * sizeof(ResultRelInfo));
 	resultRelInfo = resultRelInfos;
@@ -3679,6 +3681,7 @@ ATRewriteTable(AlteredTableInfo *tab, Oid OIDNewHeap, LOCKMODE lockmode)
 	 */
 
 	estate = CreateExecutorState();
+	estate->es_useCache = true;
 
 	/* Build the needed expression execution states */
 	foreach(l, tab->constraints)
@@ -3706,7 +3709,8 @@ ATRewriteTable(AlteredTableInfo *tab, Oid OIDNewHeap, LOCKMODE lockmode)
 		NewColumnValue *ex = lfirst(l);
 
 		/* expr already planned */
-		ex->exprstate = ExecInitExpr((Expr *) ex->expr, NULL, true);
+		Assert(estate->es_useCache == true);
+		ex->exprstate = ExecInitExpr((Expr *) ex->expr, NULL);
 	}
 
 	notnull_attrs = NIL;
@@ -6686,6 +6690,7 @@ validateCheckConstraint(Relation rel, HeapTuple constrtup)
 	constrForm = (Form_pg_constraint) GETSTRUCT(constrtup);
 
 	estate = CreateExecutorState();
+	estate->es_useCache = false;
 
 	/*
 	 * XXX this tuple doesn't really come from a syscache, but this doesn't

src/backend/commands/trigger.c

@@ -3555,6 +3555,7 @@ afterTriggerInvokeEvents(AfterTriggerEventList *events,
 	if (estate == NULL)
 	{
 		estate = CreateExecutorState();
+		estate->es_useCache = false; // ???
 		local_estate = true;
 	}
 

src/backend/commands/typecmds.c

@@ -2621,6 +2621,7 @@ validateDomainConstraint(Oid domainoid, char *ccbin)
 
 	/* Need an EState to run ExecEvalExpr */
 	estate = CreateExecutorState();
+	estate->es_useCache = false;
 	econtext = GetPerTupleExprContext(estate);
 
 	/* build execution state for expr */
@@ -3097,7 +3098,10 @@ GetDomainConstraints(Oid typeOid)
 			r = makeNode(DomainConstraintState);
 			r->constrainttype = DOM_CONSTRAINT_CHECK;
 			r->name = pstrdup(NameStr(c->conname));
-			r->check_expr = ExecInitExpr(check_expr, NULL, false);
+
+			// XXX FIXME!
+			//Assert(scanstate->es_useCache == false);
+			r->check_expr = ExecInitExpr(check_expr, NULL);
 
 			/*
 			 * use lcons() here because constraints of lower domains should be

src/backend/executor/execMain.c

@@ -141,6 +141,7 @@ standard_ExecutorStart(QueryDesc *queryDesc, int eflags)
 	 * Build EState, switch into per-query memory context for startup.
 	 */
 	estate = CreateExecutorState();
+	estate->es_useCache = true; // XXX REMOVE
 	queryDesc->estate = estate;
 
 	oldcontext = MemoryContextSwitchTo(estate->es_query_cxt);
@@ -2287,6 +2288,7 @@ EvalPlanQualStart(EPQState *epqstate, EState *parentestate, Plan *planTree)
 	rtsize = list_length(parentestate->es_range_table);
 
 	epqstate->estate = estate = CreateExecutorState();
+	estate->es_useCache = true; // XXX
 
 	oldcontext = MemoryContextSwitchTo(estate->es_query_cxt);