Subselects...

vadim4o · vadim4o · commit 5d7923dd1cd8 · 1998-02-13T03:46:56.000Z
diff --git a/src/include/executor/executor.h b/src/include/executor/executor.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: executor.h,v 1.19 1998/02/10 04:02:19 momjian Exp $
+ * $Id: executor.h,v 1.20 1998/02/13 03:43:33 vadim Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -108,6 +108,7 @@ extern void ExecInitOuterTupleSlot(EState *estate, HashJoinState *hashstate);
 
 extern TupleDesc ExecGetTupType(Plan *node);
 extern TupleDesc ExecTypeFromTL(List *targetList);
+extern void SetChangedParamList (Plan *node, List *newchg);
 
 /*
  * prototypes from functions in execTuples.c
diff --git a/src/include/executor/nodeAgg.h b/src/include/executor/nodeAgg.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodeAgg.h,v 1.6 1997/11/26 01:12:40 momjian Exp $
+ * $Id: nodeAgg.h,v 1.7 1998/02/13 03:43:34 vadim Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -21,5 +21,6 @@ extern TupleTableSlot *ExecAgg(Agg *node);
 extern bool ExecInitAgg(Agg *node, EState *estate, Plan *parent);
 extern int	ExecCountSlotsAgg(Agg *node);
 extern void ExecEndAgg(Agg *node);
+extern void ExecReScanAgg(Agg *node, ExprContext *exprCtxt, Plan *parent);
 
 #endif							/* NODEAGG_H */
diff --git a/src/include/executor/nodeHash.h b/src/include/executor/nodeHash.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodeHash.h,v 1.7 1998/01/24 22:49:01 momjian Exp $
+ * $Id: nodeHash.h,v 1.8 1998/02/13 03:43:35 vadim Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -35,5 +35,6 @@ extern HeapTuple ExecScanHashBucket(HashJoinState *hjstate, HashBucket bucket,
 				   HeapTuple curtuple, List *hjclauses,
 				   ExprContext *econtext);
 extern void ExecHashTableReset(HashJoinTable hashtable, int ntuples);
+extern void ExecReScanHash(Hash *node, ExprContext *exprCtxt, Plan *parent);
 
 #endif							/* NODEHASH_H */
diff --git a/src/include/executor/nodeHashjoin.h b/src/include/executor/nodeHashjoin.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodeHashjoin.h,v 1.7 1998/01/24 22:49:04 momjian Exp $
+ * $Id: nodeHashjoin.h,v 1.8 1998/02/13 03:43:36 vadim Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -23,6 +23,7 @@ extern int	ExecCountSlotsHashJoin(HashJoin *node);
 extern void ExecEndHashJoin(HashJoin *node);
 extern char * ExecHashJoinSaveTuple(HeapTuple heapTuple, char *buffer,
 					  File file, char *position);
+extern void ExecReScanHashJoin(HashJoin *node, ExprContext *exprCtxt, Plan *parent);
 
 
 #endif							/* NODEHASHJOIN_H */
diff --git a/src/include/executor/nodeMaterial.h b/src/include/executor/nodeMaterial.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodeMaterial.h,v 1.5 1997/11/26 01:12:53 momjian Exp $
+ * $Id: nodeMaterial.h,v 1.6 1998/02/13 03:43:37 vadim Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -21,7 +21,9 @@ extern TupleTableSlot *ExecMaterial(Material *node);
 extern bool ExecInitMaterial(Material *node, EState *estate, Plan *parent);
 extern int	ExecCountSlotsMaterial(Material *node);
 extern void ExecEndMaterial(Material *node);
+extern void ExecMaterialReScan(Material *node, ExprContext *exprCtxt, Plan *parent);
+#if 0
 extern List ExecMaterialMarkPos(Material *node);
 extern void ExecMaterialRestrPos(Material *node);
-
+#endif
 #endif							/* NODEMATERIAL_H */
diff --git a/src/include/executor/nodeNestloop.h b/src/include/executor/nodeNestloop.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodeNestloop.h,v 1.5 1997/11/26 01:12:57 momjian Exp $
+ * $Id: nodeNestloop.h,v 1.6 1998/02/13 03:43:38 vadim Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -21,5 +21,6 @@ extern TupleTableSlot *ExecNestLoop(NestLoop *node, Plan *parent);
 extern bool ExecInitNestLoop(NestLoop *node, EState *estate, Plan *parent);
 extern int	ExecCountSlotsNestLoop(NestLoop *node);
 extern void ExecEndNestLoop(NestLoop *node);
