diff options
author | Bruce Momjian <bruce@momjian.us> | 1997-11-20 23:24:03 +0000 |
---|---|---|
committer | Bruce Momjian <bruce@momjian.us> | 1997-11-20 23:24:03 +0000 |
commit | e9e1ff226f285bc7b488e670be4b8220cdba4a53 (patch) | |
tree | 7dd89bef1e88e75736c97578e6ebc0f081e71622 /src/backend/executor | |
parent | e075271c178720199fe95ba6f3482bcb5ce12df7 (diff) | |
download | postgresql-e9e1ff226f285bc7b488e670be4b8220cdba4a53.tar.gz postgresql-e9e1ff226f285bc7b488e670be4b8220cdba4a53.zip |
Remove all time travel stuff. Small parser cleanup.
Diffstat (limited to 'src/backend/executor')
-rw-r--r-- | src/backend/executor/execAmi.c | 13 | ||||
-rw-r--r-- | src/backend/executor/execMain.c | 4 | ||||
-rw-r--r-- | src/backend/executor/execUtils.c | 4 | ||||
-rw-r--r-- | src/backend/executor/nodeIndexscan.c | 8 | ||||
-rw-r--r-- | src/backend/executor/nodeMaterial.c | 4 | ||||
-rw-r--r-- | src/backend/executor/nodeSeqscan.c | 5 | ||||
-rw-r--r-- | src/backend/executor/nodeTee.c | 6 |
7 files changed, 16 insertions, 28 deletions
diff --git a/src/backend/executor/execAmi.c b/src/backend/executor/execAmi.c index ad659f5995e..bffb0f26eb4 100644 --- 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.8 1997/09/08 21:42:52 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/execAmi.c,v 1.9 1997/11/20 23:21:22 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -45,7 +45,7 @@ static Pointer ExecBeginScan(Relation relation, int nkeys, ScanKey skeys, - bool isindex, ScanDirection dir, TimeQual time_range); + bool isindex, ScanDirection dir); static Relation ExecOpenR(Oid relationOid, bool isindex); /* ---------------------------------------------------------------- @@ -70,7 +70,6 @@ ExecOpenScanR(Oid relOid, ScanKey skeys, bool isindex, ScanDirection dir, - TimeQual timeRange, Relation *returnRelation, /* return */ Pointer *returnScanDesc) /* return */ { @@ -89,8 +88,7 @@ ExecOpenScanR(Oid relOid, nkeys, skeys, isindex, - dir, - timeRange); + dir); if (returnRelation != NULL) *returnRelation = relation; @@ -146,8 +144,7 @@ ExecBeginScan(Relation relation, int nkeys, ScanKey skeys, bool isindex, - ScanDirection dir, - TimeQual time_range) + ScanDirection dir) { Pointer scanDesc; @@ -172,7 +169,7 @@ ExecBeginScan(Relation relation, { scanDesc = (Pointer) heap_beginscan(relation, ScanDirectionIsBackward(dir), - time_range, + false, nkeys, skeys); } diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c index e088f236555..45ad2efba6e 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.30 1997/11/17 16:41:04 thomas Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.31 1997/11/20 23:21:24 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -1331,13 +1331,11 @@ ExecRelCheck(Relation rel, HeapTuple tuple) slot->ttc_buffer = InvalidBuffer; slot->ttc_whichplan = -1; rte->relname = nameout(&(rel->rd_rel->relname)); - rte->timeRange = NULL; rte->refname = rte->relname; rte->relid = rel->rd_id; rte->inh = false; rte->archive = false; rte->inFromCl = true; - rte->timeQual = NULL; rtlist = lcons(rte, NIL); econtext->ecxt_scantuple = slot; /* scan tuple slot */ econtext->ecxt_innertuple = NULL; /* inner tuple slot */ diff --git a/src/backend/executor/execUtils.c b/src/backend/executor/execUtils.c index 2282775c9a5..653c4ed48f5 100644 --- a/src/backend/executor/execUtils.c +++ b/src/backend/executor/execUtils.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/execUtils.c,v 1.20 1997/10/25 01:09:10 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/execUtils.c,v 1.21 1997/11/20 23:21:26 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -756,7 +756,7 @@ ExecOpenIndices(Oid resultRelationOid, */ indexSd = heap_beginscan(indexRd, /* scan desc */ false, /* scan backward flag */ - NowTimeQual, /* time qual */ + false, /* see self */ 1, /* number scan keys */ &key); /* scan keys */ diff --git a/src/backend/executor/nodeIndexscan.c b/src/backend/executor/nodeIndexscan.c index 2ad35f822ee..ad6920a09bf 100644 --- a/src/backend/executor/nodeIndexscan.c +++ b/src/backend/executor/nodeIndexscan.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/nodeIndexscan.c,v 1.10 1997/09/08 21:43:13 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/nodeIndexscan.c,v 1.11 1997/11/20 23:21:28 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -128,7 +128,7 @@ IndexNext(IndexScan *node) { iptr = &result->heap_iptr; tuple = heap_fetch(heapRelation, - NowTimeQual, + false, iptr, &buffer); /* be tidy */ @@ -480,7 +480,6 @@ ExecInitIndexScan(IndexScan *node, EState *estate, Plan *parent) RangeTblEntry *rtentry; Index relid; Oid reloid; - TimeQual timeQual; Relation currentRelation; HeapScanDesc currentScanDesc; @@ -911,14 +910,12 @@ ExecInitIndexScan(IndexScan *node, EState *estate, Plan *parent) relid = node->scan.scanrelid; rtentry = rt_fetch(relid, rangeTable); reloid = rtentry->relid; - timeQual = rtentry->timeQual; ExecOpenScanR(reloid, /* relation */ 0, /* nkeys */ (ScanKey) NULL, /* scan key */ 0, /* is index */ direction, /* scan direction */ - timeQual, /* time qual */ ¤tRelation, /* return: rel desc */ (Pointer *) ¤tScanDesc); /* return: scan desc */ @@ -957,7 +954,6 @@ ExecInitIndexScan(IndexScan *node, EState *estate, Plan *parent) scanKeys[i], /* scan key */ true, /* is index */ direction, /* scan direction */ - timeQual, /* time qual */ &(relationDescs[i]), /* return: rel desc */ (Pointer *) &(scanDescs[i])); /* return: scan desc */ diff --git a/src/backend/executor/nodeMaterial.c b/src/backend/executor/nodeMaterial.c index ecb7c0ee283..e863d25a738 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.9 1997/09/08 21:43:14 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/nodeMaterial.c,v 1.10 1997/11/20 23:21:32 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -140,7 +140,7 @@ ExecMaterial(Material *node) currentScanDesc = heap_beginscan(currentRelation, /* relation */ ScanDirectionIsBackward(dir), /* bkwd flag */ - NowTimeQual, /* time qual */ + false, /* seeself */ 0, /* num scan keys */ NULL); /* scan keys */ matstate->csstate.css_currentRelation = currentRelation; diff --git a/src/backend/executor/nodeSeqscan.c b/src/backend/executor/nodeSeqscan.c index 5bcde93479f..fd8485daa38 100644 --- a/src/backend/executor/nodeSeqscan.c +++ b/src/backend/executor/nodeSeqscan.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/nodeSeqscan.c,v 1.7 1997/09/08 21:43:17 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/nodeSeqscan.c,v 1.8 1997/11/20 23:21:34 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -158,7 +158,6 @@ InitScanRelation(SeqScan *node, EState *estate, List *rangeTable; RangeTblEntry *rtentry; Oid reloid; - TimeQual timeQual; ScanDirection direction; Relation currentRelation; HeapScanDesc currentScanDesc; @@ -179,7 +178,6 @@ InitScanRelation(SeqScan *node, EState *estate, rangeTable = estate->es_range_table; rtentry = rt_fetch(relid, rangeTable); reloid = rtentry->relid; - timeQual = rtentry->timeQual; direction = estate->es_direction; resultRelationInfo = estate->es_result_relation_info; @@ -188,7 +186,6 @@ InitScanRelation(SeqScan *node, EState *estate, NULL, /* scan key */ 0, /* is index */ direction,/* scan direction */ - timeQual, /* time qual */ ¤tRelation, /* return: rel desc */ (Pointer *) ¤tScanDesc); /* return: scan desc */ diff --git a/src/backend/executor/nodeTee.c b/src/backend/executor/nodeTee.c index d7c0c19d2ee..149885e9dc5 100644 --- a/src/backend/executor/nodeTee.c +++ b/src/backend/executor/nodeTee.c @@ -15,7 +15,7 @@ * ExecEndTee * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/Attic/nodeTee.c,v 1.9 1997/09/08 21:43:20 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/Attic/nodeTee.c,v 1.10 1997/11/20 23:21:35 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -252,7 +252,7 @@ initTeeScanDescs(Tee *node) { teeState->tee_leftScanDesc = heap_beginscan(bufferRel, ScanDirectionIsBackward(dir), - NowTimeQual, /* time qual */ + false, /* seeself */ 0, /* num scan keys */ NULL /* scan keys */ ); @@ -261,7 +261,7 @@ initTeeScanDescs(Tee *node) { teeState->tee_rightScanDesc = heap_beginscan(bufferRel, ScanDirectionIsBackward(dir), - NowTimeQual, /* time qual */ + false, /* seeself */ 0, /* num scan keys */ NULL /* scan keys */ ); |