提交 e5e12f64 编写于 作者: M Marc G. Fournier

More cleanups by "Kurt J. Lidl" <lidl@va.pubnix.com>

上级 519496b6
......@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
* $Id: sdir.h,v 1.1.1.1 1996/07/09 06:21:09 scrappy Exp $
* $Id: sdir.h,v 1.2 1996/07/30 07:44:57 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
......@@ -27,7 +27,7 @@ typedef enum ScanDirection {
/*
* ScanDirectionIsValid --
* True iff scan direciton is valid.
* True iff scan direction is valid.
*/
#define ScanDirectionIsValid(direction) \
((bool) (BackwardScanDirection <= direction && \
......@@ -35,21 +35,21 @@ typedef enum ScanDirection {
/*
* ScanDirectionIsBackward --
* True iff scan direciton is backward.
* True iff scan direction is backward.
*/
#define ScanDirectionIsBackward(direction) \
((bool) (direction == BackwardScanDirection))
/*
* ScanDirectionIsNoMovement --
* True iff scan direciton indicates no movement.
* True iff scan direction indicates no movement.
*/
#define ScanDirectionIsNoMovement(direction) \
((bool) (direction == NoMovementScanDirection))
/*
* ScanDirectionIsForward --
* True iff scan direciton is forward.
* True iff scan direction is forward.
*/
#define ScanDirectionIsForward(direction) \
((bool) (direction == ForwardScanDirection))
......
......@@ -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;
......
......@@ -6,20 +6,13 @@
*
* 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 $
*
*-------------------------------------------------------------------------
*/
#ifndef EXECDEFS_H
#define EXECDEFS_H
/* ----------------
* executor scan direction definitions
* ----------------
*/
#define EXEC_FRWD 1 /* Scan forward */
#define EXEC_BKWD -1 /* Scan backward */
/* ----------------
* ExecutePlan() tuplecount definitions
* ----------------
......
......@@ -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
......
......@@ -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
......
......@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/storage/buffer/buf_table.c,v 1.1.1.1 1996/07/09 06:21:53 scrappy Exp $
* $Header: /cvsroot/pgsql/src/backend/storage/buffer/buf_table.c,v 1.2 1996/07/30 07:47:23 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
......@@ -34,8 +34,6 @@
static HTAB *SharedBufHash;
extern HTAB *ShmemInitHash();
typedef struct lookup {
BufferTag key;
Buffer id;
......
......@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.1.1.1 1996/07/09 06:21:56 scrappy Exp $
* $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.2 1996/07/30 07:47:33 scrappy Exp $
*
* NOTES
* Outside modules can create a lock table and acquire/release
......@@ -102,12 +102,6 @@ static MASK BITS_ON[MAX_LOCKTYPES];
*/
static bool LockingIsDisabled;
/* ------------------
* from storage/ipc/shmem.c
* ------------------
*/
extern HTAB *ShmemInitHash();
/* -------------------
* map from tableId to the lock table structure
* -------------------
......
......@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
* $Id: builtins.h,v 1.1.1.1 1996/07/09 06:22:01 scrappy Exp $
* $Id: builtins.h,v 1.2 1996/07/30 07:47:42 scrappy Exp $
*
* NOTES
* This should normally only be included by fmgr.h.
......@@ -228,7 +228,7 @@ extern POLYGON *rt_poly_inter();
in executor/executor.h*/
extern int32 pqtest();
extern int32 pqtest(struct varlena *vlena);
/* arrayfuncs.c */
#include "utils/array.h"
......
......@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/bin/psql/Attic/rlstubs.c,v 1.1.1.1 1996/07/09 06:22:15 scrappy Exp $
* $Header: /cvsroot/pgsql/src/bin/psql/Attic/rlstubs.c,v 1.2 1996/07/30 07:47:58 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
......@@ -18,7 +18,7 @@ readline(char *prompt)
{
static char buf[500];
printf("%s");
printf("%s", prompt);
return fgets(buf, 500, stdin);
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册