+extern void ExecReScanNestLoop(NestLoop *node, ExprContext *exprCtxt, Plan *parent);
 
 #endif							/* NODENESTLOOP_H */
diff --git a/src/include/executor/nodeResult.h b/src/include/executor/nodeResult.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodeResult.h,v 1.5 1997/11/26 01:12:58 momjian Exp $
+ * $Id: nodeResult.h,v 1.6 1998/02/13 03:43:39 vadim Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -21,5 +21,6 @@ extern TupleTableSlot *ExecResult(Result *node);
 extern bool ExecInitResult(Result *node, EState *estate, Plan *parent);
 extern int	ExecCountSlotsResult(Result *node);
 extern void ExecEndResult(Result *node);
+extern void ExecReScanResult(Result *node, ExprContext *exprCtxt, Plan *parent);
 
 #endif							/* NODERESULT_H */
diff --git a/src/include/executor/nodeSubplan.h b/src/include/executor/nodeSubplan.h
@@ -0,0 +1,20 @@
+/*-------------------------------------------------------------------------
+ *
+ * nodeSubplan.h--
+ *
+ *-------------------------------------------------------------------------
+ */
+#ifndef NODESUBPLAN_H
+#define NODESUBPLAN_H
+
+#include "executor/tuptable.h"
+#include "nodes/execnodes.h"
+#include "nodes/plannodes.h"
+
+extern Datum ExecSubPlan(SubPlan *node, List *pvar, ExprContext *econtext);
+extern bool ExecInitSubPlan(SubPlan *node, EState *estate, Plan *parent);
+extern void ExecReScanSetParamPlan (SubPlan *node, Plan *parent);
+extern void ExecSetParamPlan (SubPlan *node);
+extern void ExecEndSubPlan(SubPlan *node);
+
+#endif							/* NODESUBPLAN_H */
diff --git a/src/include/optimizer/clauses.h b/src/include/optimizer/clauses.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: clauses.h,v 1.8 1998/01/24 22:49:39 momjian Exp $
+ * $Id: clauses.h,v 1.9 1998/02/13 03:46:54 vadim Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -48,4 +48,8 @@ extern void get_rels_atts(Node *clause, int *relid1,
 			  AttrNumber *attno1, int *relid2, AttrNumber *attno2);
 extern void CommuteClause(Node *clause);
 
+#define	is_subplan(clause)	((Node*) clause != NULL && \
+						nodeTag((Node*) clause) == T_Expr && \
+						((Expr *) clause)->opType == SUBPLAN_EXPR)
+
 #endif							/* CLAUSES_H */
diff --git a/src/include/optimizer/planner.h b/src/include/optimizer/planner.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: planner.h,v 1.7 1997/11/26 01:13:49 momjian Exp $
+ * $Id: planner.h,v 1.8 1998/02/13 03:46:56 vadim Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -21,6 +21,7 @@
 #include "parser/parse_node.h"
 
 extern Plan *planner(Query *parse);
+extern Plan *union_planner(Query *parse);
 extern void pg_checkretval(Oid rettype, QueryTreeList *querytree_list);
 
 #endif							/* PLANNER_H */
diff --git a/src/include/optimizer/subselect.h b/src/include/optimizer/subselect.h
@@ -0,0 +1,20 @@
+/*-------------------------------------------------------------------------
+ *
+ * subselect.h--
+ *
+ *-------------------------------------------------------------------------
+ */
+#ifndef SUBSELECT_H
+#define SUBSELECT_H
+
+extern int		PlannerQueryLevel;		/* level of current query */
+extern List	   *PlannerVarParam;		/* correlation Vars to Param mapper */
+extern List	   *PlannerParamVar;		/* to get Var from Param->paramid */
+extern List	   *PlannerInitPlan;		/* init subplans for current query */
+extern int		PlannerPlanId;			/* to assigne unique ID to subquery plans */
+
+extern List	   *SS_finalize_plan (Plan *plan);
+extern Node	   *SS_replace_correlation_vars (Node *expr);
+extern Node	   *SS_process_sublinks (Node *expr);
+
+#endif							/* SUBSELECT_H */

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`*`
`7`	`7`	`* Copyright (c) 1994, Regents of the University of California`
`8`	`8`	`*`
`9`		`- * $Id: executor.h,v 1.19 1998/02/10 04:02:19 momjian Exp $`
	`9`	`+ * $Id: executor.h,v 1.20 1998/02/13 03:43:33 vadim Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -108,6 +108,7 @@ extern void ExecInitOuterTupleSlot(EState estate, HashJoinState hashstate);`
