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

Mark functions as static and ifdef NOT_USED as appropriate.

This commit is contained in:
Bruce Momjian 2000-06-08 22:38:00 +00:00
parent 5690933d6c
commit 20ad43b576
55 changed files with 188 additions and 175 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/backend/access/index/istrat.c
View File

@ -9,7 +9,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/access/index/Attic/istrat.c,v 1.44 2000/05/30 04:24:32 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/access/index/Attic/istrat.c,v 1.45 2000/06/08 22:36:51 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -207,6 +207,7 @@ StrategyEvaluationIsValid(StrategyEvaluation evaluation)
#endif #endif
#ifdef NOT_USED
/* ---------------- /* ----------------
* StrategyTermEvaluate * StrategyTermEvaluate
* ---------------- * ----------------
@ -262,7 +263,7 @@ StrategyTermEvaluate(StrategyTerm term,
return result; return result;
} }
#endif
/* ---------------- /* ----------------
* RelationGetStrategy * RelationGetStrategy
@ -340,6 +341,7 @@ RelationGetStrategy(Relation relation,
return strategy; return strategy;
} }
#ifdef NOT_USED
/* ---------------- /* ----------------
* RelationInvokeStrategy * RelationInvokeStrategy
* ---------------- * ----------------
@ -463,6 +465,7 @@ RelationInvokeStrategy(Relation relation,
} }
#endif
/* ---------------- /* ----------------
* OperatorRelationFillScanKeyEntry * OperatorRelationFillScanKeyEntry

6
src/backend/access/nbtree/nbtinsert.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.58 2000/05/30 04:24:33 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.59 2000/06/08 22:36:52 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -30,6 +30,8 @@ static OffsetNumber _bt_pgaddtup(Relation rel, Buffer buf, int keysz, ScanKey it
static bool _bt_goesonpg(Relation rel, Buffer buf, Size keysz, ScanKey scankey, BTItem afteritem); static bool _bt_goesonpg(Relation rel, Buffer buf, Size keysz, ScanKey scankey, BTItem afteritem);
static void _bt_updateitem(Relation rel, Size keysz, Buffer buf, BTItem oldItem, BTItem newItem); static void _bt_updateitem(Relation rel, Size keysz, Buffer buf, BTItem oldItem, BTItem newItem);
static bool _bt_isequal(TupleDesc itupdesc, Page page, OffsetNumber offnum, int keysz, ScanKey scankey); static bool _bt_isequal(TupleDesc itupdesc, Page page, OffsetNumber offnum, int keysz, ScanKey scankey);
static int32 _bt_tuplecompare(Relation rel, Size keysz, ScanKey scankey,
IndexTuple tuple1, IndexTuple tuple2);
/* /*
* _bt_doinsert() -- Handle insertion of a single btitem in the tree. * _bt_doinsert() -- Handle insertion of a single btitem in the tree.
@ -1360,7 +1362,7 @@ _bt_goesonpg(Relation rel,
* return -1, 0, or +1 * return -1, 0, or +1
* *
*/ */
int32 static int32
_bt_tuplecompare(Relation rel, _bt_tuplecompare(Relation rel,
Size keysz, Size keysz,
ScanKey scankey, ScanKey scankey,

4
src/backend/access/transam/xact.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.65 2000/05/30 00:49:41 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.66 2000/06/08 22:36:54 momjian Exp $
* *
* NOTES * NOTES
* Transaction aborts can now occur two ways: * Transaction aborts can now occur two ways:
@ -901,6 +901,7 @@ StartTransaction()
} }
#ifdef NOT_USED
/* --------------- /* ---------------
* Tell me if we are currently in progress * Tell me if we are currently in progress
* --------------- * ---------------
@ -910,6 +911,7 @@ CurrentXactInProgress()
{ {
return CurrentTransactionState->state == TRANS_INPROGRESS; return CurrentTransactionState->state == TRANS_INPROGRESS;
} }
#endif
/* -------------------------------- /* --------------------------------
* CommitTransaction * CommitTransaction

5
src/backend/catalog/index.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.113 2000/05/30 04:24:35 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.114 2000/06/08 22:36:59 momjian Exp $
* *
* *
* INTERFACE ROUTINES * INTERFACE ROUTINES
@ -75,6 +75,7 @@ static void DefaultBuild(Relation heapRelation, Relation indexRelation,
IndexStrategy indexStrategy, uint16 parameterCount, IndexStrategy indexStrategy, uint16 parameterCount,
Datum *parameter, FuncIndexInfoPtr funcInfo, PredInfo *predInfo); Datum *parameter, FuncIndexInfoPtr funcInfo, PredInfo *predInfo);
static Oid IndexGetRelation(Oid indexId); static Oid IndexGetRelation(Oid indexId);
static bool activate_index(Oid indexId, bool activate);
static bool reindexing = false; static bool reindexing = false;
extern bool extern bool
@ -2044,7 +2045,7 @@ IndexIsUniqueNoCache(Oid indexId)
* status per index * status per index
* --------------------------------- * ---------------------------------
*/ */
bool static bool
activate_index(Oid indexId, bool activate) activate_index(Oid indexId, bool activate)
{ {
if (!activate) /* Currently does nothing */ if (!activate) /* Currently does nothing */

5
src/backend/commands/async.c
View File

@ -7,7 +7,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/commands/async.c,v 1.64 2000/06/07 04:09:34 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/commands/async.c,v 1.65 2000/06/08 22:37:01 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -193,14 +193,11 @@ Async_Listen(char *relname, int pid)
{ {
Relation lRel; Relation lRel;
TupleDesc tdesc; TupleDesc tdesc;
HeapScanDesc scan;
HeapTuple tuple, HeapTuple tuple,
newtup; newtup;
Datum values[Natts_pg_listener]; Datum values[Natts_pg_listener];
char nulls[Natts_pg_listener]; char nulls[Natts_pg_listener];
Datum d;
int i; int i;
bool isnull;
TupleDesc tupDesc; TupleDesc tupDesc;
if (Trace_notify) if (Trace_notify)

3
src/backend/commands/comment.c
View File

@ -49,6 +49,7 @@ static void CommentAggregate(char *aggregate, char *aggtype, char *comment);
static void CommentProc(char *function, List *arguments, char *comment); static void CommentProc(char *function, List *arguments, char *comment);
static void CommentOperator(char *opname, List *arguments, char *comment); static void CommentOperator(char *opname, List *arguments, char *comment);
static void CommentTrigger(char *trigger, char *relation, char *comments); static void CommentTrigger(char *trigger, char *relation, char *comments);
static void CreateComments(Oid oid, char *comment);
/*------------------------------------------------------------------ /*------------------------------------------------------------------
* CommentObject -- * CommentObject --
@ -120,7 +121,7 @@ CommentObject(int objtype, char *objname, char *objproperty,
*------------------------------------------------------------------ *------------------------------------------------------------------
*/ */
void static void
CreateComments(Oid oid, char *comment) CreateComments(Oid oid, char *comment)
{ {

7
src/backend/commands/trigger.c
View File

@ -7,7 +7,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/commands/trigger.c,v 1.68 2000/05/30 00:49:43 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/commands/trigger.c,v 1.69 2000/06/08 22:37:01 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -38,6 +38,9 @@ static HeapTuple GetTupleForTrigger(EState *estate, ItemPointer tid,
static HeapTuple ExecCallTriggerFunc(Trigger *trigger, static HeapTuple ExecCallTriggerFunc(Trigger *trigger,
TriggerData *trigdata); TriggerData *trigdata);
static void DeferredTriggerSaveEvent(Relation rel, int event,
HeapTuple oldtup, HeapTuple newtup);
void void
CreateTrigger(CreateTrigStmt *stmt) CreateTrigger(CreateTrigStmt *stmt)
@ -1776,7 +1779,7 @@ DeferredTriggerSetState(ConstraintsSetStmt *stmt)
* Called by ExecAR...Triggers() to add the event to the queue. * Called by ExecAR...Triggers() to add the event to the queue.
* ---------- * ----------
*/ */
void static void
DeferredTriggerSaveEvent(Relation rel, int event, DeferredTriggerSaveEvent(Relation rel, int event,
HeapTuple oldtup, HeapTuple newtup) HeapTuple oldtup, HeapTuple newtup)
{ {

5
src/backend/executor/nodeTidscan.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/executor/nodeTidscan.c,v 1.7 2000/05/30 00:49:45 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/executor/nodeTidscan.c,v 1.8 2000/06/08 22:37:03 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -20,7 +20,6 @@
* ExecTidReScan rescans the tid relation. * ExecTidReScan rescans the tid relation.
* ExecEndTidScan releases all storage. * ExecEndTidScan releases all storage.
* ExecTidMarkPos marks scan position. * ExecTidMarkPos marks scan position.
* ExecTidRestrPos restores scan position.
* *
*/ */
#include "postgres.h" #include "postgres.h"
@ -353,6 +352,7 @@ ExecTidMarkPos(TidScan *node)
tidstate->tss_MarkTidPtr = tidstate->tss_TidPtr; tidstate->tss_MarkTidPtr = tidstate->tss_TidPtr;
} }
#ifdef NOT_USED
/* ---------------------------------------------------------------- /* ----------------------------------------------------------------
* ExecTidRestrPos * ExecTidRestrPos
* *
@ -370,6 +370,7 @@ ExecTidRestrPos(TidScan *node)
tidstate = node->tidstate; tidstate = node->tidstate;
tidstate->tss_TidPtr = tidstate->tss_MarkTidPtr; tidstate->tss_TidPtr = tidstate->tss_MarkTidPtr;
} }
#endif
/* ---------------------------------------------------------------- /* ----------------------------------------------------------------
* ExecInitTidScan * ExecInitTidScan

4
src/backend/lib/dllist.c
View File

@ -10,7 +10,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/lib/dllist.c,v 1.17 2000/04/12 17:15:10 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/lib/dllist.c,v 1.18 2000/06/08 22:37:05 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -109,11 +109,13 @@ DLGetTailVal(Dllist *l)
#endif #endif
#ifdef NOT_USED
Dlelem * Dlelem *
DLGetPred(Dlelem *e) /* get predecessor */ DLGetPred(Dlelem *e) /* get predecessor */
{ {
return e ? e->dle_prev : 0; return e ? e->dle_prev : 0;
} }
#endif
Dlelem * Dlelem *
DLGetSucc(Dlelem *e) /* get successor */ DLGetSucc(Dlelem *e) /* get successor */

5
src/backend/nodes/nodeFuncs.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/nodes/nodeFuncs.c,v 1.11 2000/01/26 05:56:31 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/nodes/nodeFuncs.c,v 1.12 2000/06/08 22:37:07 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -98,6 +98,7 @@ replace_opid(Oper *oper)
* constant (CONST, PARAM) nodes * constant (CONST, PARAM) nodes
*****************************************************************************/ *****************************************************************************/
#ifdef NOT_USED
/* /*
* non_null - * non_null -
* Returns t if the node is a non-null constant, e.g., if the node has a * Returns t if the node is a non-null constant, e.g., if the node has a
@ -113,3 +114,5 @@ non_null(Expr *c)
else else
return false; return false;
} }
#endif

7
src/backend/optimizer/path/clausesel.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/optimizer/path/clausesel.c,v 1.37 2000/05/31 15:38:53 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/optimizer/path/clausesel.c,v 1.38 2000/06/08 22:37:09 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -40,6 +40,9 @@ typedef struct RangeQueryClause
static void addRangeClause(RangeQueryClause **rqlist, Node *clause, static void addRangeClause(RangeQueryClause **rqlist, Node *clause,
int flag, bool isLTsel, Selectivity s2); int flag, bool isLTsel, Selectivity s2);
static Selectivity clause_selectivity(Query *root,
Node *clause,
int varRelid);
/**************************************************************************** /****************************************************************************
@ -357,7 +360,7 @@ addRangeClause(RangeQueryClause **rqlist, Node *clause,
* When varRelid is 0, all variables are treated as variables. This * When varRelid is 0, all variables are treated as variables. This
* is appropriate for ordinary join clauses and restriction clauses. * is appropriate for ordinary join clauses and restriction clauses.
*/ */
Selectivity static Selectivity
clause_selectivity(Query *root, clause_selectivity(Query *root,
Node *clause, Node *clause,
int varRelid) int varRelid)

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

@ -10,7 +10,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/optimizer/plan/createplan.c,v 1.90 2000/05/23 16:56:36 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/createplan.c,v 1.91 2000/06/08 22:37:11 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -74,6 +74,7 @@ static Material *make_material(List *tlist, Oid nonameid, Plan *lefttree,
int keycount); int keycount);
static void copy_path_costsize(Plan *dest, Path *src); static void copy_path_costsize(Plan *dest, Path *src);
static void copy_plan_costsize(Plan *dest, Plan *src); static void copy_plan_costsize(Plan *dest, Plan *src);
static SeqScan *make_seqscan(List *qptlist, List *qpqual, Index scanrelid);
/* /*
* create_plan * create_plan
@ -1119,7 +1120,7 @@ make_noname(List *tlist,
} }
SeqScan * static SeqScan *
make_seqscan(List *qptlist, make_seqscan(List *qptlist,
List *qpqual, List *qpqual,
Index scanrelid) Index scanrelid)

6
src/backend/optimizer/prep/prepqual.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/optimizer/prep/prepqual.c,v 1.25 2000/04/14 00:19:17 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/optimizer/prep/prepqual.c,v 1.26 2000/06/08 22:37:14 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -223,6 +223,7 @@ cnfify(Expr *qual, bool removeAndFlag)
return (List *) newqual; return (List *) newqual;
} }
#ifdef NOT_USED
/* /*
* dnfify * dnfify
* Convert a qualification to disjunctive normal form by applying * Convert a qualification to disjunctive normal form by applying
@ -233,7 +234,7 @@ cnfify(Expr *qual, bool removeAndFlag)
* We do not offer a 'removeOrFlag' in this case; the usages are * We do not offer a 'removeOrFlag' in this case; the usages are
* different. * different.
*/ */
Expr * static Expr *
dnfify(Expr *qual) dnfify(Expr *qual)
{ {
Expr *newqual; Expr *newqual;
@ -259,6 +260,7 @@ dnfify(Expr *qual)
return newqual; return newqual;
} }
#endif
/*-------------------- /*--------------------
* The parser regards AND and OR as purely binary operators, so a qual like * The parser regards AND and OR as purely binary operators, so a qual like

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

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/optimizer/util/joininfo.c,v 1.26 2000/02/06 03:27:33 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/optimizer/util/joininfo.c,v 1.27 2000/06/08 22:37:16 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -17,6 +17,7 @@
#include "optimizer/joininfo.h" #include "optimizer/joininfo.h"
static JoinInfo *joininfo_member(List *join_relids, List *joininfo_list);
/* /*
* joininfo_member * joininfo_member
@ -32,7 +33,7 @@
* exists. * exists.
* *
*/ */
JoinInfo * static JoinInfo *
joininfo_member(List *join_relids, List *joininfo_list) joininfo_member(List *join_relids, List *joininfo_list)
{ {
List *i; List *i;

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

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/optimizer/util/tlist.c,v 1.45 2000/05/30 00:49:49 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/optimizer/util/tlist.c,v 1.46 2000/06/08 22:37:16 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -18,6 +18,8 @@
#include "optimizer/tlist.h" #include "optimizer/tlist.h"
#include "optimizer/var.h" #include "optimizer/var.h"
static TargetEntry *tlistentry_member(Node *node, List *targetlist);
/***************************************************************************** /*****************************************************************************
* ---------- RELATION node target list routines ---------- * ---------- RELATION node target list routines ----------
*****************************************************************************/ *****************************************************************************/
@ -27,7 +29,7 @@
* Finds the (first) member of the given tlist whose expression is * Finds the (first) member of the given tlist whose expression is
* equal() to the given expression. Result is NULL if no such member. * equal() to the given expression. Result is NULL if no such member.
*/ */
TargetEntry * static TargetEntry *
tlistentry_member(Node *node, List *targetlist) tlistentry_member(Node *node, List *targetlist)
{ {
List *temp; List *temp;
@ -42,6 +44,7 @@ tlistentry_member(Node *node, List *targetlist)
return NULL; return NULL;
} }
#ifdef NOT_USED
/* /*
* matching_tlist_expr * matching_tlist_expr
* Same as tlistentry_member(), except returns the tlist expression * Same as tlistentry_member(), except returns the tlist expression
@ -58,6 +61,7 @@ matching_tlist_expr(Node *node, List *targetlist)
return (Node *) NULL; return (Node *) NULL;
} }
#endif
/* /*
* tlist_member * tlist_member

11
src/backend/parser/parse_clause.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/parser/parse_clause.c,v 1.62 2000/05/30 00:49:50 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/parser/parse_clause.c,v 1.63 2000/06/08 22:37:18 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -35,7 +35,7 @@ static char *clauseText[] = {"ORDER BY", "GROUP BY", "DISTINCT ON"};
static TargetEntry *findTargetlistEntry(ParseState *pstate, Node *node, static TargetEntry *findTargetlistEntry(ParseState *pstate, Node *node,
List *tlist, int clause); List *tlist, int clause);
static void parseFromClause(ParseState *pstate, List *frmList); static void parseFromClause(ParseState *pstate, List *frmList);
RangeTblEntry *transformTableEntry(ParseState *pstate, RangeVar *r); static RangeTblEntry *transformTableEntry(ParseState *pstate, RangeVar *r);
static List *addTargetToSortList(TargetEntry *tle, List *sortlist, static List *addTargetToSortList(TargetEntry *tle, List *sortlist,
List *targetlist, char *opname); List *targetlist, char *opname);
static bool exprIsInSortList(Node *expr, List *sortList, List *targetList); static bool exprIsInSortList(Node *expr, List *sortList, List *targetList);
@ -245,13 +245,11 @@ makeAttrList(Attr *attr)
return result; return result;
} }
#ifdef NOT_USED
/* ExpandAttrs() /* ExpandAttrs()
* Take an existing attribute node and return a list of attribute nodes * Take an existing attribute node and return a list of attribute nodes
* with one attribute name per node. * with one attribute name per node.
*/ */
List *
ExpandAttrs(Attr *attr);
List * List *
ExpandAttrs(Attr *attr) ExpandAttrs(Attr *attr)
{ {
@ -273,6 +271,7 @@ ExpandAttrs(Attr *attr)
return rlist; return rlist;
} }
#endif
/* transformUsingClause() /* transformUsingClause()
* Take an ON or USING clause from a join expression and expand if necessary. * Take an ON or USING clause from a join expression and expand if necessary.
@ -335,7 +334,7 @@ transformUsingClause(ParseState *pstate, List *usingList,
#endif #endif
RangeTblEntry * static RangeTblEntry *
transformTableEntry(ParseState *pstate, RangeVar *r) transformTableEntry(ParseState *pstate, RangeVar *r)
{ {
RelExpr *baserel = r->relExpr; RelExpr *baserel = r->relExpr;

12
src/backend/parser/parse_relation.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/parser/parse_relation.c,v 1.41 2000/06/03 04:41:32 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/parser/parse_relation.c,v 1.42 2000/06/08 22:37:18 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -65,6 +65,7 @@ static char *attnum_type[SPECIALS] = {
"cid", "cid",
}; };
#ifdef NOT_USED
/* refnameRangeTableEntries() /* refnameRangeTableEntries()
* Given refname, return a list of range table entries * Given refname, return a list of range table entries
* This is possible with JOIN syntax, where tables in a join * This is possible with JOIN syntax, where tables in a join
@ -75,10 +76,8 @@ static char *attnum_type[SPECIALS] = {
* to support outer joins in place yet. * to support outer joins in place yet.
* - thomas 2000-03-04 * - thomas 2000-03-04
*/ */
List *
refnameRangeTableEntries(ParseState *pstate, char *refname);
List * static List *
refnameRangeTableEntries(ParseState *pstate, char *refname) refnameRangeTableEntries(ParseState *pstate, char *refname)
{ {
List *rteList = NULL; List *rteList = NULL;
@ -97,6 +96,7 @@ refnameRangeTableEntries(ParseState *pstate, char *refname)
} }
return rteList; return rteList;
} }
#endif
/* given refname, return a pointer to the range table entry */ /* given refname, return a pointer to the range table entry */
RangeTblEntry * RangeTblEntry *
@ -466,6 +466,7 @@ specialAttNum(char *a)
} }
#ifdef NOT_USED
/* /*
* Given range variable, return whether attribute of this name * Given range variable, return whether attribute of this name
* is a set. * is a set.
@ -491,7 +492,9 @@ attnameIsSet(Relation rd, char *name)
} }
return get_attisset(RelationGetRelid(rd), name); return get_attisset(RelationGetRelid(rd), name);
} }
#endif
#ifdef NOT_USED
/* /*
* This should only be used if the relation is already * This should only be used if the relation is already
* heap_open()'ed. Use the cache version * heap_open()'ed. Use the cache version
@ -502,6 +505,7 @@ attnumAttNelems(Relation rd, int attid)
{ {
return rd->rd_att->attrs[attid - 1]->attnelems; return rd->rd_att->attrs[attid - 1]->attnelems;
} }
#endif
/* given attribute id, return type of that attribute */ /* given attribute id, return type of that attribute */
/* /*

11
src/backend/parser/parse_type.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/parser/parse_type.c,v 1.31 2000/06/06 16:50:37 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/parser/parse_type.c,v 1.32 2000/06/08 22:37:18 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -199,6 +199,7 @@ typeTypeRelid(Type typ)
return typtup->typrelid; return typtup->typrelid;
} }
#ifdef NOT_USED
Oid Oid
typeTypElem(Type typ) typeTypElem(Type typ)
{ {
@ -208,10 +209,11 @@ typeTypElem(Type typ)
return typtup->typelem; return typtup->typelem;
} }
#endif
#ifdef NOT_USED
/* Given the attribute type of an array return the attribute type of /* Given the attribute type of an array return the attribute type of
an element of the array */ an element of the array */
Oid Oid
GetArrayElementType(Oid typearray) GetArrayElementType(Oid typearray)
{ {
@ -237,7 +239,9 @@ GetArrayElementType(Oid typearray)
return type_struct_array->typelem; return type_struct_array->typelem;
} }
#endif
#ifdef NOT_USED
/* Given a type structure, return the in-conversion function of the type */ /* Given a type structure, return the in-conversion function of the type */
Oid Oid
typeInfunc(Type typ) typeInfunc(Type typ)
@ -248,7 +252,9 @@ typeInfunc(Type typ)
return typtup->typinput; return typtup->typinput;
} }
#endif
#ifdef NOT_USED
/* Given a type structure, return the out-conversion function of the type */ /* Given a type structure, return the out-conversion function of the type */
Oid Oid
typeOutfunc(Type typ) typeOutfunc(Type typ)
@ -259,3 +265,4 @@ typeOutfunc(Type typ)
return typtup->typoutput; return typtup->typoutput;
} }
#endif

