Commit4f807be

committed

Patch for ReScan of Group.

1 parentc1f1a2e commit4f807beCopy full SHA for 4f807be

File tree

+19

-3

lines changed

+19

-3

lines changed

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/executor/execAmi.c,v 1.22 1998/07/15 22:16:17 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/executor/execAmi.c,v 1.23 1998/07/16 01:49:18 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -42,9 +42,11 @@`
`42`	`42`	`#include"executor/nodeHashjoin.h"`
`43`	`43`	`#include"executor/nodeHash.h"`
`44`	`44`	`#include"executor/nodeAgg.h"`
	`45`	`+#include"executor/nodeGroup.h"`
`45`	`46`	`#include"executor/nodeResult.h"`
`46`	`47`	`#include"executor/nodeUnique.h"`
`47`	`48`	`#include"executor/nodeMergejoin.h"`
	`49`	`+#include"executor/nodeAppend.h"`
`48`	`50`	`#include"executor/nodeSubplan.h"`
`49`	`51`	`#include"executor/execdebug.h"`
`50`	`52`	`#include"optimizer/internal.h"/* for _TEMP_RELATION_ID_ */`
`@@ -353,6 +355,10 @@ ExecReScan(Plan node, ExprContext exprCtxt, Plan *parent)`
`353`	`355`	`ExecReScanAgg((Agg*)node,exprCtxt,parent);`
`354`	`356`	`break;`
`355`	`357`
	`358`	`+caseT_Group:`
	`359`	`+ExecReScanGroup((Group*)node,exprCtxt,parent);`
	`360`	`+break;`
	`361`	`+`
`356`	`362`	`caseT_Result:`
`357`	`363`	`ExecReScanResult((Result*)node,exprCtxt,parent);`
`358`	`364`	`break;`

Lines changed: 10 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`* columns. (ie. tuples from the same group are consecutive)`
`14`	`14`	`*`
`15`	`15`	`* IDENTIFICATION`
`16`		`- * $Header: /cvsroot/pgsql/src/backend/executor/nodeGroup.c,v 1.19 1998/06/15 19:28:21 momjian Exp $`
	`16`	`+ * $Header: /cvsroot/pgsql/src/backend/executor/nodeGroup.c,v 1.20 1998/07/16 01:49:18 momjian Exp $`
`17`	`17`	`*`
`18`	`18`	`*-------------------------------------------------------------------------`
`19`	`19`	`*/`
`@@ -417,3 +417,12 @@ sameGroup(HeapTuple oldtuple,`
`417`	`417`
`418`	`418`	`return TRUE;`
`419`	`419`	`}`
	`420`	`+`
	`421`	`+void`
	`422`	`+ExecReScanGroup(Groupnode,ExprContextexprCtxt,Plan*parent)`
	`423`	`+{`
	`424`	`+GroupState*grpstate=node->grpstate;`
	`425`	`+`
	`426`	`+grpstate->grp_useFirstTuple= FALSE;`
	`427`	`+grpstate->grp_done= FALSE;`
	`428`	`+}`

Lines changed: 2 additions & 1 deletion

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`	`externboolExecInitGroup(Groupnode,EStateestate,Plan*parent);`
`22`	`22`	`externintExecCountSlotsGroup(Group*node);`
`23`	`23`	`externvoidExecEndGroup(Group*node);`
	`24`	`+externvoidExecReScanGroup(Groupnode,ExprContextexprCtxt,Plan*parent);`
`24`	`25`
`25`	`26`	`#endif/* NODEGROUP_H */`

Comments

(0)