Commit 173c5559 authored by Bruce Momjian's avatar Bruce Momjian

Make functions static or ifdef NOT_USED. Prevent pg_version creation.

parent 0a1c2805
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.44 1998/09/07 05:35:27 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.45 1998/10/08 18:29:10 momjian Exp $
* *
* NOTES * NOTES
* The old interface functions have been converted to macros * The old interface functions have been converted to macros
...@@ -274,6 +274,7 @@ heap_sysattrbyval(AttrNumber attno) ...@@ -274,6 +274,7 @@ heap_sysattrbyval(AttrNumber attno)
return byval; return byval;
} }
#ifdef NOT_USED
/* ---------------- /* ----------------
* heap_getsysattr * heap_getsysattr
* ---------------- * ----------------
...@@ -300,6 +301,7 @@ heap_getsysattr(HeapTuple tup, Buffer b, int attnum) ...@@ -300,6 +301,7 @@ heap_getsysattr(HeapTuple tup, Buffer b, int attnum)
} }
return (Datum) NULL; return (Datum) NULL;
} }
#endif
/* ---------------- /* ----------------
* nocachegetattr * nocachegetattr
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.35 1998/09/01 04:26:51 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.36 1998/10/08 18:29:12 momjian Exp $
* *
* *
* INTERFACE ROUTINES * INTERFACE ROUTINES
...@@ -96,6 +96,8 @@ ...@@ -96,6 +96,8 @@
#include <string.h> #include <string.h>
#endif #endif
static void doinsert(Relation relation, HeapTuple tup);
static bool ImmediateInvalidation; static bool ImmediateInvalidation;
/* ---------------------------------------------------------------- /* ----------------------------------------------------------------
...@@ -475,7 +477,7 @@ heapgettup(Relation relation, ...@@ -475,7 +477,7 @@ heapgettup(Relation relation,
} }
} }
void static void
doinsert(Relation relation, HeapTuple tup) doinsert(Relation relation, HeapTuple tup)
{ {
RelationPutHeapTupleAtEnd(relation, tup); RelationPutHeapTupleAtEnd(relation, tup);
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/access/index/genam.c,v 1.14 1998/09/01 03:21:07 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/access/index/genam.c,v 1.15 1998/10/08 18:29:14 momjian Exp $
* *
* NOTES * NOTES
* many of the old access method routines have been turned into * many of the old access method routines have been turned into
...@@ -167,9 +167,6 @@ IndexScanRestart(IndexScanDesc scan, ...@@ -167,9 +167,6 @@ IndexScanRestart(IndexScanDesc scan,
scan->numberOfKeys * sizeof(ScanKeyData)); scan->numberOfKeys * sizeof(ScanKeyData));
} }
#endif
#ifdef NOT_USED
/* ---------------- /* ----------------
* IndexScanEnd -- End and index scan. * IndexScanEnd -- End and index scan.
* *
...@@ -192,7 +189,6 @@ IndexScanEnd(IndexScanDesc scan) ...@@ -192,7 +189,6 @@ IndexScanEnd(IndexScanDesc scan)
pfree(scan); pfree(scan);
} }
#endif
/* ---------------- /* ----------------
* IndexScanMarkPosition -- Mark current position in a scan. * IndexScanMarkPosition -- Mark current position in a scan.
...@@ -274,3 +270,5 @@ IndexScanRestorePosition(IndexScanDesc scan) ...@@ -274,3 +270,5 @@ IndexScanRestorePosition(IndexScanDesc scan)
scan->flags = 0x0; /* XXX should have a symbolic name */ scan->flags = 0x0; /* XXX should have a symbolic name */
} }
#endif
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.24 1998/10/06 02:39:58 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.25 1998/10/08 18:29:15 momjian Exp $
* *
* NOTES * NOTES
* Transaction aborts can now occur two ways: * Transaction aborts can now occur two ways:
...@@ -262,7 +262,6 @@ SetTransactionFlushEnabled(bool state) ...@@ -262,7 +262,6 @@ SetTransactionFlushEnabled(bool state)
TransactionFlushState = (state == true); TransactionFlushState = (state == true);
} }
#endif
/* -------------------------------- /* --------------------------------
* IsTransactionState * IsTransactionState
...@@ -297,6 +296,7 @@ IsTransactionState(void) ...@@ -297,6 +296,7 @@ IsTransactionState(void)
*/ */
return false; return false;
} }
#endif
/* -------------------------------- /* --------------------------------
* IsAbortedTransactionBlockState * IsAbortedTransactionBlockState
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/access/transam/Attic/xid.c,v 1.17 1998/09/01 03:21:34 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/access/transam/Attic/xid.c,v 1.18 1998/10/08 18:29:18 momjian Exp $
* *
* OLD COMMENTS * OLD COMMENTS
* XXX WARNING * XXX WARNING
...@@ -53,6 +53,7 @@ xidout(TransactionId transactionId) ...@@ -53,6 +53,7 @@ xidout(TransactionId transactionId)
} }
#ifdef NOT_USED
/* ---------------------------------------------------------------- /* ----------------------------------------------------------------
* TransactionIdIsLessThan * TransactionIdIsLessThan
* ---------------------------------------------------------------- * ----------------------------------------------------------------
...@@ -62,6 +63,7 @@ TransactionIdIsLessThan(TransactionId id1, TransactionId id2) ...@@ -62,6 +63,7 @@ TransactionIdIsLessThan(TransactionId id1, TransactionId id2)
{ {
return (bool) (id1 < id2); return (bool) (id1 < id2);
} }
#endif
/* ---------------------------------------------------------------- /* ----------------------------------------------------------------
* xideq * xideq
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
# Makefile for catalog # Makefile for catalog
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/backend/catalog/Makefile,v 1.13 1998/08/25 04:19:14 momjian Exp $ # $Header: /cvsroot/pgsql/src/backend/catalog/Makefile,v 1.14 1998/10/08 18:29:19 momjian Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
...@@ -31,7 +31,7 @@ GLOBALBKI_SRCS= $(addprefix ../../include/catalog/, \ ...@@ -31,7 +31,7 @@ GLOBALBKI_SRCS= $(addprefix ../../include/catalog/, \
LOCALBKI_SRCS= $(addprefix ../../include/catalog/, \ LOCALBKI_SRCS= $(addprefix ../../include/catalog/, \
pg_proc.h pg_type.h pg_attribute.h pg_class.h \ pg_proc.h pg_type.h pg_attribute.h pg_class.h \
pg_inherits.h pg_index.h pg_version.h pg_statistic.h \ pg_inherits.h pg_index.h pg_statistic.h \
pg_operator.h pg_opclass.h pg_am.h pg_amop.h pg_amproc.h \ pg_operator.h pg_opclass.h pg_am.h pg_amop.h pg_amproc.h \
pg_language.h pg_parg.h \ pg_language.h pg_parg.h \
pg_aggregate.h pg_ipl.h pg_inheritproc.h \ pg_aggregate.h pg_ipl.h pg_inheritproc.h \
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* Routines for handling of 'SET var TO', * Routines for handling of 'SET var TO',
* 'SHOW var' and 'RESET var' statements. * 'SHOW var' and 'RESET var' statements.
* *
* $Id: variable.c,v 1.13 1998/09/03 02:34:29 momjian Exp $ * $Id: variable.c,v 1.14 1998/10/08 18:29:20 momjian Exp $
* *
*/ */
...@@ -19,6 +19,28 @@ ...@@ -19,6 +19,28 @@
#include "mb/pg_wchar.h" #include "mb/pg_wchar.h"
#endif #endif
static bool show_date(void);
static bool reset_date(void);
static bool parse_date(const char *);
static bool show_timezone(void);
static bool reset_timezone(void);
static bool parse_timezone(const char *);
static bool show_cost_heap(void);
static bool reset_cost_heap(void);
static bool parse_cost_heap(const char *);
static bool show_cost_index(void);
static bool reset_cost_index(void);
static bool parse_cost_index(const char *);
static bool show_r_plans(void);
static bool reset_r_plans();
static bool parse_r_plans(const char *);
static bool reset_geqo(void);
static bool show_geqo(void);
static bool parse_geqo(const char *);
static bool show_ksqo(void);
static bool reset_ksqo(void);
static bool parse_ksqo(const char *);
extern Cost _cpu_page_wight_; extern Cost _cpu_page_wight_;
extern Cost _cpu_index_page_wight_; extern Cost _cpu_index_page_wight_;
extern bool _use_geqo_; extern bool _use_geqo_;
...@@ -128,7 +150,7 @@ get_token(char **tok, char **val, const char *str) ...@@ -128,7 +150,7 @@ get_token(char **tok, char **val, const char *str)
} }
/*-----------------------------------------------------------------------*/ /*-----------------------------------------------------------------------*/
bool static bool
parse_geqo(const char *value) parse_geqo(const char *value)
{ {
const char *rest; const char *rest;
...@@ -175,7 +197,7 @@ parse_geqo(const char *value) ...@@ -175,7 +197,7 @@ parse_geqo(const char *value)
return TRUE; return TRUE;
} }
bool static bool
show_geqo() show_geqo()
{ {
...@@ -186,7 +208,7 @@ show_geqo() ...@@ -186,7 +208,7 @@ show_geqo()
return TRUE; return TRUE;
} }
bool static bool
reset_geqo(void) reset_geqo(void)
{ {
...@@ -199,7 +221,7 @@ reset_geqo(void) ...@@ -199,7 +221,7 @@ reset_geqo(void)
return TRUE; return TRUE;
} }
bool static bool
parse_r_plans(const char *value) parse_r_plans(const char *value)
{ {
if (value == NULL) if (value == NULL)
...@@ -219,7 +241,7 @@ parse_r_plans(const char *value) ...@@ -219,7 +241,7 @@ parse_r_plans(const char *value)
} }
/*-----------------------------------------------------------------------*/ /*-----------------------------------------------------------------------*/
bool static bool
show_r_plans() show_r_plans()
{ {
...@@ -230,7 +252,7 @@ show_r_plans() ...@@ -230,7 +252,7 @@ show_r_plans()
return TRUE; return TRUE;
} }
bool static bool
reset_r_plans() reset_r_plans()
{ {
...@@ -243,7 +265,7 @@ reset_r_plans() ...@@ -243,7 +265,7 @@ reset_r_plans()
} }
/*-----------------------------------------------------------------------*/ /*-----------------------------------------------------------------------*/
bool static bool
parse_cost_heap(const char *value) parse_cost_heap(const char *value)
{ {
float32 res; float32 res;
...@@ -268,7 +290,7 @@ show_cost_heap() ...@@ -268,7 +290,7 @@ show_cost_heap()
return TRUE; return TRUE;
} }
bool static bool
reset_cost_heap() reset_cost_heap()
{ {
_cpu_page_wight_ = _CPU_PAGE_WEIGHT_; _cpu_page_wight_ = _CPU_PAGE_WEIGHT_;
...@@ -276,7 +298,7 @@ reset_cost_heap() ...@@ -276,7 +298,7 @@ reset_cost_heap()
} }
/*-----------------------------------------------------------------------*/ /*-----------------------------------------------------------------------*/
bool static bool
parse_cost_index(const char *value) parse_cost_index(const char *value)
{ {
float32 res; float32 res;
...@@ -301,7 +323,7 @@ show_cost_index() ...@@ -301,7 +323,7 @@ show_cost_index()
return TRUE; return TRUE;
} }
bool static bool
reset_cost_index() reset_cost_index()
{ {
_cpu_index_page_wight_ = _CPU_INDEX_PAGE_WEIGHT_; _cpu_index_page_wight_ = _CPU_INDEX_PAGE_WEIGHT_;
...@@ -309,7 +331,7 @@ reset_cost_index() ...@@ -309,7 +331,7 @@ reset_cost_index()
} }
/*-----------------------------------------------------------------------*/ /*-----------------------------------------------------------------------*/
bool static bool
parse_date(const char *value) parse_date(const char *value)
{ {
char *tok; char *tok;
...@@ -379,7 +401,7 @@ parse_date(const char *value) ...@@ -379,7 +401,7 @@ parse_date(const char *value)
return TRUE; return TRUE;
} }
bool static bool
show_date() show_date()
{ {
char buf[64]; char buf[64];
...@@ -431,7 +453,7 @@ static char tzbuf[64]; ...@@ -431,7 +453,7 @@ static char tzbuf[64];
* Try to save existing TZ environment variable for later use in RESET TIME ZONE. * Try to save existing TZ environment variable for later use in RESET TIME ZONE.
* - thomas 1997-11-10 * - thomas 1997-11-10
*/ */
bool static bool
parse_timezone(const char *value) parse_timezone(const char *value)
{ {
char *tok; char *tok;
...@@ -468,7 +490,7 @@ parse_timezone(const char *value) ...@@ -468,7 +490,7 @@ parse_timezone(const char *value)
return TRUE; return TRUE;
} /* parse_timezone() */ } /* parse_timezone() */
bool static bool
show_timezone() show_timezone()
{ {
char *tz; char *tz;
...@@ -625,7 +647,7 @@ indexes when multiple ORs are specified in the where clause. ...@@ -625,7 +647,7 @@ indexes when multiple ORs are specified in the where clause.
See optimizer/prep/prepkeyset.c for more on this. See optimizer/prep/prepkeyset.c for more on this.
daveh@insightdist.com 6/16/98 daveh@insightdist.com 6/16/98
-----------------------------------------------------------------------*/ -----------------------------------------------------------------------*/
bool static bool
parse_ksqo(const char *value) parse_ksqo(const char *value)
{ {
if (value == NULL) if (value == NULL)
...@@ -644,7 +666,7 @@ parse_ksqo(const char *value) ...@@ -644,7 +666,7 @@ parse_ksqo(const char *value)
return TRUE; return TRUE;
} }
bool static bool
show_ksqo() show_ksqo()
{ {
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/executor/execTuples.c,v 1.20 1998/09/01 03:22:20 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/executor/execTuples.c,v 1.21 1998/10/08 18:29:26 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -446,7 +446,6 @@ ExecSlotPolicy(TupleTableSlot *slot) /* slot to inspect */ ...@@ -446,7 +446,6 @@ ExecSlotPolicy(TupleTableSlot *slot) /* slot to inspect */
return slot->ttc_shouldFree; return slot->ttc_shouldFree;
} }
#endif
/* -------------------------------- /* --------------------------------
* ExecSetSlotPolicy * ExecSetSlotPolicy
...@@ -468,6 +467,7 @@ ExecSetSlotPolicy(TupleTableSlot *slot, /* slot to change */ ...@@ -468,6 +467,7 @@ ExecSetSlotPolicy(TupleTableSlot *slot, /* slot to change */
return old_shouldFree; return old_shouldFree;
} }
#endif
/* -------------------------------- /* --------------------------------
* ExecSlotDescriptor * ExecSlotDescriptor
...@@ -638,6 +638,7 @@ ExecInitScanTupleSlot(EState *estate, CommonScanState *commonscanstate) ...@@ -638,6 +638,7 @@ ExecInitScanTupleSlot(EState *estate, CommonScanState *commonscanstate)
commonscanstate->css_ScanTupleSlot = (TupleTableSlot *) slot; commonscanstate->css_ScanTupleSlot = (TupleTableSlot *) slot;
} }
#ifdef NOT_USED
/* ---------------- /* ----------------
* ExecInitMarkedTupleSlot * ExecInitMarkedTupleSlot
* ---------------- * ----------------
...@@ -649,6 +650,7 @@ ExecInitMarkedTupleSlot(EState *estate, MergeJoinState *mergestate) ...@@ -649,6 +650,7 @@ ExecInitMarkedTupleSlot(EState *estate, MergeJoinState *mergestate)
INIT_SLOT_ALLOC; INIT_SLOT_ALLOC;
mergestate->mj_MarkedTupleSlot = (TupleTableSlot *) slot; mergestate->mj_MarkedTupleSlot = (TupleTableSlot *) slot;
} }
#endif
/* ---------------- /* ----------------
* ExecInitOuterTupleSlot * ExecInitOuterTupleSlot
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
* ExecEndTee * ExecEndTee
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/executor/Attic/nodeTee.c,v 1.23 1998/09/01 04:28:40 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/executor/Attic/nodeTee.c,v 1.24 1998/10/08 18:29:27 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -420,6 +420,7 @@ ExecTee(Tee *node, Plan *parent) ...@@ -420,6 +420,7 @@ ExecTee(Tee *node, Plan *parent)
return result; return result;
} }
#ifdef NOT_USED
/* ---------------------------------------------------------------- /* ----------------------------------------------------------------
* ExecTeeReScan(node) * ExecTeeReScan(node)
* *
...@@ -462,6 +463,7 @@ ExecTeeReScan(Tee *node, ExprContext *exprCtxt, Plan *parent) ...@@ -462,6 +463,7 @@ ExecTeeReScan(Tee *node, ExprContext *exprCtxt, Plan *parent)
} }
} }
} }
#endif
/* --------------------------------------------------------------------- /* ---------------------------------------------------------------------
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/optimizer/plan/setrefs.c,v 1.27 1998/09/09 03:48:02 vadim Exp $ * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/setrefs.c,v 1.28 1998/10/08 18:29:29 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -46,6 +46,7 @@ static void replace_result_clause(Node *clause, List *subplanTargetList); ...@@ -46,6 +46,7 @@ static void replace_result_clause(Node *clause, List *subplanTargetList);
static bool OperandIsInner(Node *opnd, int inner_relid); static bool OperandIsInner(Node *opnd, int inner_relid);
static List *replace_agg_clause(Node *expr, List *targetlist); static List *replace_agg_clause(Node *expr, List *targetlist);
static Node *del_agg_clause(Node *clause); static Node *del_agg_clause(Node *clause);
static void set_result_tlist_references(Result *resultNode);
/***************************************************************************** /*****************************************************************************
* *
...@@ -522,7 +523,7 @@ tlist_temp_references(Oid tempid, ...@@ -522,7 +523,7 @@ tlist_temp_references(Oid tempid,
* 2) this routine will probably *NOT* work with nested dot * 2) this routine will probably *NOT* work with nested dot
* fields.... * fields....
*/ */
void static void
set_result_tlist_references(Result *resultNode) set_result_tlist_references(Result *resultNode)
{ {
Plan *subplan; Plan *subplan;
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/optimizer/util/plancat.c,v 1.22 1998/09/23 04:22:10 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/optimizer/util/plancat.c,v 1.23 1998/10/08 18:29:30 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -423,6 +423,7 @@ find_inheritance_children(Oid inhparent) ...@@ -423,6 +423,7 @@ find_inheritance_children(Oid inhparent)
return list; return list;
} }
#ifdef NOT_USED
/* /*
* VersionGetParents-- * VersionGetParents--
* *
...@@ -461,6 +462,8 @@ VersionGetParents(Oid verrelid) ...@@ -461,6 +462,8 @@ VersionGetParents(Oid verrelid)
heap_close(relation); heap_close(relation);
return list; return list;
} }
#endif
/***************************************************************************** /*****************************************************************************
* *
......
...@@ -229,7 +229,7 @@ ...@@ -229,7 +229,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/parser/Attic/gram.c,v 2.40 1998/10/03 05:40:42 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/parser/Attic/gram.c,v 2.41 1998/10/08 18:29:33 momjian Exp $
* *
* HISTORY * HISTORY
* AUTHOR DATE MAJOR EVENT * AUTHOR DATE MAJOR EVENT
...@@ -288,7 +288,7 @@ static char *xlateSqlFunc(char *); ...@@ -288,7 +288,7 @@ static char *xlateSqlFunc(char *);
static char *xlateSqlType(char *); static char *xlateSqlType(char *);
static Node *makeA_Expr(int oper, char *opname, Node *lexpr, Node *rexpr); static Node *makeA_Expr(int oper, char *opname, Node *lexpr, Node *rexpr);
static Node *makeRowExpr(char *opr, List *largs, List *rargs); static Node *makeRowExpr(char *opr, List *largs, List *rargs);
void mapTargetColumns(List *source, List *target); static void mapTargetColumns(List *source, List *target);
static List *makeConstantList( A_Const *node); static List *makeConstantList( A_Const *node);
static char *FlattenStringList(List *list); static char *FlattenStringList(List *list);
static char *fmtId(char *rawid); static char *fmtId(char *rawid);
...@@ -10636,7 +10636,7 @@ makeRowExpr(char *opr, List *largs, List *rargs) ...@@ -10636,7 +10636,7 @@ makeRowExpr(char *opr, List *largs, List *rargs)
return expr; return expr;
} }
void static void
mapTargetColumns(List *src, List *dst) mapTargetColumns(List *src, List *dst)
{ {
ColumnDef *s; ColumnDef *s;
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.34 1998/10/02 16:23:04 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.35 1998/10/08 18:29:41 momjian Exp $
* *
* HISTORY * HISTORY
* AUTHOR DATE MAJOR EVENT * AUTHOR DATE MAJOR EVENT
...@@ -69,7 +69,7 @@ static char *xlateSqlFunc(char *); ...@@ -69,7 +69,7 @@ static char *xlateSqlFunc(char *);
static char *xlateSqlType(char *); static char *xlateSqlType(char *);
static Node *makeA_Expr(int oper, char *opname, Node *lexpr, Node *rexpr); static Node *makeA_Expr(int oper, char *opname, Node *lexpr, Node *rexpr);
static Node *makeRowExpr(char *opr, List *largs, List *rargs); static Node *makeRowExpr(char *opr, List *largs, List *rargs);
void mapTargetColumns(List *source, List *target); static void mapTargetColumns(List *source, List *target);
static List *makeConstantList( A_Const *node); static List *makeConstantList( A_Const *node);
static char *FlattenStringList(List *list); static char *FlattenStringList(List *list);
static char *fmtId(char *rawid); static char *fmtId(char *rawid);
...@@ -4837,7 +4837,7 @@ makeRowExpr(char *opr, List *largs, List *rargs) ...@@ -4837,7 +4837,7 @@ makeRowExpr(char *opr, List *largs, List *rargs)
return expr; return expr;
} }
void static void
mapTargetColumns(List *src, List *dst) mapTargetColumns(List *src, List *dst)
{ {
ColumnDef *s; ColumnDef *s;
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/parser/parse_coerce.c,v 2.7 1998/10/01 22:45:30 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/parser/parse_coerce.c,v 2.8 1998/10/08 18:29:43 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -28,6 +28,8 @@ ...@@ -28,6 +28,8 @@
Oid DemoteType(Oid inType); Oid DemoteType(Oid inType);
Oid PromoteTypeToNext(Oid inType); Oid PromoteTypeToNext(Oid inType);
static Oid PreferredType(CATEGORY category, Oid type);
/* coerce_type() /* coerce_type()
* Convert a function argument to a different type. * Convert a function argument to a different type.
...@@ -347,7 +349,7 @@ IsPreferredType(CATEGORY category, Oid type) ...@@ -347,7 +349,7 @@ IsPreferredType(CATEGORY category, Oid type)
/* PreferredType() /* PreferredType()
* Return the preferred type OID for the specified category. * Return the preferred type OID for the specified category.
*/ */
Oid static Oid
PreferredType(CATEGORY category, Oid type) PreferredType(CATEGORY category, Oid type)
{ {
Oid result; Oid result;
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/parser/parse_func.c,v 1.29 1998/09/25 13:36:04 thomas Exp $ * $Header: /cvsroot/pgsql/src/backend/parser/parse_func.c,v 1.30 1998/10/08 18:29:45 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -74,6 +74,8 @@ static int match_argtypes(int nargs, ...@@ -74,6 +74,8 @@ static int match_argtypes(int nargs,
CandidateList *candidates); CandidateList *candidates);
static List *setup_tlist(char *attname, Oid relid); static List *setup_tlist(char *attname, Oid relid);
static List *setup_base_tlist(Oid typeid); static List *setup_base_tlist(Oid typeid);
static Oid *func_select_candidate(int nargs, Oid *input_typeids,
CandidateList candidates);
#define ISCOMPLEX(type) (typeidTypeRelid(type) ? true : false) #define ISCOMPLEX(type) (typeidTypeRelid(type) ? true : false)
...@@ -626,7 +628,7 @@ match_argtypes(int nargs, ...@@ -626,7 +628,7 @@ match_argtypes(int nargs,
* But for now, return NULL and make the user give a better hint. * But for now, return NULL and make the user give a better hint.
* - thomas 1998-03-17 * - thomas 1998-03-17
*/ */
Oid * static Oid *
func_select_candidate(int nargs, func_select_candidate(int nargs,
Oid *input_typeids, Oid *input_typeids,
CandidateList candidates) CandidateList candidates)
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/parser/parse_oper.c,v 1.19 1998/09/25 13:36:07 thomas Exp $ * $Header: /cvsroot/pgsql/src/backend/parser/parse_oper.c,v 1.20 1998/10/08 18:29:46 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -27,7 +27,8 @@ ...@@ -27,7 +27,8 @@
#include "storage/bufmgr.h" #include "storage/bufmgr.h"
#include "utils/syscache.h" #include "utils/syscache.h"
Oid * oper_select_candidate(int nargs, Oid *input_typeids, CandidateList candidates); static Oid * oper_select_candidate(int nargs, Oid *input_typeids,
CandidateList candidates);
static int binary_oper_get_candidates(char *opname, static int binary_oper_get_candidates(char *opname,
Oid leftTypeId, Oid leftTypeId,
Oid rightTypeId, Oid rightTypeId,
...@@ -169,7 +170,7 @@ binary_oper_get_candidates(char *opname, ...@@ -169,7 +170,7 @@ binary_oper_get_candidates(char *opname,
* some sense. (see equivalentOpersAfterPromotion for details.) * some sense. (see equivalentOpersAfterPromotion for details.)
* - ay 6/95 * - ay 6/95
*/ */
Oid * static Oid *
oper_select_candidate(int nargs, oper_select_candidate(int nargs,
Oid *input_typeids, Oid *input_typeids,
CandidateList candidates) CandidateList candidates)
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/parser/parse_target.c,v 1.29 1998/09/25 13:36:08 thomas Exp $ * $Header: /cvsroot/pgsql/src/backend/parser/parse_target.c,v 1.30 1998/10/08 18:29:47 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
static List *ExpandAllTables(ParseState *pstate); static List *ExpandAllTables(ParseState *pstate);
static char *FigureColname(Node *expr, Node *resval); static char *FigureColname(Node *expr, Node *resval);
Node *SizeTargetExpr(ParseState *pstate, static Node *SizeTargetExpr(ParseState *pstate,
Node *expr, Node *expr,
Oid attrtype, Oid attrtype,
int32 attrtypmod); int32 attrtypmod);
...@@ -664,7 +664,7 @@ CoerceTargetExpr(ParseState *pstate, ...@@ -664,7 +664,7 @@ CoerceTargetExpr(ParseState *pstate,
* Apparently going to a fixed-length string? * Apparently going to a fixed-length string?
* Then explicitly size for storage... * Then explicitly size for storage...
*/ */
Node * static Node *
SizeTargetExpr(ParseState *pstate, SizeTargetExpr(ParseState *pstate,
Node *expr, Node *expr,
Oid attrtype, Oid attrtype,
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/parser/parse_type.c,v 1.16 1998/09/01 04:30:39 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/parser/parse_type.c,v 1.17 1998/10/08 18:29:48 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -154,6 +154,7 @@ stringTypeString(Type tp, char *string, int32 atttypmod) ...@@ -154,6 +154,7 @@ stringTypeString(Type tp, char *string, int32 atttypmod)
} }
/* Given a type id, returns the out-conversion function of the type */ /* Given a type id, returns the out-conversion function of the type */
#ifdef NOT_USED
Oid Oid
typeidOutfunc(Oid type_id) typeidOutfunc(Oid type_id)
{ {
...@@ -171,6 +172,7 @@ typeidOutfunc(Oid type_id) ...@@ -171,6 +172,7 @@ typeidOutfunc(Oid type_id)
outfunc = type->typoutput; outfunc = type->typoutput;
return outfunc; return outfunc;
} }
#endif
Oid Oid
typeidTypeRelid(Oid type_id) typeidTypeRelid(Oid type_id)
......
/* A lexical scanner generated by flex */ /* A lexical scanner generated by flex */
/* Scanner skeleton version: /* Scanner skeleton version:
* $Header: /cvsroot/pgsql/src/backend/parser/Attic/scan.c,v 1.28 1998/09/15 02:25:09 scrappy Exp $ * /master/usr.bin/lex/skel.c,v 1.3 1997/09/25 00:10:23 jch Exp
*/ */
#define FLEX_SCANNER #define FLEX_SCANNER
...@@ -556,7 +556,7 @@ char *yytext; ...@@ -556,7 +556,7 @@ char *yytext;
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/parser/Attic/scan.c,v 1.28 1998/09/15 02:25:09 scrappy Exp $ * $Header: /cvsroot/pgsql/src/backend/parser/Attic/scan.c,v 1.29 1998/10/08 18:29:49 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -592,7 +592,7 @@ static char *parseCh; ...@@ -592,7 +592,7 @@ static char *parseCh;
/* MAX_PARSE_BUFFER is defined in miscadmin.h */ /* MAX_PARSE_BUFFER is defined in miscadmin.h */
#define YYLMAX MAX_PARSE_BUFFER #define YYLMAX MAX_PARSE_BUFFER
#define YY_NO_UNPUT #define YY_NO_UNPUT
extern int myinput(char* buf, int max); static int myinput(char* buf, int max);
#undef YY_INPUT #undef YY_INPUT
#define YY_INPUT(buf,result,max) {result = myinput(buf,max);} #define YY_INPUT(buf,result,max) {result = myinput(buf,max);}
#else #else
...@@ -2259,7 +2259,7 @@ unput(char c) ...@@ -2259,7 +2259,7 @@ unput(char c)
#ifdef FLEX_SCANNER #ifdef FLEX_SCANNER
/* input routine for flex to read input from a string instead of a file */ /* input routine for flex to read input from a string instead of a file */
int static int
myinput(char* buf, int max) myinput(char* buf, int max)
{ {
int len, copylen; int len, copylen;
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/parser/scan.l,v 1.43 1998/09/01 03:24:23 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/parser/scan.l,v 1.44 1998/10/08 18:29:51 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -44,7 +44,7 @@ static char *parseCh; ...@@ -44,7 +44,7 @@ static char *parseCh;
/* MAX_PARSE_BUFFER is defined in miscadmin.h */ /* MAX_PARSE_BUFFER is defined in miscadmin.h */
#define YYLMAX MAX_PARSE_BUFFER #define YYLMAX MAX_PARSE_BUFFER
#define YY_NO_UNPUT #define YY_NO_UNPUT
extern int myinput(char* buf, int max); static int myinput(char* buf, int max);
#undef YY_INPUT #undef YY_INPUT
#define YY_INPUT(buf,result,max) {result = myinput(buf,max);} #define YY_INPUT(buf,result,max) {result = myinput(buf,max);}
#else #else
...@@ -479,7 +479,7 @@ unput(char c) ...@@ -479,7 +479,7 @@ unput(char c)
#ifdef FLEX_SCANNER #ifdef FLEX_SCANNER
/* input routine for flex to read input from a string instead of a file */ /* input routine for flex to read input from a string instead of a file */
int static int
myinput(char* buf, int max) myinput(char* buf, int max)
{ {
int len, copylen; int len, copylen;
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteManip.c,v 1.19 1998/10/02 16:27:49 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteManip.c,v 1.20 1998/10/08 18:29:52 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -313,6 +313,7 @@ make_null(Oid type) ...@@ -313,6 +313,7 @@ make_null(Oid type)
return (Node *) c; return (Node *) c;
} }
#ifdef NOT_USED
void void
FixResdomTypes(List *tlist) FixResdomTypes(List *tlist)
{ {
...@@ -331,6 +332,7 @@ FixResdomTypes(List *tlist) ...@@ -331,6 +332,7 @@ FixResdomTypes(List *tlist)
} }
} }
} }
#endif
static Node * static Node *
FindMatchingNew(List *tlist, int attno) FindMatchingNew(List *tlist, int attno)
...@@ -793,6 +795,7 @@ nodeHandleViewRule(Node **nodePtr, ...@@ -793,6 +795,7 @@ nodeHandleViewRule(Node **nodePtr,
} }
} }
#ifdef NOT_USED
void void
HandleViewRule(Query *parsetree, HandleViewRule(Query *parsetree,
List *rtable, List *rtable,
...@@ -814,3 +817,5 @@ HandleViewRule(Query *parsetree, ...@@ -814,3 +817,5 @@ HandleViewRule(Query *parsetree,
nodeHandleViewRule((Node **) (&(parsetree->groupClause)), rtable, targetlist, rt_index, nodeHandleViewRule((Node **) (&(parsetree->groupClause)), rtable, targetlist, rt_index,
modified, 0); modified, 0);
} }
#endif
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.43 1998/09/01 04:31:41 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.44 1998/10/08 18:29:54 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -96,6 +96,7 @@ static BufferDesc *BufferAlloc(Relation reln, BlockNumber blockNum, ...@@ -96,6 +96,7 @@ static BufferDesc *BufferAlloc(Relation reln, BlockNumber blockNum,
static int FlushBuffer(Buffer buffer, bool release); static int FlushBuffer(Buffer buffer, bool release);
static void BufferSync(void); static void BufferSync(void);
static int BufferReplace(BufferDesc *bufHdr, bool bufferLockHeld); static int BufferReplace(BufferDesc *bufHdr, bool bufferLockHeld);
static void PrintBufferDescs(void);
/* not static but used by vacuum only ... */ /* not static but used by vacuum only ... */
int BlowawayRelationBuffers(Relation rel, BlockNumber block); int BlowawayRelationBuffers(Relation rel, BlockNumber block);
...@@ -1263,6 +1264,7 @@ BufferGetBlockNumber(Buffer buffer) ...@@ -1263,6 +1264,7 @@ BufferGetBlockNumber(Buffer buffer)
return BufferDescriptors[buffer - 1].tag.blockNum; return BufferDescriptors[buffer - 1].tag.blockNum;
} }
#ifdef NOT_USED
/* /*
* BufferGetRelation -- * BufferGetRelation --
* Returns the relation desciptor associated with a buffer. * Returns the relation desciptor associated with a buffer.
...@@ -1297,6 +1299,7 @@ BufferGetRelation(Buffer buffer) ...@@ -1297,6 +1299,7 @@ BufferGetRelation(Buffer buffer)
return relation; return relation;
} }
#endif
/* /*
* BufferReplace * BufferReplace
...@@ -1464,7 +1467,7 @@ DropBuffers(Oid dbid) ...@@ -1464,7 +1467,7 @@ DropBuffers(Oid dbid)
* use only. * use only.
* ----------------------------------------------------------------- * -----------------------------------------------------------------
*/ */
void static void
PrintBufferDescs() PrintBufferDescs()
{ {
int i; int i;
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.37 1998/09/09 18:32:05 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.38 1998/10/08 18:29:57 momjian Exp $
* *
* NOTES * NOTES
* Outside modules can create a lock table and acquire/release * Outside modules can create a lock table and acquire/release
...@@ -1712,6 +1712,7 @@ DeadLockCheck(SHM_QUEUE *lockQueue, LOCK *findlock, bool skip_check) ...@@ -1712,6 +1712,7 @@ DeadLockCheck(SHM_QUEUE *lockQueue, LOCK *findlock, bool skip_check)
return false; return false;
} }
#ifdef NOT_USED
/* /*
* Return an array with the pids of all processes owning a lock. * Return an array with the pids of all processes owning a lock.
* This works only for user locks because normal locks have no * This works only for user locks because normal locks have no
...@@ -1898,6 +1899,7 @@ LockOwners(LOCKMETHOD lockmethod, LOCKTAG *locktag) ...@@ -1898,6 +1899,7 @@ LockOwners(LOCKMETHOD lockmethod, LOCKTAG *locktag)
return array; return array;
} }
#endif
#ifdef DEADLOCK_DEBUG #ifdef DEADLOCK_DEBUG
/* /*
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Attic/multi.c,v 1.25 1998/09/01 04:32:01 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Attic/multi.c,v 1.26 1998/10/08 18:29:59 momjian Exp $
* *
* NOTES: * NOTES:
* (1) The lock.c module assumes that the caller here is doing * (1) The lock.c module assumes that the caller here is doing
...@@ -194,6 +194,7 @@ MultiLockReln(LockInfo lockinfo, LOCKMODE lockmode) ...@@ -194,6 +194,7 @@ MultiLockReln(LockInfo lockinfo, LOCKMODE lockmode)
return MultiAcquire(MultiTableId, &tag, lockmode, RELN_LEVEL); return MultiAcquire(MultiTableId, &tag, lockmode, RELN_LEVEL);
} }
#ifdef NOT_USED
/* /*
* MultiLockTuple -- Lock the TID associated with a tuple * MultiLockTuple -- Lock the TID associated with a tuple
* *
...@@ -220,6 +221,7 @@ MultiLockTuple(LockInfo lockinfo, ItemPointer tidPtr, LOCKMODE lockmode) ...@@ -220,6 +221,7 @@ MultiLockTuple(LockInfo lockinfo, ItemPointer tidPtr, LOCKMODE lockmode)
tag.tupleId = *tidPtr; tag.tupleId = *tidPtr;
return MultiAcquire(MultiTableId, &tag, lockmode, TUPLE_LEVEL); return MultiAcquire(MultiTableId, &tag, lockmode, TUPLE_LEVEL);
} }
#endif
/* /*
* same as above at page level * same as above at page level
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/storage/smgr/smgr.c,v 1.20 1998/09/01 04:32:08 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/storage/smgr/smgr.c,v 1.21 1998/10/08 18:30:03 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -72,12 +72,15 @@ static f_smgr smgrsw[] = { ...@@ -72,12 +72,15 @@ static f_smgr smgrsw[] = {
* write-once storage managers. * write-once storage managers.
*/ */
#ifdef NOT_USED
static bool smgrwo[] = { static bool smgrwo[] = {
false, /* magnetic disk */ false, /* magnetic disk */
#ifdef STABLE_MEMORY_STORAGE #ifdef STABLE_MEMORY_STORAGE
false, /* main memory */ false, /* main memory */
#endif #endif
}; };
#endif
static int NSmgr = lengthof(smgrsw); static int NSmgr = lengthof(smgrsw);
/* /*
...@@ -396,6 +399,7 @@ smgrabort() ...@@ -396,6 +399,7 @@ smgrabort()
#endif #endif
#ifdef NOT_USED
bool bool
smgriswo(int16 smgrno) smgriswo(int16 smgrno)
{ {
...@@ -404,3 +408,4 @@ smgriswo(int16 smgrno) ...@@ -404,3 +408,4 @@ smgriswo(int16 smgrno)
return smgrwo[smgrno]; return smgrwo[smgrno];
} }
#endif
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.27 1998/09/01 04:32:29 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.28 1998/10/08 18:30:05 momjian Exp $
* *
* NOTES * NOTES
* This code is actually (almost) unused. * This code is actually (almost) unused.
...@@ -941,6 +941,7 @@ intervalend(TimeInterval i) ...@@ -941,6 +941,7 @@ intervalend(TimeInterval i)
* PRIVATE ROUTINES * * PRIVATE ROUTINES *
*****************************************************************************/ *****************************************************************************/
#ifdef NOT_USED
/* /*
* isreltime - returns 1, iff datestring is of type reltime * isreltime - returns 1, iff datestring is of type reltime
* 2, iff datestring is 'invalid time' identifier * 2, iff datestring is 'invalid time' identifier
...@@ -987,6 +988,7 @@ isreltime(char *str) ...@@ -987,6 +988,7 @@ isreltime(char *str)
return 0; return 0;
} /* isreltime() */ } /* isreltime() */
#endif
#if FALSE #if FALSE
int int
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/dt.c,v 1.58 1998/09/23 17:51:46 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/dt.c,v 1.59 1998/10/08 18:30:07 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -46,6 +46,9 @@ static datetkn *datebsearch(char *key, datetkn *base, unsigned int nel); ...@@ -46,6 +46,9 @@ static datetkn *datebsearch(char *key, datetkn *base, unsigned int nel);
static DateTime dt2local(DateTime dt, int timezone); static DateTime dt2local(DateTime dt, int timezone);
static void dt2time(DateTime dt, int *hour, int *min, double *sec); static void dt2time(DateTime dt, int *hour, int *min, double *sec);
static int j2day(int jd); static int j2day(int jd);
static double time2t(const int hour, const int min, const double sec);
static int timespan2tm(TimeSpan span, struct tm * tm, float8 *fsec);
static int tm2timespan(struct tm * tm, double fsec, TimeSpan *span);
#define USE_DATE_CACHE 1 #define USE_DATE_CACHE 1
#define ROUND_ALL 0 #define ROUND_ALL 0
...@@ -2529,7 +2532,7 @@ tm2datetime(struct tm * tm, double fsec, int *tzp, DateTime *result) ...@@ -2529,7 +2532,7 @@ tm2datetime(struct tm * tm, double fsec, int *tzp, DateTime *result)
/* timespan2tm() /* timespan2tm()
* Convert a timespan data type to a tm structure. * Convert a timespan data type to a tm structure.
*/ */
int static int
timespan2tm(TimeSpan span, struct tm * tm, float8 *fsec) timespan2tm(TimeSpan span, struct tm * tm, float8 *fsec)
{ {
double time; double time;
...@@ -2566,7 +2569,7 @@ timespan2tm(TimeSpan span, struct tm * tm, float8 *fsec) ...@@ -2566,7 +2569,7 @@ timespan2tm(TimeSpan span, struct tm * tm, float8 *fsec)
return 0; return 0;
} /* timespan2tm() */ } /* timespan2tm() */
int static int
tm2timespan(struct tm * tm, double fsec, TimeSpan *span) tm2timespan(struct tm * tm, double fsec, TimeSpan *span)
{ {
span->month = ((tm->tm_year * 12) + tm->tm_mon); span->month = ((tm->tm_year * 12) + tm->tm_mon);
...@@ -2590,7 +2593,7 @@ dt2local(DateTime dt, int tz) ...@@ -2590,7 +2593,7 @@ dt2local(DateTime dt, int tz)
return dt; return dt;
} /* dt2local() */ } /* dt2local() */
double static double
time2t(const int hour, const int min, const double sec) time2t(const int hour, const int min, const double sec)
{ {
return (((hour * 60) + min) * 60) + sec; return (((hour * 60) + min) * 60) + sec;
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/nabstime.c,v 1.45 1998/09/01 03:26:08 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/adt/nabstime.c,v 1.46 1998/10/08 18:30:09 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -361,6 +361,7 @@ AbsoluteTimeIsBefore(AbsoluteTime time1, AbsoluteTime time2) ...@@ -361,6 +361,7 @@ AbsoluteTimeIsBefore(AbsoluteTime time1, AbsoluteTime time2)
return time1 < time2; return time1 < time2;
} }
#ifdef NOT_USED
bool bool
AbsoluteTimeIsAfter(AbsoluteTime time1, AbsoluteTime time2) AbsoluteTimeIsAfter(AbsoluteTime time1, AbsoluteTime time2)
{ {
...@@ -375,7 +376,7 @@ AbsoluteTimeIsAfter(AbsoluteTime time1, AbsoluteTime time2) ...@@ -375,7 +376,7 @@ AbsoluteTimeIsAfter(AbsoluteTime time1, AbsoluteTime time2)
return time1 > time2; return time1 > time2;
} }
#endif
/* abstime_finite() /* abstime_finite()
*/ */
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/name.c,v 1.15 1998/09/01 04:32:40 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/adt/name.c,v 1.16 1998/10/08 18:30:11 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -155,11 +155,13 @@ namecat(Name n1, Name n2) ...@@ -155,11 +155,13 @@ namecat(Name n1, Name n2)
#endif #endif
#ifdef NOT_USED
int int
namecmp(Name n1, Name n2) namecmp(Name n1, Name n2)
{ {
return strncmp(n1->data, n2->data, NAMEDATALEN); return strncmp(n1->data, n2->data, NAMEDATALEN);
} }
#endif
int int
namestrcpy(Name name, char *str) namestrcpy(Name name, char *str)
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/varlena.c,v 1.43 1998/09/02 23:37:08 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/adt/varlena.c,v 1.44 1998/10/08 18:30:12 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -20,6 +20,9 @@ ...@@ -20,6 +20,9 @@
#include "mb/pg_wchar.h" #include "mb/pg_wchar.h"
static int text_cmp(text *arg1, text *arg2);
/***************************************************************************** /*****************************************************************************
* USER I/O ROUTINES * * USER I/O ROUTINES *
*****************************************************************************/ *****************************************************************************/
...@@ -515,6 +518,7 @@ varstr_cmp(char *arg1, int len1, char *arg2, int len2) ...@@ -515,6 +518,7 @@ varstr_cmp(char *arg1, int len1, char *arg2, int len2)
return result; return result;
} /* varstr_cmp() */ } /* varstr_cmp() */
/* text_cmp() /* text_cmp()
* Comparison function for text strings. * Comparison function for text strings.
* Includes locale support, but must copy strings to temporary memory * Includes locale support, but must copy strings to temporary memory
...@@ -523,7 +527,7 @@ varstr_cmp(char *arg1, int len1, char *arg2, int len2) ...@@ -523,7 +527,7 @@ varstr_cmp(char *arg1, int len1, char *arg2, int len2)
* but it appears that most routines (incl. this one) assume not! - tgl 97/04/07 * but it appears that most routines (incl. this one) assume not! - tgl 97/04/07
* Returns -1, 0 or 1 * Returns -1, 0 or 1
*/ */
int static int
text_cmp(text *arg1, text *arg2) text_cmp(text *arg1, text *arg2)
{ {
char *a1p, char *a1p,
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.20 1998/09/01 03:26:42 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.21 1998/10/08 18:30:14 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -47,8 +47,6 @@ static int pronargs_save; ...@@ -47,8 +47,6 @@ static int pronargs_save;
static func_ptr user_fn_save = (func_ptr) NULL; static func_ptr user_fn_save = (func_ptr) NULL;
static func_ptr handle_load(char *filename, char *funcname); static func_ptr handle_load(char *filename, char *funcname);
func_ptr trigger_dynamic(char *filename, char *funcname);
func_ptr func_ptr
fmgr_dynamic(Oid procedureId, int *pronargs) fmgr_dynamic(Oid procedureId, int *pronargs)
{ {
...@@ -279,6 +277,7 @@ load_file(char *filename) ...@@ -279,6 +277,7 @@ load_file(char *filename)
handle_load(filename, (char *) NULL); handle_load(filename, (char *) NULL);
} }
/* Is this used? bjm 1998/10/08 */
func_ptr func_ptr
trigger_dynamic(char *filename, char *funcname) trigger_dynamic(char *filename, char *funcname)
{ {
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/init/miscinit.c,v 1.23 1998/10/05 02:48:49 thomas Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/init/miscinit.c,v 1.24 1998/10/08 18:30:16 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -114,7 +114,6 @@ AbortPostgres() ...@@ -114,7 +114,6 @@ AbortPostgres()
proc_exit(FatalExitStatus); proc_exit(FatalExitStatus);
} }
#endif
/* ---------------- /* ----------------
* StatusBackendExit * StatusBackendExit
...@@ -138,6 +137,8 @@ StatusPostmasterExit(int status) ...@@ -138,6 +137,8 @@ StatusPostmasterExit(int status)
/* someday, do some real cleanup and then call the LISP exit */ /* someday, do some real cleanup and then call the LISP exit */
proc_exit(status); proc_exit(status);
} }
#endif
/* ---------------------------------------------------------------- /* ----------------------------------------------------------------
* processing mode support stuff (used to be in pmod.c) * processing mode support stuff (used to be in pmod.c)
...@@ -145,6 +146,7 @@ StatusPostmasterExit(int status) ...@@ -145,6 +146,7 @@ StatusPostmasterExit(int status)
*/ */
static ProcessingMode Mode = NoProcessing; static ProcessingMode Mode = NoProcessing;
#ifdef NOT_USED
/* /*
* IsNoProcessingMode -- * IsNoProcessingMode --
* True iff processing mode is NoProcessing. * True iff processing mode is NoProcessing.
...@@ -154,6 +156,7 @@ IsNoProcessingMode() ...@@ -154,6 +156,7 @@ IsNoProcessingMode()
{ {
return (bool) (Mode == NoProcessing); return (bool) (Mode == NoProcessing);
} }
#endif
/* /*
* IsBootstrapProcessingMode -- * IsBootstrapProcessingMode --
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: genam.h,v 1.16 1998/09/01 04:34:06 momjian Exp $ * $Id: genam.h,v 1.17 1998/10/08 18:30:20 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -47,7 +47,5 @@ extern Datum GetIndexValue(HeapTuple tuple, TupleDesc hTupDesc, ...@@ -47,7 +47,5 @@ extern Datum GetIndexValue(HeapTuple tuple, TupleDesc hTupDesc,
/* in genam.c */ /* in genam.c */
extern IndexScanDesc RelationGetIndexScan(Relation relation, bool scanFromEnd, extern IndexScanDesc RelationGetIndexScan(Relation relation, bool scanFromEnd,
uint16 numberOfKeys, ScanKey key); uint16 numberOfKeys, ScanKey key);
extern void IndexScanMarkPosition(IndexScanDesc scan);
extern void IndexScanRestorePosition(IndexScanDesc scan);
#endif /* GENAM_H */ #endif /* GENAM_H */
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: heapam.h,v 1.37 1998/09/01 04:34:12 momjian Exp $ * $Id: heapam.h,v 1.38 1998/10/08 18:30:22 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -242,7 +242,6 @@ extern HeapAccessStatistics heap_access_stats; /* in stats.c */ ...@@ -242,7 +242,6 @@ extern HeapAccessStatistics heap_access_stats; /* in stats.c */
/* heap_create, heap_creatr, and heap_destroy are declared in catalog/heap.h */ /* heap_create, heap_creatr, and heap_destroy are declared in catalog/heap.h */
/* heapam.c */ /* heapam.c */
extern void doinsert(Relation relation, HeapTuple tup);
extern Relation heap_open(Oid relationId); extern Relation heap_open(Oid relationId);
extern Relation heap_openr(char *relationName); extern Relation heap_openr(char *relationName);
...@@ -268,7 +267,6 @@ extern void DataFill(char *data, TupleDesc tupleDesc, ...@@ -268,7 +267,6 @@ extern void DataFill(char *data, TupleDesc tupleDesc,
extern int heap_attisnull(HeapTuple tup, int attnum); extern int heap_attisnull(HeapTuple tup, int attnum);
extern int heap_sysattrlen(AttrNumber attno); extern int heap_sysattrlen(AttrNumber attno);
extern bool heap_sysattrbyval(AttrNumber attno); extern bool heap_sysattrbyval(AttrNumber attno);
extern Datum heap_getsysattr(HeapTuple tup, Buffer b, int attnum);
extern Datum nocachegetattr(HeapTuple tup, int attnum, extern Datum nocachegetattr(HeapTuple tup, int attnum,
TupleDesc att, bool *isnull); TupleDesc att, bool *isnull);
extern HeapTuple heap_copytuple(HeapTuple tuple); extern HeapTuple heap_copytuple(HeapTuple tuple);
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: xact.h,v 1.16 1998/10/06 02:40:06 tgl Exp $ * $Id: xact.h,v 1.17 1998/10/08 18:30:23 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -86,7 +86,6 @@ typedef TransactionStateData *TransactionState; ...@@ -86,7 +86,6 @@ typedef TransactionStateData *TransactionState;
extern int TransactionFlushEnabled(void); extern int TransactionFlushEnabled(void);
extern void SetTransactionFlushEnabled(bool state); extern void SetTransactionFlushEnabled(bool state);
extern bool IsTransactionState(void);
extern bool IsAbortedTransactionBlockState(void); extern bool IsAbortedTransactionBlockState(void);
extern void OverrideTransactionSystem(bool flag); extern void OverrideTransactionSystem(bool flag);
extern TransactionId GetCurrentTransactionId(void); extern TransactionId GetCurrentTransactionId(void);
...@@ -115,7 +114,6 @@ extern TransactionId DisabledTransactionId; ...@@ -115,7 +114,6 @@ extern TransactionId DisabledTransactionId;
extern TransactionId xidin(char *representation); extern TransactionId xidin(char *representation);
extern char *xidout(TransactionId transactionId); extern char *xidout(TransactionId transactionId);
extern bool xideq(TransactionId xid1, TransactionId xid2); extern bool xideq(TransactionId xid1, TransactionId xid2);
extern bool TransactionIdIsLessThan(TransactionId id1, TransactionId id2);
extern void TransactionIdAdd(TransactionId *xid, int value); extern void TransactionIdAdd(TransactionId *xid, int value);
#endif /* XACT_H */ #endif /* XACT_H */
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* Headers for handling of 'SET var TO', 'SHOW var' and 'RESET var' * Headers for handling of 'SET var TO', 'SHOW var' and 'RESET var'
* statements * statements
* *
* $Id: variable.h,v 1.7 1998/09/03 02:34:34 momjian Exp $ * $Id: variable.h,v 1.8 1998/10/08 18:30:27 momjian Exp $
* *
*/ */
#ifndef VARIABLE_H #ifndef VARIABLE_H
...@@ -30,32 +30,4 @@ bool SetPGVariable(const char *, const char *); ...@@ -30,32 +30,4 @@ bool SetPGVariable(const char *, const char *);
bool GetPGVariable(const char *); bool GetPGVariable(const char *);
bool ResetPGVariable(const char *); bool ResetPGVariable(const char *);
extern bool set_date(void);
extern bool show_date(void);
extern bool reset_date(void);
extern bool parse_date(const char *);
extern bool set_timezone(void);
extern bool show_timezone(void);
extern bool reset_timezone(void);
extern bool parse_timezone(const char *);
extern bool set_cost_heap(void);
extern bool show_cost_heap(void);
extern bool reset_cost_heap(void);
extern bool parse_cost_heap(const char *);
extern bool set_cost_index(void);
extern bool show_cost_index(void);
extern bool reset_cost_index(void);
extern bool parse_cost_index(const char *);
extern bool set_r_plans(void);
extern bool show_r_plans(void);
extern bool reset_r_plans(void);
extern bool parse_r_plans(const char *);
extern bool set_geqo(void);
extern bool show_geqo(void);
extern bool reset_geqo(void);
extern bool parse_geqo(const char *);
extern bool show_ksqo(void);
extern bool reset_ksqo(void);
extern bool parse_ksqo(const char *);
#endif /* VARIABLE_H */ #endif /* VARIABLE_H */
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: executor.h,v 1.25 1998/09/01 04:35:49 momjian Exp $ * $Id: executor.h,v 1.26 1998/10/08 18:30:29 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -132,14 +132,12 @@ extern TupleTableSlot *ExecStoreTuple(HeapTuple tuple, ...@@ -132,14 +132,12 @@ extern TupleTableSlot *ExecStoreTuple(HeapTuple tuple,
Buffer buffer, Buffer buffer,
bool shouldFree); bool shouldFree);
extern TupleTableSlot *ExecClearTuple(TupleTableSlot *slot); extern TupleTableSlot *ExecClearTuple(TupleTableSlot *slot);
extern bool ExecSetSlotPolicy(TupleTableSlot *slot, bool shouldFree);
extern TupleDesc ExecSetSlotDescriptor(TupleTableSlot *slot, extern TupleDesc ExecSetSlotDescriptor(TupleTableSlot *slot,
TupleDesc tupdesc); TupleDesc tupdesc);
extern void ExecSetSlotDescriptorIsNew(TupleTableSlot *slot, bool isNew); extern void ExecSetSlotDescriptorIsNew(TupleTableSlot *slot, bool isNew);
extern void ExecInitResultTupleSlot(EState *estate, CommonState *commonstate); extern void ExecInitResultTupleSlot(EState *estate, CommonState *commonstate);
extern void ExecInitScanTupleSlot(EState *estate, extern void ExecInitScanTupleSlot(EState *estate,
CommonScanState *commonscanstate); CommonScanState *commonscanstate);
extern void ExecInitMarkedTupleSlot(EState *estate, MergeJoinState *mergestate);
extern void ExecInitOuterTupleSlot(EState *estate, HashJoinState *hashstate); extern void ExecInitOuterTupleSlot(EState *estate, HashJoinState *hashstate);
extern TupleDesc ExecGetTupType(Plan *node); extern TupleDesc ExecGetTupType(Plan *node);
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: nodeTee.h,v 1.6 1998/09/01 04:36:09 momjian Exp $ * $Id: nodeTee.h,v 1.7 1998/10/08 18:30:31 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
extern TupleTableSlot *ExecTee(Tee *node, Plan *parent); extern TupleTableSlot *ExecTee(Tee *node, Plan *parent);
extern bool ExecInitTee(Tee *node, EState *estate, Plan *parent); extern bool ExecInitTee(Tee *node, EState *estate, Plan *parent);
extern void ExecTeeReScan(Tee *node, ExprContext *exprCtxt, Plan *parent);
extern void ExecEndTee(Tee *node, Plan *parent); extern void ExecEndTee(Tee *node, Plan *parent);
extern int ExecCountSlotsTee(Tee *node); extern int ExecCountSlotsTee(Tee *node);
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: miscadmin.h,v 1.33 1998/09/01 04:33:59 momjian Exp $ * $Id: miscadmin.h,v 1.34 1998/10/08 18:30:18 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
...@@ -197,10 +197,7 @@ extern void InitPostgres(char *name); ...@@ -197,10 +197,7 @@ extern void InitPostgres(char *name);
/* in miscinit.c */ /* in miscinit.c */
extern void ExitPostgres(ExitStatus status); extern void ExitPostgres(ExitStatus status);
extern void StatusBackendExit(int status);
extern void StatusPostmasterExit(int status);
extern bool IsNoProcessingMode(void);
extern bool IsBootstrapProcessingMode(void); extern bool IsBootstrapProcessingMode(void);
extern bool IsInitProcessingMode(void); extern bool IsInitProcessingMode(void);
extern bool IsNormalProcessingMode(void); extern bool IsNormalProcessingMode(void);
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: plancat.h,v 1.9 1998/09/01 04:37:16 momjian Exp $ * $Id: plancat.h,v 1.10 1998/10/08 18:30:32 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -58,6 +58,5 @@ extern Cost join_selectivity(Oid functionObjectId, Oid operatorObjectId, ...@@ -58,6 +58,5 @@ extern Cost join_selectivity(Oid functionObjectId, Oid operatorObjectId,
Oid relationObjectId2, AttrNumber attributeNumber2); Oid relationObjectId2, AttrNumber attributeNumber2);
extern List *find_inheritance_children(Oid inhparent); extern List *find_inheritance_children(Oid inhparent);
extern List *VersionGetParents(Oid verrelid);
#endif /* PLANCAT_H */ #endif /* PLANCAT_H */
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: planmain.h,v 1.16 1998/09/03 02:34:35 momjian Exp $ * $Id: planmain.h,v 1.17 1998/10/08 18:30:34 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -54,7 +54,6 @@ extern List *join_references(List *clauses, List *outer_tlist, ...@@ -54,7 +54,6 @@ extern List *join_references(List *clauses, List *outer_tlist,
List *inner_tlist); List *inner_tlist);
extern List *index_outerjoin_references(List *inner_indxqual, extern List *index_outerjoin_references(List *inner_indxqual,
List *outer_tlist, Index inner_relid); List *outer_tlist, Index inner_relid);
extern void set_result_tlist_references(Result *resultNode);
extern List *set_agg_tlist_references(Agg *aggNode); extern List *set_agg_tlist_references(Agg *aggNode);
extern void set_agg_agglist_references(Agg *aggNode); extern void set_agg_agglist_references(Agg *aggNode);
extern void del_agg_tlist_references(List *tlist); extern void del_agg_tlist_references(List *tlist);
......
...@@ -6,7 +6,7 @@ ...@@ -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.5 1998/09/01 04:37:32 momjian Exp $ * $Id: parse_coerce.h,v 1.6 1998/10/08 18:30:36 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -108,7 +108,6 @@ typedef enum CATEGORY ...@@ -108,7 +108,6 @@ typedef enum CATEGORY
extern bool IsPreferredType(CATEGORY category, Oid type); extern bool IsPreferredType(CATEGORY category, Oid type);
extern Oid PreferredType(CATEGORY category, Oid type);
extern CATEGORY TypeCategory(Oid type); extern CATEGORY TypeCategory(Oid type);
extern bool can_coerce_type(int nargs, Oid *input_typeids, Oid *func_typeids); extern bool can_coerce_type(int nargs, Oid *input_typeids, Oid *func_typeids);
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: parse_func.h,v 1.11 1998/09/01 04:37:34 momjian Exp $ * $Id: parse_func.h,v 1.12 1998/10/08 18:30:38 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -47,9 +47,6 @@ extern Node *ParseNestedFuncOrColumn(ParseState *pstate, Attr *attr, ...@@ -47,9 +47,6 @@ extern Node *ParseNestedFuncOrColumn(ParseState *pstate, Attr *attr,
extern Node *ParseFuncOrColumn(ParseState *pstate, char *funcname, List *fargs, extern Node *ParseFuncOrColumn(ParseState *pstate, char *funcname, List *fargs,
int *curr_resno, int precedence); int *curr_resno, int precedence);
extern Oid *
func_select_candidate(int nargs, Oid *input_typeids, CandidateList candidates);
extern void extern void
func_error(char *caller, char *funcname, int nargs, Oid *argtypes, char *msg); func_error(char *caller, char *funcname, int nargs, Oid *argtypes, char *msg);
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: parse_type.h,v 1.8 1998/09/01 04:37:40 momjian Exp $ * $Id: parse_type.h,v 1.9 1998/10/08 18:30:39 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -27,7 +27,6 @@ extern bool typeByVal(Type t); ...@@ -27,7 +27,6 @@ extern bool typeByVal(Type t);
extern char *typeTypeName(Type t); extern char *typeTypeName(Type t);
extern char typeTypeFlag(Type t); extern char typeTypeFlag(Type t);
extern char *stringTypeString(Type tp, char *string, int32 atttypmod); extern char *stringTypeString(Type tp, char *string, int32 atttypmod);
extern Oid typeidOutfunc(Oid type_id);
extern Oid typeidTypeRelid(Oid type_id); extern Oid typeidTypeRelid(Oid type_id);
extern Oid typeTypeRelid(Type typ); extern Oid typeTypeRelid(Type typ);
extern Oid typeidTypElem(Oid type_id); extern Oid typeidTypElem(Oid type_id);
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: rewriteManip.h,v 1.9 1998/09/01 04:38:03 momjian Exp $ * $Id: rewriteManip.h,v 1.10 1998/10/08 18:30:41 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -25,13 +25,10 @@ void AddQual(Query *parsetree, Node *qual); ...@@ -25,13 +25,10 @@ void AddQual(Query *parsetree, Node *qual);
void AddHavingQual(Query *parsetree, Node *havingQual); void AddHavingQual(Query *parsetree, Node *havingQual);
void AddNotQual(Query *parsetree, Node *qual); void AddNotQual(Query *parsetree, Node *qual);
void FixResdomTypes(List *user_tlist);
void FixNew(RewriteInfo *info, Query *parsetree); void FixNew(RewriteInfo *info, Query *parsetree);
void HandleRIRAttributeRule(Query *parsetree, List *rtable, List *targetlist, void HandleRIRAttributeRule(Query *parsetree, List *rtable, List *targetlist,
int rt_index, int attr_num, int *modified, int rt_index, int attr_num, int *modified,
int *badpostquel); int *badpostquel);
void HandleViewRule(Query *parsetree, List *rtable, List *targetlist,
int rt_index, int *modified);
#endif /* REWRITEMANIP_H */ #endif /* REWRITEMANIP_H */
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: bufmgr.h,v 1.22 1998/09/01 04:38:12 momjian Exp $ * $Id: bufmgr.h,v 1.23 1998/10/08 18:30:43 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -143,11 +143,9 @@ extern void ResetBufferPool(void); ...@@ -143,11 +143,9 @@ extern void ResetBufferPool(void);
extern int BufferPoolCheckLeak(void); extern int BufferPoolCheckLeak(void);
extern void FlushBufferPool(int StableMainMemoryFlag); extern void FlushBufferPool(int StableMainMemoryFlag);
extern BlockNumber BufferGetBlockNumber(Buffer buffer); extern BlockNumber BufferGetBlockNumber(Buffer buffer);
extern Relation BufferGetRelation(Buffer buffer);
extern BlockNumber RelationGetNumberOfBlocks(Relation relation); extern BlockNumber RelationGetNumberOfBlocks(Relation relation);
extern void ReleaseRelationBuffers(Relation rel); extern void ReleaseRelationBuffers(Relation rel);
extern void DropBuffers(Oid dbid); extern void DropBuffers(Oid dbid);
extern void PrintBufferDescs(void);
extern void PrintPinnedBufs(void); extern void PrintPinnedBufs(void);
extern int BufferShmemSize(void); extern int BufferShmemSize(void);
extern int ReleaseBuffer(Buffer buffer); extern int ReleaseBuffer(Buffer buffer);
......
...@@ -6,7 +6,7 @@ ...@@ -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.18 1998/09/01 04:38:24 momjian Exp $ * $Id: lock.h,v 1.19 1998/10/08 18:30:45 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -247,7 +247,6 @@ extern int LockShmemSize(void); ...@@ -247,7 +247,6 @@ extern int LockShmemSize(void);
extern bool LockingDisabled(void); extern bool LockingDisabled(void);
extern bool DeadLockCheck(SHM_QUEUE *lockQueue, LOCK *findlock, extern bool DeadLockCheck(SHM_QUEUE *lockQueue, LOCK *findlock,
bool skip_check); bool skip_check);
ArrayType *LockOwners(LOCKMETHOD lockmethod, LOCKTAG *locktag);
#ifdef DEADLOCK_DEBUG #ifdef DEADLOCK_DEBUG
extern void DumpLocks(void); extern void DumpLocks(void);
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: multilev.h,v 1.13 1998/09/01 04:38:25 momjian Exp $ * $Id: multilev.h,v 1.14 1998/10/08 18:30:46 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -75,7 +75,6 @@ extern LOCKMETHOD ShortTermTableId; ...@@ -75,7 +75,6 @@ extern LOCKMETHOD ShortTermTableId;
*/ */
extern LOCKMETHOD InitMultiLevelLocks(void); extern LOCKMETHOD InitMultiLevelLocks(void);
extern bool MultiLockReln(LockInfo lockinfo, LOCKMODE lockmode); extern bool MultiLockReln(LockInfo lockinfo, LOCKMODE lockmode);
extern bool MultiLockTuple(LockInfo lockinfo, ItemPointer tidPtr, LOCKMODE lockmode);
extern bool MultiLockPage(LockInfo lockinfo, ItemPointer tidPtr, LOCKMODE lockmode); extern bool MultiLockPage(LockInfo lockinfo, ItemPointer tidPtr, LOCKMODE lockmode);
extern bool MultiReleaseReln(LockInfo lockinfo, LOCKMODE lockmode); extern bool MultiReleaseReln(LockInfo lockinfo, LOCKMODE lockmode);
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: smgr.h,v 1.12 1998/09/01 04:38:37 momjian Exp $ * $Id: smgr.h,v 1.13 1998/10/08 18:30:47 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -39,7 +39,6 @@ extern int smgrblindwrt(int16 which, char *dbname, char *relname, Oid dbid, ...@@ -39,7 +39,6 @@ extern int smgrblindwrt(int16 which, char *dbname, char *relname, Oid dbid,
extern int smgrnblocks(int16 which, Relation reln); extern int smgrnblocks(int16 which, Relation reln);
extern int smgrtruncate(int16 which, Relation reln, int nblocks); extern int smgrtruncate(int16 which, Relation reln, int nblocks);
extern int smgrcommit(void); extern int smgrcommit(void);
extern bool smgriswo(int16 smgrno);
......
...@@ -6,7 +6,7 @@ ...@@ -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.59 1998/10/08 02:08:47 momjian Exp $ * $Id: builtins.h,v 1.60 1998/10/08 18:30:49 momjian Exp $
* *
* NOTES * NOTES
* This should normally only be included by fmgr.h. * This should normally only be included by fmgr.h.
...@@ -141,7 +141,6 @@ extern bool namelt(NameData *arg1, NameData *arg2); ...@@ -141,7 +141,6 @@ extern bool namelt(NameData *arg1, NameData *arg2);
extern bool namele(NameData *arg1, NameData *arg2); extern bool namele(NameData *arg1, NameData *arg2);
extern bool namegt(NameData *arg1, NameData *arg2); extern bool namegt(NameData *arg1, NameData *arg2);
extern bool namege(NameData *arg1, NameData *arg2); extern bool namege(NameData *arg1, NameData *arg2);
extern int namecmp(Name n1, Name n2);
extern int namecpy(Name n1, Name n2); extern int namecpy(Name n1, Name n2);
extern int namestrcpy(Name name, char *str); extern int namestrcpy(Name name, char *str);
extern int namestrcmp(Name name, char *str); extern int namestrcmp(Name name, char *str);
...@@ -229,7 +228,6 @@ extern bool intervalct(TimeInterval i1, TimeInterval i2); ...@@ -229,7 +228,6 @@ extern bool intervalct(TimeInterval i1, TimeInterval i2);
extern bool intervalov(TimeInterval i1, TimeInterval i2); extern bool intervalov(TimeInterval i1, TimeInterval i2);
extern AbsoluteTime intervalstart(TimeInterval i); extern AbsoluteTime intervalstart(TimeInterval i);
extern AbsoluteTime intervalend(TimeInterval i); extern AbsoluteTime intervalend(TimeInterval i);
extern int isreltime(char *timestring);
extern text *timeofday(void); extern text *timeofday(void);
/* filename.c */ /* filename.c */
...@@ -440,7 +438,6 @@ extern text *textcat(text *arg1, text *arg2); ...@@ -440,7 +438,6 @@ extern text *textcat(text *arg1, text *arg2);
extern bool texteq(text *arg1, text *arg2); extern bool texteq(text *arg1, text *arg2);
extern bool textne(text *arg1, text *arg2); extern bool textne(text *arg1, text *arg2);
extern int varstr_cmp(char *arg1, int len1, char *arg2, int len2); extern int varstr_cmp(char *arg1, int len1, char *arg2, int len2);
extern int text_cmp(text *arg1, text *arg2);
extern bool text_lt(text *arg1, text *arg2); extern bool text_lt(text *arg1, text *arg2);
extern bool text_le(text *arg1, text *arg2); extern bool text_le(text *arg1, text *arg2);
extern bool text_gt(text *arg1, text *arg2); extern bool text_gt(text *arg1, text *arg2);
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: dt.h,v 1.32 1998/09/01 04:38:59 momjian Exp $ * $Id: dt.h,v 1.33 1998/10/08 18:30:50 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -315,14 +315,10 @@ extern void GetCurrentTime(struct tm * tm); ...@@ -315,14 +315,10 @@ extern void GetCurrentTime(struct tm * tm);
extern DateTime SetDateTime(DateTime datetime); extern DateTime SetDateTime(DateTime datetime);
extern int tm2datetime(struct tm * tm, double fsec, int *tzp, DateTime *dt); extern int tm2datetime(struct tm * tm, double fsec, int *tzp, DateTime *dt);
extern int datetime2tm(DateTime dt, int *tzp, struct tm * tm, double *fsec, char **tzn); extern int datetime2tm(DateTime dt, int *tzp, struct tm * tm, double *fsec, char **tzn);
extern int timespan2tm(TimeSpan span, struct tm * tm, float8 *fsec);
extern int tm2timespan(struct tm * tm, double fsec, TimeSpan *span);
extern void j2date(int jd, int *year, int *month, int *day); extern void j2date(int jd, int *year, int *month, int *day);
extern int date2j(int year, int month, int day); extern int date2j(int year, int month, int day);
extern double time2t(const int hour, const int min, const double sec);
extern int ParseDateTime(char *timestr, char *lowstr, extern int ParseDateTime(char *timestr, char *lowstr,
char **field, int *ftype, int maxfields, int *numfields); char **field, int *ftype, int maxfields, int *numfields);
extern int DecodeDateTime(char **field, int *ftype, extern int DecodeDateTime(char **field, int *ftype,
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: nabstime.h,v 1.16 1998/09/01 04:39:23 momjian Exp $ * $Id: nabstime.h,v 1.17 1998/10/08 18:30:52 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -116,7 +116,6 @@ extern AbsoluteTime datetime_abstime(DateTime *datetime); ...@@ -116,7 +116,6 @@ extern AbsoluteTime datetime_abstime(DateTime *datetime);
extern DateTime *abstime_datetime(AbsoluteTime abstime); extern DateTime *abstime_datetime(AbsoluteTime abstime);
extern bool AbsoluteTimeIsBefore(AbsoluteTime time1, AbsoluteTime time2); extern bool AbsoluteTimeIsBefore(AbsoluteTime time1, AbsoluteTime time2);
extern bool AbsoluteTimeIsAfter(AbsoluteTime time1, AbsoluteTime time2);
extern void abstime2tm(AbsoluteTime time, int *tzp, struct tm * tm, char *tzn); extern void abstime2tm(AbsoluteTime time, int *tzp, struct tm * tm, char *tzn);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment