diff options
Diffstat (limited to 'src/backend/executor')
| -rw-r--r-- | src/backend/executor/execMain.c | 14 | ||||
| -rw-r--r-- | src/backend/executor/execdefs.h | 9 | ||||
| -rw-r--r-- | src/backend/executor/nodeMaterial.c | 4 | ||||
| -rw-r--r-- | src/backend/executor/nodeSort.c | 4 |
4 files changed, 12 insertions, 19 deletions
diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c index 07aac34accb..e0885ec4ccc 100644 --- a/src/backend/executor/execMain.c +++ b/src/backend/executor/execMain.c @@ -26,7 +26,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.1.1.1 1996/07/09 06:21:25 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.2 1996/07/30 07:45:27 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -49,7 +49,7 @@ static TupleDesc InitPlan(CmdType operation, Query *parseTree, static void EndPlan(Plan *plan, EState *estate); static TupleTableSlot *ExecutePlan(EState *estate, Plan *plan, Query *parseTree, CmdType operation, - int numberTuples, int direction, + int numberTuples, ScanDirection direction, void (*printfunc)()); static void ExecRetrieve(TupleTableSlot *slot, void (*printfunc)(), Relation intoRelationDesc); @@ -153,7 +153,7 @@ ExecutorRun(QueryDesc *queryDesc, EState *estate, int feature, int count) parseTree, operation, ALL_TUPLES, - EXEC_FRWD, + ForwardScanDirection, destination); break; case EXEC_FOR: @@ -162,7 +162,7 @@ ExecutorRun(QueryDesc *queryDesc, EState *estate, int feature, int count) parseTree, operation, count, - EXEC_FRWD, + ForwardScanDirection, destination); break; @@ -176,7 +176,7 @@ ExecutorRun(QueryDesc *queryDesc, EState *estate, int feature, int count) parseTree, operation, count, - EXEC_BKWD, + BackwardScanDirection, destination); break; @@ -191,7 +191,7 @@ ExecutorRun(QueryDesc *queryDesc, EState *estate, int feature, int count) parseTree, operation, ONE_TUPLE, - EXEC_FRWD, + ForwardScanDirection, destination); break; default: @@ -600,7 +600,7 @@ ExecutePlan(EState *estate, Query *parseTree, CmdType operation, int numberTuples, - int direction, + ScanDirection direction, void (*printfunc)()) { Relation intoRelationDesc; diff --git a/src/backend/executor/execdefs.h b/src/backend/executor/execdefs.h index 5aec485c95c..b0101bdbe40 100644 --- a/src/backend/executor/execdefs.h +++ b/src/backend/executor/execdefs.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: execdefs.h,v 1.1.1.1 1996/07/09 06:21:25 scrappy Exp $ + * $Id: execdefs.h,v 1.2 1996/07/30 07:45:29 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -14,13 +14,6 @@ #define EXECDEFS_H /* ---------------- - * executor scan direction definitions - * ---------------- - */ -#define EXEC_FRWD 1 /* Scan forward */ -#define EXEC_BKWD -1 /* Scan backward */ - -/* ---------------- * ExecutePlan() tuplecount definitions * ---------------- */ diff --git a/src/backend/executor/nodeMaterial.c b/src/backend/executor/nodeMaterial.c index 88fc93d2d4e..2cd7c18ff18 100644 --- a/src/backend/executor/nodeMaterial.c +++ b/src/backend/executor/nodeMaterial.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/nodeMaterial.c,v 1.1.1.1 1996/07/09 06:21:26 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/nodeMaterial.c,v 1.2 1996/07/30 07:45:31 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -79,7 +79,7 @@ ExecMaterial(Material *node) * while creating the temporary relation. * ---------------- */ - estate->es_direction = EXEC_FRWD; + estate->es_direction = ForwardScanDirection; /* ---------------- * if we couldn't create the temp or current relations then diff --git a/src/backend/executor/nodeSort.c b/src/backend/executor/nodeSort.c index 9a7f4f9456f..798bd43a170 100644 --- a/src/backend/executor/nodeSort.c +++ b/src/backend/executor/nodeSort.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/nodeSort.c,v 1.1.1.1 1996/07/09 06:21:27 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/nodeSort.c,v 1.2 1996/07/30 07:45:35 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -138,7 +138,7 @@ ExecSort(Sort *node) * while creating the temporary relation. * ---------------- */ - estate->es_direction = EXEC_FRWD; + estate->es_direction = ForwardScanDirection; /* ---------------- * if we couldn't create the temp or current relations then |