rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Another pgindent run. Sorry folks.

This commit is contained in:
Bruce Momjian 1999-05-25 22:43:53 +00:00
parent 4eadfe8754
commit fcff1cdf4e
109 changed files with 1054 additions and 750 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
contrib/int8/int8.c
View File

@ -24,7 +24,8 @@
#endif #endif
#ifndef HAVE_64BIT_INTS #ifndef HAVE_64BIT_INTS
typedef char[8] int64; typedef char[8]
int64;
#elif defined(__alpha) #elif defined(__alpha)
typedef long int int64; typedef long int int64;
@ -43,38 +44,38 @@ typedef long int int64;
#endif #endif
int64 *int8in(char *str); int64 *int8in(char *str);
char *int8out(int64 * val); char *int8out(int64 *val);
bool int8eq(int64 * val1, int64 * val2); bool int8eq(int64 *val1, int64 *val2);
bool int8ne(int64 * val1, int64 * val2); bool int8ne(int64 *val1, int64 *val2);
bool int8lt(int64 * val1, int64 * val2); bool int8lt(int64 *val1, int64 *val2);
bool int8gt(int64 * val1, int64 * val2); bool int8gt(int64 *val1, int64 *val2);
bool int8le(int64 * val1, int64 * val2); bool int8le(int64 *val1, int64 *val2);
bool int8ge(int64 * val1, int64 * val2); bool int8ge(int64 *val1, int64 *val2);
bool int84eq(int64 * val1, int32 val2); bool int84eq(int64 *val1, int32 val2);
bool int84ne(int64 * val1, int32 val2); bool int84ne(int64 *val1, int32 val2);
bool int84lt(int64 * val1, int32 val2); bool int84lt(int64 *val1, int32 val2);
bool int84gt(int64 * val1, int32 val2); bool int84gt(int64 *val1, int32 val2);
bool int84le(int64 * val1, int32 val2); bool int84le(int64 *val1, int32 val2);
bool int84ge(int64 * val1, int32 val2); bool int84ge(int64 *val1, int32 val2);
int64 *int8um(int64 * val); int64 *int8um(int64 *val);
int64 *int8pl(int64 * val1, int64 * val2); int64 *int8pl(int64 *val1, int64 *val2);
int64 *int8mi(int64 * val1, int64 * val2); int64 *int8mi(int64 *val1, int64 *val2);
int64 *int8mul(int64 * val1, int64 * val2); int64 *int8mul(int64 *val1, int64 *val2);
int64 *int8div(int64 * val1, int64 * val2); int64 *int8div(int64 *val1, int64 *val2);
int64 *int48(int32 val); int64 *int48(int32 val);
int32 int84(int64 * val); int32 int84(int64 *val);
#if FALSE #if FALSE
int64 *int28 (int16 val); int64 *int28 (int16 val);
int16 int82(int64 * val); int16 int82(int64 *val);
#endif #endif
float64 i8tod(int64 * val); float64 i8tod(int64 *val);
int64 *dtoi8(float64 val); int64 *dtoi8(float64 val);
/*********************************************************************** /***********************************************************************
@ -113,7 +114,7 @@ int8in(char *str)
/* int8out() /* int8out()
*/ */
char * char *
int8out(int64 * val) int8out(int64 *val)
{ {
char *result; char *result;
@ -148,37 +149,37 @@ int8out(int64 * val)
* Is val1 relop val2? * Is val1 relop val2?
*/ */
bool bool
int8eq(int64 * val1, int64 * val2) int8eq(int64 *val1, int64 *val2)
{ {
return (*val1 == *val2); return (*val1 == *val2);
} /* int8eq() */ } /* int8eq() */
bool bool
int8ne(int64 * val1, int64 * val2) int8ne(int64 *val1, int64 *val2)
{ {
return (*val1 != *val2); return (*val1 != *val2);
} /* int8ne() */ } /* int8ne() */
bool bool
int8lt(int64 * val1, int64 * val2) int8lt(int64 *val1, int64 *val2)
{ {
return (*val1 < *val2); return (*val1 < *val2);
} /* int8lt() */ } /* int8lt() */
bool bool
int8gt(int64 * val1, int64 * val2) int8gt(int64 *val1, int64 *val2)
{ {
return (*val1 > *val2); return (*val1 > *val2);
} /* int8gt() */ } /* int8gt() */
bool bool
int8le(int64 * val1, int64 * val2) int8le(int64 *val1, int64 *val2)
{ {
return (*val1 <= *val2); return (*val1 <= *val2);
} /* int8le() */ } /* int8le() */
bool bool
int8ge(int64 * val1, int64 * val2) int8ge(int64 *val1, int64 *val2)
{ {
return (*val1 >= *val2); return (*val1 >= *val2);
} /* int8ge() */ } /* int8ge() */
@ -188,37 +189,37 @@ int8ge(int64 * val1, int64 * val2)
* Is 64-bit val1 relop 32-bit val2? * Is 64-bit val1 relop 32-bit val2?
*/ */
bool bool
int84eq(int64 * val1, int32 val2) int84eq(int64 *val1, int32 val2)
{ {
return (*val1 == val2); return (*val1 == val2);
} /* int84eq() */ } /* int84eq() */
bool bool
int84ne(int64 * val1, int32 val2) int84ne(int64 *val1, int32 val2)
{ {
return (*val1 != val2); return (*val1 != val2);
} /* int84ne() */ } /* int84ne() */
bool bool
int84lt(int64 * val1, int32 val2) int84lt(int64 *val1, int32 val2)
{ {
return (*val1 < val2); return (*val1 < val2);
} /* int84lt() */ } /* int84lt() */
bool bool
int84gt(int64 * val1, int32 val2) int84gt(int64 *val1, int32 val2)
{ {
return (*val1 > val2); return (*val1 > val2);
} /* int84gt() */ } /* int84gt() */
bool bool
int84le(int64 * val1, int32 val2) int84le(int64 *val1, int32 val2)
{ {
return (*val1 <= val2); return (*val1 <= val2);
} /* int84le() */ } /* int84le() */
bool bool
int84ge(int64 * val1, int32 val2) int84ge(int64 *val1, int32 val2)
{ {
return (*val1 >= val2); return (*val1 >= val2);
} /* int84ge() */ } /* int84ge() */
@ -229,7 +230,7 @@ int84ge(int64 * val1, int32 val2)
*---------------------------------------------------------*/ *---------------------------------------------------------*/
int64 * int64 *
int8um(int64 * val) int8um(int64 *val)
{ {
int64 *result = palloc(sizeof(int64)); int64 *result = palloc(sizeof(int64));
@ -242,7 +243,7 @@ int8um(int64 * val)
} /* int8um() */ } /* int8um() */
int64 * int64 *
int8pl(int64 * val1, int64 * val2) int8pl(int64 *val1, int64 *val2)
{ {
int64 *result = palloc(sizeof(int64)); int64 *result = palloc(sizeof(int64));
@ -255,7 +256,7 @@ int8pl(int64 * val1, int64 * val2)
} /* int8pl() */ } /* int8pl() */
int64 * int64 *
int8mi(int64 * val1, int64 * val2) int8mi(int64 *val1, int64 *val2)
{ {
int64 *result = palloc(sizeof(int64)); int64 *result = palloc(sizeof(int64));
@ -268,7 +269,7 @@ int8mi(int64 * val1, int64 * val2)
} /* int8mi() */ } /* int8mi() */
int64 * int64 *
int8mul(int64 * val1, int64 * val2) int8mul(int64 *val1, int64 *val2)
{ {
int64 *result = palloc(sizeof(int64)); int64 *result = palloc(sizeof(int64));
@ -281,7 +282,7 @@ int8mul(int64 * val1, int64 * val2)
} /* int8mul() */ } /* int8mul() */
int64 * int64 *
int8div(int64 * val1, int64 * val2) int8div(int64 *val1, int64 *val2)
{ {
int64 *result = palloc(sizeof(int64)); int64 *result = palloc(sizeof(int64));
@ -309,7 +310,7 @@ int48(int32 val)
} /* int48() */ } /* int48() */
int32 int32
int84(int64 * val) int84(int64 *val)
{ {
int32 result; int32 result;
@ -339,7 +340,7 @@ int28 (int16 val)
} /* int28() */ } /* int28() */
int16 int16
int82(int64 * val) int82(int64 *val)
{ {
int16 result; int16 result;
@ -354,7 +355,7 @@ int82(int64 * val)
#endif #endif
float64 float64
i8tod(int64 * val) i8tod(int64 *val)
{ {
float64 result = palloc(sizeof(float64data)); float64 result = palloc(sizeof(float64data));

2
contrib/os2client/config.h
View File

@ -11,7 +11,7 @@
* DEF_PGPORT is the TCP port number on which the Postmaster listens by * DEF_PGPORT is the TCP port number on which the Postmaster listens by
* default. This can be overriden by command options, environment variables, * default. This can be overriden by command options, environment variables,
* and the postconfig hook. (set by build script) * and the postconfig hook. (set by build script)
*/ */
#define DEF_PGPORT "5432" #define DEF_PGPORT "5432"

24
src/backend/access/common/printtup.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/access/common/printtup.c,v 1.46 1999/05/25 16:06:39 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/access/common/printtup.c,v 1.47 1999/05/25 22:40:47 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -25,9 +25,9 @@
#include "libpq/pqformat.h" #include "libpq/pqformat.h"
#include "utils/syscache.h" #include "utils/syscache.h"
static void printtup_setup(DestReceiver * self, TupleDesc typeinfo); static void printtup_setup(DestReceiver *self, TupleDesc typeinfo);
static void printtup(HeapTuple tuple, TupleDesc typeinfo, DestReceiver * self); static void printtup(HeapTuple tuple, TupleDesc typeinfo, DestReceiver *self);
static void printtup_cleanup(DestReceiver * self); static void printtup_cleanup(DestReceiver *self);
/* ---------------------------------------------------------------- /* ----------------------------------------------------------------
* printtup / debugtup support * printtup / debugtup support
@ -76,7 +76,7 @@ typedef struct
Oid typoutput; /* Oid for the attribute's type output fn */ Oid typoutput; /* Oid for the attribute's type output fn */
Oid typelem; /* typelem value to pass to the output fn */ Oid typelem; /* typelem value to pass to the output fn */
FmgrInfo finfo; /* Precomputed call info for typoutput */ FmgrInfo finfo; /* Precomputed call info for typoutput */
} PrinttupAttrInfo; } PrinttupAttrInfo;
typedef struct typedef struct
{ {
@ -84,7 +84,7 @@ typedef struct
TupleDesc attrinfo; /* The attr info we are set up for */ TupleDesc attrinfo; /* The attr info we are set up for */
int nattrs; int nattrs;
PrinttupAttrInfo *myinfo; /* Cached info about each attr */ PrinttupAttrInfo *myinfo; /* Cached info about each attr */
} DR_printtup; } DR_printtup;
/* ---------------- /* ----------------
* Initialize: create a DestReceiver for printtup * Initialize: create a DestReceiver for printtup
@ -107,7 +107,7 @@ printtup_create_DR()
} }
static void static void
printtup_setup(DestReceiver * self, TupleDesc typeinfo) printtup_setup(DestReceiver *self, TupleDesc typeinfo)
{ {
/* ---------------- /* ----------------
* We could set up the derived attr info at this time, but we postpone it * We could set up the derived attr info at this time, but we postpone it
@ -123,7 +123,7 @@ printtup_setup(DestReceiver * self, TupleDesc typeinfo)
} }
static void static void
printtup_prepare_info(DR_printtup * myState, TupleDesc typeinfo, int numAttrs) printtup_prepare_info(DR_printtup *myState, TupleDesc typeinfo, int numAttrs)
{ {
int i; int i;
@ -151,7 +151,7 @@ printtup_prepare_info(DR_printtup * myState, TupleDesc typeinfo, int numAttrs)
* ---------------- * ----------------
*/ */
static void static void
printtup(HeapTuple tuple, TupleDesc typeinfo, DestReceiver * self) printtup(HeapTuple tuple, TupleDesc typeinfo, DestReceiver *self)
{ {
DR_printtup *myState = (DR_printtup *) self; DR_printtup *myState = (DR_printtup *) self;
StringInfoData buf; StringInfoData buf;
@ -228,7 +228,7 @@ printtup(HeapTuple tuple, TupleDesc typeinfo, DestReceiver * self)
* ---------------- * ----------------
*/ */
static void static void
printtup_cleanup(DestReceiver * self) printtup_cleanup(DestReceiver *self)
{ {
DR_printtup *myState = (DR_printtup *) self; DR_printtup *myState = (DR_printtup *) self;
@ -280,7 +280,7 @@ showatts(char *name, TupleDesc tupleDesc)
* ---------------- * ----------------
*/ */
void void
debugtup(HeapTuple tuple, TupleDesc typeinfo, DestReceiver * self) debugtup(HeapTuple tuple, TupleDesc typeinfo, DestReceiver *self)
{ {
int i; int i;
Datum attr; Datum attr;
@ -316,7 +316,7 @@ debugtup(HeapTuple tuple, TupleDesc typeinfo, DestReceiver * self)
* ---------------- * ----------------
*/ */
void void
printtup_internal(HeapTuple tuple, TupleDesc typeinfo, DestReceiver * self) printtup_internal(HeapTuple tuple, TupleDesc typeinfo, DestReceiver *self)
{ {
StringInfoData buf; StringInfoData buf;
int i, int i,

4
src/backend/access/common/tupdesc.c
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.49 1999/05/25 16:06:42 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.50 1999/05/25 22:40:48 momjian Exp $
* *
* NOTES * NOTES
* some of the executor utility code such as "ExecTypeFromTL" should be * some of the executor utility code such as "ExecTypeFromTL" should be
@ -75,7 +75,7 @@ CreateTemplateTupleDesc(int natts)
* ---------------------------------------------------------------- * ----------------------------------------------------------------
*/ */
TupleDesc TupleDesc
CreateTupleDesc(int natts, Form_pg_attribute * attrs) CreateTupleDesc(int natts, Form_pg_attribute *attrs)
{ {
TupleDesc desc; TupleDesc desc;

4
src/backend/access/hash/hashfunc.c
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/access/hash/hashfunc.c,v 1.17 1999/05/25 16:06:56 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/access/hash/hashfunc.c,v 1.18 1999/05/25 22:40:49 momjian Exp $
* *
* NOTES * NOTES
* These functions are stored in pg_amproc. For each operator class * These functions are stored in pg_amproc. For each operator class
@ -34,7 +34,7 @@ hashint4(uint32 key)
} }
uint32 uint32
hashint8(int64 * key) hashint8(int64 *key)
{ {
return ~((uint32) *key); return ~((uint32) *key);
} }

4
src/backend/access/nbtree/nbtcompare.c
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtcompare.c,v 1.23 1999/05/25 16:07:21 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtcompare.c,v 1.24 1999/05/25 22:40:50 momjian Exp $
* *
* NOTES * NOTES
* These functions are stored in pg_amproc. For each operator class * These functions are stored in pg_amproc. For each operator class
@ -40,7 +40,7 @@ btint4cmp(int32 a, int32 b)
} }
int32 int32
btint8cmp(int64 * a, int64 * b) btint8cmp(int64 *a, int64 *b)
{ {
if (*a > *b) if (*a > *b)
return 1; return 1;

26
src/backend/commands/_deadcode/recipe.c
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/commands/_deadcode/Attic/recipe.c,v 1.3 1999/05/25 16:08:30 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/commands/_deadcode/Attic/recipe.c,v 1.4 1999/05/25 22:40:56 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -61,11 +61,11 @@ typedef struct _teeInfo
TeePlanInfo *val; TeePlanInfo *val;
} TeeInfo; } TeeInfo;
QueryTreeList *appendQlist(QueryTreeList *q1, QueryTreeList *q2); QueryTreeList *appendQlist(QueryTreeList * q1, QueryTreeList * q2);
void OffsetVarAttno(Node *node, int varno, int offset); void OffsetVarAttno(Node *node, int varno, int offset);
static void appendTeeQuery(TeeInfo * teeInfo, static void appendTeeQuery(TeeInfo * teeInfo,
QueryTreeList *q, QueryTreeList * q,
char *teeNodeName); char *teeNodeName);
static Plan *replaceTeeScans(Plan *plan, static Plan *replaceTeeScans(Plan *plan,
@ -77,21 +77,21 @@ static void replaceSeqScan(Plan *plan,
Plan *tplan); Plan *tplan);
static void tg_rewriteQuery(TgRecipe * r, TgNode * n, static void tg_rewriteQuery(TgRecipe * r, TgNode * n,
QueryTreeList *q, QueryTreeList * q,
QueryTreeList *inputQlist); QueryTreeList * inputQlist);
static Node *tg_replaceNumberedParam(Node *expression, static Node *tg_replaceNumberedParam(Node *expression,
int pnum, int pnum,
int rt_ind, int rt_ind,
char *teeRelName); char *teeRelName);
static Node *tg_rewriteParamsInExpr(Node *expression, static Node *tg_rewriteParamsInExpr(Node *expression,
QueryTreeList *inputQlist); QueryTreeList * inputQlist);
static QueryTreeList *tg_parseSubQuery(TgRecipe * r, static QueryTreeList *tg_parseSubQuery(TgRecipe * r,
TgNode * n, TgNode * n,
TeeInfo * teeInfo); TeeInfo * teeInfo);
static QueryTreeList *tg_parseTeeNode(TgRecipe * r, static QueryTreeList *tg_parseTeeNode(TgRecipe * r,
TgNode * n, TgNode * n,
int i, int i,
QueryTreeList *qList, QueryTreeList * qList,
TeeInfo * teeInfo); TeeInfo * teeInfo);
@ -309,8 +309,8 @@ beginRecipe(RecipeStmt *stmt)
static void static void
tg_rewriteQuery(TgRecipe * r, tg_rewriteQuery(TgRecipe * r,
TgNode * n, TgNode * n,
QueryTreeList *q, QueryTreeList * q,
QueryTreeList *inputQlist) QueryTreeList * inputQlist)
{ {
Query *orig; Query *orig;
Query *inputQ; Query *inputQ;
@ -563,7 +563,7 @@ tg_replaceNumberedParam(Node *expression,
*/ */
static Node * static Node *
tg_rewriteParamsInExpr(Node *expression, QueryTreeList *inputQlist) tg_rewriteParamsInExpr(Node *expression, QueryTreeList * inputQlist)
{ {
List *tl; List *tl;
TargetEntry *param_tle, TargetEntry *param_tle,
@ -737,7 +737,7 @@ static QueryTreeList *
tg_parseTeeNode(TgRecipe * r, tg_parseTeeNode(TgRecipe * r,
TgNode * n, /* the tee node */ TgNode * n, /* the tee node */
int i, /* which input this node is to its parent */ int i, /* which input this node is to its parent */
QueryTreeList *qList, QueryTreeList * qList,
TeeInfo * teeInfo) TeeInfo * teeInfo)
{ {
@ -1122,7 +1122,7 @@ OffsetVarAttno(Node *node, int varno, int offset)
*/ */
QueryTreeList * QueryTreeList *
appendQlist(QueryTreeList *q1, QueryTreeList *q2) appendQlist(QueryTreeList * q1, QueryTreeList * q2)
{ {
QueryTreeList *newq; QueryTreeList *newq;
int i, int i,
@ -1152,7 +1152,7 @@ appendQlist(QueryTreeList *q1, QueryTreeList *q2)
* modify the query field of the teeInfo list of the particular tee node * modify the query field of the teeInfo list of the particular tee node
*/ */
static void static void
appendTeeQuery(TeeInfo * teeInfo, QueryTreeList *q, char *teeNodeName) appendTeeQuery(TeeInfo * teeInfo, QueryTreeList * q, char *teeNodeName)
{ {
int i; int i;

4
src/backend/commands/command.c
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/commands/Attic/command.c,v 1.45 1999/05/25 16:08:17 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/commands/Attic/command.c,v 1.46 1999/05/25 22:40:54 momjian Exp $
* *
* NOTES * NOTES
* The PortalExecutorHeapMemory crap needs to be eliminated * The PortalExecutorHeapMemory crap needs to be eliminated
@ -519,7 +519,7 @@ PerformAddAttribute(char *relationName,
} }
void void
LockTableCommand(LockStmt * lockstmt) LockTableCommand(LockStmt *lockstmt)
{ {
Relation rel; Relation rel;
int aclresult; int aclresult;

12
src/backend/executor/_deadcode/nodeTee.c
View File

@ -14,7 +14,7 @@
* ExecInitTee * ExecInitTee
* ExecEndTee * ExecEndTee
* *
* $Id: nodeTee.c,v 1.2 1999/05/25 16:08:50 momjian Exp $ * $Id: nodeTee.c,v 1.3 1999/05/25 22:41:04 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -44,7 +44,7 @@
* ------------------------------------------------------------------ * ------------------------------------------------------------------
*/ */
bool bool
ExecInitTee(Tee *node, EState *currentEstate, Plan *parent) ExecInitTee(Tee * node, EState *currentEstate, Plan *parent)
{ {
TeeState *teeState; TeeState *teeState;
Plan *outerPlan; Plan *outerPlan;
@ -207,7 +207,7 @@ ExecInitTee(Tee *node, EState *currentEstate, Plan *parent)
} }
int int
ExecCountSlotsTee(Tee *node) ExecCountSlotsTee(Tee * node)
{ {
/* Tee nodes can't have innerPlans */ /* Tee nodes can't have innerPlans */
return ExecCountSlotsNode(outerPlan(node)) + TEE_NSLOTS; return ExecCountSlotsNode(outerPlan(node)) + TEE_NSLOTS;
@ -223,7 +223,7 @@ ExecCountSlotsTee(Tee *node)
* ---------------------------------------------------------------- * ----------------------------------------------------------------
*/ */
static void static void
initTeeScanDescs(Tee *node) initTeeScanDescs(Tee * node)
{ {
TeeState *teeState; TeeState *teeState;
Relation bufferRel; Relation bufferRel;
@ -285,7 +285,7 @@ initTeeScanDescs(Tee *node)
*/ */
TupleTableSlot * TupleTableSlot *
ExecTee(Tee *node, Plan *parent) ExecTee(Tee * node, Plan *parent)
{ {
EState *estate; EState *estate;
TeeState *teeState; TeeState *teeState;
@ -437,7 +437,7 @@ ExecTee(Tee *node, Plan *parent)
*/ */
void void
ExecEndTee(Tee *node, Plan *parent) ExecEndTee(Tee * node, Plan *parent)
{ {
EState *estate; EState *estate;
TeeState *teeState; TeeState *teeState;

14
src/backend/executor/execMain.c
View File

@ -26,7 +26,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.84 1999/05/25 16:08:36 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.85 1999/05/25 22:40:57 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -71,9 +71,9 @@ static TupleTableSlot *ExecutePlan(EState *estate, Plan *plan,
int offsetTuples, int offsetTuples,
int numberTuples, int numberTuples,
ScanDirection direction, ScanDirection direction,
DestReceiver * destfunc); DestReceiver *destfunc);
static void ExecRetrieve(TupleTableSlot *slot, static void ExecRetrieve(TupleTableSlot *slot,
DestReceiver * destfunc, DestReceiver *destfunc,
EState *estate); EState *estate);
static void ExecAppend(TupleTableSlot *slot, ItemPointer tupleid, static void ExecAppend(TupleTableSlot *slot, ItemPointer tupleid,
EState *estate); EState *estate);
@ -548,7 +548,7 @@ typedef struct execRowMark
Relation relation; Relation relation;
Index rti; Index rti;
char resname[32]; char resname[32];
} execRowMark; } execRowMark;
typedef struct evalPlanQual typedef struct evalPlanQual
{ {
@ -556,7 +556,7 @@ typedef struct evalPlanQual
Index rti; Index rti;
EState estate; EState estate;
struct evalPlanQual *free; struct evalPlanQual *free;
} evalPlanQual; } evalPlanQual;
/* ---------------------------------------------------------------- /* ----------------------------------------------------------------
* InitPlan * InitPlan
@ -884,7 +884,7 @@ ExecutePlan(EState *estate,
int offsetTuples, int offsetTuples,
int numberTuples, int numberTuples,
ScanDirection direction, ScanDirection direction,
DestReceiver * destfunc) DestReceiver *destfunc)
{ {
JunkFilter *junkfilter; JunkFilter *junkfilter;
TupleTableSlot *slot; TupleTableSlot *slot;
@ -1124,7 +1124,7 @@ lnext: ;
*/ */
static void static void
ExecRetrieve(TupleTableSlot *slot, ExecRetrieve(TupleTableSlot *slot,
DestReceiver * destfunc, DestReceiver *destfunc,
EState *estate) EState *estate)
{ {
HeapTuple tuple; HeapTuple tuple;

8
src/backend/executor/execQual.c
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/executor/execQual.c,v 1.51 1999/05/25 16:08:37 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/executor/execQual.c,v 1.52 1999/05/25 22:40:59 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -66,7 +66,7 @@ bool execConstByVal;
int execConstLen; int execConstLen;
/* static functions decls */ /* static functions decls */
static Datum ExecEvalAggref(Aggref * aggref, ExprContext *econtext, bool *isNull); static Datum ExecEvalAggref(Aggref *aggref, ExprContext *econtext, bool *isNull);
static Datum ExecEvalArrayRef(ArrayRef *arrayRef, ExprContext *econtext, static Datum ExecEvalArrayRef(ArrayRef *arrayRef, ExprContext *econtext,
bool *isNull, bool *isDone); bool *isNull, bool *isDone);
static Datum ExecEvalAnd(Expr *andExpr, ExprContext *econtext, bool *isNull); static Datum ExecEvalAnd(Expr *andExpr, ExprContext *econtext, bool *isNull);
@ -190,7 +190,7 @@ ExecEvalArrayRef(ArrayRef *arrayRef,
* ---------------------------------------------------------------- * ----------------------------------------------------------------
*/ */
static Datum static Datum
ExecEvalAggref(Aggref * aggref, ExprContext *econtext, bool *isNull) ExecEvalAggref(Aggref *aggref, ExprContext *econtext, bool *isNull)
{ {
*isNull = econtext->ecxt_nulls[aggref->aggno]; *isNull = econtext->ecxt_nulls[aggref->aggno];
return econtext->ecxt_values[aggref->aggno]; return econtext->ecxt_values[aggref->aggno];
@ -1097,7 +1097,7 @@ ExecEvalAnd(Expr *andExpr, ExprContext *econtext, bool *isNull)
* ---------------------------------------------------------------- * ----------------------------------------------------------------
*/ */
static Datum static Datum
ExecEvalCase(CaseExpr * caseExpr, ExprContext *econtext, bool *isNull) ExecEvalCase(CaseExpr *caseExpr, ExprContext *econtext, bool *isNull)
{ {
List *clauses; List *clauses;
List *clause; List *clause;

4
src/backend/executor/nodeAgg.c
View File

@ -45,7 +45,7 @@ typedef struct AggFuncInfo
FmgrInfo finalfn; FmgrInfo finalfn;
} AggFuncInfo; } AggFuncInfo;
static Datum aggGetAttr(TupleTableSlot *tuple, Aggref * aggref, bool *isNull); static Datum aggGetAttr(TupleTableSlot *tuple, Aggref *aggref, bool *isNull);
/* --------------------------------------- /* ---------------------------------------
@ -582,7 +582,7 @@ ExecEndAgg(Agg *node)
*/ */
static Datum static Datum
aggGetAttr(TupleTableSlot *slot, aggGetAttr(TupleTableSlot *slot,
Aggref * aggref, Aggref *aggref,
bool *isNull) bool *isNull)
{ {
Datum result; Datum result;

8
src/backend/executor/nodeHashjoin.c
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/executor/nodeHashjoin.c,v 1.21 1999/05/25 16:08:42 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/executor/nodeHashjoin.c,v 1.22 1999/05/25 22:41:01 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -25,7 +25,7 @@
static TupleTableSlot *ExecHashJoinOuterGetTuple(Plan *node, Plan *parent, static TupleTableSlot *ExecHashJoinOuterGetTuple(Plan *node, Plan *parent,
HashJoinState *hjstate); HashJoinState *hjstate);
static TupleTableSlot *ExecHashJoinGetSavedTuple(HashJoinState *hjstate, static TupleTableSlot *ExecHashJoinGetSavedTuple(HashJoinState *hjstate,
BufFile * file, BufFile *file,
TupleTableSlot *tupleSlot); TupleTableSlot *tupleSlot);
static int ExecHashJoinGetBatch(int bucketno, HashJoinTable hashtable); static int ExecHashJoinGetBatch(int bucketno, HashJoinTable hashtable);
static int ExecHashJoinNewBatch(HashJoinState *hjstate); static int ExecHashJoinNewBatch(HashJoinState *hjstate);
@ -478,7 +478,7 @@ ExecHashJoinOuterGetTuple(Plan *node, Plan *parent, HashJoinState *hjstate)
static TupleTableSlot * static TupleTableSlot *
ExecHashJoinGetSavedTuple(HashJoinState *hjstate, ExecHashJoinGetSavedTuple(HashJoinState *hjstate,
BufFile * file, BufFile *file,
TupleTableSlot *tupleSlot) TupleTableSlot *tupleSlot)
{ {
HeapTupleData htup; HeapTupleData htup;
@ -625,7 +625,7 @@ ExecHashJoinGetBatch(int bucketno, HashJoinTable hashtable)
void void
ExecHashJoinSaveTuple(HeapTuple heapTuple, ExecHashJoinSaveTuple(HeapTuple heapTuple,
BufFile * file) BufFile *file)
{ {
size_t written; size_t written;

4
src/backend/executor/spi.c
View File

@ -3,7 +3,7 @@
* spi.c * spi.c
* Server Programming Interface * Server Programming Interface
* *
* $Id: spi.c,v 1.38 1999/05/25 16:08:48 momjian Exp $ * $Id: spi.c,v 1.39 1999/05/25 22:41:02 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -555,7 +555,7 @@ SPI_pfree(void *pointer)
* *
*/ */
void void
spi_printtup(HeapTuple tuple, TupleDesc tupdesc, DestReceiver * self) spi_printtup(HeapTuple tuple, TupleDesc tupdesc, DestReceiver *self)
{ {
SPITupleTable *tuptable; SPITupleTable *tuptable;
MemoryContext oldcxt; MemoryContext oldcxt;

4
src/backend/libpq/be-dumpdata.c
View File

@ -6,7 +6,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: be-dumpdata.c,v 1.24 1999/05/25 16:08:57 momjian Exp $ * $Id: be-dumpdata.c,v 1.25 1999/05/25 22:41:06 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -208,7 +208,7 @@ be_typeinit(PortalEntry *entry,
* ---------------- * ----------------
*/ */
void void
be_printtup(HeapTuple tuple, TupleDesc typeinfo, DestReceiver * self) be_printtup(HeapTuple tuple, TupleDesc typeinfo, DestReceiver *self)
{ {
int i; int i;
Datum attr; Datum attr;

28
src/backend/nodes/copyfuncs.c
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.81 1999/05/25 16:09:04 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.82 1999/05/25 22:41:11 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -371,7 +371,7 @@ _copyHashJoin(HashJoin *from)
* ---------------- * ----------------
*/ */
static void static void
CopyNonameFields(Noname * from, Noname * newnode) CopyNonameFields(Noname *from, Noname *newnode)
{ {
newnode->nonameid = from->nonameid; newnode->nonameid = from->nonameid;
newnode->keycount = from->keycount; newnode->keycount = from->keycount;
@ -384,7 +384,7 @@ CopyNonameFields(Noname * from, Noname * newnode)
* ---------------- * ----------------
*/ */
static Noname * static Noname *
_copyNoname(Noname * from) _copyNoname(Noname *from)
{ {
Noname *newnode = makeNode(Noname); Noname *newnode = makeNode(Noname);
@ -862,7 +862,7 @@ _copyFunc(Func *from)
* ---------------- * ----------------
*/ */
static Aggref * static Aggref *
_copyAggref(Aggref * from) _copyAggref(Aggref *from)
{ {
Aggref *newnode = makeNode(Aggref); Aggref *newnode = makeNode(Aggref);
@ -907,7 +907,7 @@ _copySubLink(SubLink *from)
* ---------------- * ----------------
*/ */
static CaseExpr * static CaseExpr *
_copyCaseExpr(CaseExpr * from) _copyCaseExpr(CaseExpr *from)
{ {
CaseExpr *newnode = makeNode(CaseExpr); CaseExpr *newnode = makeNode(CaseExpr);
@ -929,7 +929,7 @@ _copyCaseExpr(CaseExpr * from)
* ---------------- * ----------------
*/ */
static CaseWhen * static CaseWhen *
_copyCaseWhen(CaseWhen * from) _copyCaseWhen(CaseWhen *from)
{ {
CaseWhen *newnode = makeNode(CaseWhen); CaseWhen *newnode = makeNode(CaseWhen);
@ -1000,7 +1000,7 @@ _copyArrayRef(ArrayRef *from)
* -- JMH, 8/2/93 * -- JMH, 8/2/93
*/ */
static RelOptInfo * static RelOptInfo *
_copyRelOptInfo(RelOptInfo * from) _copyRelOptInfo(RelOptInfo *from)
{ {
RelOptInfo *newnode = makeNode(RelOptInfo); RelOptInfo *newnode = makeNode(RelOptInfo);
int i, int i,
@ -1173,7 +1173,7 @@ _copyIndexPath(IndexPath *from)
* ---------------- * ----------------
*/ */
static void static void
CopyNestPathFields(NestPath * from, NestPath * newnode) CopyNestPathFields(NestPath *from, NestPath *newnode)
{ {
Node_Copy(from, newnode, pathinfo); Node_Copy(from, newnode, pathinfo);
Node_Copy(from, newnode, outerjoinpath); Node_Copy(from, newnode, outerjoinpath);
@ -1185,7 +1185,7 @@ CopyNestPathFields(NestPath * from, NestPath * newnode)
* ---------------- * ----------------
*/ */
static NestPath * static NestPath *
_copyNestPath(NestPath * from) _copyNestPath(NestPath *from)
{ {
NestPath *newnode = makeNode(NestPath); NestPath *newnode = makeNode(NestPath);
@ -1319,7 +1319,7 @@ _copyMergeOrder(MergeOrder *from)
* ---------------- * ----------------
*/ */
static RestrictInfo * static RestrictInfo *
_copyRestrictInfo(RestrictInfo * from) _copyRestrictInfo(RestrictInfo *from)
{ {
RestrictInfo *newnode = makeNode(RestrictInfo); RestrictInfo *newnode = makeNode(RestrictInfo);
@ -1374,7 +1374,7 @@ _copyJoinMethod(JoinMethod *from)
* ---------------- * ----------------
*/ */
static HashInfo * static HashInfo *
_copyHashInfo(HashInfo * from) _copyHashInfo(HashInfo *from)
{ {
HashInfo *newnode = makeNode(HashInfo); HashInfo *newnode = makeNode(HashInfo);
@ -1393,7 +1393,7 @@ _copyHashInfo(HashInfo * from)
* ---------------- * ----------------
*/ */
static MergeInfo * static MergeInfo *
_copyMergeInfo(MergeInfo * from) _copyMergeInfo(MergeInfo *from)
{ {
MergeInfo *newnode = makeNode(MergeInfo); MergeInfo *newnode = makeNode(MergeInfo);
@ -1412,7 +1412,7 @@ _copyMergeInfo(MergeInfo * from)
* ---------------- * ----------------
*/ */
static JoinInfo * static JoinInfo *
_copyJoinInfo(JoinInfo * from) _copyJoinInfo(JoinInfo *from)
{ {
JoinInfo *newnode = makeNode(JoinInfo); JoinInfo *newnode = makeNode(JoinInfo);
@ -1496,7 +1496,7 @@ _copyRangeTblEntry(RangeTblEntry *from)
} }
static RowMark * static RowMark *
_copyRowMark(RowMark * from) _copyRowMark(RowMark *from)
{ {
RowMark *newnode = makeNode(RowMark); RowMark *newnode = makeNode(RowMark);

12
src/backend/nodes/equalfuncs.c
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/nodes/equalfuncs.c,v 1.37 1999/05/25 16:09:06 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/nodes/equalfuncs.c,v 1.38 1999/05/25 22:41:13 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -283,7 +283,7 @@ _equalFunc(Func *a, Func *b)
* RestrictInfo is a subclass of Node. * RestrictInfo is a subclass of Node.
*/ */
static bool static bool
_equalRestrictInfo(RestrictInfo * a, RestrictInfo * b) _equalRestrictInfo(RestrictInfo *a, RestrictInfo *b)
{ {
Assert(IsA(a, RestrictInfo)); Assert(IsA(a, RestrictInfo));
Assert(IsA(b, RestrictInfo)); Assert(IsA(b, RestrictInfo));
@ -307,7 +307,7 @@ _equalRestrictInfo(RestrictInfo * a, RestrictInfo * b)
* RelOptInfo is a subclass of Node. * RelOptInfo is a subclass of Node.
*/ */
static bool static bool
_equalRelOptInfo(RelOptInfo * a, RelOptInfo * b) _equalRelOptInfo(RelOptInfo *a, RelOptInfo *b)
{ {
Assert(IsA(a, RelOptInfo)); Assert(IsA(a, RelOptInfo));
Assert(IsA(b, RelOptInfo)); Assert(IsA(b, RelOptInfo));
@ -392,7 +392,7 @@ _equalIndexPath(IndexPath *a, IndexPath *b)
} }
static bool static bool
_equalNestPath(NestPath * a, NestPath * b) _equalNestPath(NestPath *a, NestPath *b)
{ {
Assert(IsA_JoinPath(a)); Assert(IsA_JoinPath(a));
Assert(IsA_JoinPath(b)); Assert(IsA_JoinPath(b));
@ -477,7 +477,7 @@ _equalMergeOrder(MergeOrder *a, MergeOrder *b)
} }
static bool static bool
_equalHashInfo(HashInfo * a, HashInfo * b) _equalHashInfo(HashInfo *a, HashInfo *b)
{ {
Assert(IsA(a, HashInfo)); Assert(IsA(a, HashInfo));
Assert(IsA(b, HashInfo)); Assert(IsA(b, HashInfo));
@ -524,7 +524,7 @@ _equalSubPlan(SubPlan *a, SubPlan *b)
} }
static bool static bool
_equalJoinInfo(JoinInfo * a, JoinInfo * b) _equalJoinInfo(JoinInfo *a, JoinInfo *b)
{ {
Assert(IsA(a, JoinInfo)); Assert(IsA(a, JoinInfo));
Assert(IsA(b, JoinInfo)); Assert(IsA(b, JoinInfo));

28
src/backend/nodes/freefuncs.c
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/nodes/Attic/freefuncs.c,v 1.17 1999/05/25 16:09:06 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/nodes/Attic/freefuncs.c,v 1.18 1999/05/25 22:41:13 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -302,7 +302,7 @@ _freeHashJoin(HashJoin *node)
* ---------------- * ----------------
*/ */
static void static void
FreeNonameFields(Noname * node) FreeNonameFields(Noname *node)
{ {
return; return;
} }
@ -313,7 +313,7 @@ FreeNonameFields(Noname * node)
* ---------------- * ----------------
*/ */
static void static void
_freeNoname(Noname * node) _freeNoname(Noname *node)
{ {
/* ---------------- /* ----------------
* free node superclass fields * free node superclass fields
@ -609,7 +609,7 @@ _freeFunc(Func *node)
* ---------------- * ----------------
*/ */
static void static void
_freeAggref(Aggref * node) _freeAggref(Aggref *node)
{ {
/* ---------------- /* ----------------
* free remainder of node * free remainder of node
@ -644,7 +644,7 @@ _freeSubLink(SubLink *node)
* ---------------- * ----------------
*/ */
static void static void
_freeCaseExpr(CaseExpr * node) _freeCaseExpr(CaseExpr *node)
{ {
/* ---------------- /* ----------------
* free remainder of node * free remainder of node
@ -662,7 +662,7 @@ _freeCaseExpr(CaseExpr * node)
* ---------------- * ----------------
*/ */
static void static void
_freeCaseWhen(CaseWhen * node) _freeCaseWhen(CaseWhen *node)
{ {
/* ---------------- /* ----------------
* free remainder of node * free remainder of node
@ -709,7 +709,7 @@ _freeArrayRef(ArrayRef *node)
* ---------------- * ----------------
*/ */
static void static void
_freeRelOptInfo(RelOptInfo * node) _freeRelOptInfo(RelOptInfo *node)
{ {
/* ---------------- /* ----------------
* free remainder of node * free remainder of node
@ -812,7 +812,7 @@ _freeIndexPath(IndexPath *node)
* ---------------- * ----------------
*/ */
static void static void
FreeNestPathFields(NestPath * node) FreeNestPathFields(NestPath *node)
{ {
freeObject(node->pathinfo); freeObject(node->pathinfo);
freeObject(node->outerjoinpath); freeObject(node->outerjoinpath);
@ -824,7 +824,7 @@ FreeNestPathFields(NestPath * node)
* ---------------- * ----------------
*/ */
static void static void
_freeNestPath(NestPath * node) _freeNestPath(NestPath *node)
{ {
/* ---------------- /* ----------------
* free the node superclass fields * free the node superclass fields
@ -933,7 +933,7 @@ _freeMergeOrder(MergeOrder *node)
* ---------------- * ----------------
*/ */
static void static void
_freeRestrictInfo(RestrictInfo * node) _freeRestrictInfo(RestrictInfo *node)
{ {
/* ---------------- /* ----------------
* free remainder of node * free remainder of node
@ -979,7 +979,7 @@ _freeJoinMethod(JoinMethod *node)
* ---------------- * ----------------
*/ */
static void static void
_freeHashInfo(HashInfo * node) _freeHashInfo(HashInfo *node)
{ {
/* ---------------- /* ----------------
* free remainder of node * free remainder of node
@ -995,7 +995,7 @@ _freeHashInfo(HashInfo * node)
* ---------------- * ----------------
*/ */
static void static void
_freeMergeInfo(MergeInfo * node) _freeMergeInfo(MergeInfo *node)
{ {
/* ---------------- /* ----------------
* free remainder of node * free remainder of node
@ -1012,7 +1012,7 @@ _freeMergeInfo(MergeInfo * node)
* ---------------- * ----------------
*/ */
static void static void
_freeJoinInfo(JoinInfo * node) _freeJoinInfo(JoinInfo *node)
{ {
/* ---------------- /* ----------------
* free remainder of node * free remainder of node
@ -1066,7 +1066,7 @@ _freeRangeTblEntry(RangeTblEntry *node)
} }
static void static void
_freeRowMark(RowMark * node) _freeRowMark(RowMark *node)
{ {
pfree(node); pfree(node);
} }

22
src/backend/nodes/outfuncs.c
View File

@ -5,7 +5,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: outfuncs.c,v 1.85 1999/05/25 16:09:09 momjian Exp $ * $Id: outfuncs.c,v 1.86 1999/05/25 22:41:14 momjian Exp $
* *
* NOTES * NOTES
* Every (plan) node in POSTGRES has an associated "out" routine which * Every (plan) node in POSTGRES has an associated "out" routine which
@ -456,7 +456,7 @@ _outIndexScan(StringInfo str, IndexScan *node)
* Noname is a subclass of Plan * Noname is a subclass of Plan
*/ */
static void static void
_outNoname(StringInfo str, Noname * node) _outNoname(StringInfo str, Noname *node)
{ {
appendStringInfo(str, " NONAME "); appendStringInfo(str, " NONAME ");
_outPlanInfo(str, (Plan *) node); _outPlanInfo(str, (Plan *) node);
@ -660,7 +660,7 @@ _outConst(StringInfo str, Const *node)
* Aggref * Aggref
*/ */
static void static void
_outAggref(StringInfo str, Aggref * node) _outAggref(StringInfo str, Aggref *node)
{ {
appendStringInfo(str, appendStringInfo(str,
" AGGREG :aggname %s :basetype %u :aggtype %u :target ", " AGGREG :aggname %s :basetype %u :aggtype %u :target ",
@ -816,7 +816,7 @@ _outEState(StringInfo str, EState *node)
* Stuff from relation.h * Stuff from relation.h
*/ */
static void static void
_outRelOptInfo(StringInfo str, RelOptInfo * node) _outRelOptInfo(StringInfo str, RelOptInfo *node)
{ {
appendStringInfo(str, " RELOPTINFO :relids "); appendStringInfo(str, " RELOPTINFO :relids ");
_outIntList(str, node->relids); _outIntList(str, node->relids);
@ -879,7 +879,7 @@ _outRangeTblEntry(StringInfo str, RangeTblEntry *node)
} }
static void static void
_outRowMark(StringInfo str, RowMark * node) _outRowMark(StringInfo str, RowMark *node)
{ {
appendStringInfo(str, " ROWMARK :rti %u :info %u", node->rti, node->info); appendStringInfo(str, " ROWMARK :rti %u :info %u", node->rti, node->info);
} }
@ -954,7 +954,7 @@ _outIndexPath(StringInfo str, IndexPath *node)
* NestPath is a subclass of Path * NestPath is a subclass of Path
*/ */
static void static void
_outNestPath(StringInfo str, NestPath * node) _outNestPath(StringInfo str, NestPath *node)
{ {
appendStringInfo(str, appendStringInfo(str,
" NESTPATH :pathtype %d :cost %f :pathkeys ", " NESTPATH :pathtype %d :cost %f :pathkeys ",
@ -1109,7 +1109,7 @@ _outMergeOrder(StringInfo str, MergeOrder *node)
* RestrictInfo is a subclass of Node. * RestrictInfo is a subclass of Node.
*/ */
static void static void
_outRestrictInfo(StringInfo str, RestrictInfo * node) _outRestrictInfo(StringInfo str, RestrictInfo *node)
{ {
appendStringInfo(str, " RESTRICTINFO :clause "); appendStringInfo(str, " RESTRICTINFO :clause ");
_outNode(str, node->clause); _outNode(str, node->clause);
@ -1144,7 +1144,7 @@ _outJoinMethod(StringInfo str, JoinMethod *node)
* HashInfo is a subclass of JoinMethod. * HashInfo is a subclass of JoinMethod.
*/ */
static void static void
_outHashInfo(StringInfo str, HashInfo * node) _outHashInfo(StringInfo str, HashInfo *node)
{ {
appendStringInfo(str, " HASHINFO :hashop %u :jmkeys ", node->hashop); appendStringInfo(str, " HASHINFO :hashop %u :jmkeys ", node->hashop);
_outNode(str, node->jmethod.jmkeys); _outNode(str, node->jmethod.jmkeys);
@ -1157,7 +1157,7 @@ _outHashInfo(StringInfo str, HashInfo * node)
* JoinInfo is a subclass of Node. * JoinInfo is a subclass of Node.
*/ */
static void static void
_outJoinInfo(StringInfo str, JoinInfo * node) _outJoinInfo(StringInfo str, JoinInfo *node)
{ {
appendStringInfo(str, " JINFO :unjoined_relids "); appendStringInfo(str, " JINFO :unjoined_relids ");
_outIntList(str, node->unjoined_relids); _outIntList(str, node->unjoined_relids);
@ -1365,7 +1365,7 @@ _outConstraint(StringInfo str, Constraint *node)
} }
static void static void
_outCaseExpr(StringInfo str, CaseExpr * node) _outCaseExpr(StringInfo str, CaseExpr *node)
{ {
appendStringInfo(str, "CASE "); appendStringInfo(str, "CASE ");
_outNode(str, node->args); _outNode(str, node->args);
@ -1377,7 +1377,7 @@ _outCaseExpr(StringInfo str, CaseExpr * node)
} }
static void static void
_outCaseWhen(StringInfo str, CaseWhen * node) _outCaseWhen(StringInfo str, CaseWhen *node)
{ {
appendStringInfo(str, " WHEN "); appendStringInfo(str, " WHEN ");
_outNode(str, node->expr); _outNode(str, node->expr);

4
src/backend/optimizer/geqo/geqo_eval.c
View File

@ -5,7 +5,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: geqo_eval.c,v 1.38 1999/05/25 16:09:15 momjian Exp $ * $Id: geqo_eval.c,v 1.39 1999/05/25 22:41:19 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -130,7 +130,7 @@ geqo_eval(Query *root, Gene *tour, int num_gene)
* Returns a new join relation incorporating all joins in a left-sided tree. * Returns a new join relation incorporating all joins in a left-sided tree.
*/ */
RelOptInfo * RelOptInfo *
gimme_tree(Query *root, Gene *tour, int rel_count, int num_gene, RelOptInfo * old_rel) gimme_tree(Query *root, Gene *tour, int rel_count, int num_gene, RelOptInfo *old_rel)
{ {
RelOptInfo *inner_rel; /* current relation */ RelOptInfo *inner_rel; /* current relation */
int base_rel_index; int base_rel_index;

4
src/backend/optimizer/geqo/geqo_misc.c
View File

@ -5,7 +5,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: geqo_misc.c,v 1.18 1999/05/25 16:09:17 momjian Exp $ * $Id: geqo_misc.c,v 1.19 1999/05/25 22:41:20 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -261,7 +261,7 @@ geqo_print_path(Query *root, Path *path, int indent)
} }
void void
geqo_print_rel(Query *root, RelOptInfo * rel) geqo_print_rel(Query *root, RelOptInfo *rel)
{ {
List *l; List *l;

14
src/backend/optimizer/geqo/minspantree.c
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/optimizer/geqo/Attic/minspantree.c,v 1.11 1999/05/25 16:09:19 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/optimizer/geqo/Attic/minspantree.c,v 1.12 1999/05/25 22:41:22 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -41,7 +41,7 @@
*/ */
void void
minspantree(Query *root, List *join_rels, RelOptInfo * garel) minspantree(Query *root, List *join_rels, RelOptInfo *garel)
{ {
int number_of_rels = length(root->base_rel_list); int number_of_rels = length(root->base_rel_list);
int number_of_joins = length(join_rels); int number_of_joins = length(join_rels);
@ -111,9 +111,9 @@ minspantree(Query *root, List *join_rels, RelOptInfo * garel)
else if (number_of_joins == 3) else if (number_of_joins == 3)
{ {
RelOptInfo *rel12 = (RelOptInfo *) & tmprel_array[1][2]; RelOptInfo *rel12 = (RelOptInfo *) &tmprel_array[1][2];
RelOptInfo *rel13 = (RelOptInfo *) & tmprel_array[1][3]; RelOptInfo *rel13 = (RelOptInfo *) &tmprel_array[1][3];
RelOptInfo *rel23 = (RelOptInfo *) & tmprel_array[2][3]; RelOptInfo *rel23 = (RelOptInfo *) &tmprel_array[2][3];
if (rel12->cheapestpath->path_cost > rel13->cheapestpath->path_cost) if (rel12->cheapestpath->path_cost > rel13->cheapestpath->path_cost)
{ {
@ -159,9 +159,9 @@ minspantree(Query *root, List *join_rels, RelOptInfo * garel)
if (connectto[tempn] != 0) if (connectto[tempn] != 0)
{ {
if (n > tempn) if (n > tempn)
joinrel = (RelOptInfo *) & tmprel_array[tempn][n]; joinrel = (RelOptInfo *) &tmprel_array[tempn][n];
else else
joinrel = (RelOptInfo *) & tmprel_array[n][tempn]; joinrel = (RelOptInfo *) &tmprel_array[n][tempn];
dist = joinrel->cheapestpath->path_cost; dist = joinrel->cheapestpath->path_cost;
if (dist < disttoconnect[tempn]) if (dist < disttoconnect[tempn])

4
src/backend/optimizer/path/_deadcode/predmig.c
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/optimizer/path/_deadcode/Attic/predmig.c,v 1.3 1999/05/25 22:04:22 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/optimizer/path/_deadcode/Attic/predmig.c,v 1.4 1999/05/25 22:41:35 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -487,7 +487,7 @@ xfunc_form_groups(Query *queryInfo, Stream root, Stream bottom)
} }
/* ------------------- UTILITY FUNCTIONS ------------------------- */ /* ------------------- UTILITY FUNCTIONS ------------------------- */
/* /*
** xfunc_free_stream ** xfunc_free_stream

8
src/backend/optimizer/path/_deadcode/xfunc.c
View File

@ -9,7 +9,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/optimizer/path/_deadcode/Attic/xfunc.c,v 1.3 1999/05/25 16:09:31 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/optimizer/path/_deadcode/Attic/xfunc.c,v 1.4 1999/05/25 22:41:36 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -144,7 +144,7 @@ xfunc_shouldpull(Query *queryInfo,
Path childpath, Path childpath,
JoinPath parentpath, JoinPath parentpath,
int whichchild, int whichchild,
RestrictInfo * maxcinfopt) /* Out: pointer to clause RestrictInfo *maxcinfopt) /* Out: pointer to clause
* to pullup */ * to pullup */
{ {
LispValue clauselist, LispValue clauselist,
@ -225,7 +225,7 @@ xfunc_shouldpull(Query *queryInfo,
|| (!is_join(childpath) || (!is_join(childpath)
&& (whichchild == INNER) && (whichchild == INNER)
&& IsA(parentpath, NestPath) && IsA(parentpath, NestPath)
&& !IsA(parentpath, HashPath) &&!IsA(parentpath, HashPath)
&&!IsA(parentpath, MergePath))))) &&!IsA(parentpath, MergePath)))))
{ {
@ -1423,7 +1423,7 @@ do { \
** Just like _copyRel, but doesn't copy the paths ** Just like _copyRel, but doesn't copy the paths
*/ */
bool bool
xfunc_copyrel(RelOptInfo from, RelOptInfo * to) xfunc_copyrel(RelOptInfo from, RelOptInfo *to)
{ {
RelOptInfo newnode; RelOptInfo newnode;

6
src/backend/optimizer/path/allpaths.c
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/optimizer/path/allpaths.c,v 1.45 1999/05/25 16:09:22 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/optimizer/path/allpaths.c,v 1.46 1999/05/25 22:41:25 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -48,7 +48,7 @@ static RelOptInfo *make_one_rel_by_joins(Query *root, List *rels,
int levels_needed); int levels_needed);
#ifdef OPTIMIZER_DEBUG #ifdef OPTIMIZER_DEBUG
static void debug_print_rel(Query *root, RelOptInfo * rel); static void debug_print_rel(Query *root, RelOptInfo *rel);
#endif #endif
@ -355,7 +355,7 @@ print_path(Query *root, Path *path, int indent)
} }
static void static void
debug_print_rel(Query *root, RelOptInfo * rel) debug_print_rel(Query *root, RelOptInfo *rel)
{ {
List *l; List *l;

6
src/backend/optimizer/path/costsize.c
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/optimizer/path/costsize.c,v 1.37 1999/05/25 16:09:23 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/optimizer/path/costsize.c,v 1.38 1999/05/25 22:41:27 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -390,7 +390,7 @@ cost_hashjoin(Cost outercost,
* Returns the size. * Returns the size.
*/ */
int int
compute_rel_size(RelOptInfo * rel) compute_rel_size(RelOptInfo *rel)
{ {
Cost temp; Cost temp;
int temp1; int temp1;
@ -413,7 +413,7 @@ compute_rel_size(RelOptInfo * rel)
* Returns the width of the tuple as a fixnum. * Returns the width of the tuple as a fixnum.
*/ */
int int
compute_rel_width(RelOptInfo * rel) compute_rel_width(RelOptInfo *rel)
{ {
return compute_targetlist_width(get_actual_tlist(rel->targetlist)); return compute_targetlist_width(get_actual_tlist(rel->targetlist));
} }

66
src/backend/optimizer/path/indxpath.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/optimizer/path/indxpath.c,v 1.55 1999/05/25 16:09:24 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/optimizer/path/indxpath.c,v 1.56 1999/05/25 22:41:28 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -45,32 +45,32 @@
#include "utils/lsyscache.h" #include "utils/lsyscache.h"
static void match_index_orclauses(RelOptInfo * rel, RelOptInfo * index, int indexkey, static void match_index_orclauses(RelOptInfo *rel, RelOptInfo *index, int indexkey,
int xclass, List *restrictinfo_list); int xclass, List *restrictinfo_list);
static bool match_index_to_operand(int indexkey, Expr *operand, static bool match_index_to_operand(int indexkey, Expr *operand,
RelOptInfo * rel, RelOptInfo * index); RelOptInfo *rel, RelOptInfo *index);
static List *match_index_orclause(RelOptInfo * rel, RelOptInfo * index, int indexkey, static List *match_index_orclause(RelOptInfo *rel, RelOptInfo *index, int indexkey,
int xclass, List *or_clauses, List *other_matching_indices); int xclass, List *or_clauses, List *other_matching_indices);
static List *group_clauses_by_indexkey(RelOptInfo * rel, RelOptInfo * index, static List *group_clauses_by_indexkey(RelOptInfo *rel, RelOptInfo *index,
int *indexkeys, Oid *classes, List *restrictinfo_list); int *indexkeys, Oid *classes, List *restrictinfo_list);
static List *group_clauses_by_ikey_for_joins(RelOptInfo * rel, RelOptInfo * index, static List *group_clauses_by_ikey_for_joins(RelOptInfo *rel, RelOptInfo *index,
int *indexkeys, Oid *classes, List *join_cinfo_list, List *restr_cinfo_list); int *indexkeys, Oid *classes, List *join_cinfo_list, List *restr_cinfo_list);
static RestrictInfo *match_clause_to_indexkey(RelOptInfo * rel, RelOptInfo * index, int indexkey, static RestrictInfo *match_clause_to_indexkey(RelOptInfo *rel, RelOptInfo *index, int indexkey,
int xclass, RestrictInfo * restrictInfo, bool join); int xclass, RestrictInfo *restrictInfo, bool join);
static bool pred_test(List *predicate_list, List *restrictinfo_list, static bool pred_test(List *predicate_list, List *restrictinfo_list,
List *joininfo_list); List *joininfo_list);
static bool one_pred_test(Expr *predicate, List *restrictinfo_list); static bool one_pred_test(Expr *predicate, List *restrictinfo_list);
static bool one_pred_clause_expr_test(Expr *predicate, Node *clause); static bool one_pred_clause_expr_test(Expr *predicate, Node *clause);
static bool one_pred_clause_test(Expr *predicate, Node *clause); static bool one_pred_clause_test(Expr *predicate, Node *clause);
static bool clause_pred_clause_test(Expr *predicate, Node *clause); static bool clause_pred_clause_test(Expr *predicate, Node *clause);
static List *indexable_joinclauses(RelOptInfo * rel, RelOptInfo * index, static List *indexable_joinclauses(RelOptInfo *rel, RelOptInfo *index,
List *joininfo_list, List *restrictinfo_list); List *joininfo_list, List *restrictinfo_list);
static List *index_innerjoin(Query *root, RelOptInfo * rel, static List *index_innerjoin(Query *root, RelOptInfo *rel,
List *clausegroup_list, RelOptInfo * index); List *clausegroup_list, RelOptInfo *index);
static List *create_index_path_group(Query *root, RelOptInfo * rel, RelOptInfo * index, static List *create_index_path_group(Query *root, RelOptInfo *rel, RelOptInfo *index,
List *clausegroup_list, bool join); List *clausegroup_list, bool join);
static List *add_index_paths(List *indexpaths, List *new_indexpaths); static List *add_index_paths(List *indexpaths, List *new_indexpaths);
static bool function_index_operand(Expr *funcOpnd, RelOptInfo * rel, RelOptInfo * index); static bool function_index_operand(Expr *funcOpnd, RelOptInfo *rel, RelOptInfo *index);
/* find_index_paths() /* find_index_paths()
@ -100,7 +100,7 @@ static bool function_index_operand(Expr *funcOpnd, RelOptInfo * rel, RelOptInfo
*/ */
List * List *
create_index_paths(Query *root, create_index_paths(Query *root,
RelOptInfo * rel, RelOptInfo *rel,
List *indices, List *indices,
List *restrictinfo_list, List *restrictinfo_list,
List *joininfo_list) List *joininfo_list)
@ -217,8 +217,8 @@ create_index_paths(Query *root,
* *
*/ */
static void static void
match_index_orclauses(RelOptInfo * rel, match_index_orclauses(RelOptInfo *rel,
RelOptInfo * index, RelOptInfo *index,
int indexkey, int indexkey,
int xclass, int xclass,
List *restrictinfo_list) List *restrictinfo_list)
@ -253,8 +253,8 @@ match_index_orclauses(RelOptInfo * rel,
static bool static bool
match_index_to_operand(int indexkey, match_index_to_operand(int indexkey,
Expr *operand, Expr *operand,
RelOptInfo * rel, RelOptInfo *rel,
RelOptInfo * index) RelOptInfo *index)
{ {
bool result; bool result;
@ -296,8 +296,8 @@ match_index_to_operand(int indexkey,
* match the third, g,h match the fourth, etc. * match the third, g,h match the fourth, etc.
*/ */
static List * static List *
match_index_orclause(RelOptInfo * rel, match_index_orclause(RelOptInfo *rel,
RelOptInfo * index, RelOptInfo *index,
int indexkey, int indexkey,
int xclass, int xclass,
List *or_clauses, List *or_clauses,
@ -387,8 +387,8 @@ match_index_orclause(RelOptInfo * rel,
* *
*/ */
static List * static List *
group_clauses_by_indexkey(RelOptInfo * rel, group_clauses_by_indexkey(RelOptInfo *rel,
RelOptInfo * index, RelOptInfo *index,
int *indexkeys, int *indexkeys,
Oid *classes, Oid *classes,
List *restrictinfo_list) List *restrictinfo_list)
@ -449,8 +449,8 @@ group_clauses_by_indexkey(RelOptInfo * rel,
* *
*/ */
static List * static List *
group_clauses_by_ikey_for_joins(RelOptInfo * rel, group_clauses_by_ikey_for_joins(RelOptInfo *rel,
RelOptInfo * index, RelOptInfo *index,
int *indexkeys, int *indexkeys,
Oid *classes, Oid *classes,
List *join_cinfo_list, List *join_cinfo_list,
@ -571,11 +571,11 @@ group_clauses_by_ikey_for_joins(RelOptInfo * rel,
* *
*/ */
static RestrictInfo * static RestrictInfo *
match_clause_to_indexkey(RelOptInfo * rel, match_clause_to_indexkey(RelOptInfo *rel,
RelOptInfo * index, RelOptInfo *index,
int indexkey, int indexkey,
int xclass, int xclass,
RestrictInfo * restrictInfo, RestrictInfo *restrictInfo,
bool join) bool join)
{ {
Expr *clause = restrictInfo->clause; Expr *clause = restrictInfo->clause;
@ -1183,7 +1183,7 @@ clause_pred_clause_test(Expr *predicate, Node *clause)
* *
*/ */
static List * static List *
indexable_joinclauses(RelOptInfo * rel, RelOptInfo * index, indexable_joinclauses(RelOptInfo *rel, RelOptInfo *index,
List *joininfo_list, List *restrictinfo_list) List *joininfo_list, List *restrictinfo_list)
{ {
JoinInfo *joininfo = (JoinInfo *) NULL; JoinInfo *joininfo = (JoinInfo *) NULL;
@ -1255,8 +1255,8 @@ extract_restrict_clauses(List *clausegroup)
* *
*/ */
static List * static List *
index_innerjoin(Query *root, RelOptInfo * rel, List *clausegroup_list, index_innerjoin(Query *root, RelOptInfo *rel, List *clausegroup_list,
RelOptInfo * index) RelOptInfo *index)
{ {
List *clausegroup = NIL; List *clausegroup = NIL;
List *cg_list = NIL; List *cg_list = NIL;
@ -1343,8 +1343,8 @@ index_innerjoin(Query *root, RelOptInfo * rel, List *clausegroup_list,
*/ */
static List * static List *
create_index_path_group(Query *root, create_index_path_group(Query *root,
RelOptInfo * rel, RelOptInfo *rel,
RelOptInfo * index, RelOptInfo *index,
List *clausegroup_list, List *clausegroup_list,
bool join) bool join)
{ {
@ -1386,7 +1386,7 @@ add_index_paths(List *indexpaths, List *new_indexpaths)
} }
static bool static bool
function_index_operand(Expr *funcOpnd, RelOptInfo * rel, RelOptInfo * index) function_index_operand(Expr *funcOpnd, RelOptInfo *rel, RelOptInfo *index)
{ {
Oid heapRelid = (Oid) lfirsti(rel->relids); Oid heapRelid = (Oid) lfirsti(rel->relids);
Func *function; Func *function;

34
src/backend/optimizer/path/joinpath.c
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/optimizer/path/joinpath.c,v 1.37 1999/05/25 16:09:25 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/optimizer/path/joinpath.c,v 1.38 1999/05/25 22:41:30 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -30,14 +30,14 @@
* _enable_mergejoin} */ * _enable_mergejoin} */
static Path *best_innerjoin(List *join_paths, List *outer_relid); static Path *best_innerjoin(List *join_paths, List *outer_relid);
static List *sort_inner_and_outer(RelOptInfo * joinrel, RelOptInfo * outerrel, RelOptInfo * innerrel, static List *sort_inner_and_outer(RelOptInfo *joinrel, RelOptInfo *outerrel, RelOptInfo *innerrel,
List *mergeinfo_list); List *mergeinfo_list);
static List *match_unsorted_outer(RelOptInfo * joinrel, RelOptInfo * outerrel, RelOptInfo * innerrel, static List *match_unsorted_outer(RelOptInfo *joinrel, RelOptInfo *outerrel, RelOptInfo *innerrel,
List *outerpath_list, Path *cheapest_inner, Path *best_innerjoin, List *outerpath_list, Path *cheapest_inner, Path *best_innerjoin,
List *mergeinfo_list); List *mergeinfo_list);
static List *match_unsorted_inner(RelOptInfo * joinrel, RelOptInfo * outerrel, RelOptInfo * innerrel, static List *match_unsorted_inner(RelOptInfo *joinrel, RelOptInfo *outerrel, RelOptInfo *innerrel,
List *innerpath_list, List *mergeinfo_list); List *innerpath_list, List *mergeinfo_list);
static List *hash_inner_and_outer(RelOptInfo * joinrel, RelOptInfo * outerrel, RelOptInfo * innerrel, static List *hash_inner_and_outer(RelOptInfo *joinrel, RelOptInfo *outerrel, RelOptInfo *innerrel,
List *hashinfo_list); List *hashinfo_list);
/* /*
@ -194,9 +194,9 @@ best_innerjoin(List *join_paths, Relids outer_relids)
* Returns a list of mergejoin paths. * Returns a list of mergejoin paths.
*/ */
static List * static List *
sort_inner_and_outer(RelOptInfo * joinrel, sort_inner_and_outer(RelOptInfo *joinrel,
RelOptInfo * outerrel, RelOptInfo *outerrel,
RelOptInfo * innerrel, RelOptInfo *innerrel,
List *mergeinfo_list) List *mergeinfo_list)
{ {
List *ms_list = NIL; List *ms_list = NIL;
@ -268,9 +268,9 @@ sort_inner_and_outer(RelOptInfo * joinrel,
* Returns a list of possible join path nodes. * Returns a list of possible join path nodes.
*/ */
static List * static List *
match_unsorted_outer(RelOptInfo * joinrel, match_unsorted_outer(RelOptInfo *joinrel,
RelOptInfo * outerrel, RelOptInfo *outerrel,
RelOptInfo * innerrel, RelOptInfo *innerrel,
List *outerpath_list, List *outerpath_list,
Path *cheapest_inner, Path *cheapest_inner,
Path *best_innerjoin, Path *best_innerjoin,
@ -411,9 +411,9 @@ match_unsorted_outer(RelOptInfo * joinrel,
* Returns a list of possible merge paths. * Returns a list of possible merge paths.
*/ */
static List * static List *
match_unsorted_inner(RelOptInfo * joinrel, match_unsorted_inner(RelOptInfo *joinrel,
RelOptInfo * outerrel, RelOptInfo *outerrel,
RelOptInfo * innerrel, RelOptInfo *innerrel,
List *innerpath_list, List *innerpath_list,
List *mergeinfo_list) List *mergeinfo_list)
{ {
@ -503,9 +503,9 @@ match_unsorted_inner(RelOptInfo * joinrel,
* Returns a list of hashjoin paths. * Returns a list of hashjoin paths.
*/ */
static List * static List *
hash_inner_and_outer(RelOptInfo * joinrel, hash_inner_and_outer(RelOptInfo *joinrel,
RelOptInfo * outerrel, RelOptInfo *outerrel,
RelOptInfo * innerrel, RelOptInfo *innerrel,
List *hashinfo_list) List *hashinfo_list)
{ {
List *hjoin_list = NIL; List *hjoin_list = NIL;

14
src/backend/optimizer/path/joinrels.c
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/optimizer/path/joinrels.c,v 1.33 1999/05/25 16:09:26 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/optimizer/path/joinrels.c,v 1.34 1999/05/25 22:41:31 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -26,8 +26,8 @@
static List *new_joininfo_list(List *joininfo_list, Relids join_relids); static List *new_joininfo_list(List *joininfo_list, Relids join_relids);
static bool nonoverlap_sets(List *s1, List *s2); static bool nonoverlap_sets(List *s1, List *s2);
static bool is_subset(List *s1, List *s2); static bool is_subset(List *s1, List *s2);
static void set_joinrel_size(RelOptInfo * joinrel, RelOptInfo * outer_rel, static void set_joinrel_size(RelOptInfo *joinrel, RelOptInfo *outer_rel,
RelOptInfo * inner_rel, JoinInfo * jinfo); RelOptInfo *inner_rel, JoinInfo *jinfo);
/* /*
* make_rels_by_joins * make_rels_by_joins
@ -89,7 +89,7 @@ make_rels_by_joins(Query *root, List *old_rels)
* Returns a list of new join relations. * Returns a list of new join relations.
*/ */
List * List *
make_rels_by_clause_joins(Query *root, RelOptInfo * old_rel, make_rels_by_clause_joins(Query *root, RelOptInfo *old_rel,
List *joininfo_list, Relids only_relids) List *joininfo_list, Relids only_relids)
{ {
List *join_list = NIL; List *join_list = NIL;
@ -159,7 +159,7 @@ make_rels_by_clause_joins(Query *root, RelOptInfo * old_rel,
* Returns a list of new join relations. * Returns a list of new join relations.
*/ */
List * List *
make_rels_by_clauseless_joins(RelOptInfo * old_rel, List *inner_rels) make_rels_by_clauseless_joins(RelOptInfo *old_rel, List *inner_rels)
{ {
RelOptInfo *inner_rel; RelOptInfo *inner_rel;
List *t_list = NIL; List *t_list = NIL;
@ -192,7 +192,7 @@ make_rels_by_clauseless_joins(RelOptInfo * old_rel, List *inner_rels)
* Returns the new join relation node. * Returns the new join relation node.
*/ */
RelOptInfo * RelOptInfo *
make_join_rel(RelOptInfo * outer_rel, RelOptInfo * inner_rel, JoinInfo * joininfo) make_join_rel(RelOptInfo *outer_rel, RelOptInfo *inner_rel, JoinInfo *joininfo)
{ {
RelOptInfo *joinrel = makeNode(RelOptInfo); RelOptInfo *joinrel = makeNode(RelOptInfo);
List *joinrel_joininfo_list = NIL; List *joinrel_joininfo_list = NIL;
@ -436,7 +436,7 @@ is_subset(List *s1, List *s2)
} }
static void static void
set_joinrel_size(RelOptInfo * joinrel, RelOptInfo * outer_rel, RelOptInfo * inner_rel, JoinInfo * jinfo) set_joinrel_size(RelOptInfo *joinrel, RelOptInfo *outer_rel, RelOptInfo *inner_rel, JoinInfo *jinfo)
{ {
int ntuples; int ntuples;
float selec; float selec;

12
src/backend/optimizer/path/orindxpath.c
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/optimizer/path/orindxpath.c,v 1.24 1999/05/25 16:09:27 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/optimizer/path/orindxpath.c,v 1.25 1999/05/25 22:41:32 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -31,9 +31,9 @@
#include "parser/parsetree.h" #include "parser/parsetree.h"
static void best_or_subclause_indices(Query *root, RelOptInfo * rel, List *subclauses, static void best_or_subclause_indices(Query *root, RelOptInfo *rel, List *subclauses,
List *indices, List **indexids, Cost *cost, Cost *selec); List *indices, List **indexids, Cost *cost, Cost *selec);
static void best_or_subclause_index(Query *root, RelOptInfo * rel, Expr *subclause, static void best_or_subclause_index(Query *root, RelOptInfo *rel, Expr *subclause,
List *indices, int *indexid, Cost *cost, Cost *selec); List *indices, int *indexid, Cost *cost, Cost *selec);
@ -49,7 +49,7 @@ static void best_or_subclause_index(Query *root, RelOptInfo * rel, Expr *subclau
*/ */
List * List *
create_or_index_paths(Query *root, create_or_index_paths(Query *root,
RelOptInfo * rel, List *clauses) RelOptInfo *rel, List *clauses)
{ {
List *t_list = NIL; List *t_list = NIL;
List *clist; List *clist;
@ -156,7 +156,7 @@ create_or_index_paths(Query *root,
*/ */
static void static void
best_or_subclause_indices(Query *root, best_or_subclause_indices(Query *root,
RelOptInfo * rel, RelOptInfo *rel,
List *subclauses, List *subclauses,
List *indices, List *indices,
List **indexids, /* return value */ List **indexids, /* return value */
@ -205,7 +205,7 @@ best_or_subclause_indices(Query *root,
*/ */
static void static void
best_or_subclause_index(Query *root, best_or_subclause_index(Query *root,
RelOptInfo * rel, RelOptInfo *rel,
Expr *subclause, Expr *subclause,
List *indices, List *indices,
int *retIndexid, /* return value */ int *retIndexid, /* return value */

6
src/backend/optimizer/path/prune.c
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/prune.c,v 1.38 1999/05/25 16:09:28 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/prune.c,v 1.39 1999/05/25 22:41:33 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -24,7 +24,7 @@
#include "utils/elog.h" #include "utils/elog.h"
static List *merge_rel_with_same_relids(RelOptInfo * rel, Relids unjoined_relids); static List *merge_rel_with_same_relids(RelOptInfo *rel, Relids unjoined_relids);
/* /*
* merge_rels_with_same_relids * merge_rels_with_same_relids
@ -59,7 +59,7 @@ merge_rels_with_same_relids(List *rel_list)
* *
*/ */
static List * static List *
merge_rel_with_same_relids(RelOptInfo * rel, Relids unjoined_relids) merge_rel_with_same_relids(RelOptInfo *rel, Relids unjoined_relids)
{ {
List *i = NIL; List *i = NIL;
List *result = NIL; List *result = NIL;

6
src/backend/optimizer/plan/createplan.c
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/optimizer/plan/createplan.c,v 1.56 1999/05/25 16:09:34 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/createplan.c,v 1.57 1999/05/25 22:41:38 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -53,7 +53,7 @@ static SeqScan *create_seqscan_node(Path *best_path, List *tlist,
List *scan_clauses); List *scan_clauses);
static IndexScan *create_indexscan_node(IndexPath *best_path, List *tlist, static IndexScan *create_indexscan_node(IndexPath *best_path, List *tlist,
List *scan_clauses); List *scan_clauses);
static NestLoop *create_nestloop_node(NestPath * best_path, List *tlist, static NestLoop *create_nestloop_node(NestPath *best_path, List *tlist,
List *clauses, Plan *outer_node, List *outer_tlist, List *clauses, Plan *outer_node, List *outer_tlist,
Plan *inner_node, List *inner_tlist); Plan *inner_node, List *inner_tlist);
static MergeJoin *create_mergejoin_node(MergePath *best_path, List *tlist, static MergeJoin *create_mergejoin_node(MergePath *best_path, List *tlist,
@ -418,7 +418,7 @@ create_indexscan_node(IndexPath *best_path,
*****************************************************************************/ *****************************************************************************/
static NestLoop * static NestLoop *
create_nestloop_node(NestPath * best_path, create_nestloop_node(NestPath *best_path,
List *tlist, List *tlist,
List *clauses, List *clauses,
Plan *outer_node, Plan *outer_node,

6
src/backend/optimizer/plan/initsplan.c
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/optimizer/plan/initsplan.c,v 1.30 1999/05/25 16:09:36 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/initsplan.c,v 1.31 1999/05/25 22:41:39 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -40,7 +40,7 @@
extern int Quiet; extern int Quiet;
static void add_restrict_and_join_to_rel(Query *root, List *clause); static void add_restrict_and_join_to_rel(Query *root, List *clause);
static void add_join_info_to_rels(Query *root, RestrictInfo * restrictinfo, static void add_join_info_to_rels(Query *root, RestrictInfo *restrictinfo,
Relids join_relids); Relids join_relids);
static void add_vars_to_targetlist(Query *root, List *vars, Relids join_relids); static void add_vars_to_targetlist(Query *root, List *vars, Relids join_relids);
@ -240,7 +240,7 @@ add_restrict_and_join_to_rel(Query *root, List *clause)
* *
*/ */
static void static void
add_join_info_to_rels(Query *root, RestrictInfo * restrictinfo, add_join_info_to_rels(Query *root, RestrictInfo *restrictinfo,
Relids join_relids) Relids join_relids)
{ {
List *join_relid; List *join_relid;

6
src/backend/optimizer/plan/setrefs.c
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/optimizer/plan/setrefs.c,v 1.47 1999/05/25 16:09:39 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/setrefs.c,v 1.48 1999/05/25 22:41:41 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -35,7 +35,7 @@
static void set_join_tlist_references(Join *join); static void set_join_tlist_references(Join *join);
static void set_nonamescan_tlist_references(SeqScan *nonamescan); static void set_nonamescan_tlist_references(SeqScan *nonamescan);
static void set_noname_tlist_references(Noname * noname); static void set_noname_tlist_references(Noname *noname);
static Node *replace_clause_joinvar_refs(Node *clause, static Node *replace_clause_joinvar_refs(Node *clause,
List *outer_tlist, List *outer_tlist,
List *inner_tlist); List *inner_tlist);
@ -161,7 +161,7 @@ set_nonamescan_tlist_references(SeqScan *nonamescan)
* *
*/ */
static void static void
set_noname_tlist_references(Noname * noname) set_noname_tlist_references(Noname *noname)
{ {
Plan *source = ((Plan *) noname)->lefttree; Plan *source = ((Plan *) noname)->lefttree;

4
src/backend/optimizer/util/clauses.c
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/optimizer/util/clauses.c,v 1.34 1999/05/25 16:09:50 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/optimizer/util/clauses.c,v 1.35 1999/05/25 22:41:46 momjian Exp $
* *
* HISTORY * HISTORY
* AUTHOR DATE MAJOR EVENT * AUTHOR DATE MAJOR EVENT
@ -369,7 +369,7 @@ pull_constant_clauses(List *quals, List **constantQual)
* *
*/ */
void void
clause_get_relids_vars(Node *clause, Relids * relids, List **vars) clause_get_relids_vars(Node *clause, Relids *relids, List **vars)
{ {
List *clvars = pull_var_clause(clause); List *clvars = pull_var_clause(clause);
List *var_list = NIL; List *var_list = NIL;

4
src/backend/optimizer/util/indexnode.c
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/indexnode.c,v 1.15 1999/05/25 16:09:53 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/indexnode.c,v 1.16 1999/05/25 22:41:47 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -33,7 +33,7 @@ static List *find_secondary_index(Query *root, Oid relid);
* *
*/ */
List * List *
find_relation_indices(Query *root, RelOptInfo * rel) find_relation_indices(Query *root, RelOptInfo *rel)
{ {
if (rel->indexed) if (rel->indexed)
return find_secondary_index(root, lfirsti(rel->relids)); return find_secondary_index(root, lfirsti(rel->relids));

4
src/backend/optimizer/util/joininfo.c
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/optimizer/util/joininfo.c,v 1.20 1999/05/25 16:09:54 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/optimizer/util/joininfo.c,v 1.21 1999/05/25 22:41:47 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -62,7 +62,7 @@ joininfo_member(List *join_relids, List *joininfo_list)
* *
*/ */
JoinInfo * JoinInfo *
find_joininfo_node(RelOptInfo * this_rel, Relids join_relids) find_joininfo_node(RelOptInfo *this_rel, Relids join_relids)
{ {
JoinInfo *joininfo = joininfo_member(join_relids, JoinInfo *joininfo = joininfo_member(join_relids,
this_rel->joininfo); this_rel->joininfo);

4
src/backend/optimizer/util/keys.c
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/keys.c,v 1.20 1999/05/25 16:09:56 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/keys.c,v 1.21 1999/05/25 22:41:48 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -54,7 +54,7 @@ static bool equal_indexkey_var(int index_key, Var *var);
* *
*/ */
bool bool
match_indexkey_operand(int indexkey, Var *operand, RelOptInfo * rel) match_indexkey_operand(int indexkey, Var *operand, RelOptInfo *rel)
{ {
if (IsA(operand, Var) && if (IsA(operand, Var) &&
(lfirsti(rel->relids) == operand->varno) && (lfirsti(rel->relids) == operand->varno) &&

20
src/backend/optimizer/util/pathnode.c
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/optimizer/util/pathnode.c,v 1.41 1999/05/25 16:09:58 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/optimizer/util/pathnode.c,v 1.42 1999/05/25 22:41:49 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -62,7 +62,7 @@ path_is_cheaper(Path *path1, Path *path2)
* *
*/ */
Path * Path *
set_cheapest(RelOptInfo * parent_rel, List *pathlist) set_cheapest(RelOptInfo *parent_rel, List *pathlist)
{ {
List *p; List *p;
Path *cheapest_so_far; Path *cheapest_so_far;
@ -99,7 +99,7 @@ set_cheapest(RelOptInfo * parent_rel, List *pathlist)
* *
*/ */
List * List *
add_pathlist(RelOptInfo * parent_rel, List *unique_paths, List *new_paths) add_pathlist(RelOptInfo *parent_rel, List *unique_paths, List *new_paths)
{ {
List *p1; List *p1;
@ -278,7 +278,7 @@ better_path(Path *new_path, List *unique_paths, bool *is_new)
* *
*/ */
Path * Path *
create_seqscan_path(RelOptInfo * rel) create_seqscan_path(RelOptInfo *rel)
{ {
int relid = 0; int relid = 0;
@ -326,8 +326,8 @@ create_seqscan_path(RelOptInfo * rel)
*/ */
IndexPath * IndexPath *
create_index_path(Query *root, create_index_path(Query *root,
RelOptInfo * rel, RelOptInfo *rel,
RelOptInfo * index, RelOptInfo *index,
List *restriction_clauses, List *restriction_clauses,
bool is_join_scan) bool is_join_scan)
{ {
@ -473,8 +473,8 @@ create_index_path(Query *root,
* *
*/ */
NestPath * NestPath *
create_nestloop_path(RelOptInfo * joinrel, create_nestloop_path(RelOptInfo *joinrel,
RelOptInfo * outer_rel, RelOptInfo *outer_rel,
Path *outer_path, Path *outer_path,
Path *inner_path, Path *inner_path,
List *pathkeys) List *pathkeys)
@ -541,7 +541,7 @@ create_nestloop_path(RelOptInfo * joinrel,
* *
*/ */
MergePath * MergePath *
create_mergejoin_path(RelOptInfo * joinrel, create_mergejoin_path(RelOptInfo *joinrel,
int outersize, int outersize,
int innersize, int innersize,
int outerwidth, int outerwidth,
@ -604,7 +604,7 @@ create_mergejoin_path(RelOptInfo * joinrel,
* *
*/ */
HashPath * HashPath *
create_hashjoin_path(RelOptInfo * joinrel, create_hashjoin_path(RelOptInfo *joinrel,
int outersize, int outersize,
int innersize, int innersize,
int outerwidth, int outerwidth,

4
src/backend/optimizer/util/restrictinfo.c
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/optimizer/util/restrictinfo.c,v 1.3 1999/05/25 16:10:02 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/optimizer/util/restrictinfo.c,v 1.4 1999/05/25 22:41:50 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -27,7 +27,7 @@
* *
*/ */
bool bool
valid_or_clause(RestrictInfo * restrictinfo) valid_or_clause(RestrictInfo *restrictinfo)
{ {
if (restrictinfo != NULL && if (restrictinfo != NULL &&
!single_node((Node *) restrictinfo->clause) && !single_node((Node *) restrictinfo->clause) &&

4
src/backend/optimizer/util/tlist.c
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/optimizer/util/tlist.c,v 1.32 1999/05/25 16:10:03 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/optimizer/util/tlist.c,v 1.33 1999/05/25 22:41:51 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -93,7 +93,7 @@ matching_tlist_var(Var *var, List *targetlist)
* CREATES: new var_node iff no matching var_node exists in targetlist * CREATES: new var_node iff no matching var_node exists in targetlist
*/ */
void void
add_var_to_tlist(RelOptInfo * rel, Var *var) add_var_to_tlist(RelOptInfo *rel, Var *var)
{ {
Expr *oldvar; Expr *oldvar;

12
src/backend/storage/file/fd.c
View File

@ -6,7 +6,7 @@
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* IDENTIFICATION * IDENTIFICATION
* $Id: fd.c,v 1.40 1999/05/25 16:11:03 momjian Exp $ * $Id: fd.c,v 1.41 1999/05/25 22:41:57 momjian Exp $
* *
* NOTES: * NOTES:
* *
@ -1064,7 +1064,7 @@ BufFileCreate(File file)
* Like fclose(), this also implicitly FileCloses the underlying File. * Like fclose(), this also implicitly FileCloses the underlying File.
*/ */
void void
BufFileClose(BufFile * file) BufFileClose(BufFile *file)
{ {
/* flush any unwritten data */ /* flush any unwritten data */
BufFileFlush(file); BufFileFlush(file);
@ -1079,7 +1079,7 @@ BufFileClose(BufFile * file)
* Like fread() except we assume 1-byte element size. * Like fread() except we assume 1-byte element size.
*/ */
size_t size_t
BufFileRead(BufFile * file, void *ptr, size_t size) BufFileRead(BufFile *file, void *ptr, size_t size)
{ {
size_t nread = 0; size_t nread = 0;
size_t nthistime; size_t nthistime;
@ -1125,7 +1125,7 @@ BufFileRead(BufFile * file, void *ptr, size_t size)
* Like fwrite() except we assume 1-byte element size. * Like fwrite() except we assume 1-byte element size.
*/ */
size_t size_t
BufFileWrite(BufFile * file, void *ptr, size_t size) BufFileWrite(BufFile *file, void *ptr, size_t size)
{ {
size_t nwritten = 0; size_t nwritten = 0;
size_t nthistime; size_t nthistime;
@ -1169,7 +1169,7 @@ BufFileWrite(BufFile * file, void *ptr, size_t size)
* Like fflush() * Like fflush()
*/ */
int int
BufFileFlush(BufFile * file) BufFileFlush(BufFile *file)
{ {
if (file->dirty) if (file->dirty)
{ {
@ -1187,7 +1187,7 @@ BufFileFlush(BufFile * file)
* the new file offset (or -1 in case of error). * the new file offset (or -1 in case of error).
*/ */
long long
BufFileSeek(BufFile * file, long offset, int whence) BufFileSeek(BufFile *file, long offset, int whence)
{ {
if (BufFileFlush(file) < 0) if (BufFileFlush(file) < 0)
return -1L; return -1L;

4
src/backend/storage/lmgr/lmgr.c
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lmgr.c,v 1.24 1999/05/25 16:11:20 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lmgr.c,v 1.25 1999/05/25 22:42:01 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -92,7 +92,7 @@ static int LockPrios[] = {
7 7
}; };
LOCKMETHOD LockTableId = (LOCKMETHOD) NULL; LOCKMETHOD LockTableId = (LOCKMETHOD) NULL;
LOCKMETHOD LongTermTableId = (LOCKMETHOD) NULL; LOCKMETHOD LongTermTableId = (LOCKMETHOD) NULL;
/* /*

6
src/backend/storage/lmgr/lock.c
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.53 1999/05/25 16:11:21 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.54 1999/05/25 22:42:03 momjian Exp $
* *
* NOTES * NOTES
* Outside modules can create a lock table and acquire/release * Outside modules can create a lock table and acquire/release
@ -231,7 +231,7 @@ LockDisable(int status)
* Notes: just copying. Should only be called once. * Notes: just copying. Should only be called once.
*/ */
static void static void
LockMethodInit(LOCKMETHODTABLE * lockMethodTable, LockMethodInit(LOCKMETHODTABLE *lockMethodTable,
MASK *conflictsP, MASK *conflictsP,
int *prioP, int *prioP,
int numModes) int numModes)
@ -1843,7 +1843,7 @@ LockOwners(LOCKMETHOD lockmethod, LOCKTAG *locktag)
if (is_user_lock) if (is_user_lock)
{ {
TPRINTF(TRACE_USERLOCKS, "LockOwners: user lock tag [%u]", TPRINTF(TRACE_USERLOCKS, "LockOwners: user lock tag [%u]",
locktag->objId.blkno; locktag->objId.blkno);
} }
#endif #endif

6
src/backend/storage/lmgr/proc.c
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.56 1999/05/25 16:11:23 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.57 1999/05/25 22:42:03 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -46,7 +46,7 @@
* This is so that we can support more backends. (system-wide semaphore * This is so that we can support more backends. (system-wide semaphore
* sets run out pretty fast.) -ay 4/95 * sets run out pretty fast.) -ay 4/95
* *
* $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.56 1999/05/25 16:11:23 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.57 1999/05/25 22:42:03 momjian Exp $
*/ */
#include <sys/time.h> #include <sys/time.h>
#include <unistd.h> #include <unistd.h>
@ -492,7 +492,7 @@ ProcQueueInit(PROC_QUEUE *queue)
*/ */
int int
ProcSleep(PROC_QUEUE *waitQueue,/* lock->waitProcs */ ProcSleep(PROC_QUEUE *waitQueue,/* lock->waitProcs */
LOCKMETHODCTL * lockctl, LOCKMETHODCTL *lockctl,
int token, /* lockmode */ int token, /* lockmode */
LOCK *lock) LOCK *lock)
{ {

8
src/backend/tcop/dest.c
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/tcop/dest.c,v 1.30 1999/05/25 16:11:37 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/tcop/dest.c,v 1.31 1999/05/25 22:42:06 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -60,17 +60,17 @@ static char CommandInfo[32] = {0};
* ---------------- * ----------------
*/ */
static void static void
donothingReceive(HeapTuple tuple, TupleDesc typeinfo, DestReceiver * self) donothingReceive(HeapTuple tuple, TupleDesc typeinfo, DestReceiver *self)
{ {
} }
static void static void
donothingSetup(DestReceiver * self, TupleDesc typeinfo) donothingSetup(DestReceiver *self, TupleDesc typeinfo)
{ {
} }
static void static void
donothingCleanup(DestReceiver * self) donothingCleanup(DestReceiver *self)
{ {
} }

3
src/backend/tioga/tgRecipe.h
View File

@ -11,7 +11,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: tgRecipe.h,v 1.10 1999/05/25 22:04:36 momjian Exp $ * $Id: tgRecipe.h,v 1.11 1999/05/25 22:42:09 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -37,6 +37,7 @@ typedef struct
* *
* *
* *
*
* geo-decls.h */ * geo-decls.h */
#endif /* TIOGA_FRONTEND */ #endif /* TIOGA_FRONTEND */

76
src/backend/utils/adt/int8.c
View File

@ -71,7 +71,7 @@ int8in(char *str)
/* int8out() /* int8out()
*/ */
char * char *
int8out(int64 * val) int8out(int64 *val)
{ {
char *result; char *result;
@ -100,37 +100,37 @@ int8out(int64 * val)
* Is val1 relop val2? * Is val1 relop val2?
*/ */
bool bool
int8eq(int64 * val1, int64 * val2) int8eq(int64 *val1, int64 *val2)
{ {
return *val1 == *val2; return *val1 == *val2;
} /* int8eq() */ } /* int8eq() */
bool bool
int8ne(int64 * val1, int64 * val2) int8ne(int64 *val1, int64 *val2)
{ {
return *val1 != *val2; return *val1 != *val2;
} /* int8ne() */ } /* int8ne() */
bool bool
int8lt(int64 * val1, int64 * val2) int8lt(int64 *val1, int64 *val2)
{ {
return *val1 < *val2; return *val1 < *val2;
} /* int8lt() */ } /* int8lt() */
bool bool
int8gt(int64 * val1, int64 * val2) int8gt(int64 *val1, int64 *val2)
{ {
return *val1 > *val2; return *val1 > *val2;
} /* int8gt() */ } /* int8gt() */
bool bool
int8le(int64 * val1, int64 * val2) int8le(int64 *val1, int64 *val2)
{ {
return *val1 <= *val2; return *val1 <= *val2;
} /* int8le() */ } /* int8le() */
bool bool
int8ge(int64 * val1, int64 * val2) int8ge(int64 *val1, int64 *val2)
{ {
return *val1 >= *val2; return *val1 >= *val2;
} /* int8ge() */ } /* int8ge() */
@ -140,37 +140,37 @@ int8ge(int64 * val1, int64 * val2)
* Is 64-bit val1 relop 32-bit val2? * Is 64-bit val1 relop 32-bit val2?
*/ */
bool bool
int84eq(int64 * val1, int32 val2) int84eq(int64 *val1, int32 val2)
{ {
return *val1 == val2; return *val1 == val2;
} /* int84eq() */ } /* int84eq() */
bool bool
int84ne(int64 * val1, int32 val2) int84ne(int64 *val1, int32 val2)
{ {
return *val1 != val2; return *val1 != val2;
} /* int84ne() */ } /* int84ne() */
bool bool
int84lt(int64 * val1, int32 val2) int84lt(int64 *val1, int32 val2)
{ {
return *val1 < val2; return *val1 < val2;
} /* int84lt() */ } /* int84lt() */
bool bool
int84gt(int64 * val1, int32 val2) int84gt(int64 *val1, int32 val2)
{ {
return *val1 > val2; return *val1 > val2;
} /* int84gt() */ } /* int84gt() */
bool bool
int84le(int64 * val1, int32 val2) int84le(int64 *val1, int32 val2)
{ {
return *val1 <= val2; return *val1 <= val2;
} /* int84le() */ } /* int84le() */
bool bool
int84ge(int64 * val1, int32 val2) int84ge(int64 *val1, int32 val2)
{ {
return *val1 >= val2; return *val1 >= val2;
} /* int84ge() */ } /* int84ge() */
@ -180,37 +180,37 @@ int84ge(int64 * val1, int32 val2)
* Is 32-bit val1 relop 64-bit val2? * Is 32-bit val1 relop 64-bit val2?
*/ */
bool bool
int48eq(int32 val1, int64 * val2) int48eq(int32 val1, int64 *val2)
{ {
return val1 == *val2; return val1 == *val2;
} /* int48eq() */ } /* int48eq() */
bool bool
int48ne(int32 val1, int64 * val2) int48ne(int32 val1, int64 *val2)
{ {
return val1 != *val2; return val1 != *val2;
} /* int48ne() */ } /* int48ne() */
bool bool
int48lt(int32 val1, int64 * val2) int48lt(int32 val1, int64 *val2)
{ {
return val1 < *val2; return val1 < *val2;
} /* int48lt() */ } /* int48lt() */
bool bool
int48gt(int32 val1, int64 * val2) int48gt(int32 val1, int64 *val2)
{ {
return val1 > *val2; return val1 > *val2;
} /* int48gt() */ } /* int48gt() */
bool bool
int48le(int32 val1, int64 * val2) int48le(int32 val1, int64 *val2)
{ {
return val1 <= *val2; return val1 <= *val2;
} /* int48le() */ } /* int48le() */
bool bool
int48ge(int32 val1, int64 * val2) int48ge(int32 val1, int64 *val2)
{ {
return val1 >= *val2; return val1 >= *val2;
} /* int48ge() */ } /* int48ge() */
@ -221,7 +221,7 @@ int48ge(int32 val1, int64 * val2)
*---------------------------------------------------------*/ *---------------------------------------------------------*/
int64 * int64 *
int8um(int64 * val) int8um(int64 *val)
{ {
int64 temp = 0; int64 temp = 0;
int64 *result = palloc(sizeof(int64)); int64 *result = palloc(sizeof(int64));
@ -236,7 +236,7 @@ int8um(int64 * val)
int64 * int64 *
int8pl(int64 * val1, int64 * val2) int8pl(int64 *val1, int64 *val2)
{ {
int64 *result = palloc(sizeof(int64)); int64 *result = palloc(sizeof(int64));
@ -249,7 +249,7 @@ int8pl(int64 * val1, int64 * val2)
} /* int8pl() */ } /* int8pl() */
int64 * int64 *
int8mi(int64 * val1, int64 * val2) int8mi(int64 *val1, int64 *val2)
{ {
int64 *result = palloc(sizeof(int64)); int64 *result = palloc(sizeof(int64));
@ -262,7 +262,7 @@ int8mi(int64 * val1, int64 * val2)
} /* int8mi() */ } /* int8mi() */
int64 * int64 *
int8mul(int64 * val1, int64 * val2) int8mul(int64 *val1, int64 *val2)
{ {
int64 *result = palloc(sizeof(int64)); int64 *result = palloc(sizeof(int64));
@ -275,7 +275,7 @@ int8mul(int64 * val1, int64 * val2)
} /* int8mul() */ } /* int8mul() */
int64 * int64 *
int8div(int64 * val1, int64 * val2) int8div(int64 *val1, int64 *val2)
{ {
int64 *result = palloc(sizeof(int64)); int64 *result = palloc(sizeof(int64));
@ -288,7 +288,7 @@ int8div(int64 * val1, int64 * val2)
} /* int8div() */ } /* int8div() */
int64 * int64 *
int8larger(int64 * val1, int64 * val2) int8larger(int64 *val1, int64 *val2)
{ {
int64 *result = palloc(sizeof(int64)); int64 *result = palloc(sizeof(int64));
@ -301,7 +301,7 @@ int8larger(int64 * val1, int64 * val2)
} /* int8larger() */ } /* int8larger() */
int64 * int64 *
int8smaller(int64 * val1, int64 * val2) int8smaller(int64 *val1, int64 *val2)
{ {
int64 *result = palloc(sizeof(int64)); int64 *result = palloc(sizeof(int64));
@ -315,7 +315,7 @@ int8smaller(int64 * val1, int64 * val2)
int64 * int64 *
int84pl(int64 * val1, int32 val2) int84pl(int64 *val1, int32 val2)
{ {
int64 *result = palloc(sizeof(int64)); int64 *result = palloc(sizeof(int64));
@ -328,7 +328,7 @@ int84pl(int64 * val1, int32 val2)
} /* int84pl() */ } /* int84pl() */
int64 * int64 *
int84mi(int64 * val1, int32 val2) int84mi(int64 *val1, int32 val2)
{ {
int64 *result = palloc(sizeof(int64)); int64 *result = palloc(sizeof(int64));
@ -341,7 +341,7 @@ int84mi(int64 * val1, int32 val2)
} /* int84mi() */ } /* int84mi() */
int64 * int64 *
int84mul(int64 * val1, int32 val2) int84mul(int64 *val1, int32 val2)
{ {
int64 *result = palloc(sizeof(int64)); int64 *result = palloc(sizeof(int64));
@ -354,7 +354,7 @@ int84mul(int64 * val1, int32 val2)
} /* int84mul() */ } /* int84mul() */
int64 * int64 *
int84div(int64 * val1, int32 val2) int84div(int64 *val1, int32 val2)
{ {
int64 *result = palloc(sizeof(int64)); int64 *result = palloc(sizeof(int64));
@ -368,7 +368,7 @@ int84div(int64 * val1, int32 val2)
int64 * int64 *
int48pl(int32 val1, int64 * val2) int48pl(int32 val1, int64 *val2)
{ {
int64 *result = palloc(sizeof(int64)); int64 *result = palloc(sizeof(int64));
@ -381,7 +381,7 @@ int48pl(int32 val1, int64 * val2)
} /* int48pl() */ } /* int48pl() */
int64 * int64 *
int48mi(int32 val1, int64 * val2) int48mi(int32 val1, int64 *val2)
{ {
int64 *result = palloc(sizeof(int64)); int64 *result = palloc(sizeof(int64));
@ -394,7 +394,7 @@ int48mi(int32 val1, int64 * val2)
} /* int48mi() */ } /* int48mi() */
int64 * int64 *
int48mul(int32 val1, int64 * val2) int48mul(int32 val1, int64 *val2)
{ {
int64 *result = palloc(sizeof(int64)); int64 *result = palloc(sizeof(int64));
@ -407,7 +407,7 @@ int48mul(int32 val1, int64 * val2)
} /* int48mul() */ } /* int48mul() */
int64 * int64 *
int48div(int32 val1, int64 * val2) int48div(int32 val1, int64 *val2)
{ {
int64 *result = palloc(sizeof(int64)); int64 *result = palloc(sizeof(int64));
@ -435,7 +435,7 @@ int48(int32 val)
} /* int48() */ } /* int48() */
int32 int32
int84(int64 * val) int84(int64 *val)
{ {
int32 result; int32 result;
@ -473,7 +473,7 @@ int28 (int16 val)
} /* int28() */ } /* int28() */
int16 int16
int82(int64 * val) int82(int64 *val)
{ {
int16 result; int16 result;
@ -491,7 +491,7 @@ int82(int64 * val)
#endif #endif
float64 float64
i8tod(int64 * val) i8tod(int64 *val)
{ {
float64 result = palloc(sizeof(float64data)); float64 result = palloc(sizeof(float64data));
@ -546,7 +546,7 @@ text_int8(text *str)
/* int8_text() /* int8_text()
*/ */
text * text *
int8_text(int64 * val) int8_text(int64 *val)
{ {
text *result; text *result;

166
src/backend/utils/adt/numeric.c
View File

@ -5,7 +5,7 @@
* *
* 1998 Jan Wieck * 1998 Jan Wieck
* *
* $Header: /cvsroot/pgsql/src/backend/utils/adt/numeric.c,v 1.15 1999/05/25 22:04:40 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/adt/numeric.c,v 1.16 1999/05/25 22:42:13 momjian Exp $
* *
* ---------- * ----------
*/ */
@ -63,7 +63,7 @@ typedef struct NumericDigitBuf
struct NumericDigitBuf *prev; struct NumericDigitBuf *prev;
struct NumericDigitBuf *next; struct NumericDigitBuf *next;
int size; int size;
} NumericDigitBuf; } NumericDigitBuf;
typedef struct NumericVar typedef struct NumericVar
{ {
@ -74,7 +74,7 @@ typedef struct NumericVar
int sign; int sign;
NumericDigitBuf *buf; NumericDigitBuf *buf;
NumericDigit *digits; NumericDigit *digits;
} NumericVar; } NumericVar;
/* ---------- /* ----------
@ -114,7 +114,7 @@ static NumericVar const_nan =
#ifdef NUMERIC_DEBUG #ifdef NUMERIC_DEBUG
static void dump_numeric(char *str, Numeric num); static void dump_numeric(char *str, Numeric num);
static void dump_var(char *str, NumericVar * var); static void dump_var(char *str, NumericVar *var);
#else #else
#define dump_numeric(s,n) #define dump_numeric(s,n)
@ -122,37 +122,37 @@ static void dump_var(char *str, NumericVar * var);
#endif #endif
static NumericDigitBuf *digitbuf_alloc(int size); static NumericDigitBuf *digitbuf_alloc(int size);
static void digitbuf_free(NumericDigitBuf * buf); static void digitbuf_free(NumericDigitBuf *buf);
#define init_var(v) memset(v,0,sizeof(NumericVar)) #define init_var(v) memset(v,0,sizeof(NumericVar))
static void free_var(NumericVar * var); static void free_var(NumericVar *var);
static void free_allvars(void); static void free_allvars(void);
static void set_var_from_str(char *str, NumericVar * dest); static void set_var_from_str(char *str, NumericVar *dest);
static void set_var_from_num(Numeric value, NumericVar * dest); static void set_var_from_num(Numeric value, NumericVar *dest);
static void set_var_from_var(NumericVar * value, NumericVar * dest); static void set_var_from_var(NumericVar *value, NumericVar *dest);
static Numeric make_result(NumericVar * var); static Numeric make_result(NumericVar *var);
static void apply_typmod(NumericVar * var, int32 typmod); static void apply_typmod(NumericVar *var, int32 typmod);
static int cmp_var(NumericVar * var1, NumericVar * var2); static int cmp_var(NumericVar *var1, NumericVar *var2);
static void add_var(NumericVar * var1, NumericVar * var2, NumericVar * result); static void add_var(NumericVar *var1, NumericVar *var2, NumericVar *result);
static void sub_var(NumericVar * var1, NumericVar * var2, NumericVar * result); static void sub_var(NumericVar *var1, NumericVar *var2, NumericVar *result);
static void mul_var(NumericVar * var1, NumericVar * var2, NumericVar * result); static void mul_var(NumericVar *var1, NumericVar *var2, NumericVar *result);
static void div_var(NumericVar * var1, NumericVar * var2, NumericVar * result); static void div_var(NumericVar *var1, NumericVar *var2, NumericVar *result);
static void mod_var(NumericVar * var1, NumericVar * var2, NumericVar * result); static void mod_var(NumericVar *var1, NumericVar *var2, NumericVar *result);
static void ceil_var(NumericVar * var, NumericVar * result); static void ceil_var(NumericVar *var, NumericVar *result);
static void floor_var(NumericVar * var, NumericVar * result); static void floor_var(NumericVar *var, NumericVar *result);
static void sqrt_var(NumericVar * arg, NumericVar * result); static void sqrt_var(NumericVar *arg, NumericVar *result);
static void exp_var(NumericVar * arg, NumericVar * result); static void exp_var(NumericVar *arg, NumericVar *result);
static void ln_var(NumericVar * arg, NumericVar * result); static void ln_var(NumericVar *arg, NumericVar *result);
static void log_var(NumericVar * base, NumericVar * num, NumericVar * result); static void log_var(NumericVar *base, NumericVar *num, NumericVar *result);
static void power_var(NumericVar * base, NumericVar * exp, NumericVar * result); static void power_var(NumericVar *base, NumericVar *exp, NumericVar *result);
static int cmp_abs(NumericVar * var1, NumericVar * var2); static int cmp_abs(NumericVar *var1, NumericVar *var2);
static void add_abs(NumericVar * var1, NumericVar * var2, NumericVar * result); static void add_abs(NumericVar *var1, NumericVar *var2, NumericVar *result);
static void sub_abs(NumericVar * var1, NumericVar * var2, NumericVar * result); static void sub_abs(NumericVar *var1, NumericVar *var2, NumericVar *result);
@ -1835,7 +1835,7 @@ dump_numeric(char *str, Numeric num)
* ---------- * ----------
*/ */
static void static void
dump_var(char *str, NumericVar * var) dump_var(char *str, NumericVar *var)
{ {
int i; int i;
@ -1962,7 +1962,7 @@ digitbuf_alloc(int size)
* ---------- * ----------
*/ */
static void static void
digitbuf_free(NumericDigitBuf * buf) digitbuf_free(NumericDigitBuf *buf)
{ {
NumericDigitBuf *smallest; NumericDigitBuf *smallest;
@ -2048,7 +2048,7 @@ digitbuf_free(NumericDigitBuf * buf)
* ---------- * ----------
*/ */
static void static void
free_var(NumericVar * var) free_var(NumericVar *var)
{ {
if (var->buf != NULL) if (var->buf != NULL)
{ {
@ -2096,7 +2096,7 @@ free_allvars(void)
* ---------- * ----------
*/ */
static void static void
set_var_from_str(char *str, NumericVar * dest) set_var_from_str(char *str, NumericVar *dest)
{ {
char *cp = str; char *cp = str;
bool have_dp = FALSE; bool have_dp = FALSE;
@ -2238,7 +2238,7 @@ set_var_from_str(char *str, NumericVar * dest)
* *
*/ */
static void static void
set_var_from_num(Numeric num, NumericVar * dest) set_var_from_num(Numeric num, NumericVar *dest)
{ {
NumericDigit *digit; NumericDigit *digit;
int i; int i;
@ -2275,7 +2275,7 @@ set_var_from_num(Numeric num, NumericVar * dest)
* ---------- * ----------
*/ */
static void static void
set_var_from_var(NumericVar * value, NumericVar * dest) set_var_from_var(NumericVar *value, NumericVar *dest)
{ {
NumericDigitBuf *newbuf; NumericDigitBuf *newbuf;
NumericDigit *newdigits; NumericDigit *newdigits;
@ -2299,7 +2299,7 @@ set_var_from_var(NumericVar * value, NumericVar * dest)
* ---------- * ----------
*/ */
static Numeric static Numeric
make_result(NumericVar * var) make_result(NumericVar *var)
{ {
Numeric result; Numeric result;
NumericDigit *digit = var->digits; NumericDigit *digit = var->digits;
@ -2368,7 +2368,7 @@ make_result(NumericVar * var)
* ---------- * ----------
*/ */
static void static void
apply_typmod(NumericVar * var, int32 typmod) apply_typmod(NumericVar *var, int32 typmod)
{ {
int precision; int precision;
int scale; int scale;
@ -2439,7 +2439,7 @@ apply_typmod(NumericVar * var, int32 typmod)
* ---------- * ----------
*/ */
static int static int
cmp_var(NumericVar * var1, NumericVar * var2) cmp_var(NumericVar *var1, NumericVar *var2)
{ {
if (var1->ndigits == 0) if (var1->ndigits == 0)
{ {
@ -2478,7 +2478,7 @@ cmp_var(NumericVar * var1, NumericVar * var2)
* ---------- * ----------
*/ */
static void static void
add_var(NumericVar * var1, NumericVar * var2, NumericVar * result) add_var(NumericVar *var1, NumericVar *var2, NumericVar *result)
{ {
/* ---------- /* ----------
* Decide on the signs of the two variables what to do * Decide on the signs of the two variables what to do
@ -2506,10 +2506,10 @@ add_var(NumericVar * var1, NumericVar * var2, NumericVar * result)
switch (cmp_abs(var1, var2)) switch (cmp_abs(var1, var2))
{ {
case 0: /* ---------- case 0: /* ----------
* ABS(var1) == ABS(var2) * ABS(var1) == ABS(var2)
* result = ZERO * result = ZERO
* ---------- * ----------
*/ */
digitbuf_free(result->buf); digitbuf_free(result->buf);
result->buf = digitbuf_alloc(0); result->buf = digitbuf_alloc(0);
result->ndigits = 0; result->ndigits = 0;
@ -2522,10 +2522,10 @@ add_var(NumericVar * var1, NumericVar * var2, NumericVar * result)
break; break;
case 1: /* ---------- case 1: /* ----------
* ABS(var1) > ABS(var2) * ABS(var1) > ABS(var2)
* result = +(ABS(var1) - ABS(var2)) * result = +(ABS(var1) - ABS(var2))
* ---------- * ----------
*/ */
sub_abs(var1, var2, result); sub_abs(var1, var2, result);
result->sign = NUMERIC_POS; result->sign = NUMERIC_POS;
break; break;
@ -2553,10 +2553,10 @@ add_var(NumericVar * var1, NumericVar * var2, NumericVar * result)
switch (cmp_abs(var1, var2)) switch (cmp_abs(var1, var2))
{ {
case 0: /* ---------- case 0: /* ----------
* ABS(var1) == ABS(var2) * ABS(var1) == ABS(var2)
* result = ZERO * result = ZERO
* ---------- * ----------
*/ */
digitbuf_free(result->buf); digitbuf_free(result->buf);
result->buf = digitbuf_alloc(0); result->buf = digitbuf_alloc(0);
result->ndigits = 0; result->ndigits = 0;
@ -2569,10 +2569,10 @@ add_var(NumericVar * var1, NumericVar * var2, NumericVar * result)
break; break;
case 1: /* ---------- case 1: /* ----------
* ABS(var1) > ABS(var2) * ABS(var1) > ABS(var2)
* result = -(ABS(var1) - ABS(var2)) * result = -(ABS(var1) - ABS(var2))
* ---------- * ----------
*/ */
sub_abs(var1, var2, result); sub_abs(var1, var2, result);
result->sign = NUMERIC_NEG; result->sign = NUMERIC_NEG;
break; break;
@ -2609,7 +2609,7 @@ add_var(NumericVar * var1, NumericVar * var2, NumericVar * result)
* ---------- * ----------
*/ */
static void static void
sub_var(NumericVar * var1, NumericVar * var2, NumericVar * result) sub_var(NumericVar *var1, NumericVar *var2, NumericVar *result)
{ {
/* ---------- /* ----------
* Decide on the signs of the two variables what to do * Decide on the signs of the two variables what to do
@ -2637,10 +2637,10 @@ sub_var(NumericVar * var1, NumericVar * var2, NumericVar * result)
switch (cmp_abs(var1, var2)) switch (cmp_abs(var1, var2))
{ {
case 0: /* ---------- case 0: /* ----------
* ABS(var1) == ABS(var2) * ABS(var1) == ABS(var2)
* result = ZERO * result = ZERO
* ---------- * ----------
*/ */
digitbuf_free(result->buf); digitbuf_free(result->buf);
result->buf = digitbuf_alloc(0); result->buf = digitbuf_alloc(0);
result->ndigits = 0; result->ndigits = 0;
@ -2653,10 +2653,10 @@ sub_var(NumericVar * var1, NumericVar * var2, NumericVar * result)
break; break;
case 1: /* ---------- case 1: /* ----------
* ABS(var1) > ABS(var2) * ABS(var1) > ABS(var2)
* result = +(ABS(var1) - ABS(var2)) * result = +(ABS(var1) - ABS(var2))
* ---------- * ----------
*/ */
sub_abs(var1, var2, result); sub_abs(var1, var2, result);
result->sign = NUMERIC_POS; result->sign = NUMERIC_POS;
break; break;
@ -2684,10 +2684,10 @@ sub_var(NumericVar * var1, NumericVar * var2, NumericVar * result)
switch (cmp_abs(var1, var2)) switch (cmp_abs(var1, var2))
{ {
case 0: /* ---------- case 0: /* ----------
* ABS(var1) == ABS(var2) * ABS(var1) == ABS(var2)
* result = ZERO * result = ZERO
* ---------- * ----------
*/ */
digitbuf_free(result->buf); digitbuf_free(result->buf);
result->buf = digitbuf_alloc(0); result->buf = digitbuf_alloc(0);
result->ndigits = 0; result->ndigits = 0;
@ -2700,10 +2700,10 @@ sub_var(NumericVar * var1, NumericVar * var2, NumericVar * result)
break; break;
case 1: /* ---------- case 1: /* ----------
* ABS(var1) > ABS(var2) * ABS(var1) > ABS(var2)
* result = -(ABS(var1) - ABS(var2)) * result = -(ABS(var1) - ABS(var2))
* ---------- * ----------
*/ */
sub_abs(var1, var2, result); sub_abs(var1, var2, result);
result->sign = NUMERIC_NEG; result->sign = NUMERIC_NEG;
break; break;
@ -2740,7 +2740,7 @@ sub_var(NumericVar * var1, NumericVar * var2, NumericVar * result)
* ---------- * ----------
*/ */
static void static void
mul_var(NumericVar * var1, NumericVar * var2, NumericVar * result) mul_var(NumericVar *var1, NumericVar *var2, NumericVar *result)
{ {
NumericDigitBuf *res_buf; NumericDigitBuf *res_buf;
NumericDigit *res_digits; NumericDigit *res_digits;
@ -2825,7 +2825,7 @@ mul_var(NumericVar * var1, NumericVar * var2, NumericVar * result)
* ---------- * ----------
*/ */
static void static void
div_var(NumericVar * var1, NumericVar * var2, NumericVar * result) div_var(NumericVar *var1, NumericVar *var2, NumericVar *result)
{ {
NumericDigit *res_digits; NumericDigit *res_digits;
int res_ndigits; int res_ndigits;
@ -3046,7 +3046,7 @@ div_var(NumericVar * var1, NumericVar * var2, NumericVar * result)
* ---------- * ----------
*/ */
static void static void
mod_var(NumericVar * var1, NumericVar * var2, NumericVar * result) mod_var(NumericVar *var1, NumericVar *var2, NumericVar *result)
{ {
NumericVar tmp; NumericVar tmp;
int save_global_rscale; int save_global_rscale;
@ -3083,7 +3083,7 @@ mod_var(NumericVar * var1, NumericVar * var2, NumericVar * result)
* ---------- * ----------
*/ */
static void static void
ceil_var(NumericVar * var, NumericVar * result) ceil_var(NumericVar *var, NumericVar *result)
{ {
NumericVar tmp; NumericVar tmp;
@ -3108,7 +3108,7 @@ ceil_var(NumericVar * var, NumericVar * result)
* ---------- * ----------
*/ */
static void static void
floor_var(NumericVar * var, NumericVar * result) floor_var(NumericVar *var, NumericVar *result)
{ {
NumericVar tmp; NumericVar tmp;
@ -3132,7 +3132,7 @@ floor_var(NumericVar * var, NumericVar * result)
* ---------- * ----------
*/ */
static void static void
sqrt_var(NumericVar * arg, NumericVar * result) sqrt_var(NumericVar *arg, NumericVar *result)
{ {
NumericVar tmp_arg; NumericVar tmp_arg;
NumericVar tmp_val; NumericVar tmp_val;
@ -3210,7 +3210,7 @@ sqrt_var(NumericVar * arg, NumericVar * result)
* ---------- * ----------
*/ */
static void static void
exp_var(NumericVar * arg, NumericVar * result) exp_var(NumericVar *arg, NumericVar *result)
{ {
NumericVar x; NumericVar x;
NumericVar xpow; NumericVar xpow;
@ -3304,7 +3304,7 @@ exp_var(NumericVar * arg, NumericVar * result)
* ---------- * ----------
*/ */
static void static void
ln_var(NumericVar * arg, NumericVar * result) ln_var(NumericVar *arg, NumericVar *result)
{ {
NumericVar x; NumericVar x;
NumericVar xx; NumericVar xx;
@ -3382,7 +3382,7 @@ ln_var(NumericVar * arg, NumericVar * result)
* ---------- * ----------
*/ */
static void static void
log_var(NumericVar * base, NumericVar * num, NumericVar * result) log_var(NumericVar *base, NumericVar *num, NumericVar *result)
{ {
NumericVar ln_base; NumericVar ln_base;
NumericVar ln_num; NumericVar ln_num;
@ -3411,7 +3411,7 @@ log_var(NumericVar * base, NumericVar * num, NumericVar * result)
* ---------- * ----------
*/ */
static void static void
power_var(NumericVar * base, NumericVar * exp, NumericVar * result) power_var(NumericVar *base, NumericVar *exp, NumericVar *result)
{ {
NumericVar ln_base; NumericVar ln_base;
NumericVar ln_num; NumericVar ln_num;
@ -3455,7 +3455,7 @@ power_var(NumericVar * base, NumericVar * exp, NumericVar * result)
* ---------- * ----------
*/ */
static int static int
cmp_abs(NumericVar * var1, NumericVar * var2) cmp_abs(NumericVar *var1, NumericVar *var2)
{ {
int i1 = 0; int i1 = 0;
int i2 = 0; int i2 = 0;
@ -3513,7 +3513,7 @@ cmp_abs(NumericVar * var1, NumericVar * var2)
* ---------- * ----------
*/ */
static void static void
add_abs(NumericVar * var1, NumericVar * var2, NumericVar * result) add_abs(NumericVar *var1, NumericVar *var2, NumericVar *result)
{ {
NumericDigitBuf *res_buf; NumericDigitBuf *res_buf;
NumericDigit *res_digits; NumericDigit *res_digits;
@ -3582,7 +3582,7 @@ add_abs(NumericVar * var1, NumericVar * var2, NumericVar * result)
* ---------- * ----------
*/ */
static void static void
sub_abs(NumericVar * var1, NumericVar * var2, NumericVar * result) sub_abs(NumericVar *var1, NumericVar *var2, NumericVar *result)
{ {
NumericDigitBuf *res_buf; NumericDigitBuf *res_buf;
NumericDigit *res_digits; NumericDigit *res_digits;

40
src/backend/utils/adt/ruleutils.c
View File

@ -3,7 +3,7 @@
* out of it's tuple * out of it's tuple
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/ruleutils.c,v 1.16 1999/05/25 22:04:41 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/adt/ruleutils.c,v 1.17 1999/05/25 22:42:13 momjian Exp $
* *
* This software is copyrighted by Jan Wieck - Hamburg. * This software is copyrighted by Jan Wieck - Hamburg.
* *
@ -67,7 +67,7 @@ typedef struct QryHier
{ {
struct QryHier *parent; struct QryHier *parent;
Query *query; Query *query;
} QryHier; } QryHier;
/* ---------- /* ----------
@ -101,16 +101,16 @@ NameData *pg_get_userbyid(int4 uid);
*/ */
static char *make_ruledef(HeapTuple ruletup, TupleDesc rulettc); static char *make_ruledef(HeapTuple ruletup, TupleDesc rulettc);
static char *make_viewdef(HeapTuple ruletup, TupleDesc rulettc); static char *make_viewdef(HeapTuple ruletup, TupleDesc rulettc);
static char *get_query_def(Query *query, QryHier * parentqh); static char *get_query_def(Query *query, QryHier *parentqh);
static char *get_select_query_def(Query *query, QryHier * qh); static char *get_select_query_def(Query *query, QryHier *qh);
static char *get_insert_query_def(Query *query, QryHier * qh); static char *get_insert_query_def(Query *query, QryHier *qh);
static char *get_update_query_def(Query *query, QryHier * qh); static char *get_update_query_def(Query *query, QryHier *qh);
static char *get_delete_query_def(Query *query, QryHier * qh); static char *get_delete_query_def(Query *query, QryHier *qh);
static char *get_rule_expr(QryHier * qh, int rt_index, Node *node, bool varprefix); static char *get_rule_expr(QryHier *qh, int rt_index, Node *node, bool varprefix);
static char *get_func_expr(QryHier * qh, int rt_index, Expr *expr, bool varprefix); static char *get_func_expr(QryHier *qh, int rt_index, Expr *expr, bool varprefix);
static char *get_tle_expr(QryHier * qh, int rt_index, TargetEntry *tle, bool varprefix); static char *get_tle_expr(QryHier *qh, int rt_index, TargetEntry *tle, bool varprefix);
static char *get_const_expr(Const *constval); static char *get_const_expr(Const *constval);
static char *get_sublink_expr(QryHier * qh, int rt_index, Node *node, bool varprefix); static char *get_sublink_expr(QryHier *qh, int rt_index, Node *node, bool varprefix);
static char *get_relation_name(Oid relid); static char *get_relation_name(Oid relid);
static char *get_attribute_name(Oid relid, int2 attnum); static char *get_attribute_name(Oid relid, int2 attnum);
static bool check_if_rte_used(int rt_index, Node *node, int sup); static bool check_if_rte_used(int rt_index, Node *node, int sup);
@ -806,7 +806,7 @@ make_viewdef(HeapTuple ruletup, TupleDesc rulettc)
* ---------- * ----------
*/ */
static char * static char *
get_query_def(Query *query, QryHier * parentqh) get_query_def(Query *query, QryHier *parentqh)
{ {
QryHier qh; QryHier qh;
@ -850,7 +850,7 @@ get_query_def(Query *query, QryHier * parentqh)
* ---------- * ----------
*/ */
static char * static char *
get_select_query_def(Query *query, QryHier * qh) get_select_query_def(Query *query, QryHier *qh)
{ {
char buf[BUFSIZE]; char buf[BUFSIZE];
char *sep; char *sep;
@ -1020,7 +1020,7 @@ get_select_query_def(Query *query, QryHier * qh)
* ---------- * ----------
*/ */
static char * static char *
get_insert_query_def(Query *query, QryHier * qh) get_insert_query_def(Query *query, QryHier *qh)
{ {
char buf[BUFSIZE]; char buf[BUFSIZE];
char *sep; char *sep;
@ -1130,7 +1130,7 @@ get_insert_query_def(Query *query, QryHier * qh)
* ---------- * ----------
*/ */
static char * static char *
get_update_query_def(Query *query, QryHier * qh) get_update_query_def(Query *query, QryHier *qh)
{ {
char buf[BUFSIZE]; char buf[BUFSIZE];
char *sep; char *sep;
@ -1183,7 +1183,7 @@ get_update_query_def(Query *query, QryHier * qh)
* ---------- * ----------
*/ */
static char * static char *
get_delete_query_def(Query *query, QryHier * qh) get_delete_query_def(Query *query, QryHier *qh)
{ {
char buf[BUFSIZE]; char buf[BUFSIZE];
RangeTblEntry *rte; RangeTblEntry *rte;
@ -1217,7 +1217,7 @@ get_delete_query_def(Query *query, QryHier * qh)
* ---------- * ----------
*/ */
static char * static char *
get_rule_expr(QryHier * qh, int rt_index, Node *node, bool varprefix) get_rule_expr(QryHier *qh, int rt_index, Node *node, bool varprefix)
{ {
char buf[BUFSIZE]; char buf[BUFSIZE];
@ -1417,7 +1417,7 @@ get_rule_expr(QryHier * qh, int rt_index, Node *node, bool varprefix)
* ---------- * ----------
*/ */
static char * static char *
get_func_expr(QryHier * qh, int rt_index, Expr *expr, bool varprefix) get_func_expr(QryHier *qh, int rt_index, Expr *expr, bool varprefix)
{ {
char buf[BUFSIZE]; char buf[BUFSIZE];
HeapTuple proctup; HeapTuple proctup;
@ -1496,7 +1496,7 @@ get_func_expr(QryHier * qh, int rt_index, Expr *expr, bool varprefix)
* ---------- * ----------
*/ */
static char * static char *
get_tle_expr(QryHier * qh, int rt_index, TargetEntry *tle, bool varprefix) get_tle_expr(QryHier *qh, int rt_index, TargetEntry *tle, bool varprefix)
{ {
HeapTuple proctup; HeapTuple proctup;
Form_pg_proc procStruct; Form_pg_proc procStruct;
@ -1605,7 +1605,7 @@ get_const_expr(Const *constval)
* ---------- * ----------
*/ */
static char * static char *
get_sublink_expr(QryHier * qh, int rt_index, Node *node, bool varprefix) get_sublink_expr(QryHier *qh, int rt_index, Node *node, bool varprefix)
{ {
SubLink *sublink = (SubLink *) node; SubLink *sublink = (SubLink *) node;
Query *query = (Query *) (sublink->subselect); Query *query = (Query *) (sublink->subselect);

4
src/backend/utils/cache/syscache.c vendored
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/cache/syscache.c,v 1.25 1999/05/25 16:12:23 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/cache/syscache.c,v 1.26 1999/05/25 22:42:15 momjian Exp $
* *
* NOTES * NOTES
* These routines allow the parser/planner/executor to perform * These routines allow the parser/planner/executor to perform
@ -205,7 +205,7 @@ static struct cachedesc cacheinfo[] = {
0, 0,
0 0
}, },
offsetof(FormData_pg_type, typalign) + sizeof(char), offsetof(FormData_pg_type, typalign) +sizeof(char),
TypeNameIndex, TypeNameIndex,
TypeNameIndexScan}, TypeNameIndexScan},
{TypeRelationName, /* TYPOID */ {TypeRelationName, /* TYPOID */

4
src/backend/utils/cache/temprel.c vendored
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/cache/Attic/temprel.c,v 1.3 1999/05/25 16:12:24 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/cache/Attic/temprel.c,v 1.4 1999/05/25 22:42:16 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -49,7 +49,7 @@ typedef struct TempTable
{ {
char *user_relname; char *user_relname;
HeapTuple pg_class_tuple; HeapTuple pg_class_tuple;
} TempTable; } TempTable;
void void

10
src/backend/utils/mb/big5.c
View File

@ -7,7 +7,7 @@
* *
* 1999/1/15 Tatsuo Ishii * 1999/1/15 Tatsuo Ishii
* *
* $Id: big5.c,v 1.3 1999/05/25 22:04:45 momjian Exp $ * $Id: big5.c,v 1.4 1999/05/25 22:42:19 momjian Exp $
*/ */
#include "mb/pg_wchar.h" #include "mb/pg_wchar.h"
@ -218,7 +218,7 @@ static unsigned short BinarySearchRange
{ {
if (0 == array[mid].peer) if (0 == array[mid].peer)
return 0; return 0;
if (code >= (unsigned)0xa140) if (code >= (unsigned) 0xa140)
{ {
/* big5 to cns */ /* big5 to cns */
tmp = ((code & 0xff00) - (array[mid].code & 0xff00)) >> 8; tmp = ((code & 0xff00) - (array[mid].code & 0xff00)) >> 8;
@ -292,7 +292,7 @@ BIG5toCNS(unsigned short big5, unsigned char *lc)
unsigned short cns = 0; unsigned short cns = 0;
int i; int i;
if (big5 < (unsigned)0xc940) if (big5 < (unsigned) 0xc940)
{ {
/* level 1 */ /* level 1 */
@ -301,14 +301,14 @@ BIG5toCNS(unsigned short big5, unsigned char *lc)
if (b1c4[i][0] == big5) if (b1c4[i][0] == big5)
{ {
*lc = LC_CNS11643_4; *lc = LC_CNS11643_4;
return (b1c4[i][1] | (unsigned)0x8080); return (b1c4[i][1] | (unsigned) 0x8080);
} }
} }
if (0 < (cns = BinarySearchRange(big5Level1ToCnsPlane1, 23, big5))) if (0 < (cns = BinarySearchRange(big5Level1ToCnsPlane1, 23, big5)))
*lc = LC_CNS11643_1; *lc = LC_CNS11643_1;
} }
else if (big5 == (unsigned)0xc94a) else if (big5 == (unsigned) 0xc94a)
{ {
/* level 2 */ /* level 2 */
*lc = LC_CNS11643_1; *lc = LC_CNS11643_1;

4
src/backend/utils/mb/conv.c
View File

@ -2,7 +2,7 @@
* conversion between client encoding and server internal encoding * conversion between client encoding and server internal encoding
* (currently mule internal code (mic) is used) * (currently mule internal code (mic) is used)
* Tatsuo Ishii * Tatsuo Ishii
* $Id: conv.c,v 1.9 1999/05/25 22:04:47 momjian Exp $ * $Id: conv.c,v 1.10 1999/05/25 22:42:20 momjian Exp $
*/ */
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
@ -384,7 +384,7 @@ big52mic(unsigned char *big5, unsigned char *p, int len)
while (len > 0 && (c1 = *big5++)) while (len > 0 && (c1 = *big5++))
{ {
if (c1 <= (unsigned)0x7f) if (c1 <= (unsigned) 0x7f)
{ /* ASCII */ { /* ASCII */
len--; len--;
*p++ = c1; *p++ = c1;

14
src/backend/utils/sort/psort.c
View File

@ -4,7 +4,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: psort.c,v 1.52 1999/05/25 16:12:59 momjian Exp $ * $Id: psort.c,v 1.53 1999/05/25 22:42:22 momjian Exp $
* *
* NOTES * NOTES
* Sorts the first relation into the second relation. * Sorts the first relation into the second relation.
@ -55,9 +55,9 @@
#include "utils/rel.h" #include "utils/rel.h"
static bool createfirstrun(Sort *node); static bool createfirstrun(Sort *node);
static bool createrun(Sort *node, BufFile * file); static bool createrun(Sort *node, BufFile *file);
static void destroytape(BufFile * file); static void destroytape(BufFile *file);
static void dumptuples(BufFile * file, Sort *node); static void dumptuples(BufFile *file, Sort *node);
static BufFile *gettape(void); static BufFile *gettape(void);
static void initialrun(Sort *node); static void initialrun(Sort *node);
static void inittapes(Sort *node); static void inittapes(Sort *node);
@ -473,7 +473,7 @@ createfirstrun(Sort *node)
* Tuples contains the tuples for the following run upon exit * Tuples contains the tuples for the following run upon exit
*/ */
static bool static bool
createrun(Sort *node, BufFile * file) createrun(Sort *node, BufFile *file)
{ {
HeapTuple lasttuple; HeapTuple lasttuple;
HeapTuple tup; HeapTuple tup;
@ -720,7 +720,7 @@ merge(Sort *node, struct tape * dest)
* dumptuples - stores all the tuples in tree into file * dumptuples - stores all the tuples in tree into file
*/ */
static void static void
dumptuples(BufFile * file, Sort *node) dumptuples(BufFile *file, Sort *node)
{ {
struct leftist *tp; struct leftist *tp;
struct leftist *newp; struct leftist *newp;
@ -996,7 +996,7 @@ gettape()
* destroytape - unlinks the tape * destroytape - unlinks the tape
*/ */
static void static void
destroytape(BufFile * file) destroytape(BufFile *file)
{ {
BufFileClose(file); BufFileClose(file);
} }

2
src/bin/pgtclsh/pgtclAppInit.c
View File

@ -73,7 +73,7 @@ main(int argc, char **argv)
*/ */
int int
Tcl_AppInit(Tcl_Interp * interp) Tcl_AppInit(Tcl_Interp *interp)
{ {
if (Tcl_Init(interp) == TCL_ERROR) if (Tcl_Init(interp) == TCL_ERROR)
return TCL_ERROR; return TCL_ERROR;

2
src/bin/pgtclsh/pgtkAppInit.c
View File

@ -72,7 +72,7 @@ main(int argc, char **argv)
*/ */
int int
Tcl_AppInit(Tcl_Interp * interp) Tcl_AppInit(Tcl_Interp *interp)
{ {
if (Tcl_Init(interp) == TCL_ERROR) if (Tcl_Init(interp) == TCL_ERROR)
return TCL_ERROR; return TCL_ERROR;

4
src/include/access/hash.h
View File

@ -6,7 +6,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: hash.h,v 1.23 1999/05/25 16:13:27 momjian Exp $ * $Id: hash.h,v 1.24 1999/05/25 22:42:30 momjian Exp $
* *
* NOTES * NOTES
* modeled after Margo Seltzer's hash implementation for unix. * modeled after Margo Seltzer's hash implementation for unix.
@ -265,7 +265,7 @@ extern void hashdelete(Relation rel, ItemPointer tid);
/* hashfunc.c */ /* hashfunc.c */
extern uint32 hashint2(int16 key); extern uint32 hashint2(int16 key);
extern uint32 hashint4(uint32 key); extern uint32 hashint4(uint32 key);
extern uint32 hashint8(int64 * key); extern uint32 hashint8(int64 *key);
extern uint32 hashfloat4(float32 keyp); extern uint32 hashfloat4(float32 keyp);
extern uint32 hashfloat8(float64 keyp); extern uint32 hashfloat8(float64 keyp);
extern uint32 hashoid(Oid key); extern uint32 hashoid(Oid key);

4
src/include/access/htup.h
View File

@ -6,7 +6,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: htup.h,v 1.15 1999/05/25 16:13:31 momjian Exp $ * $Id: htup.h,v 1.16 1999/05/25 22:42:32 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -48,7 +48,7 @@ typedef struct HeapTupleHeaderData
/* bit map of domains */ /* bit map of domains */
/* MORE DATA FOLLOWS AT END OF STRUCT */ /* MORE DATA FOLLOWS AT END OF STRUCT */
} HeapTupleHeaderData; } HeapTupleHeaderData;
typedef HeapTupleHeaderData *HeapTupleHeader; typedef HeapTupleHeaderData *HeapTupleHeader;

8
src/include/access/printtup.h
View File

@ -6,7 +6,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: printtup.h,v 1.9 1999/05/25 16:13:33 momjian Exp $ * $Id: printtup.h,v 1.10 1999/05/25 22:42:32 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -18,13 +18,13 @@
extern DestReceiver *printtup_create_DR(void); extern DestReceiver *printtup_create_DR(void);
extern void showatts(char *name, TupleDesc attinfo); extern void showatts(char *name, TupleDesc attinfo);
extern void debugtup(HeapTuple tuple, TupleDesc typeinfo, extern void debugtup(HeapTuple tuple, TupleDesc typeinfo,
DestReceiver * self); DestReceiver *self);
extern void printtup_internal(HeapTuple tuple, TupleDesc typeinfo, extern void printtup_internal(HeapTuple tuple, TupleDesc typeinfo,
DestReceiver * self); DestReceiver *self);
/* XXX this one is really in executor/spi.c */ /* XXX this one is really in executor/spi.c */
extern void spi_printtup(HeapTuple tuple, TupleDesc tupdesc, extern void spi_printtup(HeapTuple tuple, TupleDesc tupdesc,
DestReceiver * self); DestReceiver *self);
extern int getTypeOutAndElem(Oid type, Oid *typOutput, Oid *typElem); extern int getTypeOutAndElem(Oid type, Oid *typOutput, Oid *typElem);

3
src/include/access/strat.h
View File

@ -7,7 +7,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: strat.h,v 1.14 1999/05/25 22:04:56 momjian Exp $ * $Id: strat.h,v 1.15 1999/05/25 22:42:34 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -33,6 +33,7 @@ typedef struct StrategyTransformMapData
* *
* *
* *
*
* STRUCTURE */ * STRUCTURE */
typedef StrategyTransformMapData *StrategyTransformMap; typedef StrategyTransformMapData *StrategyTransformMap;

4
src/include/access/transam.h
View File

@ -6,7 +6,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: transam.h,v 1.20 1999/05/25 16:13:35 momjian Exp $ * $Id: transam.h,v 1.21 1999/05/25 22:42:35 momjian Exp $
* *
* NOTES * NOTES
* Transaction System Version 101 now support proper oid * Transaction System Version 101 now support proper oid
@ -128,7 +128,7 @@ typedef struct VariableCacheData
TransactionId nextXid; TransactionId nextXid;
uint32 oid_count; /* not implemented, yet */ uint32 oid_count; /* not implemented, yet */
Oid nextOid; Oid nextOid;
} VariableCacheData; } VariableCacheData;
typedef VariableCacheData *VariableCache; typedef VariableCacheData *VariableCache;

4
src/include/access/tupdesc.h
View File

@ -6,7 +6,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: tupdesc.h,v 1.21 1999/02/13 23:20:59 momjian Exp $ * $Id: tupdesc.h,v 1.22 1999/05/25 22:42:36 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -57,7 +57,7 @@ typedef struct tupleDesc
extern TupleDesc CreateTemplateTupleDesc(int natts); extern TupleDesc CreateTemplateTupleDesc(int natts);
extern TupleDesc CreateTupleDesc(int natts, Form_pg_attribute * attrs); extern TupleDesc CreateTupleDesc(int natts, Form_pg_attribute *attrs);
extern TupleDesc CreateTupleDescCopy(TupleDesc tupdesc); extern TupleDesc CreateTupleDescCopy(TupleDesc tupdesc);

4
src/include/commands/command.h
View File

@ -6,7 +6,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: command.h,v 1.13 1999/05/25 16:13:49 momjian Exp $ * $Id: command.h,v 1.14 1999/05/25 22:42:41 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -44,6 +44,6 @@ extern void PortalCleanup(Portal portal);
extern void PerformAddAttribute(char *relationName, char *userName, extern void PerformAddAttribute(char *relationName, char *userName,
bool inh, ColumnDef *colDef); bool inh, ColumnDef *colDef);
extern void LockTableCommand(LockStmt * lockstmt); extern void LockTableCommand(LockStmt *lockstmt);
#endif /* COMMAND_H */ #endif /* COMMAND_H */

6
src/include/commands/vacuum.h
View File

@ -6,7 +6,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: vacuum.h,v 1.19 1999/05/25 16:13:50 momjian Exp $ * $Id: vacuum.h,v 1.20 1999/05/25 22:42:43 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -99,7 +99,7 @@ typedef struct VTupleLinkData
{ {
ItemPointerData new_tid; ItemPointerData new_tid;
ItemPointerData this_tid; ItemPointerData this_tid;
} VTupleLinkData; } VTupleLinkData;
typedef VTupleLinkData *VTupleLink; typedef VTupleLinkData *VTupleLink;
@ -108,7 +108,7 @@ typedef struct VTupleMoveData
ItemPointerData tid; /* tuple ID */ ItemPointerData tid; /* tuple ID */
VPageDescr vpd; /* where to move */ VPageDescr vpd; /* where to move */
bool cleanVpd; /* clean vpd before using */ bool cleanVpd; /* clean vpd before using */
} VTupleMoveData; } VTupleMoveData;
typedef VTupleMoveData *VTupleMove; typedef VTupleMoveData *VTupleMove;

4
src/include/executor/hashjoin.h
View File

@ -6,7 +6,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: hashjoin.h,v 1.12 1999/05/25 16:13:54 momjian Exp $ * $Id: hashjoin.h,v 1.13 1999/05/25 22:42:45 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -44,7 +44,7 @@ typedef struct HashJoinTupleData
struct HashJoinTupleData *next; /* link to next tuple in same struct HashJoinTupleData *next; /* link to next tuple in same
* bucket */ * bucket */
HeapTupleData htup; /* tuple header */ HeapTupleData htup; /* tuple header */
} HashJoinTupleData; } HashJoinTupleData;
typedef HashJoinTupleData *HashJoinTuple; typedef HashJoinTupleData *HashJoinTuple;

4
src/include/executor/nodeHashjoin.h
View File

@ -6,7 +6,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: nodeHashjoin.h,v 1.13 1999/05/25 16:13:56 momjian Exp $ * $Id: nodeHashjoin.h,v 1.14 1999/05/25 22:42:46 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -21,7 +21,7 @@ extern TupleTableSlot *ExecHashJoin(HashJoin *node);
extern bool ExecInitHashJoin(HashJoin *node, EState *estate, Plan *parent); extern bool ExecInitHashJoin(HashJoin *node, EState *estate, Plan *parent);
extern int ExecCountSlotsHashJoin(HashJoin *node); extern int ExecCountSlotsHashJoin(HashJoin *node);
extern void ExecEndHashJoin(HashJoin *node); extern void ExecEndHashJoin(HashJoin *node);
extern void ExecHashJoinSaveTuple(HeapTuple heapTuple, BufFile * file); extern void ExecHashJoinSaveTuple(HeapTuple heapTuple, BufFile *file);
extern void ExecReScanHashJoin(HashJoin *node, ExprContext *exprCtxt, Plan *parent); extern void ExecReScanHashJoin(HashJoin *node, ExprContext *exprCtxt, Plan *parent);
#endif /* NODEHASHJOIN_H */ #endif /* NODEHASHJOIN_H */

4
src/include/libpq/libpq.h
View File

@ -6,7 +6,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: libpq.h,v 1.29 1999/05/25 16:14:00 momjian Exp $ * $Id: libpq.h,v 1.30 1999/05/25 22:42:50 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -220,7 +220,7 @@ extern PortalEntry *be_newportal(void);
extern void be_typeinit(PortalEntry *entry, TupleDesc attrs, extern void be_typeinit(PortalEntry *entry, TupleDesc attrs,
int natts); int natts);
extern void be_printtup(HeapTuple tuple, TupleDesc typeinfo, extern void be_printtup(HeapTuple tuple, TupleDesc typeinfo,
DestReceiver * self); DestReceiver *self);
/* in be-pqexec.c */ /* in be-pqexec.c */

4
src/include/libpq/pqcomm.h
View File

@ -8,7 +8,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: pqcomm.h,v 1.35 1999/05/03 19:10:24 momjian Exp $ * $Id: pqcomm.h,v 1.36 1999/05/25 22:42:51 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -156,6 +156,6 @@ typedef struct CancelRequestPacket
* request */ * request */
uint32 backendPID; /* PID of client's backend */ uint32 backendPID; /* PID of client's backend */
uint32 cancelAuthCode; /* secret key to authorize cancel */ uint32 cancelAuthCode; /* secret key to authorize cancel */
} CancelRequestPacket; } CancelRequestPacket;
#endif /* PQCOMM_H */ #endif /* PQCOMM_H */

4
src/include/nodes/execnodes.h
View File

@ -6,7 +6,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: execnodes.h,v 1.29 1999/05/25 16:14:07 momjian Exp $ * $Id: execnodes.h,v 1.30 1999/05/25 22:42:54 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -698,7 +698,7 @@ typedef struct TeeState
MemoryContext tee_mcxt; MemoryContext tee_mcxt;
HeapScanDesc tee_leftScanDesc, HeapScanDesc tee_leftScanDesc,
tee_rightScanDesc; tee_rightScanDesc;
} TeeState; } TeeState;
#endif #endif

6
src/include/nodes/memnodes.h
View File

@ -6,7 +6,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: memnodes.h,v 1.12 1999/05/25 16:14:09 momjian Exp $ * $Id: memnodes.h,v 1.13 1999/05/25 22:42:55 momjian Exp $
* *
* XXX the typedefs in this file are different from the other ???nodes.h; * XXX the typedefs in this file are different from the other ???nodes.h;
* they are pointers to structures instead of the structures themselves. * they are pointers to structures instead of the structures themselves.
@ -60,7 +60,7 @@ typedef struct MemoryContextData
{ {
NodeTag type; NodeTag type;
MemoryContextMethods method; MemoryContextMethods method;
} MemoryContextData; } MemoryContextData;
/* utils/mcxt.h contains typedef struct MemoryContextData *MemoryContext */ /* utils/mcxt.h contains typedef struct MemoryContextData *MemoryContext */
@ -73,7 +73,7 @@ typedef struct GlobalMemoryData
AllocSetData setData; AllocSetData setData;
char *name; char *name;
OrderedElemData elemData; OrderedElemData elemData;
} GlobalMemoryData; } GlobalMemoryData;
/* utils/mcxt.h contains typedef struct GlobalMemoryData *GlobalMemory */ /* utils/mcxt.h contains typedef struct GlobalMemoryData *GlobalMemory */

14
src/include/nodes/parsenodes.h
View File

@ -6,7 +6,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: parsenodes.h,v 1.73 1999/05/25 16:14:09 momjian Exp $ * $Id: parsenodes.h,v 1.74 1999/05/25 22:42:57 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -457,7 +457,7 @@ typedef struct UnlistenStmt
{ {
NodeTag type; NodeTag type;
char *relname; /* relation to unlisten on */ char *relname; /* relation to unlisten on */
} UnlistenStmt; } UnlistenStmt;
/* ---------------------- /* ----------------------
* {Begin|Abort|End} Transaction Statement * {Begin|Abort|End} Transaction Statement
@ -590,7 +590,7 @@ typedef struct LockStmt
NodeTag type; NodeTag type;
char *relname; /* relation to lock */ char *relname; /* relation to lock */
int mode; /* lock mode */ int mode; /* lock mode */
} LockStmt; } LockStmt;
/***************************************************************************** /*****************************************************************************
* Optimizable Statements * Optimizable Statements
@ -748,7 +748,7 @@ typedef struct CaseExpr
Node *arg; /* implicit equality comparison argument */ Node *arg; /* implicit equality comparison argument */
List *args; /* the arguments (list of WHEN clauses) */ List *args; /* the arguments (list of WHEN clauses) */
Node *defresult; /* the default result (ELSE clause) */ Node *defresult; /* the default result (ELSE clause) */
} CaseExpr; } CaseExpr;
/* /*
* CaseWhen - an argument to a CASE expression * CaseWhen - an argument to a CASE expression
@ -758,7 +758,7 @@ typedef struct CaseWhen
NodeTag type; NodeTag type;
Node *expr; /* comparison expression */ Node *expr; /* comparison expression */
Node *result; /* substitution result */ Node *result; /* substitution result */
} CaseWhen; } CaseWhen;
/* /*
* ColumnDef - column definition (used in various creates) * ColumnDef - column definition (used in various creates)
@ -896,7 +896,7 @@ typedef struct JoinExpr
RangeVar *larg; RangeVar *larg;
Node *rarg; Node *rarg;
List *quals; List *quals;
} JoinExpr; } JoinExpr;
/**************************************************************************** /****************************************************************************
@ -972,6 +972,6 @@ typedef struct RowMark
NodeTag type; NodeTag type;
Index rti; /* index in Query->rtable */ Index rti; /* index in Query->rtable */
bits8 info; /* as above */ bits8 info; /* as above */
} RowMark; } RowMark;
#endif /* PARSENODES_H */ #endif /* PARSENODES_H */

6
src/include/nodes/plannodes.h
View File

@ -6,7 +6,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: plannodes.h,v 1.26 1999/05/25 16:14:10 momjian Exp $ * $Id: plannodes.h,v 1.27 1999/05/25 22:42:58 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -264,7 +264,7 @@ typedef struct Noname
Plan plan; Plan plan;
Oid nonameid; Oid nonameid;
int keycount; int keycount;
} Noname; } Noname;
/* ---------------- /* ----------------
* materialization node * materialization node
@ -338,7 +338,7 @@ typedef struct Tee
List *rtentries; /* the range table for the plan below the List *rtentries; /* the range table for the plan below the
* Tee may be different than the parent * Tee may be different than the parent
* plans */ * plans */
} Tee; } Tee;
#endif #endif

4
src/include/nodes/primnodes.h
View File

@ -6,7 +6,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: primnodes.h,v 1.28 1999/05/25 16:14:11 momjian Exp $ * $Id: primnodes.h,v 1.29 1999/05/25 22:42:59 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -273,7 +273,7 @@ typedef struct Aggref
Node *target; Node *target;
int aggno; int aggno;
bool usenulls; bool usenulls;
} Aggref; } Aggref;
/* ---------------- /* ----------------
* SubLink * SubLink

14
src/include/nodes/relation.h
View File

@ -6,7 +6,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: relation.h,v 1.31 1999/05/25 16:14:12 momjian Exp $ * $Id: relation.h,v 1.32 1999/05/25 22:43:01 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -100,7 +100,7 @@ typedef struct RelOptInfo
List *restrictinfo; /* RestrictInfo structures */ List *restrictinfo; /* RestrictInfo structures */
List *joininfo; /* JoinInfo structures */ List *joininfo; /* JoinInfo structures */
List *innerjoin; List *innerjoin;
} RelOptInfo; } RelOptInfo;
extern Var *get_expr(TargetEntry *foo); extern Var *get_expr(TargetEntry *foo);
extern Var *get_groupclause_expr(GroupClause *groupClause, List *targetList); extern Var *get_groupclause_expr(GroupClause *groupClause, List *targetList);
@ -167,7 +167,7 @@ typedef struct NestPath
List *pathinfo; List *pathinfo;
Path *outerjoinpath; Path *outerjoinpath;
Path *innerjoinpath; Path *innerjoinpath;
} NestPath; } NestPath;
typedef NestPath JoinPath; typedef NestPath JoinPath;
@ -223,7 +223,7 @@ typedef struct RestrictInfo
/* hashjoin only */ /* hashjoin only */
Oid hashjoinoperator; Oid hashjoinoperator;
Relids restrictinfojoinid; Relids restrictinfojoinid;
} RestrictInfo; } RestrictInfo;
typedef struct JoinMethod typedef struct JoinMethod
{ {
@ -236,13 +236,13 @@ typedef struct HashInfo
{ {
JoinMethod jmethod; JoinMethod jmethod;
Oid hashop; Oid hashop;
} HashInfo; } HashInfo;
typedef struct MergeInfo typedef struct MergeInfo
{ {
JoinMethod jmethod; JoinMethod jmethod;
MergeOrder *m_ordering; MergeOrder *m_ordering;
} MergeInfo; } MergeInfo;
typedef struct JoinInfo typedef struct JoinInfo
{ {
@ -251,7 +251,7 @@ typedef struct JoinInfo
List *jinfo_restrictinfo; List *jinfo_restrictinfo;
bool mergejoinable; bool mergejoinable;
bool hashjoinable; bool hashjoinable;
} JoinInfo; } JoinInfo;
typedef struct Iter typedef struct Iter
{ {

4
src/include/optimizer/clauses.h
View File

@ -6,7 +6,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: clauses.h,v 1.17 1999/05/25 16:14:15 momjian Exp $ * $Id: clauses.h,v 1.18 1999/05/25 22:43:03 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -38,7 +38,7 @@ extern Expr *make_andclause(List *andclauses);
extern bool case_clause(Node *clause); extern bool case_clause(Node *clause);
extern List *pull_constant_clauses(List *quals, List **constantQual); extern List *pull_constant_clauses(List *quals, List **constantQual);
extern void clause_get_relids_vars(Node *clause, Relids * relids, List **vars); extern void clause_get_relids_vars(Node *clause, Relids *relids, List **vars);
extern int NumRelids(Node *clause); extern int NumRelids(Node *clause);
extern bool contains_not(Node *clause); extern bool contains_not(Node *clause);
extern bool is_joinable(Node *clause); extern bool is_joinable(Node *clause);

6
src/include/optimizer/cost.h
View File

@ -6,7 +6,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: cost.h,v 1.19 1999/05/25 16:14:16 momjian Exp $ * $Id: cost.h,v 1.20 1999/05/25 22:43:04 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -43,8 +43,8 @@ extern Cost cost_mergejoin(Cost outercost, Cost innercost,
extern Cost cost_hashjoin(Cost outercost, Cost innercost, List *outerkeys, extern Cost cost_hashjoin(Cost outercost, Cost innercost, List *outerkeys,
List *innerkeys, int outersize, int innersize, List *innerkeys, int outersize, int innersize,
int outerwidth, int innerwidth); int outerwidth, int innerwidth);
extern int compute_rel_size(RelOptInfo * rel); extern int compute_rel_size(RelOptInfo *rel);
extern int compute_rel_width(RelOptInfo * rel); extern int compute_rel_width(RelOptInfo *rel);
extern int compute_joinrel_size(JoinPath *joinpath); extern int compute_joinrel_size(JoinPath *joinpath);
extern int page_size(int tuples, int width); extern int page_size(int tuples, int width);

4
src/include/optimizer/geqo.h
View File

@ -5,7 +5,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: geqo.h,v 1.15 1999/05/25 16:14:16 momjian Exp $ * $Id: geqo.h,v 1.16 1999/05/25 22:43:05 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -72,6 +72,6 @@ extern void geqo_params(int string_length);
extern void geqo_eval_startup(void); extern void geqo_eval_startup(void);
extern Cost geqo_eval(Query *root, Gene *tour, int num_gene); extern Cost geqo_eval(Query *root, Gene *tour, int num_gene);
extern RelOptInfo *gimme_tree(Query *root, Gene *tour, int rel_count, extern RelOptInfo *gimme_tree(Query *root, Gene *tour, int rel_count,
int num_gene, RelOptInfo * old_rel); int num_gene, RelOptInfo *old_rel);
#endif /* GEQO_H */ #endif /* GEQO_H */

4
src/include/optimizer/geqo_misc.h
View File

@ -5,7 +5,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: geqo_misc.h,v 1.10 1999/05/25 16:14:17 momjian Exp $ * $Id: geqo_misc.h,v 1.11 1999/05/25 22:43:07 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -31,7 +31,7 @@ extern void print_pool(FILE *fp, Pool *pool, int start, int stop);
extern void print_gen(FILE *fp, Pool *pool, int generation); extern void print_gen(FILE *fp, Pool *pool, int generation);
extern void print_edge_table(FILE *fp, Edge *edge_table, int num_gene); extern void print_edge_table(FILE *fp, Edge *edge_table, int num_gene);
extern void geqo_print_rel(Query *root, RelOptInfo * rel); extern void geqo_print_rel(Query *root, RelOptInfo *rel);
extern void geqo_print_path(Query *root, Path *path, int indent); extern void geqo_print_path(Query *root, Path *path, int indent);
extern void geqo_print_joinclauses(Query *root, List *clauses); extern void geqo_print_joinclauses(Query *root, List *clauses);

4
src/include/optimizer/joininfo.h
View File

@ -6,7 +6,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: joininfo.h,v 1.11 1999/05/25 16:14:19 momjian Exp $ * $Id: joininfo.h,v 1.12 1999/05/25 22:43:08 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -18,7 +18,7 @@
#include "nodes/primnodes.h" #include "nodes/primnodes.h"
extern JoinInfo *joininfo_member(List *join_relids, List *joininfo_list); extern JoinInfo *joininfo_member(List *join_relids, List *joininfo_list);
extern JoinInfo *find_joininfo_node(RelOptInfo * this_rel, List *join_relids); extern JoinInfo *find_joininfo_node(RelOptInfo *this_rel, List *join_relids);
extern Var *other_join_clause_var(Var *var, Expr *clause); extern Var *other_join_clause_var(Var *var, Expr *clause);
#endif /* JOININFO_H */ #endif /* JOININFO_H */

4
src/include/optimizer/keys.h
View File

@ -6,7 +6,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: keys.h,v 1.14 1999/05/25 16:14:19 momjian Exp $ * $Id: keys.h,v 1.15 1999/05/25 22:43:09 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -16,7 +16,7 @@
#include "nodes/nodes.h" #include "nodes/nodes.h"
#include "nodes/relation.h" #include "nodes/relation.h"
extern bool match_indexkey_operand(int indexkey, Var *operand, RelOptInfo * rel); extern bool match_indexkey_operand(int indexkey, Var *operand, RelOptInfo *rel);
extern Var *extract_join_key(JoinKey *jk, int outer_or_inner); extern Var *extract_join_key(JoinKey *jk, int outer_or_inner);
extern bool pathkeys_match(List *keys1, List *keys2, int *better_key); extern bool pathkeys_match(List *keys1, List *keys2, int *better_key);
extern List *collect_index_pathkeys(int *index_keys, List *tlist); extern List *collect_index_pathkeys(int *index_keys, List *tlist);

18
src/include/optimizer/pathnode.h
View File

@ -6,7 +6,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: pathnode.h,v 1.16 1999/05/25 16:14:20 momjian Exp $ * $Id: pathnode.h,v 1.17 1999/05/25 22:43:10 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -21,20 +21,20 @@
* prototypes for pathnode.c * prototypes for pathnode.c
*/ */
extern bool path_is_cheaper(Path *path1, Path *path2); extern bool path_is_cheaper(Path *path1, Path *path2);
extern Path *set_cheapest(RelOptInfo * parent_rel, List *pathlist); extern Path *set_cheapest(RelOptInfo *parent_rel, List *pathlist);
extern List *add_pathlist(RelOptInfo * parent_rel, List *unique_paths, extern List *add_pathlist(RelOptInfo *parent_rel, List *unique_paths,
List *new_paths); List *new_paths);
extern Path *create_seqscan_path(RelOptInfo * rel); extern Path *create_seqscan_path(RelOptInfo *rel);
extern IndexPath *create_index_path(Query *root, RelOptInfo * rel, RelOptInfo * index, extern IndexPath *create_index_path(Query *root, RelOptInfo *rel, RelOptInfo *index,
List *restriction_clauses, bool is_join_scan); List *restriction_clauses, bool is_join_scan);
extern NestPath *create_nestloop_path(RelOptInfo * joinrel, RelOptInfo * outer_rel, extern NestPath *create_nestloop_path(RelOptInfo *joinrel, RelOptInfo *outer_rel,
Path *outer_path, Path *inner_path, List *pathkeys); Path *outer_path, Path *inner_path, List *pathkeys);
extern MergePath *create_mergejoin_path(RelOptInfo * joinrel, int outersize, extern MergePath *create_mergejoin_path(RelOptInfo *joinrel, int outersize,
int innersize, int outerwidth, int innerwidth, Path *outer_path, int innersize, int outerwidth, int innerwidth, Path *outer_path,
Path *inner_path, List *pathkeys, MergeOrder *order, Path *inner_path, List *pathkeys, MergeOrder *order,
List *mergeclauses, List *outersortkeys, List *innersortkeys); List *mergeclauses, List *outersortkeys, List *innersortkeys);
extern HashPath *create_hashjoin_path(RelOptInfo * joinrel, int outersize, extern HashPath *create_hashjoin_path(RelOptInfo *joinrel, int outersize,
int innersize, int outerwidth, int innerwidth, Path *outer_path, int innersize, int outerwidth, int innerwidth, Path *outer_path,
Path *inner_path, List *pathkeys, Oid operator, List *hashclauses, Path *inner_path, List *pathkeys, Oid operator, List *hashclauses,
List *outerkeys, List *innerkeys); List *outerkeys, List *innerkeys);
@ -49,6 +49,6 @@ extern RelOptInfo *get_join_rel(Query *root, Relids relid);
/* /*
* prototypes for indexnode.h * prototypes for indexnode.h
*/ */
extern List *find_relation_indices(Query *root, RelOptInfo * rel); extern List *find_relation_indices(Query *root, RelOptInfo *rel);
#endif /* PATHNODE_H */ #endif /* PATHNODE_H */

12
src/include/optimizer/paths.h
View File

@ -7,7 +7,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: paths.h,v 1.28 1999/05/25 16:14:21 momjian Exp $ * $Id: paths.h,v 1.29 1999/05/25 22:43:11 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -27,7 +27,7 @@ extern RelOptInfo *make_one_rel(Query *root, List *rels);
* indxpath.h * indxpath.h
* routines to generate index paths * routines to generate index paths
*/ */
extern List *create_index_paths(Query *root, RelOptInfo * rel, List *indices, extern List *create_index_paths(Query *root, RelOptInfo *rel, List *indices,
List *restrictinfo_list, List *restrictinfo_list,
List *joininfo_list); List *joininfo_list);
@ -41,7 +41,7 @@ extern void update_rels_pathlist_for_joins(Query *root, List *joinrels);
/* /*
* orindxpath.h * orindxpath.h
*/ */
extern List *create_or_index_paths(Query *root, RelOptInfo * rel, List *clauses); extern List *create_or_index_paths(Query *root, RelOptInfo *rel, List *clauses);
/* /*
* hashutils.h * hashutils.h
@ -79,11 +79,11 @@ extern MergeInfo *match_order_mergeinfo(PathOrder *ordering,
* routines to determine which relations to join * routines to determine which relations to join
*/ */
extern List *make_rels_by_joins(Query *root, List *old_rels); extern List *make_rels_by_joins(Query *root, List *old_rels);
extern List *make_rels_by_clause_joins(Query *root, RelOptInfo * old_rel, extern List *make_rels_by_clause_joins(Query *root, RelOptInfo *old_rel,
List *joininfo_list, Relids only_relids); List *joininfo_list, Relids only_relids);
extern List *make_rels_by_clauseless_joins(RelOptInfo * old_rel, extern List *make_rels_by_clauseless_joins(RelOptInfo *old_rel,
List *inner_rels); List *inner_rels);
extern RelOptInfo *make_join_rel(RelOptInfo * outer_rel, RelOptInfo * inner_rel, JoinInfo * joininfo); extern RelOptInfo *make_join_rel(RelOptInfo *outer_rel, RelOptInfo *inner_rel, JoinInfo *joininfo);
extern List *new_join_tlist(List *tlist, int first_resdomno); extern List *new_join_tlist(List *tlist, int first_resdomno);
extern RelOptInfo *get_cheapest_complete_rel(List *join_rel_list); extern RelOptInfo *get_cheapest_complete_rel(List *join_rel_list);

4
src/include/optimizer/restrictinfo.h
View File

@ -6,7 +6,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: restrictinfo.h,v 1.3 1999/05/25 16:14:22 momjian Exp $ * $Id: restrictinfo.h,v 1.4 1999/05/25 22:43:12 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -16,7 +16,7 @@
#include "nodes/pg_list.h" #include "nodes/pg_list.h"
#include "nodes/relation.h" #include "nodes/relation.h"
extern bool valid_or_clause(RestrictInfo * restrictinfo); extern bool valid_or_clause(RestrictInfo *restrictinfo);
extern List *get_actual_clauses(List *restrictinfo_list); extern List *get_actual_clauses(List *restrictinfo_list);
extern void get_relattvals(List *restrictinfo_list, List **attnos, extern void get_relattvals(List *restrictinfo_list, List **attnos,
List **values, List **flags); List **values, List **flags);

4
src/include/optimizer/tlist.h
View File

@ -6,7 +6,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: tlist.h,v 1.17 1999/05/25 16:14:23 momjian Exp $ * $Id: tlist.h,v 1.18 1999/05/25 22:43:13 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -19,7 +19,7 @@
extern TargetEntry *tlistentry_member(Var *var, List *targetlist); extern TargetEntry *tlistentry_member(Var *var, List *targetlist);
extern Expr *matching_tlist_var(Var *var, List *targetlist); extern Expr *matching_tlist_var(Var *var, List *targetlist);
extern void add_var_to_tlist(RelOptInfo * rel, Var *var); extern void add_var_to_tlist(RelOptInfo *rel, Var *var);
extern TargetEntry *create_tl_element(Var *var, int resdomno); extern TargetEntry *create_tl_element(Var *var, int resdomno);
extern List *get_actual_tlist(List *tlist); extern List *get_actual_tlist(List *tlist);
extern Resdom *tlist_member(Var *var, List *tlist); extern Resdom *tlist_member(Var *var, List *tlist);

12
src/include/optimizer/xfunc.h
View File

@ -6,7 +6,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: xfunc.h,v 1.17 1999/05/25 16:14:23 momjian Exp $ * $Id: xfunc.h,v 1.18 1999/05/25 22:43:14 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -49,10 +49,10 @@ extern int XfuncMode; /* defined in tcop/postgres.c */
#define is_join(pathnode) (length(get_relids(get_parent(pathnode))) > 1 ? 1 : 0) #define is_join(pathnode) (length(get_relids(get_parent(pathnode))) > 1 ? 1 : 0)
/* function prototypes from planner/path/xfunc.c */ /* function prototypes from planner/path/xfunc.c */
extern void xfunc_trypullup(RelOptInfo * rel); extern void xfunc_trypullup(RelOptInfo *rel);
extern int xfunc_shouldpull(Path *childpath, JoinPath *parentpath, extern int xfunc_shouldpull(Path *childpath, JoinPath *parentpath,
int whichchild, RestrictInfo * maxcinfopt); int whichchild, RestrictInfo *maxcinfopt);
extern RestrictInfo *xfunc_pullup(Path *childpath, JoinPath *parentpath, RestrictInfo * cinfo, extern RestrictInfo *xfunc_pullup(Path *childpath, JoinPath *parentpath, RestrictInfo *cinfo,
int whichchild, int clausetype); int whichchild, int clausetype);
extern Cost xfunc_rank(Expr *clause); extern Cost xfunc_rank(Expr *clause);
extern Cost xfunc_expense(Query *queryInfo, Expr *clause); extern Cost xfunc_expense(Query *queryInfo, Expr *clause);
@ -69,7 +69,7 @@ extern List *xfunc_primary_join(JoinPath *pathnode);
extern Cost xfunc_get_path_cost(Path *pathnode); extern Cost xfunc_get_path_cost(Path *pathnode);
extern Cost xfunc_total_path_cost(JoinPath *pathnode); extern Cost xfunc_total_path_cost(JoinPath *pathnode);
extern Cost xfunc_expense_per_tuple(JoinPath *joinnode, int whichchild); extern Cost xfunc_expense_per_tuple(JoinPath *joinnode, int whichchild);
extern void xfunc_fixvars(Expr *clause, RelOptInfo * rel, int varno); extern void xfunc_fixvars(Expr *clause, RelOptInfo *rel, int varno);
extern int xfunc_cinfo_compare(void *arg1, void *arg2); extern int xfunc_cinfo_compare(void *arg1, void *arg2);
extern int xfunc_clause_compare(void *arg1, void *arg2); extern int xfunc_clause_compare(void *arg1, void *arg2);
extern void xfunc_disjunct_sort(List *clause_list); extern void xfunc_disjunct_sort(List *clause_list);
@ -78,7 +78,7 @@ extern int xfunc_func_width(RegProcedure funcid, List *args);
extern int xfunc_tuple_width(Relation rd); extern int xfunc_tuple_width(Relation rd);
extern int xfunc_num_join_clauses(JoinPath *path); extern int xfunc_num_join_clauses(JoinPath *path);
extern List *xfunc_LispRemove(List *foo, List *bar); extern List *xfunc_LispRemove(List *foo, List *bar);
extern bool xfunc_copyrel(RelOptInfo * from, RelOptInfo ** to); extern bool xfunc_copyrel(RelOptInfo *from, RelOptInfo **to);
/* /*
* function prototypes for path/predmig.c * function prototypes for path/predmig.c

4
src/include/parser/parse_agg.h
View File

@ -6,7 +6,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: parse_agg.h,v 1.9 1999/05/25 16:14:26 momjian Exp $ * $Id: parse_agg.h,v 1.10 1999/05/25 22:43:16 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -18,7 +18,7 @@
#include <nodes/primnodes.h> #include <nodes/primnodes.h>
#include <parser/parse_node.h> #include <parser/parse_node.h>
extern void AddAggToParseState(ParseState *pstate, Aggref * aggref); extern void AddAggToParseState(ParseState *pstate, Aggref *aggref);
extern void parseCheckAggregates(ParseState *pstate, Query *qry); extern void parseCheckAggregates(ParseState *pstate, Query *qry);
extern Aggref *ParseAgg(ParseState *pstate, char *aggname, Oid basetype, extern Aggref *ParseAgg(ParseState *pstate, char *aggname, Oid basetype,
List *target, int precedence); List *target, int precedence);

4
src/include/parser/parse_coerce.h
View File

@ -6,7 +6,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: parse_coerce.h,v 1.11 1999/05/25 16:14:26 momjian Exp $ * $Id: parse_coerce.h,v 1.12 1999/05/25 22:43:17 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -26,7 +26,7 @@ typedef enum CATEGORY
NETWORK_TYPE, NETWORK_TYPE,
USER_TYPE, USER_TYPE,
MIXED_TYPE MIXED_TYPE
} CATEGORY; } CATEGORY;
/* IS_BUILTIN_TYPE() /* IS_BUILTIN_TYPE()

12
src/include/storage/fd.h
View File

@ -6,7 +6,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: fd.h,v 1.14 1999/05/25 16:14:41 momjian Exp $ * $Id: fd.h,v 1.15 1999/05/25 22:43:24 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -91,11 +91,11 @@ extern void FreeFile(FILE *);
* atop virtual Files... * atop virtual Files...
*/ */
extern BufFile *BufFileCreate(File file); extern BufFile *BufFileCreate(File file);
extern void BufFileClose(BufFile * file); extern void BufFileClose(BufFile *file);
extern size_t BufFileRead(BufFile * file, void *ptr, size_t size); extern size_t BufFileRead(BufFile *file, void *ptr, size_t size);
extern size_t BufFileWrite(BufFile * file, void *ptr, size_t size); extern size_t BufFileWrite(BufFile *file, void *ptr, size_t size);
extern int BufFileFlush(BufFile * file); extern int BufFileFlush(BufFile *file);
extern long BufFileSeek(BufFile * file, long offset, int whence); extern long BufFileSeek(BufFile *file, long offset, int whence);
/* Miscellaneous support routines */ /* Miscellaneous support routines */
extern int FileNameUnlink(char *filename); extern int FileNameUnlink(char *filename);

4
src/include/storage/lmgr.h
View File

@ -6,7 +6,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: lmgr.h,v 1.19 1999/05/07 01:23:05 vadim Exp $ * $Id: lmgr.h,v 1.20 1999/05/25 22:43:26 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -32,7 +32,7 @@ typedef struct LockRelId
{ {
Oid relId; /* a relation identifier */ Oid relId; /* a relation identifier */
Oid dbId; /* a database identifier */ Oid dbId; /* a database identifier */
} LockRelId; } LockRelId;
typedef struct LockInfoData typedef struct LockInfoData
{ {

6
src/include/storage/lock.h
View File

@ -6,7 +6,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: lock.h,v 1.27 1999/05/25 16:14:42 momjian Exp $ * $Id: lock.h,v 1.28 1999/05/25 22:43:26 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -100,7 +100,7 @@ typedef struct LOCKMETHODCTL
int conflictTab[MAX_LOCKMODES]; int conflictTab[MAX_LOCKMODES];
int prio[MAX_LOCKMODES]; int prio[MAX_LOCKMODES];
SPINLOCK masterLock; SPINLOCK masterLock;
} LOCKMETHODCTL; } LOCKMETHODCTL;
/* /*
* lockHash -- hash table on lock Ids, * lockHash -- hash table on lock Ids,
@ -113,7 +113,7 @@ typedef struct LOCKMETHODTABLE
HTAB *lockHash; HTAB *lockHash;
HTAB *xidHash; HTAB *xidHash;
LOCKMETHODCTL *ctl; LOCKMETHODCTL *ctl;
} LOCKMETHODTABLE; } LOCKMETHODTABLE;
/* ----------------------- /* -----------------------
* A transaction never conflicts with its own locks. Hence, if * A transaction never conflicts with its own locks. Hence, if

4
src/include/storage/proc.h
View File

@ -6,7 +6,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: proc.h,v 1.23 1999/05/25 16:14:45 momjian Exp $ * $Id: proc.h,v 1.24 1999/05/25 22:43:27 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -119,7 +119,7 @@ extern bool ProcRemove(int pid);
/* make static in storage/lmgr/proc.c -- jolly */ /* make static in storage/lmgr/proc.c -- jolly */
extern void ProcQueueInit(PROC_QUEUE *queue); extern void ProcQueueInit(PROC_QUEUE *queue);
extern int ProcSleep(PROC_QUEUE *queue, LOCKMETHODCTL * lockctl, int token, extern int ProcSleep(PROC_QUEUE *queue, LOCKMETHODCTL *lockctl, int token,
LOCK *lock); LOCK *lock);
extern PROC *ProcWakeup(PROC *proc, int errType); extern PROC *ProcWakeup(PROC *proc, int errType);
extern int ProcLockWakeup(PROC_QUEUE *queue, LOCKMETHOD lockmethod, extern int ProcLockWakeup(PROC_QUEUE *queue, LOCKMETHOD lockmethod,

4
src/include/storage/shmem.h
View File

@ -6,7 +6,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: shmem.h,v 1.17 1999/05/25 16:14:45 momjian Exp $ * $Id: shmem.h,v 1.18 1999/05/25 22:43:27 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -90,7 +90,7 @@ typedef struct
char key[SHMEM_INDEX_KEYSIZE]; /* string name */ char key[SHMEM_INDEX_KEYSIZE]; /* string name */
unsigned long location; /* location in shared mem */ unsigned long location; /* location in shared mem */
unsigned long size; /* numbytes allocated for the structure */ unsigned long size; /* numbytes allocated for the structure */
} ShmemIndexEnt; } ShmemIndexEnt;
/* /*
* prototypes for functions in shmqueue.c * prototypes for functions in shmqueue.c

8
src/include/tcop/dest.h
View File

@ -44,7 +44,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: dest.h,v 1.19 1999/05/25 16:14:47 momjian Exp $ * $Id: dest.h,v 1.20 1999/05/25 22:43:29 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -82,10 +82,10 @@ struct _DestReceiver
{ {
/* Called for each tuple to be output: */ /* Called for each tuple to be output: */
void (*receiveTuple) (HeapTuple tuple, TupleDesc typeinfo, void (*receiveTuple) (HeapTuple tuple, TupleDesc typeinfo,
DestReceiver * self); DestReceiver *self);
/* Initialization and teardown: */ /* Initialization and teardown: */
void (*setup) (DestReceiver * self, TupleDesc typeinfo); void (*setup) (DestReceiver *self, TupleDesc typeinfo);
void (*cleanup) (DestReceiver * self); void (*cleanup) (DestReceiver *self);
/* Private fields might appear beyond this point... */ /* Private fields might appear beyond this point... */
}; };

4
src/include/utils/builtins.h
View File

@ -6,7 +6,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: builtins.h,v 1.79 1999/05/25 16:14:52 momjian Exp $ * $Id: builtins.h,v 1.80 1999/05/25 22:43:31 momjian Exp $
* *
* NOTES * NOTES
* This should normally only be included by fmgr.h. * This should normally only be included by fmgr.h.
@ -164,7 +164,7 @@ extern void ltoa(int32 l, char *a);
*/ */
extern int32 btint2cmp(int16 a, int16 b); extern int32 btint2cmp(int16 a, int16 b);
extern int32 btint4cmp(int32 a, int32 b); extern int32 btint4cmp(int32 a, int32 b);
extern int32 btint8cmp(int64 * a, int64 * b); extern int32 btint8cmp(int64 *a, int64 *b);
extern int32 btint24cmp(int16 a, int32 b); extern int32 btint24cmp(int16 a, int32 b);
extern int32 btint42cmp(int32 a, int16 b); extern int32 btint42cmp(int32 a, int16 b);
extern int32 btfloat4cmp(float32 a, float32 b); extern int32 btfloat4cmp(float32 a, float32 b);

6
src/include/utils/inet.h
View File

@ -6,7 +6,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: inet.h,v 1.4 1999/05/25 16:14:54 momjian Exp $ * $Id: inet.h,v 1.5 1999/05/25 22:43:34 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -27,7 +27,7 @@ typedef struct
unsigned int ipv4_addr; /* network byte order */ unsigned int ipv4_addr; /* network byte order */
/* add IPV6 address type here */ /* add IPV6 address type here */
} addr; } addr;
} inet_struct; } inet_struct;
typedef struct varlena inet; typedef struct varlena inet;
@ -51,7 +51,7 @@ typedef struct manufacturer
unsigned char b; unsigned char b;
unsigned char c; unsigned char c;
char *name; char *name;
} manufacturer; } manufacturer;
extern manufacturer manufacturers[]; extern manufacturer manufacturers[];

78
src/include/utils/int8.h
View File

@ -6,7 +6,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: int8.h,v 1.13 1999/05/25 16:14:55 momjian Exp $ * $Id: int8.h,v 1.14 1999/05/25 22:43:35 momjian Exp $
* *
* NOTES * NOTES
* These data types are supported on all 64-bit architectures, and may * These data types are supported on all 64-bit architectures, and may
@ -47,60 +47,60 @@ typedef long int int64;
extern int64 *int8in(char *str); extern int64 *int8in(char *str);
extern char *int8out(int64 * val); extern char *int8out(int64 *val);
extern bool int8eq(int64 * val1, int64 * val2); extern bool int8eq(int64 *val1, int64 *val2);
extern bool int8ne(int64 * val1, int64 * val2); extern bool int8ne(int64 *val1, int64 *val2);
extern bool int8lt(int64 * val1, int64 * val2); extern bool int8lt(int64 *val1, int64 *val2);
extern bool int8gt(int64 * val1, int64 * val2); extern bool int8gt(int64 *val1, int64 *val2);
extern bool int8le(int64 * val1, int64 * val2); extern bool int8le(int64 *val1, int64 *val2);
extern bool int8ge(int64 * val1, int64 * val2); extern bool int8ge(int64 *val1, int64 *val2);
extern bool int84eq(int64 * val1, int32 val2); extern bool int84eq(int64 *val1, int32 val2);
extern bool int84ne(int64 * val1, int32 val2); extern bool int84ne(int64 *val1, int32 val2);
extern bool int84lt(int64 * val1, int32 val2); extern bool int84lt(int64 *val1, int32 val2);
extern bool int84gt(int64 * val1, int32 val2); extern bool int84gt(int64 *val1, int32 val2);
extern bool int84le(int64 * val1, int32 val2); extern bool int84le(int64 *val1, int32 val2);
extern bool int84ge(int64 * val1, int32 val2); extern bool int84ge(int64 *val1, int32 val2);
extern bool int48eq(int32 val1, int64 * val2); extern bool int48eq(int32 val1, int64 *val2);
extern bool int48ne(int32 val1, int64 * val2); extern bool int48ne(int32 val1, int64 *val2);
extern bool int48lt(int32 val1, int64 * val2); extern bool int48lt(int32 val1, int64 *val2);
extern bool int48gt(int32 val1, int64 * val2); extern bool int48gt(int32 val1, int64 *val2);
extern bool int48le(int32 val1, int64 * val2); extern bool int48le(int32 val1, int64 *val2);
extern bool int48ge(int32 val1, int64 * val2); extern bool int48ge(int32 val1, int64 *val2);
extern int64 *int8um(int64 * val); extern int64 *int8um(int64 *val);
extern int64 *int8pl(int64 * val1, int64 * val2); extern int64 *int8pl(int64 *val1, int64 *val2);
extern int64 *int8mi(int64 * val1, int64 * val2); extern int64 *int8mi(int64 *val1, int64 *val2);
extern int64 *int8mul(int64 * val1, int64 * val2); extern int64 *int8mul(int64 *val1, int64 *val2);
extern int64 *int8div(int64 * val1, int64 * val2); extern int64 *int8div(int64 *val1, int64 *val2);
extern int64 *int8larger(int64 * val1, int64 * val2); extern int64 *int8larger(int64 *val1, int64 *val2);
extern int64 *int8smaller(int64 * val1, int64 * val2); extern int64 *int8smaller(int64 *val1, int64 *val2);
extern int64 *int84pl(int64 * val1, int32 val2); extern int64 *int84pl(int64 *val1, int32 val2);
extern int64 *int84mi(int64 * val1, int32 val2); extern int64 *int84mi(int64 *val1, int32 val2);
extern int64 *int84mul(int64 * val1, int32 val2); extern int64 *int84mul(int64 *val1, int32 val2);
extern int64 *int84div(int64 * val1, int32 val2); extern int64 *int84div(int64 *val1, int32 val2);
extern int64 *int48pl(int32 val1, int64 * val2); extern int64 *int48pl(int32 val1, int64 *val2);
extern int64 *int48mi(int32 val1, int64 * val2); extern int64 *int48mi(int32 val1, int64 *val2);
extern int64 *int48mul(int32 val1, int64 * val2); extern int64 *int48mul(int32 val1, int64 *val2);
extern int64 *int48div(int32 val1, int64 * val2); extern int64 *int48div(int32 val1, int64 *val2);
extern int64 *int48(int32 val); extern int64 *int48(int32 val);
extern int32 int84(int64 * val); extern int32 int84(int64 *val);
#if NOT_USED #if NOT_USED
extern int64 *int28 (int16 val); extern int64 *int28 (int16 val);
extern int16 int82(int64 * val); extern int16 int82(int64 *val);
#endif #endif
extern float64 i8tod(int64 * val); extern float64 i8tod(int64 *val);
extern int64 *dtoi8(float64 val); extern int64 *dtoi8(float64 val);
extern text *int8_text(int64 * val); extern text *int8_text(int64 *val);
extern int64 *text_int8(text *str); extern int64 *text_int8(text *str);
#endif /* INT8_H */ #endif /* INT8_H */

6
src/include/utils/memutils.h
View File

@ -15,7 +15,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: memutils.h,v 1.25 1999/05/25 16:14:56 momjian Exp $ * $Id: memutils.h,v 1.26 1999/05/25 22:43:36 momjian Exp $
* *
* NOTES * NOTES
* some of the information in this file will be moved to * some of the information in this file will be moved to
@ -168,7 +168,7 @@ typedef struct AllocBlockData
struct AllocBlockData *next; struct AllocBlockData *next;
char *freeptr; char *freeptr;
char *endptr; char *endptr;
} AllocBlockData; } AllocBlockData;
typedef AllocBlockData *AllocBlock; typedef AllocBlockData *AllocBlock;
@ -182,7 +182,7 @@ typedef struct AllocChunkData
void *aset; void *aset;
/* size is always the chunk size */ /* size is always the chunk size */
Size size; Size size;
} AllocChunkData; } AllocChunkData;
typedef AllocChunkData *AllocChunk; typedef AllocChunkData *AllocChunk;

4
src/include/utils/numeric.h
View File

@ -5,7 +5,7 @@
* *
* 1998 Jan Wieck * 1998 Jan Wieck
* *
* $Header: /cvsroot/pgsql/src/include/utils/numeric.h,v 1.5 1999/05/25 16:14:56 momjian Exp $ * $Header: /cvsroot/pgsql/src/include/utils/numeric.h,v 1.6 1999/05/25 22:43:37 momjian Exp $
* *
* ---------- * ----------
*/ */
@ -58,7 +58,7 @@ typedef struct NumericData
uint16 n_rscale; /* Result scale */ uint16 n_rscale; /* Result scale */
uint16 n_sign_dscale; /* Sign + display scale */ uint16 n_sign_dscale; /* Sign + display scale */
unsigned char n_data[1]; /* Digit data */ unsigned char n_data[1]; /* Digit data */
} NumericData; } NumericData;
typedef NumericData *Numeric; typedef NumericData *Numeric;
#define NUMERIC_HDRSZ (sizeof(int32) + sizeof(uint16) * 3) #define NUMERIC_HDRSZ (sizeof(int32) + sizeof(uint16) * 3)

4
src/include/utils/tqual.h
View File

@ -7,7 +7,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: tqual.h,v 1.21 1999/05/25 16:14:58 momjian Exp $ * $Id: tqual.h,v 1.22 1999/05/25 22:43:39 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -23,7 +23,7 @@ typedef struct SnapshotData
uint32 xcnt; /* # of xact below */ uint32 xcnt; /* # of xact below */
TransactionId *xip; /* array of xacts in progress */ TransactionId *xip; /* array of xacts in progress */
ItemPointerData tid; /* required for Dirty snapshot -:( */ ItemPointerData tid; /* required for Dirty snapshot -:( */
} SnapshotData; } SnapshotData;
typedef SnapshotData *Snapshot; typedef SnapshotData *Snapshot;

Some files were not shown because too many files have changed in this diff Show More