ExecReScan for Unique & Sort nodes.
This commit is contained in:
Vadim B. Mikheev
parent
e4fd534645
commit
f0e7e2faa4
|
|
@ -7,7 +7,7 @@
|
|||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/backend/executor/execAmi.c,v 1.17 1998/02/13 03:26:36 vadim Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/executor/execAmi.c,v 1.18 1998/02/23 06:26:53 vadim Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
|
|
@ -43,6 +43,7 @@
|
|||
#include "executor/nodeHash.h"
|
||||
#include "executor/nodeAgg.h"
|
||||
#include "executor/nodeResult.h"
|
||||
#include "executor/nodeUnique.h"
|
||||
#include "executor/nodeSubplan.h"
|
||||
#include "executor/execdebug.h"
|
||||
#include "optimizer/internal.h" /* for _TEMP_RELATION_ID_ */
|
||||
|
|
@ -354,6 +355,14 @@ ExecReScan(Plan *node, ExprContext *exprCtxt, Plan *parent)
|
|||
ExecReScanResult((Result*) node, exprCtxt, parent);
|
||||
break;
|
||||
|
||||
case T_Unique:
|
||||
ExecReScanUnique((Unique*) node, exprCtxt, parent);
|
||||
break;
|
||||
|
||||
case T_Sort:
|
||||
ExecReScanSort((Sort*) node, exprCtxt, parent);
|
||||
break;
|
||||
|
||||
/*
|
||||
* Tee is never used
|
||||
case T_Tee:
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/backend/executor/nodeSort.c,v 1.12 1998/01/07 21:02:56 momjian Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/executor/nodeSort.c,v 1.13 1998/02/23 06:26:56 vadim Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
|
|
@ -183,8 +183,6 @@ ExecSort(Sort *node)
|
|||
else
|
||||
{
|
||||
slot = (TupleTableSlot *) sortstate->csstate.cstate.cs_ResultTupleSlot;
|
||||
/* *** get_cs_ResultTupleSlot((CommonState) sortstate); */
|
||||
/* slot = sortstate->csstate.css_ScanTupleSlot; orig */
|
||||
}
|
||||
|
||||
SO1_printf("ExecSort: %s\n",
|
||||
|
|
@ -390,3 +388,28 @@ ExecSortRestrPos(Sort *node)
|
|||
*/
|
||||
psort_restorepos(node);
|
||||
}
|
||||
|
||||
void
|
||||
ExecReScanSort(Sort *node, ExprContext *exprCtxt, Plan *parent)
|
||||
{
|
||||
SortState *sortstate = node->sortstate;
|
||||
|
||||
/*
|
||||
* If we haven't sorted yet, just return. If outerplan'
|
||||
* chgParam is not NULL then it will be re-scanned by
|
||||
* ExecProcNode, else - no reason to re-scan it at all.
|
||||
*/
|
||||
if (sortstate->sort_Flag == false)
|
||||
return;
|
||||
|
||||
ExecClearTuple(sortstate->csstate.cstate.cs_ResultTupleSlot);
|
||||
|
||||
psort_rescan (node);
|
||||
|
||||
/*
|
||||
* If subnode is to be rescanned then we aren't sorted
|
||||
*/
|
||||
if (((Plan*) node)->lefttree->chgParam != NULL)
|
||||
sortstate->sort_Flag = false;
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/backend/executor/nodeUnique.c,v 1.15 1998/02/18 12:40:44 vadim Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/executor/nodeUnique.c,v 1.16 1998/02/23 06:26:58 vadim Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
|
|
@ -355,3 +355,19 @@ ExecEndUnique(Unique *node)
|
|||
ExecEndNode(outerPlan((Plan *) node), (Plan *) node);
|
||||
ExecClearTuple(uniquestate->cs_ResultTupleSlot);
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
ExecReScanUnique(Unique *node, ExprContext *exprCtxt, Plan *parent)
|
||||
{
|
||||
UniqueState *uniquestate = node->uniquestate;
|
||||
|
||||
ExecClearTuple(uniquestate->cs_ResultTupleSlot);
|
||||
/*
|
||||
* if chgParam of subnode is not null then plan
|
||||
* will be re-scanned by first ExecProcNode.
|
||||
*/
|
||||
if (((Plan*) node)->lefttree->chgParam == NULL)
|
||||
ExecReScan (((Plan*) node)->lefttree, exprCtxt, (Plan *) node);
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/backend/utils/sort/Attic/psort.c,v 1.37 1998/02/11 19:13:47 momjian Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/utils/sort/Attic/psort.c,v 1.38 1998/02/23 06:27:39 vadim Exp $
|
||||
*
|
||||
* NOTES
|
||||
* Sorts the first relation into the second relation.
|
||||
|
|
@ -924,8 +924,6 @@ psort_end(Sort * node)
|
|||
|
||||
if (!node->cleaned)
|
||||
{
|
||||
Assert(node != (Sort *) NULL);
|
||||
|
||||
/*
|
||||
* I'm changing this because if we are sorting a relation with no
|
||||
* tuples, psortstate is NULL.
|
||||
|
|
@ -944,12 +942,35 @@ psort_end(Sort * node)
|
|||
(int) ceil((double) PS(node)->BytesWritten / BLCKSZ);
|
||||
|
||||
pfree((void *) node->psortstate);
|
||||
node->psortstate = NULL;
|
||||
|
||||
node->cleaned = TRUE;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
psort_rescan (Sort *node)
|
||||
{
|
||||
/*
|
||||
* If subnode is to be rescanned then free our previous results
|
||||
*/
|
||||
if (((Plan*) node)->lefttree->chgParam != NULL)
|
||||
{
|
||||
psort_end (node);
|
||||
node->cleaned = false;
|
||||
}
|
||||
else if (PS(node) != (Psortstate *) NULL)
|
||||
{
|
||||
PS(node)->all_fetched = false;
|
||||
PS(node)->psort_current = 0;
|
||||
PS(node)->psort_saved = 0;
|
||||
if (PS(node)->using_tape_files == true)
|
||||
rewind (PS(node)->psort_grab_file);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/*
|
||||
* gettape - handles access temporary files in polyphase merging
|
||||
*
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
*
|
||||
* Copyright (c) 1994, Regents of the University of California
|
||||
*
|
||||
* $Id: nodeSort.h,v 1.5 1997/11/26 01:13:04 momjian Exp $
|
||||
* $Id: nodeSort.h,v 1.6 1998/02/23 06:27:55 vadim Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
|
|
@ -23,5 +23,6 @@ extern int ExecCountSlotsSort(Sort *node);
|
|||
extern void ExecEndSort(Sort *node);
|
||||
extern void ExecSortMarkPos(Sort *node);
|
||||
extern void ExecSortRestrPos(Sort *node);
|
||||
extern void ExecReScanSort(Sort *node, ExprContext *exprCtxt, Plan *parent);
|
||||
|
||||
#endif /* NODESORT_H */
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
*
|
||||
* Copyright (c) 1994, Regents of the University of California
|
||||
*
|
||||
* $Id: nodeUnique.h,v 1.5 1997/11/26 01:13:06 momjian Exp $
|
||||
* $Id: nodeUnique.h,v 1.6 1998/02/23 06:27:56 vadim Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
|
|
@ -21,5 +21,6 @@ extern TupleTableSlot *ExecUnique(Unique *node);
|
|||
extern bool ExecInitUnique(Unique *node, EState *estate, Plan *parent);
|
||||
extern int ExecCountSlotsUnique(Unique *node);
|
||||
extern void ExecEndUnique(Unique *node);
|
||||
extern void ExecReScanUnique(Unique *node, ExprContext *exprCtxt, Plan *parent);
|
||||
|
||||
#endif /* NODEUNIQUE_H */
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
*
|
||||
* Copyright (c) 1994, Regents of the University of California
|
||||
*
|
||||
* $Id: psort.h,v 1.14 1997/10/15 06:36:36 vadim Exp $
|
||||
* $Id: psort.h,v 1.15 1998/02/23 06:28:16 vadim Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
|
|
@ -104,5 +104,6 @@ extern HeapTuple psort_grabtuple(Sort *node, bool *should_free);
|
|||
extern void psort_markpos(Sort *node);
|
||||
extern void psort_restorepos(Sort *node);
|
||||
extern void psort_end(Sort *node);
|
||||
extern void psort_rescan(Sort *node);
|
||||
|
||||
#endif /* PSORT_H */
|
||||
|
|
|
|||
Loading…
Reference in New Issue