`108`	`108`
`109`	`109`	`extern TupleDesc ExecGetTupType(Plan *node);`
`110`	`110`	`extern TupleDesc ExecTypeFromTL(List *targetList);`
	`111`	`+extern void SetChangedParamList (Plan node, List newchg);`
`111`	`112`
`112`	`113`	`/*`
`113`	`114`	`* prototypes from functions in execTuples.c`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`*`
`7`	`7`	`* Copyright (c) 1994, Regents of the University of California`
`8`	`8`	`*`
`9`		`- * $Id: nodeAgg.h,v 1.6 1997/11/26 01:12:40 momjian Exp $`
	`9`	`+ * $Id: nodeAgg.h,v 1.7 1998/02/13 03:43:34 vadim Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -21,5 +21,6 @@ extern TupleTableSlot ExecAgg(Agg node);`
`21`	`21`	`extern bool ExecInitAgg(Agg node, EState estate, Plan *parent);`
`22`	`22`	`extern int ExecCountSlotsAgg(Agg *node);`
`23`	`23`	`extern void ExecEndAgg(Agg *node);`
	`24`	`+extern void ExecReScanAgg(Agg node, ExprContext exprCtxt, Plan *parent);`
`24`	`25`
`25`	`26`	`#endif /* NODEAGG_H */`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`*`
`7`	`7`	`* Copyright (c) 1994, Regents of the University of California`
`8`	`8`	`*`
`9`		`- * $Id: nodeHash.h,v 1.7 1998/01/24 22:49:01 momjian Exp $`
	`9`	`+ * $Id: nodeHash.h,v 1.8 1998/02/13 03:43:35 vadim Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -35,5 +35,6 @@ extern HeapTuple ExecScanHashBucket(HashJoinState *hjstate, HashBucket bucket,`
`35`	`35`	`HeapTuple curtuple, List *hjclauses,`
`36`	`36`	`ExprContext *econtext);`
`37`	`37`	`extern void ExecHashTableReset(HashJoinTable hashtable, int ntuples);`
	`38`	`+extern void ExecReScanHash(Hash node, ExprContext exprCtxt, Plan *parent);`
`38`	`39`
`39`	`40`	`#endif /* NODEHASH_H */`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`*`
`7`	`7`	`* Copyright (c) 1994, Regents of the University of California`
`8`	`8`	`*`
`9`		`- * $Id: nodeHashjoin.h,v 1.7 1998/01/24 22:49:04 momjian Exp $`
	`9`	`+ * $Id: nodeHashjoin.h,v 1.8 1998/02/13 03:43:36 vadim Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -23,6 +23,7 @@ extern int ExecCountSlotsHashJoin(HashJoin *node);`
`23`	`23`	`extern void ExecEndHashJoin(HashJoin *node);`
`24`	`24`	`extern char * ExecHashJoinSaveTuple(HeapTuple heapTuple, char *buffer,`
`25`	`25`	`File file, char *position);`
	`26`	`+extern void ExecReScanHashJoin(HashJoin node, ExprContext exprCtxt, Plan *parent);`
`26`	`27`
`27`	`28`
`28`	`29`	`#endif /* NODEHASHJOIN_H */`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`*`
`7`	`7`	`* Copyright (c) 1994, Regents of the University of California`
`8`	`8`	`*`
`9`		`- * $Id: nodeMaterial.h,v 1.5 1997/11/26 01:12:53 momjian Exp $`
	`9`	`+ * $Id: nodeMaterial.h,v 1.6 1998/02/13 03:43:37 vadim Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -21,7 +21,9 @@ extern TupleTableSlot ExecMaterial(Material node);`