5
src/backend/storage/buffer/bufmgr.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.81 2000/05/19 03:22:28 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.82 2000/06/08 22:37:20 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -75,7 +75,6 @@ static void WaitIO(BufferDesc *buf, SPINLOCK spinlock);
static void StartBufferIO(BufferDesc *buf, bool forInput); static void StartBufferIO(BufferDesc *buf, bool forInput);
static void TerminateBufferIO(BufferDesc *buf); static void TerminateBufferIO(BufferDesc *buf);
static void ContinueBufferIO(BufferDesc *buf, bool forInput); static void ContinueBufferIO(BufferDesc *buf, bool forInput);
extern void InitBufferIO(void);
extern void AbortBufferIO(void); extern void AbortBufferIO(void);
/* /*
@ -2488,11 +2487,13 @@ ContinueBufferIO(BufferDesc *buf, bool forInput)
IsForInput = forInput; IsForInput = forInput;
} }
#ifdef NOT_USED
void void
InitBufferIO(void) InitBufferIO(void)
{ {
InProgressBuf = (BufferDesc *) 0; InProgressBuf = (BufferDesc *) 0;
} }
#endif
/* /*
* This function is called from ProcReleaseSpins(). * This function is called from ProcReleaseSpins().

9
src/backend/storage/file/buffile.c
View File

@ -7,7 +7,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/storage/file/buffile.c,v 1.5 2000/04/12 17:15:35 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/storage/file/buffile.c,v 1.6 2000/06/08 22:37:22 momjian Exp $
* *
* NOTES: * NOTES:
* *
@ -149,6 +149,7 @@ BufFileCreateTemp(void)
return file; return file;
} }
#ifdef NOT_USED
/* /*
* Create a BufFile and attach it to an already-opened virtual File. * Create a BufFile and attach it to an already-opened virtual File.
* *
@ -161,6 +162,7 @@ BufFileCreate(File file)
{ {
return makeBufFile(file); return makeBufFile(file);
} }
#endif
/* /*
* Close a BufFile * Close a BufFile
@ -529,12 +531,14 @@ BufFileSeek(BufFile *file, int fileno, long offset, int whence)
return 0; return 0;
} }
#ifdef NOT_USED
void void
BufFileTell(BufFile *file, int *fileno, long *offset) BufFileTell(BufFile *file, int *fileno, long *offset)
{ {
*fileno = file->curFile; *fileno = file->curFile;
*offset = file->curOffset + file->pos; *offset = file->curOffset + file->pos;
} }
#endif
/* /*
* BufFileSeekBlock --- block-oriented seek * BufFileSeekBlock --- block-oriented seek
@ -556,6 +560,7 @@ BufFileSeekBlock(BufFile *file, long blknum)
SEEK_SET); SEEK_SET);
} }
#ifdef NOT_USED
/* /*
* BufFileTellBlock --- block-oriented tell * BufFileTellBlock --- block-oriented tell
* *
@ -570,3 +575,5 @@ BufFileTellBlock(BufFile *file)
blknum += file->curFile * RELSEG_SIZE; blknum += file->curFile * RELSEG_SIZE;
return blknum; return blknum;
} }
#endif

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

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lmgr.c,v 1.40 2000/05/31 00:28:30 petere Exp $ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lmgr.c,v 1.41 2000/06/08 22:37:24 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -227,6 +227,7 @@ XactLockTableInsert(TransactionId xid)
elog(ERROR, "XactLockTableInsert: LockAcquire failed"); elog(ERROR, "XactLockTableInsert: LockAcquire failed");
} }
#ifdef NOT_USED
void void
XactLockTableDelete(TransactionId xid) XactLockTableDelete(TransactionId xid)
{ {
@ -242,6 +243,7 @@ XactLockTableDelete(TransactionId xid)
LockRelease(LockTableId, &tag, ExclusiveLock); LockRelease(LockTableId, &tag, ExclusiveLock);
} }
#endif
void void
XactLockTableWait(TransactionId xid) XactLockTableWait(TransactionId xid)

16
src/backend/tcop/postgres.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.158 2000/06/04 01:44:33 petere Exp $ * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.159 2000/06/08 22:37:26 momjian Exp $
* *
* NOTES * NOTES
* this is the "main" module of the postgres backend and * this is the "main" module of the postgres backend and
@ -136,6 +136,8 @@ static int SocketBackend(StringInfo inBuf);
static int ReadCommand(StringInfo inBuf); static int ReadCommand(StringInfo inBuf);
static void pg_exec_query(char *query_string); static void pg_exec_query(char *query_string);
static void SigHupHandler(SIGNAL_ARGS); static void SigHupHandler(SIGNAL_ARGS);
static void FloatExceptionHandler(SIGNAL_ARGS);
static void quickdie(SIGNAL_ARGS);
/* /*
* Flag to mark SIGHUP. Whenever the main loop comes around it * Flag to mark SIGHUP. Whenever the main loop comes around it
@ -537,11 +539,13 @@ pg_exec_query(char *query_string)
pg_exec_query_dest(query_string, whereToSendOutput, FALSE); pg_exec_query_dest(query_string, whereToSendOutput, FALSE);
} }
#ifdef NOT_USED
void void
pg_exec_query_acl_override(char *query_string) pg_exec_query_acl_override(char *query_string)
{ {
pg_exec_query_dest(query_string, whereToSendOutput, TRUE); pg_exec_query_dest(query_string, whereToSendOutput, TRUE);
} }
#endif
void void
pg_exec_query_dest(char *query_string, /* string to execute */ pg_exec_query_dest(char *query_string, /* string to execute */
@ -681,7 +685,7 @@ handle_warn(SIGNAL_ARGS)
siglongjmp(Warn_restart, 1); siglongjmp(Warn_restart, 1);
} }
void static void
quickdie(SIGNAL_ARGS) quickdie(SIGNAL_ARGS)
{ {
PG_SETMASK(&BlockSig); PG_SETMASK(&BlockSig);
@ -722,7 +726,7 @@ die(SIGNAL_ARGS)
} }
/* signal handler for floating point exception */ /* signal handler for floating point exception */
void static void
FloatExceptionHandler(SIGNAL_ARGS) FloatExceptionHandler(SIGNAL_ARGS)
{ {
elog(ERROR, "floating point exception!" elog(ERROR, "floating point exception!"
@ -1379,7 +1383,7 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[])
if (!IsUnderPostmaster) if (!IsUnderPostmaster)
{ {
puts("\nPOSTGRES backend interactive interface "); puts("\nPOSTGRES backend interactive interface ");
puts("$Revision: 1.158 $ $Date: 2000/06/04 01:44:33 $\n"); puts("$Revision: 1.159 $ $Date: 2000/06/08 22:37:26 $\n");
} }
/* /*
@ -1696,8 +1700,8 @@ ShowUsage(void)
/* DisplayTupleCount(StatFp); */ /* DisplayTupleCount(StatFp); */
} }
#ifdef USE_ASSERT_CHECKING #ifdef NOT_USED
int static int
assertEnable(int val) assertEnable(int val)
{ {
assert_enabled = val; assert_enabled = val;

26
src/backend/utils/adt/datetime.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/datetime.c,v 1.48 2000/05/29 19:16:57 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/adt/datetime.c,v 1.49 2000/06/08 22:37:28 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -31,6 +31,17 @@
#include "miscadmin.h" #include "miscadmin.h"
#include "utils/datetime.h" #include "utils/datetime.h"
static int DecodeNumber(int flen, char *field,
int fmask, int *tmask,
struct tm * tm, double *fsec, int *is2digits);
static int DecodeNumberField(int len, char *str,
int fmask, int *tmask,
struct tm * tm, double *fsec, int *is2digits);
static int DecodeTime(char *str, int fmask, int *tmask,
struct tm * tm, double *fsec);
static int DecodeTimezone(char *str, int *tzp);
static datetkn *datebsearch(char *key, datetkn *base, unsigned int nel);
static int DecodeDate(char *str, int fmask, int *tmask, struct tm * tm);
#define USE_DATE_CACHE 1 #define USE_DATE_CACHE 1
#define ROUND_ALL 0 #define ROUND_ALL 0
@ -1155,12 +1166,11 @@ DecodeTimeOnly(char **field, int *ftype, int nf,
return 0; return 0;
} /* DecodeTimeOnly() */ } /* DecodeTimeOnly() */
/* DecodeDate() /* DecodeDate()
* Decode date string which includes delimiters. * Decode date string which includes delimiters.
* Insist on a complete set of fields. * Insist on a complete set of fields.
*/ */
int static int
DecodeDate(char *str, int fmask, int *tmask, struct tm * tm) DecodeDate(char *str, int fmask, int *tmask, struct tm * tm)
{ {
double fsec; double fsec;
@ -1288,7 +1298,7 @@ DecodeDate(char *str, int fmask, int *tmask, struct tm * tm)
* Only check the lower limit on hours, since this same code * Only check the lower limit on hours, since this same code
* can be used to represent time spans. * can be used to represent time spans.
*/ */
int static int
DecodeTime(char *str, int fmask, int *tmask, struct tm * tm, double *fsec) DecodeTime(char *str, int fmask, int *tmask, struct tm * tm, double *fsec)
{ {
char *cp; char *cp;
@ -1341,7 +1351,7 @@ DecodeTime(char *str, int fmask, int *tmask, struct tm * tm, double *fsec)
/* DecodeNumber() /* DecodeNumber()
* Interpret numeric field as a date value in context. * Interpret numeric field as a date value in context.
*/ */
int static int
DecodeNumber(int flen, char *str, int fmask, DecodeNumber(int flen, char *str, int fmask,
int *tmask, struct tm * tm, double *fsec, int *is2digits) int *tmask, struct tm * tm, double *fsec, int *is2digits)
{ {
@ -1445,7 +1455,7 @@ DecodeNumber(int flen, char *str, int fmask,
/* DecodeNumberField() /* DecodeNumberField()
* Interpret numeric string as a concatenated date field. * Interpret numeric string as a concatenated date field.
*/ */
int static int
DecodeNumberField(int len, char *str, int fmask, DecodeNumberField(int len, char *str, int fmask,
int *tmask, struct tm * tm, double *fsec, int *is2digits) int *tmask, struct tm * tm, double *fsec, int *is2digits)
{ {
@ -1519,7 +1529,7 @@ DecodeNumberField(int len, char *str, int fmask,
/* DecodeTimezone() /* DecodeTimezone()
* Interpret string as a numeric timezone. * Interpret string as a numeric timezone.
*/ */
int static int
DecodeTimezone(char *str, int *tzp) DecodeTimezone(char *str, int *tzp)
{ {
int tz; int tz;
@ -1908,7 +1918,7 @@ DecodeUnits(int field, char *lowtoken, int *val)
* Binary search -- from Knuth (6.2.1) Algorithm B. Special case like this * Binary search -- from Knuth (6.2.1) Algorithm B. Special case like this
* is WAY faster than the generic bsearch(). * is WAY faster than the generic bsearch().
*/ */
datetkn * static datetkn *
datebsearch(char *key, datetkn *base, unsigned int nel) datebsearch(char *key, datetkn *base, unsigned int nel)
{ {
datetkn *last = base + nel - 1, datetkn *last = base + nel - 1,

6
src/backend/utils/adt/float.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/float.c,v 1.58 2000/06/05 07:28:51 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/adt/float.c,v 1.59 2000/06/08 22:37:28 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -67,6 +67,8 @@
#include "fmgr.h" #include "fmgr.h"
#include "utils/builtins.h" #include "utils/builtins.h"
static void CheckFloat8Val(double val);
#ifndef NAN #ifndef NAN
#define NAN (0.0/0.0) #define NAN (0.0/0.0)
#endif #endif
@ -154,7 +156,7 @@ CheckFloat4Val(double val)
raise an elog warning if it is raise an elog warning if it is
*/ */
void static void
CheckFloat8Val(double val) CheckFloat8Val(double val)
{ {

9
src/backend/utils/adt/tid.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/tid.c,v 1.18 2000/05/30 00:49:53 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/adt/tid.c,v 1.19 2000/06/08 22:37:28 momjian Exp $
* *
* NOTES * NOTES
* input routine largely stolen from boxin(). * input routine largely stolen from boxin().
@ -114,6 +114,7 @@ tideq(ItemPointer arg1, ItemPointer arg2)
arg1->ip_posid == arg2->ip_posid); arg1->ip_posid == arg2->ip_posid);
} }
#ifdef NOT_USED
bool bool
tidne(ItemPointer arg1, ItemPointer arg2) tidne(ItemPointer arg1, ItemPointer arg2)
{ {
@ -123,7 +124,9 @@ tidne(ItemPointer arg1, ItemPointer arg2)
BlockIdGetBlockNumber(&(arg2->ip_blkid)) || BlockIdGetBlockNumber(&(arg2->ip_blkid)) ||
arg1->ip_posid != arg2->ip_posid); arg1->ip_posid != arg2->ip_posid);
} }
#endif
#ifdef NOT_USED
text * text *
tid_text(ItemPointer tid) tid_text(ItemPointer tid)
{ {
@ -135,7 +138,9 @@ tid_text(ItemPointer tid)
return textin(str); return textin(str);
} /* tid_text() */ } /* tid_text() */
#endif
#ifdef NOT_USED
ItemPointer ItemPointer
text_tid(const text *string) text_tid(const text *string)
{ {
@ -151,7 +156,7 @@ text_tid(const text *string)
return result; return result;
} /* text_tid() */ } /* text_tid() */
#endif
/* /*
* Functions to get latest tid of a specified tuple. * Functions to get latest tid of a specified tuple.

23
src/backend/utils/adt/timestamp.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/timestamp.c,v 1.27 2000/05/29 01:59:08 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/adt/timestamp.c,v 1.28 2000/06/08 22:37:28 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -35,6 +35,11 @@
static double time2t(const int hour, const int min, const double sec); static double time2t(const int hour, const int min, const double sec);
static int EncodeSpecialTimestamp(Timestamp dt, char *str);
static Timestamp dt2local(Timestamp dt, int timezone);
static void dt2time(Timestamp dt, int *hour, int *min, double *sec);
static int interval2tm(Interval span, struct tm * tm, float8 *fsec);
static int tm2interval(struct tm * tm, double fsec, Interval *span);
/***************************************************************************** /*****************************************************************************
@ -120,15 +125,9 @@ timestamp_out(Timestamp *dt)
return NULL; return NULL;
if (TIMESTAMP_IS_RESERVED(*dt)) if (TIMESTAMP_IS_RESERVED(*dt))
{
EncodeSpecialTimestamp(*dt, buf); EncodeSpecialTimestamp(*dt, buf);
}
else if (timestamp2tm(*dt, &tz, tm, &fsec, &tzn) == 0) else if (timestamp2tm(*dt, &tz, tm, &fsec, &tzn) == 0)
{
EncodeDateTime(tm, fsec, &tz, &tzn, DateStyle, buf); EncodeDateTime(tm, fsec, &tz, &tzn, DateStyle, buf);
}
else else
EncodeSpecialTimestamp(DT_INVALID, buf); EncodeSpecialTimestamp(DT_INVALID, buf);
@ -228,7 +227,7 @@ interval_out(Interval *span)
/* EncodeSpecialTimestamp() /* EncodeSpecialTimestamp()
* Convert reserved timestamp data type to string. * Convert reserved timestamp data type to string.
*/ */
int static int
EncodeSpecialTimestamp(Timestamp dt, char *str) EncodeSpecialTimestamp(Timestamp dt, char *str)
{ {
if (TIMESTAMP_IS_RESERVED(dt)) if (TIMESTAMP_IS_RESERVED(dt))
@ -266,7 +265,7 @@ now(void)
return result; return result;
} }
void static void
dt2time(Timestamp jd, int *hour, int *min, double *sec) dt2time(Timestamp jd, int *hour, int *min, double *sec)
{ {
double time; double time;
@ -434,7 +433,7 @@ tm2timestamp(struct tm * tm, double fsec, int *tzp, Timestamp *result)
/* interval2tm() /* interval2tm()
* Convert a interval data type to a tm structure. * Convert a interval data type to a tm structure.
*/ */
int static int
interval2tm(Interval span, struct tm * tm, float8 *fsec) interval2tm(Interval span, struct tm * tm, float8 *fsec)
{ {
double time; double time;
@ -466,7 +465,7 @@ interval2tm(Interval span, struct tm * tm, float8 *fsec)
return 0; return 0;
} /* interval2tm() */ } /* interval2tm() */
int static int
tm2interval(struct tm * tm, double fsec, Interval *span) tm2interval(struct tm * tm, double fsec, Interval *span)
{ {
span->month = ((tm->tm_year * 12) + tm->tm_mon); span->month = ((tm->tm_year * 12) + tm->tm_mon);
@ -485,7 +484,7 @@ time2t(const int hour, const int min, const double sec)
return (((hour * 60) + min) * 60) + sec; return (((hour * 60) + min) * 60) + sec;
} /* time2t() */ } /* time2t() */
Timestamp static Timestamp
dt2local(Timestamp dt, int tz) dt2local(Timestamp dt, int tz)
{ {
dt -= tz; dt -= tz;

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

@ -7,7 +7,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/cache/lsyscache.c,v 1.41 2000/04/12 17:15:53 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/cache/lsyscache.c,v 1.42 2000/06/08 22:37:30 momjian Exp $
* *
* NOTES * NOTES
* Eventually, the index information should go through here, too. * Eventually, the index information should go through here, too.
@ -513,6 +513,7 @@ get_func_rettype(Oid funcid)
/* ---------- RELATION CACHE ---------- */ /* ---------- RELATION CACHE ---------- */
#ifdef NOT_USED
/* /*
* get_relnatts - * get_relnatts -
* *
@ -536,6 +537,7 @@ get_relnatts(Oid relid)
else else
return InvalidAttrNumber; return InvalidAttrNumber;
} }
#endif
/* /*
* get_rel_name - * get_rel_name -

6
src/backend/utils/init/findbe.c
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/init/Attic/findbe.c,v 1.17 2000/01/26 05:57:26 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/init/Attic/findbe.c,v 1.18 2000/06/08 22:37:33 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -32,6 +32,8 @@
#define S_IXOTH ((S_IXUSR)>>6) #define S_IXOTH ((S_IXUSR)>>6)
#endif #endif
static int ValidateBinary(char *path);
/* /*
* ValidateBinary -- validate "path" as a POSTMASTER/POSTGRES executable file * ValidateBinary -- validate "path" as a POSTMASTER/POSTGRES executable file
* *
@ -39,7 +41,7 @@
* -1 if the regular file "path" does not exist or cannot be executed. * -1 if the regular file "path" does not exist or cannot be executed.
* -2 if the file is otherwise valid but cannot be read. * -2 if the file is otherwise valid but cannot be read.
*/ */
int static int
ValidateBinary(char *path) ValidateBinary(char *path)
{ {
struct stat buf; struct stat buf;

6
src/backend/utils/init/miscinit.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/init/miscinit.c,v 1.47 2000/06/02 15:57:32 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/init/miscinit.c,v 1.48 2000/06/08 22:37:33 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -30,6 +30,8 @@
#include "miscadmin.h" #include "miscadmin.h"
#include "utils/syscache.h" #include "utils/syscache.h"
static char *GetPidFname(void);
#ifdef CYR_RECODE #ifdef CYR_RECODE
unsigned char RecodeForwTable[128]; unsigned char RecodeForwTable[128];
@ -406,7 +408,7 @@ SetPidFname(char *datadir)
/* /*
* Get path to the pid file * Get path to the pid file
*/ */
char * static char *
GetPidFname(void) GetPidFname(void)
{ {
return (PidFile); return (PidFile);

5
src/include/access/istrat.h
View File

@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $Id: istrat.h,v 1.16 2000/01/26 05:57:50 momjian Exp $ * $Id: istrat.h,v 1.17 2000/06/08 22:37:36 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -55,9 +55,6 @@ extern Size AttributeNumberGetIndexStrategySize(AttrNumber maxAttributeNumber,
extern StrategyNumber RelationGetStrategy(Relation relation, extern StrategyNumber RelationGetStrategy(Relation relation,
AttrNumber attributeNumber, StrategyEvaluation evaluation, AttrNumber attributeNumber, StrategyEvaluation evaluation,
RegProcedure procedure); RegProcedure procedure);
extern bool RelationInvokeStrategy(Relation relation,
StrategyEvaluation evaluation, AttrNumber attributeNumber,
StrategyNumber strategy, Datum left, Datum right);
extern void IndexSupportInitialize(IndexStrategy indexStrategy, extern void IndexSupportInitialize(IndexStrategy indexStrategy,
RegProcedure *indexSupport, Oid indexObjectId, RegProcedure *indexSupport, Oid indexObjectId,
Oid accessMethodObjectId, StrategyNumber maxStrategyNumber, Oid accessMethodObjectId, StrategyNumber maxStrategyNumber,

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

@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $Id: nbtree.h,v 1.35 2000/04/12 17:16:26 momjian Exp $ * $Id: nbtree.h,v 1.36 2000/06/08 22:37:38 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -205,8 +205,6 @@ typedef struct BTPageState
*/ */
extern InsertIndexResult _bt_doinsert(Relation rel, BTItem btitem, extern InsertIndexResult _bt_doinsert(Relation rel, BTItem btitem,
bool index_is_unique, Relation heapRel); bool index_is_unique, Relation heapRel);
extern int32 _bt_tuplecompare(Relation rel, Size keysz, ScanKey scankey,
IndexTuple tuple1, IndexTuple tuple2);
extern bool _bt_itemcmp(Relation rel, Size keysz, ScanKey scankey, extern bool _bt_itemcmp(Relation rel, Size keysz, ScanKey scankey,
BTItem item1, BTItem item2, StrategyNumber strat); BTItem item1, BTItem item2, StrategyNumber strat);

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

@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $Id: xact.h,v 1.25 2000/06/05 07:28:57 tgl Exp $ * $Id: xact.h,v 1.26 2000/06/08 22:37:38 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -102,7 +102,6 @@ extern bool CommandIdIsCurrentCommandId(CommandId cid);
extern bool CommandIdGEScanCommandId(CommandId cid); extern bool CommandIdGEScanCommandId(CommandId cid);
extern void CommandCounterIncrement(void); extern void CommandCounterIncrement(void);
extern void InitializeTransactionSystem(void); extern void InitializeTransactionSystem(void);
extern bool CurrentXactInProgress(void);
extern void StartTransactionCommand(void); extern void StartTransactionCommand(void);
extern void CommitTransactionCommand(void); extern void CommitTransactionCommand(void);
extern void AbortCurrentTransaction(void); extern void AbortCurrentTransaction(void);

4
src/include/c.h
View File

@ -8,7 +8,7 @@
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $Id: c.h,v 1.73 2000/06/02 16:40:09 momjian Exp $ * $Id: c.h,v 1.74 2000/06/08 22:37:35 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -751,8 +751,6 @@ extern int assert_enabled;
#define LogAssertState(condition, printArgs) \ #define LogAssertState(condition, printArgs) \
LogTrap(!(condition), BadState, printArgs) LogTrap(!(condition), BadState, printArgs)
extern int assertEnable(int val);
#ifdef ASSERT_CHECKING_TEST #ifdef ASSERT_CHECKING_TEST
extern int assertTest(int val); extern int assertTest(int val);

3
src/include/catalog/index.h
View File

@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $Id: index.h,v 1.23 2000/04/12 17:16:27 momjian Exp $ * $Id: index.h,v 1.24 2000/06/08 22:37:39 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -64,7 +64,6 @@ extern void index_build(Relation heapRelation, Relation indexRelation,
extern bool IndexIsUnique(Oid indexId); extern bool IndexIsUnique(Oid indexId);
extern bool IndexIsUniqueNoCache(Oid indexId); extern bool IndexIsUniqueNoCache(Oid indexId);
extern bool activate_index(Oid indexId, bool activate);
extern bool reindex_index(Oid indexId, bool force); extern bool reindex_index(Oid indexId, bool force);
extern bool activate_indexes_of_a_table(Oid relid, bool activate); extern bool activate_indexes_of_a_table(Oid relid, bool activate);
extern bool reindex_relation(Oid relid, bool force); extern bool reindex_relation(Oid relid, bool force);

5
src/include/commands/comment.h
View File

@ -23,9 +23,8 @@
*------------------------------------------------------------------ *------------------------------------------------------------------
*/ */
void CreateComments(Oid oid, char *comment); extern void DeleteComments(Oid oid);
void DeleteComments(Oid oid); extern void CommentObject(int objtype, char *objname, char *objproperty,
void CommentObject(int objtype, char *objname, char *objproperty,
List *objlist, char *comment); List *objlist, char *comment);
#endif /* COMMENT_H */ #endif /* COMMENT_H */

5
src/include/commands/trigger.h
View File

@ -6,7 +6,7 @@
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $Id: trigger.h,v 1.20 2000/05/29 01:59:11 tgl Exp $ * $Id: trigger.h,v 1.21 2000/06/08 22:37:42 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -137,9 +137,6 @@ extern void DeferredTriggerAbortXact(void);
extern void DeferredTriggerSetState(ConstraintsSetStmt *stmt); extern void DeferredTriggerSetState(ConstraintsSetStmt *stmt);
extern void DeferredTriggerSaveEvent(Relation rel, int event,
HeapTuple oldtup, HeapTuple newtup);
/* /*
* in utils/adt/ri_triggers.c * in utils/adt/ri_triggers.c

3
src/include/executor/nodeTidscan.h
View File

@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $Id: nodeTidscan.h,v 1.3 2000/04/12 17:16:33 momjian Exp $ * $Id: nodeTidscan.h,v 1.4 2000/06/08 22:37:44 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -20,7 +20,6 @@ extern TupleTableSlot *ExecTidScan(TidScan *node);
extern void ExecTidReScan(TidScan *node, ExprContext *exprCtxt, Plan *parent); extern void ExecTidReScan(TidScan *node, ExprContext *exprCtxt, Plan *parent);
extern void ExecEndTidScan(TidScan *node); extern void ExecEndTidScan(TidScan *node);
extern void ExecTidMarkPos(TidScan *node); extern void ExecTidMarkPos(TidScan *node);
extern void ExecTidRestrPos(TidScan *node);
extern bool ExecInitTidScan(TidScan *node, EState *estate, Plan *parent); extern bool ExecInitTidScan(TidScan *node, EState *estate, Plan *parent);
extern int ExecCountSlotsTidScan(TidScan *node); extern int ExecCountSlotsTidScan(TidScan *node);
extern void ExecTidReScan(TidScan *node, ExprContext *exprCtxt, Plan *parent); extern void ExecTidReScan(TidScan *node, ExprContext *exprCtxt, Plan *parent);

3
src/include/lib/dllist.h
View File

@ -27,7 +27,7 @@
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $Id: dllist.h,v 1.12 2000/04/12 17:16:34 momjian Exp $ * $Id: dllist.h,v 1.13 2000/06/08 22:37:46 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -61,7 +61,6 @@ extern void DLFreeElem(Dlelem *);
extern Dlelem *DLGetHead(Dllist *); extern Dlelem *DLGetHead(Dllist *);
extern Dlelem *DLGetTail(Dllist *); extern Dlelem *DLGetTail(Dllist *);
extern Dlelem *DLRemTail(Dllist *l); extern Dlelem *DLRemTail(Dllist *l);
extern Dlelem *DLGetPred(Dlelem *); /* get predecessor */
extern Dlelem *DLGetSucc(Dlelem *); /* get successor */ extern Dlelem *DLGetSucc(Dlelem *); /* get successor */
extern void DLRemove(Dlelem *); /* removes node from list */ extern void DLRemove(Dlelem *); /* removes node from list */
extern void DLAddHead(Dllist *list, Dlelem *node); extern void DLAddHead(Dllist *list, Dlelem *node);

4
src/include/miscadmin.h
View File

@ -12,7 +12,7 @@
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $Id: miscadmin.h,v 1.57 2000/05/31 00:28:36 petere Exp $ * $Id: miscadmin.h,v 1.58 2000/06/08 22:37:35 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
@ -142,7 +142,6 @@ extern char *getpgusername(void);
extern void SetPgUserName(void); extern void SetPgUserName(void);
extern int GetUserId(void); extern int GetUserId(void);
extern void SetUserId(void); extern void SetUserId(void);
extern int ValidateBinary(char *path);
extern int FindExec(char *backend, char *argv0, char *binary_name); extern int FindExec(char *backend, char *argv0, char *binary_name);
extern int CheckPathAccess(char *path, char *name, int open_mode); extern int CheckPathAccess(char *path, char *name, int open_mode);
@ -233,7 +232,6 @@ extern void SetWaitingForLock(bool);
#define PIDFNAME "postmaster.pid" #define PIDFNAME "postmaster.pid"
extern void SetPidFname(char *datadir); extern void SetPidFname(char *datadir);
extern char *GetPidFname(void);
extern void UnlinkPidFile(void); extern void UnlinkPidFile(void);
extern int SetPidFile(pid_t pid); extern int SetPidFile(pid_t pid);

3
src/include/nodes/nodeFuncs.h
View File

@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $Id: nodeFuncs.h,v 1.11 2000/01/26 05:58:16 momjian Exp $ * $Id: nodeFuncs.h,v 1.12 2000/06/08 22:37:48 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -20,6 +20,5 @@ extern bool single_node(Node *node);
extern bool var_is_outer(Var *var); extern bool var_is_outer(Var *var);
extern bool var_is_rel(Var *var); extern bool var_is_rel(Var *var);
extern Oper *replace_opid(Oper *oper); extern Oper *replace_opid(Oper *oper);
extern bool non_null(Expr *c);
#endif /* NODEFUNCS_H */ #endif /* NODEFUNCS_H */

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

@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $Id: cost.h,v 1.33 2000/05/31 00:28:38 petere Exp $ * $Id: cost.h,v 1.34 2000/06/08 22:37:51 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -81,8 +81,5 @@ extern Selectivity restrictlist_selectivity(Query *root,
extern Selectivity clauselist_selectivity(Query *root, extern Selectivity clauselist_selectivity(Query *root,
List *clauses, List *clauses,
int varRelid); int varRelid);
extern Selectivity clause_selectivity(Query *root,
Node *clause,
int varRelid);
#endif /* COST_H */ #endif /* COST_H */

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

@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $Id: joininfo.h,v 1.15 2000/01/26 05:58:20 momjian Exp $ * $Id: joininfo.h,v 1.16 2000/06/08 22:37:51 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -16,7 +16,6 @@
#include "nodes/relation.h" #include "nodes/relation.h"
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);
#endif /* JOININFO_H */ #endif /* JOININFO_H */

3
src/include/optimizer/planmain.h
View File

@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $Id: planmain.h,v 1.40 2000/05/31 00:28:38 petere Exp $ * $Id: planmain.h,v 1.41 2000/06/08 22:37:51 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -27,7 +27,6 @@ extern Plan *query_planner(Query *root, List *tlist, List *qual,
* prototypes for plan/createplan.c * prototypes for plan/createplan.c
*/ */
extern Plan *create_plan(Query *root, Path *best_path); extern Plan *create_plan(Query *root, Path *best_path);
extern SeqScan *make_seqscan(List *qptlist, List *qpqual, Index scanrelid);
extern Sort *make_sort(List *tlist, Oid nonameid, Plan *lefttree, extern Sort *make_sort(List *tlist, Oid nonameid, Plan *lefttree,
int keycount); int keycount);
extern Agg *make_agg(List *tlist, List *qual, Plan *lefttree); extern Agg *make_agg(List *tlist, List *qual, Plan *lefttree);

3
src/include/optimizer/prep.h
View File

@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $Id: prep.h,v 1.21 2000/01/26 05:58:21 momjian Exp $ * $Id: prep.h,v 1.22 2000/06/08 22:37:51 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -22,7 +22,6 @@
*/ */
extern List *canonicalize_qual(Expr *qual, bool removeAndFlag); extern List *canonicalize_qual(Expr *qual, bool removeAndFlag);
extern List *cnfify(Expr *qual, bool removeAndFlag); extern List *cnfify(Expr *qual, bool removeAndFlag);
extern Expr *dnfify(Expr *qual);
/* /*
* prototypes for preptlist.c * prototypes for preptlist.c

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

@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $Id: tlist.h,v 1.25 2000/04/12 17:16:42 momjian Exp $ * $Id: tlist.h,v 1.26 2000/06/08 22:37:51 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -16,8 +16,6 @@
#include "nodes/relation.h" #include "nodes/relation.h"
extern TargetEntry *tlistentry_member(Node *node, List *targetlist);
extern Node *matching_tlist_expr(Node *node, List *targetlist);
extern Resdom *tlist_member(Node *node, List *targetlist); extern Resdom *tlist_member(Node *node, List *targetlist);
extern void add_var_to_tlist(RelOptInfo *rel, Var *var); extern void add_var_to_tlist(RelOptInfo *rel, Var *var);

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

@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $Id: parse_relation.h,v 1.17 2000/06/03 04:41:33 momjian Exp $ * $Id: parse_relation.h,v 1.18 2000/06/08 22:37:53 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -32,8 +32,6 @@ extern List *expandAll(ParseState *pstate, char *relname, Attr *ref,
int *this_resno); int *this_resno);
extern int attnameAttNum(Relation rd, char *a); extern int attnameAttNum(Relation rd, char *a);
extern int specialAttNum(char *a); extern int specialAttNum(char *a);
extern bool attnameIsSet(Relation rd, char *name);
extern int attnumAttNelems(Relation rd, int attid);
extern Oid attnumTypeId(Relation rd, int attid); extern Oid attnumTypeId(Relation rd, int attid);
extern void warnAutoRange(ParseState *pstate, char *refname); extern void warnAutoRange(ParseState *pstate, char *refname);

6
src/include/parser/parse_type.h
View File

@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $Id: parse_type.h,v 1.13 2000/03/16 06:35:06 tgl Exp $ * $Id: parse_type.h,v 1.14 2000/06/08 22:37:53 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -30,10 +30,6 @@ extern char typeTypeFlag(Type t);
extern Datum stringTypeDatum(Type tp, char *string, int32 atttypmod); extern Datum stringTypeDatum(Type tp, char *string, int32 atttypmod);
extern Oid typeidTypeRelid(Oid type_id); extern Oid typeidTypeRelid(Oid type_id);
extern Oid typeTypeRelid(Type typ); extern Oid typeTypeRelid(Type typ);
extern Oid typeTypElem(Type typ);
extern Oid GetArrayElementType(Oid typearray);
extern Oid typeInfunc(Type typ);
extern Oid typeOutfunc(Type typ);
#define ISCOMPLEX(typeid) (typeidTypeRelid(typeid) != InvalidOid) #define ISCOMPLEX(typeid) (typeidTypeRelid(typeid) != InvalidOid)

5
src/include/storage/buffile.h
View File

@ -18,7 +18,7 @@
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $Id: buffile.h,v 1.4 2000/04/12 17:16:51 momjian Exp $ * $Id: buffile.h,v 1.5 2000/06/08 22:37:54 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -37,13 +37,10 @@ typedef struct BufFile BufFile;
*/ */
extern BufFile *BufFileCreateTemp(void); extern BufFile *BufFileCreateTemp(void);
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 BufFileSeek(BufFile *file, int fileno, long offset, int whence); extern int BufFileSeek(BufFile *file, int fileno, long offset, int whence);
extern void BufFileTell(BufFile *file, int *fileno, long *offset);
extern int BufFileSeekBlock(BufFile *file, long blknum); extern int BufFileSeekBlock(BufFile *file, long blknum);
extern long BufFileTellBlock(BufFile *file);
#endif /* BUFFILE_H */ #endif /* BUFFILE_H */

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

@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $Id: lmgr.h,v 1.24 2000/01/26 05:58:33 momjian Exp $ * $Id: lmgr.h,v 1.25 2000/06/08 22:37:54 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -45,7 +45,6 @@ extern void UnlockPage(Relation relation, BlockNumber blkno, LOCKMODE lockmode);
/* and this is for transactions */ /* and this is for transactions */
extern void XactLockTableInsert(TransactionId xid); extern void XactLockTableInsert(TransactionId xid);
extern void XactLockTableDelete(TransactionId xid);
extern void XactLockTableWait(TransactionId xid); extern void XactLockTableWait(TransactionId xid);
/* proc.c */ /* proc.c */

5
src/include/tcop/tcopprot.h
View File

@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $Id: tcopprot.h,v 1.28 2000/05/31 00:28:39 petere Exp $ * $Id: tcopprot.h,v 1.29 2000/06/08 22:37:56 momjian Exp $
* *
* OLD COMMENTS * OLD COMMENTS
* This file was created so that other c files could get the two * This file was created so that other c files could get the two
@ -37,7 +37,6 @@ extern List *pg_parse_and_rewrite(char *query_string,
Oid *typev, int nargs, Oid *typev, int nargs,
bool aclOverride); bool aclOverride);
extern Plan *pg_plan_query(Query *querytree); extern Plan *pg_plan_query(Query *querytree);
extern void pg_exec_query_acl_override(char *query_string);
extern void pg_exec_query_dest(char *query_string, extern void pg_exec_query_dest(char *query_string,
CommandDest dest, CommandDest dest,
bool aclOverride); bool aclOverride);
@ -45,9 +44,7 @@ extern void pg_exec_query_dest(char *query_string,
#endif /* BOOTSTRAP_INCLUDE */ #endif /* BOOTSTRAP_INCLUDE */
extern void handle_warn(SIGNAL_ARGS); extern void handle_warn(SIGNAL_ARGS);
extern void quickdie(SIGNAL_ARGS);
extern void die(SIGNAL_ARGS); extern void die(SIGNAL_ARGS);
extern void FloatExceptionHandler(SIGNAL_ARGS);
extern void CancelQuery(void); extern void CancelQuery(void);
extern int PostgresMain(int argc, char *argv[], extern int PostgresMain(int argc, char *argv[],
int real_argc, char *real_argv[]); int real_argc, char *real_argv[]);

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

@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $Id: builtins.h,v 1.113 2000/06/05 07:29:07 tgl Exp $ * $Id: builtins.h,v 1.114 2000/06/08 22:37:58 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -209,7 +209,6 @@ extern char *filename_in(char *file);
extern char *filename_out(char *s); extern char *filename_out(char *s);
/* float.c */ /* float.c */
extern void CheckFloat8Val(double val); /* used by lex */
extern float32 float4in(char *num); extern float32 float4in(char *num);
extern char *float4out(float32 num); extern char *float4out(float32 num);
extern float64 float8in(char *num); extern float64 float8in(char *num);
@ -408,9 +407,6 @@ extern char *make_greater_string(const char *str, Oid datatype);
extern ItemPointer tidin(const char *str); extern ItemPointer tidin(const char *str);
extern char *tidout(ItemPointer itemPtr); extern char *tidout(ItemPointer itemPtr);
extern bool tideq(ItemPointer, ItemPointer); extern bool tideq(ItemPointer, ItemPointer);
extern bool tidne(ItemPointer, ItemPointer);
extern text *tid_text(ItemPointer);
extern ItemPointer text_tid(const text *);
extern ItemPointer currtid_byreloid(Oid relOid, ItemPointer); extern ItemPointer currtid_byreloid(Oid relOid, ItemPointer);
extern ItemPointer currtid_byrelname(const text *relName, ItemPointer); extern ItemPointer currtid_byrelname(const text *relName, ItemPointer);

13
src/include/utils/datetime.h
View File

@ -9,7 +9,7 @@
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $Id: datetime.h,v 1.14 2000/05/29 19:16:56 tgl Exp $ * $Id: datetime.h,v 1.15 2000/06/08 22:37:58 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -255,19 +255,8 @@ extern int EncodeTimeOnly(struct tm * tm, double fsec, int *tzp, int style, char
extern int EncodeDateTime(struct tm * tm, double fsec, int *tzp, char **tzn, int style, char *str); extern int EncodeDateTime(struct tm * tm, double fsec, int *tzp, char **tzn, int style, char *str);
extern int EncodeTimeSpan(struct tm * tm, double fsec, int style, char *str); extern int EncodeTimeSpan(struct tm * tm, double fsec, int style, char *str);
extern int DecodeDate(char *str, int fmask, int *tmask, struct tm * tm);
extern int DecodeNumber(int flen, char *field,
int fmask, int *tmask,
struct tm * tm, double *fsec, int *is2digits);
extern int DecodeNumberField(int len, char *str,
int fmask, int *tmask,
struct tm * tm, double *fsec, int *is2digits);
extern int DecodeSpecial(int field, char *lowtoken, int *val); extern int DecodeSpecial(int field, char *lowtoken, int *val);
extern int DecodeTime(char *str, int fmask, int *tmask,
struct tm * tm, double *fsec);
extern int DecodeTimezone(char *str, int *tzp);
extern int DecodeUnits(int field, char *lowtoken, int *val); extern int DecodeUnits(int field, char *lowtoken, int *val);
extern datetkn *datebsearch(char *key, datetkn *base, unsigned int nel);
extern int j2day(int jd); extern int j2day(int jd);

3
src/include/utils/lsyscache.h
View File

@ -6,7 +6,7 @@
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $Id: lsyscache.h,v 1.23 2000/04/12 17:16:55 momjian Exp $ * $Id: lsyscache.h,v 1.24 2000/06/08 22:37:58 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -34,7 +34,6 @@ extern Oid get_negator(Oid opid);
extern RegProcedure get_oprrest(Oid opid); extern RegProcedure get_oprrest(Oid opid);
extern RegProcedure get_oprjoin(Oid opid); extern RegProcedure get_oprjoin(Oid opid);
extern Oid get_func_rettype(Oid funcid); extern Oid get_func_rettype(Oid funcid);
extern int get_relnatts(Oid relid);
extern char *get_rel_name(Oid relid); extern char *get_rel_name(Oid relid);
extern struct varlena *get_relstub(Oid relid, int no, bool *islast); extern struct varlena *get_relstub(Oid relid, int no, bool *islast);
extern Oid get_ruleid(char *rulename); extern Oid get_ruleid(char *rulename);

7
src/include/utils/timestamp.h
View File

@ -6,7 +6,7 @@
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $Id: timestamp.h,v 1.4 2000/04/12 17:16:56 momjian Exp $ * $Id: timestamp.h,v 1.5 2000/06/08 22:37:58 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -158,11 +158,6 @@ extern int tm2timestamp(struct tm * tm, double fsec, int *tzp, Timestamp *dt);
extern int timestamp2tm(Timestamp dt, int *tzp, struct tm * tm, double *fsec, char **tzn); extern int timestamp2tm(Timestamp dt, int *tzp, struct tm * tm, double *fsec, char **tzn);
extern Timestamp SetTimestamp(Timestamp timestamp); extern Timestamp SetTimestamp(Timestamp timestamp);
extern Timestamp dt2local(Timestamp dt, int timezone);
extern void dt2time(Timestamp dt, int *hour, int *min, double *sec);
extern int EncodeSpecialTimestamp(Timestamp dt, char *str);
extern int interval2tm(Interval span, struct tm * tm, float8 *fsec);
extern int tm2interval(struct tm * tm, double fsec, Interval *span);
extern Timestamp *now(void); extern Timestamp *now(void);
#endif /* TIMESTAMP_H */ #endif /* TIMESTAMP_H */

5
src/tools/find_static
View File

@ -16,7 +16,7 @@ find . -name '[a-z]*.o' -type f -print | while read FILE
do do
nm $FILE | cut -c10-100 |awk '{printf "%s\t%s\t%s\n", "'"$FILE"'",$1,$2}' nm $FILE | cut -c10-100 |awk '{printf "%s\t%s\t%s\n", "'"$FILE"'",$1,$2}'
done >/tmp/$$ done >/tmp/$$
destroydb debug dropdb debug
createdb debug createdb debug
echo " echo "
create table debug (file text, scope char, func text); create table debug (file text, scope char, func text);
@ -43,6 +43,7 @@ echo "
select * select *
from debug2 from debug2
where scope = 'T'; where scope = 'T'
order by file, func;
" |psql debug " |psql debug