Phase 1 of read-only-plans project: cause executor state nodes to point

to plan nodes, not vice-versa.  All executor state nodes now inherit from
struct PlanState.  Copying of plan trees has been simplified by not
storing a list of SubPlans in Plan nodes (eliminating duplicate links).
The executor still needs such a list, but it can build it during
ExecutorStart since it has to scan the plan tree anyway.
No initdb forced since no stored-on-disk structures changed, but you
will need a full recompile because of node-numbering changes.

1 files changed, 15 insertions, 7 deletions

diff --git a/src/include/executor/execdesc.h b/src/include/executor/execdesc.h
index 363dabe43b4..9a95551d7c8 100644
--- a/src/include/executor/execdesc.h
+++ b/src/include/executor/execdesc.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: execdesc.h,v 1.20 2002/09/04 20:31:42 momjian Exp $
+ * $Id: execdesc.h,v 1.21 2002/12/05 15:50:36 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,30 +16,38 @@
 #define EXECDESC_H
 
 #include "nodes/parsenodes.h"
-#include "nodes/plannodes.h"
+#include "nodes/execnodes.h"
 #include "tcop/dest.h"
 
 
 /* ----------------
  *		query descriptor:
+ *
  *	a QueryDesc encapsulates everything that the executor
  *	needs to execute the query
  * ---------------------
  */
 typedef struct QueryDesc
 {
+	/* These fields are provided by CreateQueryDesc */
 	CmdType		operation;		/* CMD_SELECT, CMD_UPDATE, etc. */
-	Query	   *parsetree;
-	Plan	   *plantree;
+	Query	   *parsetree;		/* rewritten parsetree */
+	Plan	   *plantree;		/* planner's output */
 	CommandDest dest;			/* the destination output of the execution */
 	const char *portalName;		/* name of portal, or NULL */
+	ParamListInfo params;		/* param values being passed in */
+	bool		doInstrument;	/* TRUE requests runtime instrumentation */
 
-	TupleDesc	tupDesc;		/* set by ExecutorStart */
+	/* These fields are set by ExecutorStart */
+	TupleDesc	tupDesc;		/* descriptor for result tuples */
+	EState	   *estate;			/* executor's query-wide state */
+	PlanState  *planstate;		/* tree of per-plan-node state */
 } QueryDesc;
 
 /* in pquery.c */
 extern QueryDesc *CreateQueryDesc(Query *parsetree, Plan *plantree,
-				CommandDest dest, const char *portalName);
-
+								  CommandDest dest, const char *portalName,
+								  ParamListInfo params,
+								  bool doInstrument);
 
 #endif   /* EXECDESC_H  */