`21`	`21`	`extern bool ExecInitMaterial(Material node, EState estate, Plan *parent);`
`22`	`22`	`extern int ExecCountSlotsMaterial(Material *node);`
`23`	`23`	`extern void ExecEndMaterial(Material *node);`
	`24`	`+extern void ExecMaterialReScan(Material node, ExprContext exprCtxt, Plan *parent);`
	`25`	`+#if 0`
`24`	`26`	`extern List ExecMaterialMarkPos(Material *node);`
`25`	`27`	`extern void ExecMaterialRestrPos(Material *node);`
`26`		`-`
	`28`	`+#endif`
`27`	`29`	`#endif /* NODEMATERIAL_H */`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`*`
`7`	`7`	`* Copyright (c) 1994, Regents of the University of California`
`8`	`8`	`*`
`9`		`- * $Id: nodeNestloop.h,v 1.5 1997/11/26 01:12:57 momjian Exp $`
	`9`	`+ * $Id: nodeNestloop.h,v 1.6 1998/02/13 03:43:38 vadim Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -21,5 +21,6 @@ extern TupleTableSlot ExecNestLoop(NestLoop node, Plan *parent);`
`21`	`21`	`extern bool ExecInitNestLoop(NestLoop node, EState estate, Plan *parent);`
`22`	`22`	`extern int ExecCountSlotsNestLoop(NestLoop *node);`
`23`	`23`	`extern void ExecEndNestLoop(NestLoop *node);`
	`24`	`+extern void ExecReScanNestLoop(NestLoop node, ExprContext exprCtxt, Plan *parent);`
`24`	`25`
`25`	`26`	`#endif /* NODENESTLOOP_H */`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`*`
`7`	`7`	`* Copyright (c) 1994, Regents of the University of California`
`8`	`8`	`*`
`9`		`- * $Id: nodeResult.h,v 1.5 1997/11/26 01:12:58 momjian Exp $`
	`9`	`+ * $Id: nodeResult.h,v 1.6 1998/02/13 03:43:39 vadim Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -21,5 +21,6 @@ extern TupleTableSlot ExecResult(Result node);`
`21`	`21`	`extern bool ExecInitResult(Result node, EState estate, Plan *parent);`
`22`	`22`	`extern int ExecCountSlotsResult(Result *node);`
`23`	`23`	`extern void ExecEndResult(Result *node);`
	`24`	`+extern void ExecReScanResult(Result node, ExprContext exprCtxt, Plan *parent);`
`24`	`25`
`25`	`26`	`#endif /* NODERESULT_H */`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`*`
`7`	`7`	`* Copyright (c) 1994, Regents of the University of California`
`8`	`8`	`*`
`9`		`- * $Id: clauses.h,v 1.8 1998/01/24 22:49:39 momjian Exp $`
	`9`	`+ * $Id: clauses.h,v 1.9 1998/02/13 03:46:54 vadim Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -48,4 +48,8 @@ extern void get_rels_atts(Node clause, int relid1,`
`48`	`48`	`AttrNumber attno1, int relid2, AttrNumber *attno2);`
`49`	`49`	`extern void CommuteClause(Node *clause);`
`50`	`50`
	`51`	`+#define is_subplan(clause) ((Node*) clause != NULL && \`
	`52`	`+ nodeTag((Node*) clause) == T_Expr && \`
	`53`	`+ ((Expr *) clause)->opType == SUBPLAN_EXPR)`
	`54`	`+`
`51`	`55`	`#endif /* CLAUSES_H */`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`*`
`7`	`7`	`* Copyright (c) 1994, Regents of the University of California`
`8`	`8`	`*`
`9`		`- * $Id: planner.h,v 1.7 1997/11/26 01:13:49 momjian Exp $`
	`9`	`+ * $Id: planner.h,v 1.8 1998/02/13 03:46:56 vadim Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -21,6 +21,7 @@`
`21`	`21`	`#include "parser/parse_node.h"`
`22`	`22`
`23`	`23`	`extern Plan planner(Query parse);`
	`24`	`+extern Plan union_planner(Query parse);`
`24`	`25`	`extern void pg_checkretval(Oid rettype, QueryTreeList *querytree_list);`
`25`	`26`
`26`	`27`	`#endif /* PLANNER_H */`