Patch for ReScan of Group.

bmomjian · bmomjian · commit 4f807be2ad68 · 1998-07-16T01:49:19.000Z
diff --git a/src/backend/executor/execAmi.c b/src/backend/executor/execAmi.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/execAmi.c,v 1.22 1998/07/15 22:16:17 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/execAmi.c,v 1.23 1998/07/16 01:49:18 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -42,9 +42,11 @@
 #include "executor/nodeHashjoin.h"
 #include "executor/nodeHash.h"
 #include "executor/nodeAgg.h"
+#include "executor/nodeGroup.h"
 #include "executor/nodeResult.h"
 #include "executor/nodeUnique.h"
 #include "executor/nodeMergejoin.h"
+#include "executor/nodeAppend.h"
 #include "executor/nodeSubplan.h"
 #include "executor/execdebug.h"
 #include "optimizer/internal.h" /* for _TEMP_RELATION_ID_ */
@@ -353,6 +355,10 @@ ExecReScan(Plan *node, ExprContext *exprCtxt, Plan *parent)
 			ExecReScanAgg((Agg *) node, exprCtxt, parent);
 			break;
 
+		case T_Group:
+			ExecReScanGroup((Group *) node, exprCtxt, parent);
+			break;
+
 		case T_Result:
 			ExecReScanResult((Result *) node, exprCtxt, parent);
 			break;
diff --git a/src/backend/executor/nodeGroup.c b/src/backend/executor/nodeGroup.c
@@ -13,7 +13,7 @@
  *	  columns. (ie. tuples from the same group are consecutive)
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeGroup.c,v 1.19 1998/06/15 19:28:21 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeGroup.c,v 1.20 1998/07/16 01:49:18 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -417,3 +417,12 @@ sameGroup(HeapTuple oldtuple,
 
 	return TRUE;
 }
+
+void
+ExecReScanGroup(Group *node, ExprContext *exprCtxt, Plan *parent)
+{
+	GroupState *grpstate = node->grpstate;
+
+	grpstate->grp_useFirstTuple = FALSE;
+	grpstate->grp_done = FALSE;
+}
diff --git a/src/include/executor/nodeGroup.h b/src/include/executor/nodeGroup.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodeGroup.h,v 1.5 1997/11/26 01:12:46 momjian Exp $
+ * $Id: nodeGroup.h,v 1.6 1998/07/16 01:49:19 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -21,5 +21,6 @@ extern TupleTableSlot *ExecGroup(Group *node);
 extern bool ExecInitGroup(Group *node, EState *estate, Plan *parent);
 extern int	ExecCountSlotsGroup(Group *node);
 extern void ExecEndGroup(Group *node);
+extern void ExecReScanGroup(Group *node, ExprContext *exprCtxt, Plan *parent);
 
 #endif							/* NODEGROUP_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: nodeGroup.h,v 1.5 1997/11/26 01:12:46 momjian Exp $`
	`9`	`+ * $Id: nodeGroup.h,v 1.6 1998/07/16 01:49:19 momjian Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -21,5 +21,6 @@ extern TupleTableSlot ExecGroup(Group node);`
`21`	`21`	`extern bool ExecInitGroup(Group node, EState estate, Plan *parent);`
`22`	`22`	`extern int ExecCountSlotsGroup(Group *node);`
`23`	`23`	`extern void ExecEndGroup(Group *node);`
	`24`	`+extern void ExecReScanGroup(Group node, ExprContext exprCtxt, Plan *parent);`
`24`	`25`
`25`	`26`	`#endif /* NODEGROUP_H */`