diff options
Diffstat (limited to 'src')
186 files changed, 1114 insertions, 1048 deletions
diff --git a/src/backend/access/common/heaptuple.c b/src/backend/access/common/heaptuple.c index 6c2f72c6838..71d76a6fc2f 100644 --- a/src/backend/access/common/heaptuple.c +++ b/src/backend/access/common/heaptuple.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.18 1996/12/09 01:22:17 bryanh Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.19 1997/08/19 21:28:49 momjian Exp $ * * NOTES * The old interface functions have been converted to macros @@ -39,6 +39,8 @@ #define register #endif /* !NO_ASSERT_CHECKING && sparc && sunos4 */ +static char *heap_getsysattr(HeapTuple tup, Buffer b, int attnum); + /* ---------------------------------------------------------------- * misc support routines * ---------------------------------------------------------------- @@ -335,7 +337,7 @@ heap_sysattrbyval(AttrNumber attno) * heap_getsysattr * ---------------- */ -char * +static char * heap_getsysattr(HeapTuple tup, Buffer b, int attnum) { switch (attnum) { @@ -740,6 +742,7 @@ heap_copytuple(HeapTuple tuple) return(newTuple); } +#ifdef NOT_USED /* ---------------- * heap_deformtuple * @@ -772,6 +775,7 @@ heap_deformtuple(HeapTuple tuple, nulls[i] = ' '; } } +#endif /* ---------------- * heap_formtuple diff --git a/src/backend/access/common/indextuple.c b/src/backend/access/common/indextuple.c index 80e7c71c098..a71fc46dc98 100644 --- a/src/backend/access/common/indextuple.c +++ b/src/backend/access/common/indextuple.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.14 1997/06/12 15:41:52 vadim Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.15 1997/08/19 21:28:50 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -27,6 +27,8 @@ #endif static Size IndexInfoFindDataOffset(unsigned short t_info); +static char *fastgetiattr(IndexTuple tup, int attnum, + TupleDesc att, bool *isnull); /* ---------------------------------------------------------------- * index_ tuple interface routines @@ -125,7 +127,7 @@ index_formtuple(TupleDesc tupleDescriptor, * the same attribute descriptor will go much quicker. -cim 5/4/91 * ---------------- */ -char * +static char * fastgetiattr(IndexTuple tup, int attnum, TupleDesc tupleDesc, diff --git a/src/backend/access/gist/gist.c b/src/backend/access/gist/gist.c index 15be274b001..1d36f340ed6 100644 --- a/src/backend/access/gist/gist.c +++ b/src/backend/access/gist/gist.c @@ -57,7 +57,9 @@ static OffsetNumber gistchoose(Relation r, Page p, IndexTuple it, static int gistnospace(Page p, IndexTuple it); void gistdelete(Relation r, ItemPointer tid); static IndexTuple gist_tuple_replacekey(Relation r, GISTENTRY entry, IndexTuple t); - +static void gistcentryinit(GISTSTATE *giststate, GISTENTRY *e, char *pr, + Relation r, Page pg, OffsetNumber o, int b, bool l) ; +static char *int_range_out(INTRANGE *r); /* ** routine to build an index. Basically calls insert over and over @@ -1172,7 +1174,7 @@ gistdentryinit(GISTSTATE *giststate, GISTENTRY *e, char *pr, Relation r, /* ** initialize a GiST entry with a compressed version of pred */ -void +static void gistcentryinit(GISTSTATE *giststate, GISTENTRY *e, char *pr, Relation r, Page pg, OffsetNumber o, int b, bool l) { @@ -1244,7 +1246,8 @@ _gistdump(Relation r) } } -char *text_range_out(TXTRANGE *r) +#ifdef NOT_USED +static char *text_range_out(TXTRANGE *r) { char *result; char *lower, *upper; @@ -1266,8 +1269,9 @@ char *text_range_out(TXTRANGE *r) pfree(upper); return(result); } +#endif -char * +static char * int_range_out(INTRANGE *r) { char *result; diff --git a/src/backend/access/gist/gistget.c b/src/backend/access/gist/gistget.c index 1b424f9d28f..ac1697e5ed2 100644 --- a/src/backend/access/gist/gistget.c +++ b/src/backend/access/gist/gistget.c @@ -34,6 +34,9 @@ static RetrieveIndexResult gistscancache(IndexScanDesc s, ScanDirection dir); static RetrieveIndexResult gistfirst(IndexScanDesc s, ScanDirection dir); static RetrieveIndexResult gistnext(IndexScanDesc s, ScanDirection dir); static ItemPointer gistheapptr(Relation r, ItemPointer itemp); +static bool gistindex_keytest(IndexTuple tuple, TupleDesc tupdesc, + int scanKeySize, ScanKey key, GISTSTATE *giststate, + Relation r, Page p, OffsetNumber offset); RetrieveIndexResult @@ -217,7 +220,7 @@ gistnext(IndexScanDesc s, ScanDirection dir) } /* Similar to index_keytest, but decompresses the key in the IndexTuple */ -bool +static bool gistindex_keytest(IndexTuple tuple, TupleDesc tupdesc, int scanKeySize, diff --git a/src/backend/access/gist/giststrat.c b/src/backend/access/gist/giststrat.c index fd9ab849cbe..8c78ccec3ae 100644 --- a/src/backend/access/gist/giststrat.c +++ b/src/backend/access/gist/giststrat.c @@ -102,6 +102,7 @@ RelationGetGISTStrategy(Relation r, return (RelationGetStrategy(r, attnum, &GISTEvaluationData, proc)); } +#ifdef NOT_USED bool RelationInvokeGISTStrategy(Relation r, AttrNumber attnum, @@ -112,4 +113,4 @@ RelationInvokeGISTStrategy(Relation r, return (RelationInvokeStrategy(r, &GISTEvaluationData, attnum, s, left, right)); } - +#endif diff --git a/src/backend/access/hash/hashstrat.c b/src/backend/access/hash/hashstrat.c index d7f60d28697..bf68ae02f66 100644 --- a/src/backend/access/hash/hashstrat.c +++ b/src/backend/access/hash/hashstrat.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/hash/Attic/hashstrat.c,v 1.7 1996/11/05 09:40:24 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/hash/Attic/hashstrat.c,v 1.8 1997/08/19 21:29:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -33,6 +33,7 @@ static StrategyNumber HTNegateCommute[1] = { InvalidStrategy }; +#ifdef NOT_USED static StrategyEvaluationData HTEvaluationData = { /* XXX static for simplicity */ @@ -42,13 +43,15 @@ static StrategyEvaluationData HTEvaluationData = { (StrategyTransformMap)HTNegateCommute, {NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL} }; +#endif /* ---------------------------------------------------------------- * RelationGetHashStrategy * ---------------------------------------------------------------- */ -StrategyNumber +#ifdef NOT_USED +static StrategyNumber _hash_getstrat(Relation rel, AttrNumber attno, RegProcedure proc) @@ -61,8 +64,10 @@ _hash_getstrat(Relation rel, return (strat); } +#endif -bool +#ifdef NOT_USED +static bool _hash_invokestrat(Relation rel, AttrNumber attno, StrategyNumber strat, @@ -72,28 +77,4 @@ _hash_invokestrat(Relation rel, return (RelationInvokeStrategy(rel, &HTEvaluationData, attno, strat, left, right)); } - - - - - - - - - - - - - - - - - - - - - - - - - +#endif diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c index e49c1edb4be..97d2c950b12 100644 --- a/src/backend/access/heap/heapam.c +++ b/src/backend/access/heap/heapam.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.13 1997/08/12 22:51:40 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.14 1997/08/19 21:29:17 momjian Exp $ * * * INTERFACE ROUTINES @@ -461,6 +461,7 @@ doinsert(Relation relation, HeapTuple tup) * HeapScanIsValid is now a macro in relscan.h -cim 4/27/91 */ +#ifdef NOT_USED /* ---------------- * SetHeapAccessMethodImmediateInvalidation * ---------------- @@ -470,6 +471,7 @@ SetHeapAccessMethodImmediateInvalidation(bool on) { ImmediateInvalidation = on; } +#endif /* ---------------------------------------------------------------- * heap access method interface diff --git a/src/backend/access/heap/stats.c b/src/backend/access/heap/stats.c index 913b09e6913..ae8273ac81c 100644 --- a/src/backend/access/heap/stats.c +++ b/src/backend/access/heap/stats.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/heap/Attic/stats.c,v 1.10 1997/08/12 22:51:44 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/heap/Attic/stats.c,v 1.11 1997/08/19 21:29:21 momjian Exp $ * * NOTES * initam should be moved someplace else. @@ -28,13 +28,15 @@ # include <string.h> #endif +static void InitHeapAccessStatistics(void); + /* ---------------- * InitHeapAccessStatistics * ---------------- */ HeapAccessStatistics heap_access_stats = (HeapAccessStatistics) NULL; -void +static void InitHeapAccessStatistics() { MemoryContext oldContext; @@ -121,6 +123,7 @@ InitHeapAccessStatistics() heap_access_stats = stats; } +#ifdef NOT_USED /* ---------------- * ResetHeapAccessStatistics * ---------------- @@ -171,7 +174,9 @@ ResetHeapAccessStatistics() time(&stats->local_reset_timestamp); time(&stats->last_request_timestamp); } +#endif +#ifdef NOT_USED /* ---------------- * GetHeapAccessStatistics * ---------------- @@ -206,7 +211,9 @@ HeapAccessStatistics GetHeapAccessStatistics() return stats; } +#endif +#ifdef NOT_USED /* ---------------- * PrintHeapAccessStatistics * ---------------- @@ -302,7 +309,9 @@ PrintHeapAccessStatistics(HeapAccessStatistics stats) printf("\n"); } +#endif +#ifdef NOT_USED /* ---------------- * PrintAndFreeHeapAccessStatistics * ---------------- @@ -314,6 +323,7 @@ PrintAndFreeHeapAccessStatistics(HeapAccessStatistics stats) if (stats != NULL) pfree(stats); } +#endif /* ---------------------------------------------------------------- * access method initialization diff --git a/src/backend/access/index/genam.c b/src/backend/access/index/genam.c index d1bbbf63014..52b7b1473bf 100644 --- a/src/backend/access/index/genam.c +++ b/src/backend/access/index/genam.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/index/genam.c,v 1.6 1996/11/05 10:02:02 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/index/genam.c,v 1.7 1997/08/19 21:29:26 momjian Exp $ * * NOTES * many of the old access method routines have been turned into @@ -127,6 +127,7 @@ RelationGetIndexScan(Relation relation, return (scan); } +#ifdef NOT_USED /* ---------------- * IndexScanRestart -- Restart an index scan. * @@ -166,7 +167,9 @@ IndexScanRestart(IndexScanDesc scan, key, scan->numberOfKeys * sizeof(ScanKeyData)); } +#endif +#ifdef NOT_USED /* ---------------- * IndexScanEnd -- End and index scan. * @@ -188,6 +191,7 @@ IndexScanEnd(IndexScanDesc scan) pfree(scan); } +#endif /* ---------------- * IndexScanMarkPosition -- Mark current position in a scan. diff --git a/src/backend/access/index/indexam.c b/src/backend/access/index/indexam.c index 16f11ca07a4..5681e7be4f3 100644 --- a/src/backend/access/index/indexam.c +++ b/src/backend/access/index/indexam.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/index/indexam.c,v 1.11 1997/08/12 22:51:48 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/index/indexam.c,v 1.12 1997/08/19 21:29:30 momjian Exp $ * * INTERFACE ROUTINES * index_open - open an index relation by relationId @@ -271,6 +271,7 @@ index_endscan(IndexScanDesc scan) RelationUnsetRIntentLock(scan->relation); } +#ifdef NOT_USED /* ---------------- * index_markpos - mark a scan position * ---------------- @@ -285,7 +286,9 @@ index_markpos(IndexScanDesc scan) fmgr(procedure, scan); } +#endif +#ifdef NOT_USED /* ---------------- * index_restrpos - restore a scan position * ---------------- @@ -300,6 +303,7 @@ index_restrpos(IndexScanDesc scan) fmgr(procedure, scan); } +#endif /* ---------------- * index_getnext - get the next tuple from a scan diff --git a/src/backend/access/index/istrat.c b/src/backend/access/index/istrat.c index 78faab96a55..d7acd9e0c4c 100644 --- a/src/backend/access/index/istrat.c +++ b/src/backend/access/index/istrat.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/index/Attic/istrat.c,v 1.7 1996/11/05 10:02:06 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/index/Attic/istrat.c,v 1.8 1997/08/19 21:29:32 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -26,6 +26,16 @@ #include <access/istrat.h> #include <fmgr.h> +static bool StrategyEvaluationIsValid(StrategyEvaluation evaluation); +static bool StrategyExpressionIsValid(StrategyExpression expression, + StrategyNumber maxStrategy); +static ScanKey StrategyMapGetScanKeyEntry(StrategyMap map, + StrategyNumber strategyNumber); +static bool StrategyOperatorIsValid(StrategyOperator operator, + StrategyNumber maxStrategy); +static bool StrategyTermIsValid(StrategyTerm term, + StrategyNumber maxStrategy); + /* ---------------------------------------------------------------- * misc strategy support routines * ---------------------------------------------------------------- @@ -50,7 +60,7 @@ * Assumes that the index strategy number is valid. * Bounds checking should be done outside this routine. */ -ScanKey +static ScanKey StrategyMapGetScanKeyEntry(StrategyMap map, StrategyNumber strategyNumber) { @@ -103,7 +113,7 @@ AttributeNumberGetIndexStrategySize(AttrNumber maxAttributeNumber, * StrategyOperatorIsValid * ---------------- */ -bool +static bool StrategyOperatorIsValid(StrategyOperator operator, StrategyNumber maxStrategy) { @@ -117,7 +127,7 @@ StrategyOperatorIsValid(StrategyOperator operator, * StrategyTermIsValid * ---------------- */ -bool +static bool StrategyTermIsValid(StrategyTerm term, StrategyNumber maxStrategy) { @@ -141,7 +151,7 @@ StrategyTermIsValid(StrategyTerm term, * StrategyExpressionIsValid * ---------------- */ -bool +static bool StrategyExpressionIsValid(StrategyExpression expression, StrategyNumber maxStrategy) { @@ -165,7 +175,7 @@ StrategyExpressionIsValid(StrategyExpression expression, * StrategyEvaluationIsValid * ---------------- */ -bool +static bool StrategyEvaluationIsValid(StrategyEvaluation evaluation) { Index index; diff --git a/src/backend/access/nbtree/nbtpage.c b/src/backend/access/nbtree/nbtpage.c index 93b420fd771..9142c557378 100644 --- a/src/backend/access/nbtree/nbtpage.c +++ b/src/backend/access/nbtree/nbtpage.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtpage.c,v 1.8 1997/05/30 18:35:33 vadim Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtpage.c,v 1.9 1997/08/19 21:29:36 momjian Exp $ * * NOTES * Postgres btree pages look like ordinary relation pages. The opaque @@ -36,6 +36,9 @@ # include <string.h> #endif +static void _bt_setpagelock(Relation rel, BlockNumber blkno, int access); +static void _bt_unsetpagelock(Relation rel, BlockNumber blkno, int access); + #define BTREE_METAPAGE 0 #define BTREE_MAGIC 0x053162 @@ -118,6 +121,7 @@ _bt_metapinit(Relation rel) RelationUnsetLockForWrite(rel); } +#ifdef NOT_USED /* * _bt_checkmeta() -- Verify that the metadata stored in a btree are * reasonable. @@ -157,6 +161,7 @@ _bt_checkmeta(Relation rel) _bt_relbuf(rel, metabuf, BT_READ); } +#endif /* * _bt_getroot() -- Get the root page of the btree. @@ -537,7 +542,7 @@ _bt_getstackbuf(Relation rel, BTStack stack, int access) } } -void +static void _bt_setpagelock(Relation rel, BlockNumber blkno, int access) { ItemPointerData iptr; @@ -552,7 +557,7 @@ _bt_setpagelock(Relation rel, BlockNumber blkno, int access) } } -void +static void _bt_unsetpagelock(Relation rel, BlockNumber blkno, int access) { ItemPointerData iptr; diff --git a/src/backend/access/nbtree/nbtsearch.c b/src/backend/access/nbtree/nbtsearch.c index a0999d5d6ff..1d1c8072b93 100644 --- a/src/backend/access/nbtree/nbtsearch.c +++ b/src/backend/access/nbtree/nbtsearch.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtsearch.c,v 1.22 1997/08/12 22:51:50 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtsearch.c,v 1.23 1997/08/19 21:29:42 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -34,7 +34,7 @@ _bt_searchr(Relation rel, int keysz, ScanKey scankey, static OffsetNumber _bt_firsteq(Relation rel, TupleDesc itupdesc, Page page, Size keysz, ScanKey scankey, OffsetNumber offnum); -int +static int _bt_compare(Relation rel, TupleDesc itupdesc, Page page, int keysz, ScanKey scankey, OffsetNumber offnum); static bool @@ -556,7 +556,7 @@ _bt_firsteq(Relation rel, * but not "any time a new min key is inserted" (see _bt_insertonpg). * - vadim 12/05/96 */ -int +static int _bt_compare(Relation rel, TupleDesc itupdesc, Page page, diff --git a/src/backend/access/nbtree/nbtsort.c b/src/backend/access/nbtree/nbtsort.c index 060bc996555..8e054d24abf 100644 --- a/src/backend/access/nbtree/nbtsort.c +++ b/src/backend/access/nbtree/nbtsort.c @@ -5,7 +5,7 @@ * * * IDENTIFICATION - * $Id: nbtsort.c,v 1.18 1997/08/12 22:51:52 momjian Exp $ + * $Id: nbtsort.c,v 1.19 1997/08/19 21:29:46 momjian Exp $ * * NOTES * @@ -68,6 +68,11 @@ extern int ShowExecutorStats; #endif +static BTItem _bt_buildadd(Relation index, void *pstate, BTItem bti, int flags); +static BTItem _bt_minitem(Page opage, BlockNumber oblkno, int atend); +static void *_bt_pagestate(Relation index, int flags, int level, bool doupper); +static void _bt_uppershutdown(Relation index, BTPageState *state); + /* * turn on debugging output. * @@ -806,7 +811,7 @@ _bt_slideleft(Relation index, Buffer buf, Page page) * allocate and initialize a new BTPageState. the returned structure * is suitable for immediate use by _bt_buildadd. */ -void * +static void * _bt_pagestate(Relation index, int flags, int level, bool doupper) { BTPageState *state = (BTPageState *) palloc(sizeof(BTPageState)); @@ -829,7 +834,7 @@ _bt_pagestate(Relation index, int flags, int level, bool doupper) * the page to which the item used to point, e.g., a heap page if * 'opage' is a leaf page). */ -BTItem +static BTItem _bt_minitem(Page opage, BlockNumber oblkno, int atend) { OffsetNumber off; @@ -883,7 +888,7 @@ _bt_minitem(Page opage, BlockNumber oblkno, int atend) * * if all keys are unique, 'first' will always be the same as 'last'. */ -BTItem +static BTItem _bt_buildadd(Relation index, void *pstate, BTItem bti, int flags) { BTPageState *state = (BTPageState *) pstate; @@ -1055,7 +1060,7 @@ _bt_buildadd(Relation index, void *pstate, BTItem bti, int flags) return(last_bti); } -void +static void _bt_uppershutdown(Relation index, BTPageState *state) { BTPageState *s; @@ -1311,6 +1316,7 @@ _bt_merge(Relation index, BTSpool *btspool) * which case we can just build the upper levels as we create the * sorted bottom level). it is only used for index recycling. */ +#ifdef NOT_USED void _bt_upperbuild(Relation index) { @@ -1370,6 +1376,7 @@ _bt_upperbuild(Relation index) _bt_uppershutdown(index, state); } +#endif /* * given a spool loading by successive calls to _bt_spool, create an diff --git a/src/backend/access/nbtree/nbtutils.c b/src/backend/access/nbtree/nbtutils.c index f74a476bab8..738e55dbccd 100644 --- a/src/backend/access/nbtree/nbtutils.c +++ b/src/backend/access/nbtree/nbtutils.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtutils.c,v 1.10 1997/04/16 01:48:29 vadim Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtutils.c,v 1.11 1997/08/19 21:29:47 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -303,6 +303,7 @@ _bt_formitem(IndexTuple itup) return (btitem); } +#ifdef NOT_USED bool _bt_checkqual(IndexScanDesc scan, IndexTuple itup) { @@ -315,7 +316,9 @@ _bt_checkqual(IndexScanDesc scan, IndexTuple itup) else return (true); } +#endif +#ifdef NOT_USED bool _bt_checkforkeys(IndexScanDesc scan, IndexTuple itup, Size keysz) { @@ -328,6 +331,7 @@ _bt_checkforkeys(IndexScanDesc scan, IndexTuple itup, Size keysz) else return (true); } +#endif bool _bt_checkkeys (IndexScanDesc scan, IndexTuple tuple, Size *keysok) diff --git a/src/backend/access/rtree/rtstrat.c b/src/backend/access/rtree/rtstrat.c index 5e8750dbbce..7025a30999d 100644 --- a/src/backend/access/rtree/rtstrat.c +++ b/src/backend/access/rtree/rtstrat.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtstrat.c,v 1.5 1996/11/05 10:54:20 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtstrat.c,v 1.6 1997/08/19 21:29:52 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -18,6 +18,9 @@ #include <access/rtree.h> #include <access/istrat.h> +static StrategyNumber RelationGetRTStrategy(Relation r, + AttrNumber attnum, RegProcedure proc); + /* * Note: negate, commute, and negatecommute all assume that operators are * ordered as follows in the strategy map: @@ -200,7 +203,7 @@ static StrategyNumber RTOperMap[RTNStrategies] = { RTOverlapStrategyNumber }; -StrategyNumber +static StrategyNumber RelationGetRTStrategy(Relation r, AttrNumber attnum, RegProcedure proc) @@ -208,6 +211,7 @@ RelationGetRTStrategy(Relation r, return (RelationGetStrategy(r, attnum, &RTEvaluationData, proc)); } +#ifdef NOT_USED bool RelationInvokeRTStrategy(Relation r, AttrNumber attnum, @@ -218,6 +222,7 @@ RelationInvokeRTStrategy(Relation r, return (RelationInvokeStrategy(r, &RTEvaluationData, attnum, s, left, right)); } +#endif RegProcedure RTMapOperator(Relation r, diff --git a/src/backend/access/transam/transam.c b/src/backend/access/transam/transam.c index bbd81858919..9087e50bc40 100644 --- a/src/backend/access/transam/transam.c +++ b/src/backend/access/transam/transam.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/transam/transam.c,v 1.8 1996/11/27 15:15:54 vadim Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/transam/transam.c,v 1.9 1997/08/19 21:29:59 momjian Exp $ * * NOTES * This file contains the high level access-method interface to the @@ -26,6 +26,12 @@ #include <storage/spin.h> #include <commands/vacuum.h> +static int RecoveryCheckingEnabled(void); +static void TransRecover(Relation logRelation); +static bool TransactionLogTest(TransactionId transactionId, XidStatus status); +static void TransactionLogUpdate(TransactionId transactionId, + XidStatus status); + /* ---------------- * global variables holding pointers to relations used * by the transaction system. These are initialized by @@ -95,17 +101,19 @@ extern bool BuildingBtree; * recovery checking accessors * ---------------- */ -int +static int RecoveryCheckingEnabled(void) { return RecoveryCheckingEnableState; } -void +#ifdef NOT_USED +static void SetRecoveryCheckingEnabled(bool state) { RecoveryCheckingEnableState = (state == true); } +#endif /* ---------------------------------------------------------------- * postgres log/time access method interface @@ -124,7 +132,7 @@ SetRecoveryCheckingEnabled(bool state) * -------------------------------- */ -bool /* true/false: does transaction id have specified status? */ +static bool /* true/false: does transaction id have specified status? */ TransactionLogTest(TransactionId transactionId, /* transaction id to test */ XidStatus status) /* transaction status */ { @@ -186,7 +194,7 @@ TransactionLogTest(TransactionId transactionId, /* transaction id to test */ * TransactionLogUpdate * -------------------------------- */ -void +static void TransactionLogUpdate(TransactionId transactionId, /* trans id to update */ XidStatus status) /* new trans status */ { @@ -371,7 +379,7 @@ TransactionIdGetCommitTime(TransactionId transactionId) /* transaction id to tes * passed a flag on the command line. * -------------------------------- */ -void +static void TransRecover(Relation logRelation) { #if 0 @@ -664,6 +672,7 @@ TransactionIdAbort(TransactionId transactionId) TransactionLogUpdate(transactionId, XID_ABORT); } +#ifdef NOT_USED void TransactionIdSetInProgress(TransactionId transactionId) { @@ -672,3 +681,4 @@ TransactionIdSetInProgress(TransactionId transactionId) TransactionLogUpdate(transactionId, XID_INPROGRESS); } +#endif diff --git a/src/backend/access/transam/transsup.c b/src/backend/access/transam/transsup.c index 4eed0b87888..c3f1d4fc9fc 100644 --- a/src/backend/access/transam/transsup.c +++ b/src/backend/access/transam/transsup.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/transam/Attic/transsup.c,v 1.8 1997/08/12 22:51:57 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/transam/Attic/transsup.c,v 1.9 1997/08/19 21:30:12 momjian Exp $ * * NOTES * This file contains support functions for the high @@ -23,6 +23,15 @@ #include <access/xact.h> #include <storage/lmgr.h> +static AbsoluteTime TransBlockGetCommitTime(Block tblock, + TransactionId transactionId); +static XidStatus TransBlockGetXidStatus(Block tblock, + TransactionId transactionId); +static void TransBlockSetCommitTime(Block tblock, + TransactionId transactionId, AbsoluteTime commitTime); +static void TransBlockSetXidStatus(Block tblock, + TransactionId transactionId, XidStatus xstatus); + /* ---------------------------------------------------------------- * general support routines * ---------------------------------------------------------------- @@ -93,7 +102,8 @@ TransComputeBlockNumber(Relation relation, /* relation to test */ * -------------------------------- */ -XidStatus +#ifdef NOT_USED +static XidStatus TransBlockGetLastTransactionIdStatus(Block tblock, TransactionId baseXid, TransactionId *returnXidP) @@ -159,6 +169,7 @@ TransBlockGetLastTransactionIdStatus(Block tblock, */ return xstatus; } +#endif /* -------------------------------- * TransBlockGetXidStatus @@ -167,7 +178,7 @@ TransBlockGetLastTransactionIdStatus(Block tblock, * -------------------------------- */ -XidStatus +static XidStatus TransBlockGetXidStatus(Block tblock, TransactionId transactionId) { @@ -218,7 +229,7 @@ TransBlockGetXidStatus(Block tblock, * This sets the status of the desired transaction * -------------------------------- */ -void +static void TransBlockSetXidStatus(Block tblock, TransactionId transactionId, XidStatus xstatus) @@ -279,7 +290,7 @@ TransBlockSetXidStatus(Block tblock, * specified transaction id in the trans block. * -------------------------------- */ -AbsoluteTime +static AbsoluteTime TransBlockGetCommitTime(Block tblock, TransactionId transactionId) { @@ -320,7 +331,7 @@ TransBlockGetCommitTime(Block tblock, * This sets the commit time of the specified transaction * -------------------------------- */ -void +static void TransBlockSetCommitTime(Block tblock, TransactionId transactionId, AbsoluteTime commitTime) @@ -590,6 +601,7 @@ TransBlockNumberSetCommitTime(Relation relation, * TransGetLastRecordedTransaction * -------------------------------- */ +#ifdef NOT_USED void TransGetLastRecordedTransaction(Relation relation, TransactionId xid, /* return: transaction id */ @@ -651,3 +663,4 @@ TransGetLastRecordedTransaction(Relation relation, */ RelationUnsetLockForRead(relation); } +#endif diff --git a/src/backend/access/transam/varsup.c b/src/backend/access/transam/varsup.c index 2bf74210d4a..ba60ca35941 100644 --- a/src/backend/access/transam/varsup.c +++ b/src/backend/access/transam/varsup.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/transam/varsup.c,v 1.8 1997/08/12 22:51:58 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/transam/varsup.c,v 1.9 1997/08/19 21:30:16 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -20,6 +20,13 @@ #include <access/heapam.h> #include <catalog/catname.h> +static void GetNewObjectIdBlock(Oid *oid_return, int oid_block_size); +static void VariableRelationGetNextOid(Oid *oid_return); +static void VariableRelationGetNextXid(TransactionId *xidP); +static void VariableRelationPutLastXid(TransactionId xid); +static void VariableRelationPutNextOid(Oid *oidP); +static void VariableRelationGetLastXid(TransactionId *xidP); + /* --------------------- * spin lock for oid generation * --------------------- @@ -35,7 +42,7 @@ int OidGenLockId; * VariableRelationGetNextXid * -------------------------------- */ -void +static void VariableRelationGetNextXid(TransactionId *xidP) { Buffer buf; @@ -77,7 +84,7 @@ VariableRelationGetNextXid(TransactionId *xidP) * VariableRelationGetLastXid * -------------------------------- */ -void +static void VariableRelationGetLastXid(TransactionId *xidP) { Buffer buf; @@ -166,7 +173,7 @@ VariableRelationPutNextXid(TransactionId xid) * VariableRelationPutLastXid * -------------------------------- */ -void +static void VariableRelationPutLastXid(TransactionId xid) { Buffer buf; @@ -209,7 +216,7 @@ VariableRelationPutLastXid(TransactionId xid) * VariableRelationGetNextOid * -------------------------------- */ -void +static void VariableRelationGetNextOid(Oid *oid_return) { Buffer buf; @@ -277,7 +284,7 @@ VariableRelationGetNextOid(Oid *oid_return) * VariableRelationPutNextOid * -------------------------------- */ -void +static void VariableRelationPutNextOid(Oid *oidP) { Buffer buf; @@ -484,7 +491,7 @@ UpdateLastCommittedXid(TransactionId xid) * id assignments should use this * ---------------- */ -void +static void GetNewObjectIdBlock(Oid *oid_return, /* place to return the new object id */ int oid_block_size) /* number of oids desired */ { diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c index 227c793a37e..903cca41130 100644 --- a/src/backend/access/transam/xact.c +++ b/src/backend/access/transam/xact.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.11 1997/08/12 22:52:01 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.12 1997/08/19 21:30:19 momjian Exp $ * * NOTES * Transaction aborts can now occur two ways: @@ -151,6 +151,21 @@ #include <commands/async.h> #include <commands/sequence.h> +static void AbortTransaction(void); +static void AtAbort_Cache(void); +static void AtAbort_Locks(void); +static void AtAbort_Memory(void); +static void AtCommit_Cache(void); +static void AtCommit_Locks(void); +static void AtCommit_Memory(void); +static void AtStart_Cache(void); +static void AtStart_Locks(void); +static void AtStart_Memory(void); +static void CommitTransaction(void); +static void RecordTransactionAbort(void); +static void RecordTransactionCommit(void); +static void StartTransaction(void); + /* ---------------- * global variables holding the current transaction state. * @@ -232,11 +247,13 @@ TransactionFlushEnabled(void) return TransactionFlushState; } +#ifdef NOT_USED void SetTransactionFlushEnabled(bool state) { TransactionFlushState = (state == true); } +#endif /* -------------------------------- * IsTransactionState @@ -420,12 +437,13 @@ CommandIdIsCurrentCommandId(CommandId cid) * ClearCommandIdCounterOverflowFlag * -------------------------------- */ +#ifdef NOT_USED void ClearCommandIdCounterOverflowFlag() { CommandIdCounterOverflowFlag = false; } - +#endif /* -------------------------------- * CommandCounterIncrement @@ -464,7 +482,7 @@ InitializeTransactionSystem() * AtStart_Cache * -------------------------------- */ -void +static void AtStart_Cache() { DiscardInvalid(); @@ -474,7 +492,7 @@ AtStart_Cache() * AtStart_Locks * -------------------------------- */ -void +static void AtStart_Locks() { /* @@ -489,7 +507,7 @@ AtStart_Locks() * AtStart_Memory * -------------------------------- */ -void +static void AtStart_Memory() { Portal portal; @@ -526,7 +544,7 @@ AtStart_Memory() * -cim 3/18/90 * -------------------------------- */ -void +static void RecordTransactionCommit() { TransactionId xid; @@ -569,7 +587,7 @@ RecordTransactionCommit() * AtCommit_Cache * -------------------------------- */ -void +static void AtCommit_Cache() { /* ---------------- @@ -586,7 +604,7 @@ AtCommit_Cache() * AtCommit_Locks * -------------------------------- */ -void +static void AtCommit_Locks() { /* ---------------- @@ -602,7 +620,7 @@ AtCommit_Locks() * AtCommit_Memory * -------------------------------- */ -void +static void AtCommit_Memory() { /* ---------------- @@ -624,7 +642,7 @@ AtCommit_Memory() * RecordTransactionAbort * -------------------------------- */ -void +static void RecordTransactionAbort() { TransactionId xid; @@ -655,7 +673,7 @@ RecordTransactionAbort() * AtAbort_Cache * -------------------------------- */ -void +static void AtAbort_Cache() { RegisterInvalid(false); @@ -665,7 +683,7 @@ AtAbort_Cache() * AtAbort_Locks * -------------------------------- */ -void +static void AtAbort_Locks() { /* ---------------- @@ -682,7 +700,7 @@ AtAbort_Locks() * AtAbort_Memory * -------------------------------- */ -void +static void AtAbort_Memory() { /* ---------------- @@ -704,7 +722,7 @@ AtAbort_Memory() * * -------------------------------- */ -void +static void StartTransaction() { TransactionState s = CurrentTransactionState; @@ -788,7 +806,7 @@ CurrentXactInProgress() * * -------------------------------- */ -void +static void CommitTransaction() { TransactionState s = CurrentTransactionState; @@ -847,7 +865,7 @@ CommitTransaction() * * -------------------------------- */ -void +static void AbortTransaction() { TransactionState s = CurrentTransactionState; @@ -1245,7 +1263,8 @@ EndTransactionBlock(void) * AbortTransactionBlock * -------------------------------- */ -void +#ifdef NOT_USED +static void AbortTransactionBlock(void) { TransactionState s = CurrentTransactionState; @@ -1288,6 +1307,7 @@ AbortTransactionBlock(void) AbortTransaction(); s->blockState = TBLOCK_ENDABORT; } +#endif /* -------------------------------- * UserAbortTransactionBlock diff --git a/src/backend/access/transam/xid.c b/src/backend/access/transam/xid.c index db3dd1b8c36..16e55e26411 100644 --- a/src/backend/access/transam/xid.c +++ b/src/backend/access/transam/xid.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/transam/Attic/xid.c,v 1.6 1997/08/12 22:52:02 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/transam/Attic/xid.c,v 1.7 1997/08/19 21:30:20 momjian Exp $ * * OLD COMMENTS * XXX WARNING @@ -132,6 +132,7 @@ xideq(TransactionId xid1, TransactionId xid2) * TransactionIdIncrement * ---------------------------------------------------------------- */ +#ifdef NOT_USED void TransactionIdIncrement(TransactionId *transactionId) { @@ -141,6 +142,7 @@ TransactionIdIncrement(TransactionId *transactionId) elog(FATAL, "TransactionIdIncrement: exhausted XID's"); return; } +#endif /* ---------------------------------------------------------------- * TransactionIdAdd diff --git a/src/backend/bootstrap/bootstrap.c b/src/backend/bootstrap/bootstrap.c index 7d769cddff7..6b27010d3a9 100644 --- a/src/backend/bootstrap/bootstrap.c +++ b/src/backend/bootstrap/bootstrap.c @@ -7,7 +7,7 @@ * Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.20 1997/08/18 20:51:44 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.21 1997/08/19 21:30:24 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -103,7 +103,14 @@ #define ALLOC(t, c) (t *)calloc((unsigned)(c), sizeof(t)) #define FIRST_TYPE_OID 16 /* OID of the first type */ - extern int Int_yyparse (void); +extern int Int_yyparse (void); +static hashnode *AddStr(char *str, int strlength, int mderef); +static AttributeTupleForm AllocateAttribute(void); +static bool BootstrapAlreadySeen(Oid id); +static int CompHash (char *str, int len); +static hashnode *FindStr (char *str, int length, hashnode *mderef); +static int gettype(char *type); +static void cleanup(void); /* ---------------- * global variables @@ -701,7 +708,7 @@ InsertOneNull(int i) #define MORE_THAN_THE_NUMBER_OF_CATALOGS 256 -bool +static bool BootstrapAlreadySeen(Oid id) { static Oid seenArray[MORE_THAN_THE_NUMBER_OF_CATALOGS]; @@ -728,7 +735,7 @@ BootstrapAlreadySeen(Oid id) * cleanup * ---------------- */ -void +static void cleanup() { static int beenhere = 0; @@ -750,7 +757,7 @@ cleanup() * gettype * ---------------- */ -int +static int gettype(char *type) { int i; @@ -806,7 +813,7 @@ gettype(char *type) * AllocateAttribute * ---------------- */ -AttributeTupleForm /* XXX */ +static AttributeTupleForm /* XXX */ AllocateAttribute() { AttributeTupleForm attribute = @@ -898,7 +905,7 @@ LexIDStr(int ident_num) * are mod'ing by a prime number. * ---------------- */ -int +static int CompHash(char *str, int len) { register int result; @@ -917,7 +924,7 @@ CompHash(char *str, int len) * or NULL if the string is not in the table. * ---------------- */ -hashnode * +static hashnode * FindStr(char *str, int length, hashnode *mderef) { hashnode *node; @@ -947,7 +954,7 @@ FindStr(char *str, int length, hashnode *mderef) * has assigned to this string. * ---------------- */ -hashnode * +static hashnode * AddStr(char *str, int strlength, int mderef) { hashnode *temp, *trail, *newnode; diff --git a/src/backend/catalog/heap.c b/src/backend/catalog/heap.c index 986c7a0826a..2be18831643 100644 --- a/src/backend/catalog/heap.c +++ b/src/backend/catalog/heap.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.16 1997/08/19 04:42:54 vadim Exp $ + * $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.17 1997/08/19 21:30:30 momjian Exp $ * * INTERFACE ROUTINES * heap_creatr() - Create an uncataloged heap relation @@ -53,6 +53,19 @@ # include <string.h> #endif +static void AddPgRelationTuple(Relation pg_class_desc, + Relation new_rel_desc, Oid new_rel_oid, int arch, unsigned natts); +static void AddToTempRelList(Relation r); +static void DeletePgAttributeTuples(Relation rdesc); +static void DeletePgRelationTuple(Relation rdesc); +static void DeletePgTypeTuple(Relation rdesc); +static int RelationAlreadyExists(Relation pg_class_desc, char relname[]); +static void RelationRemoveIndexes(Relation relation); +static void RelationRemoveInheritance(Relation relation); +static void RemoveFromTempRelList(Relation r); +static void addNewRelationType(char *typeName, Oid new_rel_oid); + + /* ---------------------------------------------------------------- * XXX UGLY HARD CODED BADNESS FOLLOWS XXX * @@ -447,7 +460,7 @@ CheckAttributeNames(TupleDesc tupdesc) * has to open pg_class and pass an open descriptor. * -------------------------------- */ -int +static int RelationAlreadyExists(Relation pg_class_desc, char relname[]) { ScanKeyData key; @@ -610,7 +623,7 @@ AddNewAttributeTuples(Oid new_rel_oid, * adding a tuple to pg_class. * -------------------------------- */ -void +static void AddPgRelationTuple(Relation pg_class_desc, Relation new_rel_desc, Oid new_rel_oid, @@ -689,7 +702,7 @@ AddPgRelationTuple(Relation pg_class_desc, * define a complex type corresponding to the new relation * -------------------------------- */ -void +static void addNewRelationType(char *typeName, Oid new_rel_oid) { Oid new_type_oid; @@ -854,7 +867,7 @@ heap_create(char relname[], * lots of work. * -------------------------------- */ -void +static void RelationRemoveInheritance(Relation relation) { Relation catalogRelation; @@ -953,7 +966,7 @@ RelationRemoveInheritance(Relation relation) * * -------------------------------- */ -void +static void RelationRemoveIndexes(Relation relation) { Relation indexRelation; @@ -991,7 +1004,7 @@ RelationRemoveIndexes(Relation relation) * * -------------------------------- */ -void +static void DeletePgRelationTuple(Relation rdesc) { Relation pg_class_desc; @@ -1048,7 +1061,7 @@ DeletePgRelationTuple(Relation rdesc) * * -------------------------------- */ -void +static void DeletePgAttributeTuples(Relation rdesc) { Relation pg_attribute_desc; @@ -1117,7 +1130,7 @@ DeletePgAttributeTuples(Relation rdesc) * special. presently we disallow the destroy. * -------------------------------- */ -void +static void DeletePgTypeTuple(Relation rdesc) { Relation pg_type_desc; @@ -1386,7 +1399,7 @@ InitTempRelList(void) we don't really remove it, just mark it as NULL and DestroyTempRels will look for NULLs */ -void +static void RemoveFromTempRelList(Relation r) { int i; @@ -1407,7 +1420,7 @@ RemoveFromTempRelList(Relation r) MODIFIES the global variable tempRels */ -void +static void AddToTempRelList(Relation r) { if (!tempRels) diff --git a/src/backend/catalog/pg_type.c b/src/backend/catalog/pg_type.c index 3d61533aff0..caf53b03ea6 100644 --- a/src/backend/catalog/pg_type.c +++ b/src/backend/catalog/pg_type.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/catalog/pg_type.c,v 1.6 1997/08/12 22:52:13 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/catalog/pg_type.c,v 1.7 1997/08/19 21:30:38 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -30,6 +30,9 @@ # include <string.h> #endif +static Oid TypeShellMakeWithOpenRelation(Relation pg_type_desc, + char *typeName); + /* ---------------------------------------------------------------- * TypeGetWithOpenRelation * @@ -145,7 +148,7 @@ TypeGet(char* typeName, /* name of type to be fetched */ * * ---------------------------------------------------------------- */ -Oid +static Oid TypeShellMakeWithOpenRelation(Relation pg_type_desc, char *typeName) { register int i; diff --git a/src/backend/commands/_deadcode/version.c b/src/backend/commands/_deadcode/version.c index c823f0d0dd9..bac35cd4f87 100644 --- a/src/backend/commands/_deadcode/version.c +++ b/src/backend/commands/_deadcode/version.c @@ -10,7 +10,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/_deadcode/Attic/version.c,v 1.4 1997/08/12 20:15:13 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/_deadcode/Attic/version.c,v 1.5 1997/08/19 21:30:47 momjian Exp $ * * NOTES * At the point the version is defined, 2 physical relations are created @@ -35,9 +35,9 @@ #define MAX_QUERY_LEN 1024 char rule_buf[MAX_QUERY_LEN]; +#ifdef NOT_USED static char attr_list[MAX_QUERY_LEN]; - -static void setAttrList(char *bname); +#endif /* * problem: the version system assumes that the rules it declares will @@ -82,6 +82,7 @@ static void setAttrList(char *bname); * DO NOT COMMIT THE XACT, just increase the Cid counter! * _sp. */ +#ifdef NOT_USED static void eval_as_new_xact(char *query) { @@ -92,10 +93,11 @@ eval_as_new_xact(char *query) CommandCounterIncrement(); pg_eval(query, (char **) NULL, (Oid *) NULL, 0); } - +#endif /* * Define a version. */ +#ifdef NOT_USED void DefineVersion(char *name, char *fromRelname, char *date) { @@ -130,11 +132,12 @@ DefineVersion(char *name, char *fromRelname, char *date) VersionReplace (name, saved_basename,saved_snapshot); VersionRetrieve (name, saved_basename, saved_snapshot); } - +#endif /* * Creates the deltas. */ +#ifdef NOT_USED void VersionCreate(char *vname, char *bname) { @@ -161,6 +164,7 @@ VersionCreate(char *vname, char *bname) sprintf (query_buf, "CREATE TABLE %s_del (DOID oid)", vname); eval_as_new_xact (query_buf); } +#endif /* @@ -168,6 +172,7 @@ VersionCreate(char *vname, char *bname) * sets the global variable 'attr_list' with the list of attributes (names) * for that relation. */ +#ifdef NOT_USED static void setAttrList(char *bname) { @@ -203,13 +208,15 @@ setAttrList(char *bname) return; } +#endif /* * This routine defines the rule governing the append semantics of * versions. All tuples appended to a version gets appended to the * <vname>_added relation. */ -void +#ifdef NOT_USED +static void VersionAppend(char *vname, char *bname) { sprintf(rule_buf, @@ -218,7 +225,7 @@ VersionAppend(char *vname, char *bname) eval_as_new_xact(rule_buf); } - +#endif /* * This routine defines the rule governing the retrieval semantics of @@ -228,6 +235,7 @@ VersionAppend(char *vname, char *bname) * 2. Retrieve all tuples in the base relation which are not in * the <vname>_del relation. */ +#ifdef NOT_USED void VersionRetrieve(char *vname, char *bname, char *snapshot) { @@ -245,6 +253,7 @@ where _%s.oid !!= '%s_del.DOID'", /* printf("%s\n",rule_buf); */ } +#endif /* * This routine defines the rules that govern the delete semantics of @@ -257,6 +266,7 @@ where _%s.oid !!= '%s_del.DOID'", * then we have to mark that tuple as being deleted by adding * it to the <vname>_del relation. */ +#ifdef NOT_USED void VersionDelete(char *vname, char *bname, char *snapshot) { @@ -280,6 +290,7 @@ bname,bname,snapshot,bname); eval_as_new_xact(rule_buf); #endif /* OLD_REWRITE */ } +#endif /* * This routine defines the rules that govern the update semantics @@ -293,6 +304,7 @@ bname,bname,snapshot,bname); * adding the tuple to the <vname>_del relation. * 2.2 A copy of the tuple is appended to the <vname>_added relation */ +#ifdef NOT_USED void VersionReplace(char *vname, char *bname, char *snapshot) { @@ -332,3 +344,4 @@ vname,attr_list,bname,bname,snapshot,vname,bname); } +#endif diff --git a/src/backend/commands/async.c b/src/backend/commands/async.c index 45a225fafb6..8a1e6d59b57 100644 --- a/src/backend/commands/async.c +++ b/src/backend/commands/async.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/async.c,v 1.16 1997/08/12 22:52:15 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/async.c,v 1.17 1997/08/19 21:30:42 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -93,6 +93,9 @@ static Dllist *pendingNotifies = NULL; static int AsyncExistsPendingNotify(char *); static void ClearPendingNotify(void); +static void Async_NotifyFrontEnd(void); +static void Async_Unlisten(char *relname, int pid); +static void Async_UnlistenOnExit(int code, char *relname); /* *-------------------------------------------------------------- @@ -478,7 +481,7 @@ Async_Listen(char *relname, int pid) * *-------------------------------------------------------------- */ -void +static void Async_Unlisten(char *relname, int pid) { Relation lDesc; @@ -498,7 +501,7 @@ Async_Unlisten(char *relname, int pid) heap_close(lDesc); } -void +static void Async_UnlistenOnExit(int code, /* from exitpg */ char *relname) { @@ -529,7 +532,7 @@ Async_UnlistenOnExit(int code, /* from exitpg */ */ GlobalMemory notifyContext = NULL; -void +static void Async_NotifyFrontEnd() { extern CommandDest whereToSendOutput; diff --git a/src/backend/commands/cluster.c b/src/backend/commands/cluster.c index 0e2a5eea7d1..65a9c041643 100644 --- a/src/backend/commands/cluster.c +++ b/src/backend/commands/cluster.c @@ -14,7 +14,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/cluster.c,v 1.12 1997/08/18 20:52:07 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/cluster.c,v 1.13 1997/08/19 21:30:45 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -49,6 +49,10 @@ #include <utils/acl.h> #endif /* !NO_SECURITY */ +static Relation copy_heap(Oid OIDOldHeap); +static void copy_index(Oid OIDOldIndex, Oid OIDNewHeap); +static void rebuildheap(Oid OIDNewHeap, Oid OIDOldHeap, Oid OIDOldIndex); + /* * cluster * @@ -178,7 +182,7 @@ cluster(char oldrelname[], char oldindexname[]) StartTransactionCommand(); } -Relation +static Relation copy_heap(Oid OIDOldHeap) { char NewName[NAMEDATALEN]; @@ -219,7 +223,7 @@ copy_heap(Oid OIDOldHeap) return NewHeap; } -void +static void copy_index(Oid OIDOldIndex, Oid OIDNewHeap) { Relation OldIndex, NewHeap; @@ -309,7 +313,7 @@ copy_index(Oid OIDOldIndex, Oid OIDNewHeap) } -void +static void rebuildheap(Oid OIDNewHeap, Oid OIDOldHeap, Oid OIDOldIndex) { Relation LocalNewHeap, LocalOldHeap, LocalOldIndex; diff --git a/src/backend/executor/execAmi.c b/src/backend/executor/execAmi.c index dedb9d3b054..84b33d4f1e1 100644 --- a/src/backend/executor/execAmi.c +++ b/src/backend/executor/execAmi.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/execAmi.c,v 1.4 1996/11/08 00:45:54 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/execAmi.c,v 1.5 1997/08/19 21:30:51 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -43,6 +43,10 @@ #include "access/heapam.h" #include "catalog/heap.h" +static Pointer ExecBeginScan(Relation relation, int nkeys, ScanKey skeys, + bool isindex, ScanDirection dir, TimeQual time_range); +static Relation ExecOpenR(Oid relationOid, bool isindex); + /* ---------------------------------------------------------------- * ExecOpenScanR * @@ -99,7 +103,7 @@ ExecOpenScanR(Oid relOid, * returns a relation descriptor given an object id. * ---------------------------------------------------------------- */ -Relation +static Relation ExecOpenR(Oid relationOid, bool isindex) { Relation relation; @@ -133,7 +137,7 @@ ExecOpenR(Oid relationOid, bool isindex) * -cim 9/14/89 * ---------------------------------------------------------------- */ -Pointer +static Pointer ExecBeginScan(Relation relation, int nkeys, ScanKey skeys, diff --git a/src/backend/executor/execFlatten.c b/src/backend/executor/execFlatten.c index 646c571506e..c9bde2ff663 100644 --- a/src/backend/executor/execFlatten.c +++ b/src/backend/executor/execFlatten.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/Attic/execFlatten.c,v 1.1.1.1 1996/07/09 06:21:24 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/Attic/execFlatten.c,v 1.2 1997/08/19 21:30:56 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -32,6 +32,11 @@ #include "executor/executor.h" #include "executor/execFlatten.h" +#ifdef SETS_FIXED +static bool FjoinBumpOuterNodes(TargetEntry *tlist, ExprContext *econtext, + DatumPtr results, char *nulls); +#endif + Datum ExecEvalIter(Iter *iterNode, ExprContext *econtext, @@ -168,13 +173,13 @@ ExecEvalFjoin(TargetEntry *tlist, return; } -bool +#ifdef SETS_FIXED +static bool FjoinBumpOuterNodes(TargetEntry *tlist, ExprContext *econtext, DatumPtr results, char *nulls) { -#ifdef SETS_FIXED bool funcIsDone = true; Fjoin *fjNode = tlist->fjoin; char *alwaysDone = fjNode->fj_alwaysDone; @@ -231,6 +236,5 @@ FjoinBumpOuterNodes(TargetEntry *tlist, trailers = lnext(trailers); } return false; -#endif - return false; } +#endif diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c index b839ececc09..28e1ab452cd 100644 --- a/src/backend/executor/execMain.c +++ b/src/backend/executor/execMain.c @@ -26,7 +26,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.16 1997/08/19 04:43:45 vadim Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.17 1997/08/19 21:31:00 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -80,12 +80,14 @@ static int queryLimit = ALL_TUPLES; #undef ALL_TUPLES #define ALL_TUPLES queryLimit +#ifdef NOT_USED int ExecutorLimit(int limit) { return queryLimit = limit; } #endif +#endif /* ---------------------------------------------------------------- * ExecutorStart diff --git a/src/backend/executor/execQual.c b/src/backend/executor/execQual.c index 9d943368a34..536b0068342 100644 --- a/src/backend/executor/execQual.c +++ b/src/backend/executor/execQual.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/execQual.c,v 1.11 1997/04/22 03:32:35 vadim Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/execQual.c,v 1.12 1997/08/19 21:31:03 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -72,6 +72,19 @@ int execConstLen; static Datum ExecEvalAggreg(Aggreg *agg, ExprContext *econtext, bool *isNull); static Datum ExecEvalArrayRef(ArrayRef *arrayRef, ExprContext *econtext, bool *isNull, bool *isDone); +static Datum ExecEvalAnd(Expr *andExpr, ExprContext *econtext, bool *isNull); +static Datum ExecEvalFunc(Expr *funcClause, ExprContext *econtext, + bool *isNull, bool *isDone); +static void ExecEvalFuncArgs(FunctionCachePtr fcache, ExprContext *econtext, + List *argList, Datum argV[], bool *argIsDone); +static Datum ExecEvalNot(Expr *notclause, ExprContext *econtext, bool *isNull); +static Datum ExecEvalOper(Expr *opClause, ExprContext *econtext, + bool *isNull); +static Datum ExecEvalOr(Expr *orExpr, ExprContext *econtext, bool *isNull); +static Datum ExecEvalVar(Var *variable, ExprContext *econtext, bool *isNull); +static Datum ExecMakeFunctionResult(Node *node, List *arguments, + ExprContext *econtext, bool *isNull, bool *isDone); +static bool ExecQualClause(Node *clause, ExprContext *econtext); /* -------------------------------- * ExecEvalArrayRef @@ -201,7 +214,7 @@ ExecEvalAggreg(Aggreg *agg, ExprContext *econtext, bool *isNull) * We have an Assert to make sure this entry condition is met. * * ---------------------------------------------------------------- */ -Datum +static Datum ExecEvalVar(Var *variable, ExprContext *econtext, bool *isNull) { Datum result; @@ -460,7 +473,8 @@ ExecEvalParam(Param *expression, ExprContext *econtext, bool *isNull) * to use this. Ex: overpaid(EMP) might call GetAttributeByNum(). * ---------------- */ -char * +#ifdef NOT_USED +static char * GetAttributeByNum(TupleTableSlot *slot, AttrNumber attrno, bool *isNull) @@ -492,8 +506,10 @@ GetAttributeByNum(TupleTableSlot *slot, return (char *) NULL; return (char *) retval; } +#endif /* XXX char16 name for catalogs */ +#ifdef NOT_USED char * att_by_num(TupleTableSlot *slot, AttrNumber attrno, @@ -501,6 +517,7 @@ att_by_num(TupleTableSlot *slot, { return(GetAttributeByNum(slot, attrno, isNull)); } +#endif char * GetAttributeByName(TupleTableSlot *slot, char *attname, bool *isNull) @@ -552,13 +569,15 @@ GetAttributeByName(TupleTableSlot *slot, char *attname, bool *isNull) } /* XXX char16 name for catalogs */ +#ifdef NOT_USED char * att_by_name(TupleTableSlot *slot, char *attname, bool *isNull) { return(GetAttributeByName(slot, attname, isNull)); } +#endif -void +static void ExecEvalFuncArgs(FunctionCachePtr fcache, ExprContext *econtext, List *argList, @@ -603,7 +622,7 @@ ExecEvalFuncArgs(FunctionCachePtr fcache, * ExecMakeFunctionResult * ---------------- */ -Datum +static Datum ExecMakeFunctionResult(Node *node, List *arguments, ExprContext *econtext, @@ -785,7 +804,7 @@ ExecMakeFunctionResult(Node *node, * ExecEvalOper * ---------------------------------------------------------------- */ -Datum +static Datum ExecEvalOper(Expr *opClause, ExprContext *econtext, bool *isNull) { Oper *op; @@ -829,7 +848,7 @@ ExecEvalOper(Expr *opClause, ExprContext *econtext, bool *isNull) * ---------------------------------------------------------------- */ -Datum +static Datum ExecEvalFunc(Expr *funcClause, ExprContext *econtext, bool *isNull, @@ -883,7 +902,7 @@ ExecEvalFunc(Expr *funcClause, * need to know this, mind you... * ---------------------------------------------------------------- */ -Datum +static Datum ExecEvalNot(Expr *notclause, ExprContext *econtext, bool *isNull) { Datum expr_value; @@ -922,7 +941,7 @@ ExecEvalNot(Expr *notclause, ExprContext *econtext, bool *isNull) * ExecEvalOr * ---------------------------------------------------------------- */ -Datum +static Datum ExecEvalOr(Expr *orExpr, ExprContext *econtext, bool *isNull) { List *clauses; @@ -985,7 +1004,7 @@ ExecEvalOr(Expr *orExpr, ExprContext *econtext, bool *isNull) * ExecEvalAnd * ---------------------------------------------------------------- */ -Datum +static Datum ExecEvalAnd(Expr *andExpr, ExprContext *econtext, bool *isNull) { List *clauses; @@ -1168,7 +1187,7 @@ ExecEvalExpr(Node *expression, * rest of the qualification) * ---------------------------------------------------------------- */ -bool +static bool ExecQualClause(Node *clause, ExprContext *econtext) { Datum expr_value; diff --git a/src/backend/executor/execTuples.c b/src/backend/executor/execTuples.c index a1fa78ad3bd..0d5e7fda9fb 100644 --- a/src/backend/executor/execTuples.c +++ b/src/backend/executor/execTuples.c @@ -14,7 +14,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/execTuples.c,v 1.5 1996/12/11 00:26:38 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/execTuples.c,v 1.6 1997/08/19 21:31:05 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -131,6 +131,9 @@ #include "parser/catalog_utils.h" #include "catalog/pg_type.h" +static TupleTableSlot *NodeGetResultTupleSlot(Plan *node); + + /* ---------------------------------------------------------------- * tuple table create/delete functions * ---------------------------------------------------------------- @@ -428,11 +431,13 @@ ExecClearTuple(TupleTableSlot* slot) /* slot in which to store tuple */ * merge joins that you need to diddle the slot policy. * -------------------------------- */ +#ifdef NOT_USED bool /* return: slot policy */ ExecSlotPolicy(TupleTableSlot* slot) /* slot to inspect */ { return slot->ttc_shouldFree; } +#endif /* -------------------------------- * ExecSetSlotPolicy @@ -500,6 +505,7 @@ ExecSetSlotDescriptorIsNew(TupleTableSlot *slot,/* slot to change */ * with the slot's tuple, and set the "isNew" flag at the same time. * -------------------------------- */ +#ifdef NOT_USED TupleDesc /* return: old slot tuple descriptor */ ExecSetNewSlotDescriptor(TupleTableSlot *slot, /* slot to change */ TupleDesc tupdesc) /* tuple descriptor */ @@ -510,6 +516,7 @@ ExecSetNewSlotDescriptor(TupleTableSlot *slot, /* slot to change */ return old_tupdesc; } +#endif /* -------------------------------- * ExecSlotBuffer @@ -532,6 +539,7 @@ ExecSetNewSlotDescriptor(TupleTableSlot *slot, /* slot to change */ * also use ExecIncrSlotBufferRefcnt(). * -------------------------------- */ +#ifdef NOT_USED Buffer /* return: old slot buffer */ ExecSetSlotBuffer(TupleTableSlot *slot, /* slot to change */ Buffer b) /* tuple descriptor */ @@ -541,6 +549,7 @@ ExecSetSlotBuffer(TupleTableSlot *slot, /* slot to change */ return oldb; } +#endif /* -------------------------------- * ExecIncrSlotBufferRefcnt @@ -602,6 +611,7 @@ TupIsNull(TupleTableSlot* slot) /* slot to check */ * now storing a new type of tuple in this slot * -------------------------------- */ +#ifdef NOT_USED bool /* return: descriptor "is new" */ ExecSlotDescriptorIsNew(TupleTableSlot *slot) /* slot to inspect */ { @@ -609,6 +619,7 @@ ExecSlotDescriptorIsNew(TupleTableSlot *slot) /* slot to inspect */ return isNew; */ return slot->ttc_descIsNew; } +#endif /* ---------------------------------------------------------------- * convenience initialization routines @@ -686,6 +697,7 @@ ExecInitOuterTupleSlot(EState *estate, HashJoinState *hashstate) * ExecInitHashTupleSlot * ---------------- */ +#ifdef NOT_USED void ExecInitHashTupleSlot(EState *estate, HashJoinState *hashstate) { @@ -693,8 +705,9 @@ ExecInitHashTupleSlot(EState *estate, HashJoinState *hashstate) INIT_SLOT_ALLOC; hashstate->hj_HashTupleSlot = slot; } +#endif -TupleTableSlot * +static TupleTableSlot * NodeGetResultTupleSlot(Plan *node) { TupleTableSlot *slot; diff --git a/src/backend/executor/execUtils.c b/src/backend/executor/execUtils.c index a44c0f024ac..05973cb030c 100644 --- a/src/backend/executor/execUtils.c +++ b/src/backend/executor/execUtils.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/execUtils.c,v 1.10 1997/08/18 20:52:27 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/execUtils.c,v 1.11 1997/08/19 21:31:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -58,6 +58,9 @@ #include "catalog/pg_type.h" #include "parser/parsetree.h" +static void ExecGetIndexKeyInfo(IndexTupleForm indexTuple, int *numAttsOutP, + AttrNumber **attsOutP, FuncIndexInfoPtr fInfoP); + /* ---------------------------------------------------------------- * global counters for number of tuples processed, retrieved, * appended, replaced, deleted. @@ -82,6 +85,7 @@ extern int NIndexTupleProcessed; /* have to be defined in the access * ResetTupleCount * ---------------------------------------------------------------- */ +#ifdef NOT_USED void ResetTupleCount(void) { @@ -92,11 +96,13 @@ ResetTupleCount(void) NTupleReplaced = 0; NIndexTupleProcessed = 0; } +#endif /* ---------------------------------------------------------------- * PrintTupleCount * ---------------------------------------------------------------- */ +#ifdef NOT_USED void DisplayTupleCount(FILE *statfp) { @@ -127,6 +133,7 @@ DisplayTupleCount(FILE *statfp) (NTupleReplaced == 1) ? "" : "s"); fprintf(statfp, "\n"); } +#endif /* ---------------------------------------------------------------- * miscellanious init node support functions @@ -287,6 +294,7 @@ ExecGetResultType(CommonState *commonstate) * ExecFreeResultType * ---------------- */ +#ifdef NOT_USED void ExecFreeResultType(CommonState *commonstate) { @@ -299,7 +307,7 @@ ExecFreeResultType(CommonState *commonstate) /* ExecFreeTypeInfo(tupType); */ pfree(tupType); } - +#endif /* ---------------- * ExecAssignProjectionInfo @@ -382,6 +390,7 @@ ExecGetScanType(CommonScanState *csstate) * ExecFreeScanType * ---------------- */ +#ifdef NOT_USED void ExecFreeScanType(CommonScanState *csstate) { @@ -394,6 +403,7 @@ ExecFreeScanType(CommonScanState *csstate) /* ExecFreeTypeInfo(tupType); */ pfree(tupType); } +#endif /* ---------------- * ExecAssignScanType @@ -581,7 +591,7 @@ QueryDescGetTypeInfo(QueryDesc *queryDesc) * parameters. * ---------------------------------------------------------------- */ -void +static void ExecGetIndexKeyInfo(IndexTupleForm indexTuple, int *numAttsOutP, AttrNumber **attsOutP, @@ -938,6 +948,7 @@ ExecCloseIndices(RelationInfo *resultRelationInfo) * set of routines.. * ---------------------------------------------------------------- */ +#ifdef NOT_USED IndexTuple ExecFormIndexTuple(HeapTuple heapTuple, Relation heapRelation, @@ -1011,6 +1022,7 @@ ExecFormIndexTuple(HeapTuple heapTuple, return indexTuple; } +#endif /* ---------------------------------------------------------------- * ExecInsertIndexTuples diff --git a/src/backend/executor/nodeAppend.c b/src/backend/executor/nodeAppend.c index fe2e88a7ad6..7abc6d91744 100644 --- a/src/backend/executor/nodeAppend.c +++ b/src/backend/executor/nodeAppend.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/nodeAppend.c,v 1.4 1996/11/06 06:47:39 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/nodeAppend.c,v 1.5 1997/08/19 21:31:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -64,6 +64,8 @@ #include "utils/mcxt.h" #include "parser/parsetree.h" /* for rt_store() macro */ +static bool exec_append_initialize_next(Append *node); + /* ---------------------------------------------------------------- * exec-append-initialize-next * @@ -73,7 +75,7 @@ * Returns t iff there is a "next" scan to process. * ---------------------------------------------------------------- */ -bool +static bool exec_append_initialize_next(Append *node) { EState *estate; diff --git a/src/backend/executor/nodeHash.c b/src/backend/executor/nodeHash.c index c68052be2d2..10bfe9842cf 100644 --- a/src/backend/executor/nodeHash.c +++ b/src/backend/executor/nodeHash.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/nodeHash.c,v 1.9 1997/07/28 00:53:58 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/nodeHash.c,v 1.10 1997/08/19 21:31:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -47,6 +47,11 @@ static int HashTBSize; static void mk_hj_temp(char *tempname); static int hashFunc(char *key, int len); +static int ExecHashPartition(Hash *node); +static RelativeAddr hashTableAlloc(int size, HashJoinTable hashtable); +static void ExecHashOverflowInsert(HashJoinTable hashtable, + HashBucket bucket, + HeapTuple heapTuple); /* ---------------------------------------------------------------- * ExecHash @@ -258,7 +263,7 @@ ExecEndHash(Hash *node) ExecEndNode(outerPlan, (Plan*)node); } -RelativeAddr +static RelativeAddr hashTableAlloc(int size, HashJoinTable hashtable) { RelativeAddr p; @@ -577,7 +582,7 @@ ExecHashGetBucket(HashJoinTable hashtable, * insert into the overflow area of a hash bucket * ---------------------------------------------------------------- */ -void +static void ExecHashOverflowInsert(HashJoinTable hashtable, HashBucket bucket, HeapTuple heapTuple) @@ -790,7 +795,7 @@ hashFunc(char *key, int len) * determine the number of batches needed for a hashjoin * ---------------------------------------------------------------- */ -int +static int ExecHashPartition(Hash *node) { Plan *outerNode; diff --git a/src/backend/executor/nodeHashjoin.c b/src/backend/executor/nodeHashjoin.c index 55c77ef9d88..c9f24efe193 100644 --- a/src/backend/executor/nodeHashjoin.c +++ b/src/backend/executor/nodeHashjoin.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/nodeHashjoin.c,v 1.4 1997/07/28 00:54:06 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/nodeHashjoin.c,v 1.5 1997/08/19 21:31:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -39,6 +39,13 @@ static TupleTableSlot * ExecHashJoinGetSavedTuple(HashJoinState *hjstate, char *buffer, File file, TupleTableSlot *tupleSlot, int *block, char **position); +static int ExecHashJoinGetBatch(int bucketno, HashJoinTable hashtable, + int nbatch); + +static int ExecHashJoinNewBatch(HashJoinState *hjstate); + + + /* ---------------------------------------------------------------- * ExecHashJoin * @@ -624,7 +631,7 @@ ExecHashJoinGetSavedTuple(HashJoinState *hjstate, * switch to a new hashjoin batch * ---------------------------------------------------------------- */ -int +static int ExecHashJoinNewBatch(HashJoinState *hjstate) { File *innerBatches; @@ -742,7 +749,7 @@ ExecHashJoinNewBatch(HashJoinState *hjstate) * batch 0 1 2 ... * ---------------------------------------------------------------- */ -int +static int ExecHashJoinGetBatch(int bucketno, HashJoinTable hashtable, int nbatch) { int b; diff --git a/src/backend/executor/nodeMergejoin.c b/src/backend/executor/nodeMergejoin.c index 3f81b1b89a9..9151479d306 100644 --- a/src/backend/executor/nodeMergejoin.c +++ b/src/backend/executor/nodeMergejoin.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/nodeMergejoin.c,v 1.7 1997/08/12 22:52:38 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/nodeMergejoin.c,v 1.8 1997/08/19 21:31:10 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -84,6 +84,8 @@ #include "utils/lsyscache.h" #include "utils/psort.h" +static bool MergeCompare(List *eqQual, List *compareQual, ExprContext *econtext); + /* ---------------------------------------------------------------- * MarkInnerTuple and RestoreInnerTuple macros * @@ -251,7 +253,7 @@ MJFormISortopO(List *qualList, Oid sortOp) * if (key1i > key2i) is true and (key1j = key2j) for 0 < j < i. * ---------------------------------------------------------------- */ -bool +static bool MergeCompare(List *eqQual, List *compareQual, ExprContext *econtext) { List *clause; @@ -319,6 +321,7 @@ MergeCompare(List *eqQual, List *compareQual, ExprContext *econtext) * when EXEC_MERGEJOINDEBUG is defined * ---------------------------------------------------------------- */ +#ifdef EXEC_MERGEJOINDEBUG void ExecMergeTupleDumpInner(ExprContext *econtext) { @@ -332,7 +335,7 @@ ExecMergeTupleDumpInner(ExprContext *econtext) debugtup(innerSlot->val, innerSlot->ttc_tupleDescriptor); } - + void ExecMergeTupleDumpOuter(ExprContext *econtext) { @@ -346,7 +349,7 @@ ExecMergeTupleDumpOuter(ExprContext *econtext) debugtup(outerSlot->val, outerSlot->ttc_tupleDescriptor); } - + void ExecMergeTupleDumpMarked(ExprContext *econtext, MergeJoinState *mergestate) @@ -362,7 +365,7 @@ ExecMergeTupleDumpMarked(ExprContext *econtext, debugtup(markedSlot->val, markedSlot->ttc_tupleDescriptor); } - + void ExecMergeTupleDump(ExprContext *econtext, MergeJoinState *mergestate) { @@ -374,6 +377,7 @@ ExecMergeTupleDump(ExprContext *econtext, MergeJoinState *mergestate) printf("******** \n"); } +#endif static void CleanUpSort(Plan *plan) { diff --git a/src/backend/executor/nodeSeqscan.c b/src/backend/executor/nodeSeqscan.c index 68cb6345a2c..b94bb58d260 100644 --- a/src/backend/executor/nodeSeqscan.c +++ b/src/backend/executor/nodeSeqscan.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/nodeSeqscan.c,v 1.3 1996/11/08 05:56:16 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/nodeSeqscan.c,v 1.4 1997/08/19 21:31:12 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -30,6 +30,11 @@ #include "access/heapam.h" #include "parser/parsetree.h" +static Oid InitScanRelation(SeqScan *node, EState *estate, + CommonScanState *scanstate, Plan *outerPlan); + +static TupleTableSlot *SeqNext(SeqScan *node); + /* ---------------------------------------------------------------- * Scan Support * ---------------------------------------------------------------- @@ -40,7 +45,7 @@ * This is a workhorse for ExecSeqScan * ---------------------------------------------------------------- */ -TupleTableSlot * +static TupleTableSlot * SeqNext(SeqScan *node) { HeapTuple tuple; @@ -139,7 +144,7 @@ S1_printf("ExecSeqScan: returned tuple slot: %d\n", slot); * subplans of scans. * ---------------------------------------------------------------- */ -Oid +static Oid InitScanRelation(SeqScan *node, EState *estate, CommonScanState *scanstate, Plan *outerPlan) { diff --git a/src/backend/lib/dllist.c b/src/backend/lib/dllist.c index a0487edb876..b8dd14a231b 100644 --- a/src/backend/lib/dllist.c +++ b/src/backend/lib/dllist.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/lib/dllist.c,v 1.4 1996/11/10 03:00:20 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/lib/dllist.c,v 1.5 1997/08/19 21:31:16 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -67,6 +67,7 @@ DLGetHead(Dllist* l) } /* get the value stored in the first element */ +#ifdef NOT_USED void* DLGetHeadVal(Dllist* l) { @@ -74,6 +75,7 @@ DLGetHeadVal(Dllist* l) return (e ? e->dle_val : 0); } +#endif Dlelem* DLGetTail(Dllist* l) @@ -82,6 +84,7 @@ DLGetTail(Dllist* l) } /* get the value stored in the first element */ +#ifdef NOT_USED void* DLGetTailVal(Dllist* l) { @@ -89,7 +92,7 @@ DLGetTailVal(Dllist* l) return (e ? e->dle_val : 0); } - +#endif Dlelem* DLGetPred(Dlelem* e) /* get predecessor */ diff --git a/src/backend/lib/lispsort.c b/src/backend/lib/lispsort.c index 9376395998a..11acc5683b2 100644 --- a/src/backend/lib/lispsort.c +++ b/src/backend/lib/lispsort.c @@ -6,7 +6,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/lib/Attic/lispsort.c,v 1.3 1996/11/06 08:27:14 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/lib/Attic/lispsort.c,v 1.4 1997/08/19 21:31:18 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -22,6 +22,7 @@ #include <lib/lispsort.h> #include <lib/qsort.h> +#ifdef NOT_USED /* ** lisp_qsort: Takes a lisp list as input, copies it into an array of lisp ** nodes which it sorts via qsort() with the comparison function @@ -57,3 +58,4 @@ List *lisp_qsort(List *the_list, /* the list to be sorted */ return(output); } +#endif diff --git a/src/backend/libpq/auth.c b/src/backend/libpq/auth.c index b1c747b4e45..abf59e25b17 100644 --- a/src/backend/libpq/auth.c +++ b/src/backend/libpq/auth.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.13 1997/08/12 22:52:45 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.14 1997/08/19 21:31:23 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -72,6 +72,8 @@ #include <libpq/hba.h> #include <libpq/password.h> +static int be_getauthsvc(MsgType msgtype); + /*---------------------------------------------------------------- * common definitions for generic fe/be routines *---------------------------------------------------------------- @@ -586,7 +588,7 @@ be_setauthsvc(char *name) return; } -int +static int be_getauthsvc(MsgType msgtype) { int i; diff --git a/src/backend/libpq/be-pqexec.c b/src/backend/libpq/be-pqexec.c index 031f7ea8a9e..caa710129a9 100644 --- a/src/backend/libpq/be-pqexec.c +++ b/src/backend/libpq/be-pqexec.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/libpq/Attic/be-pqexec.c,v 1.3 1997/08/12 20:15:19 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/libpq/Attic/be-pqexec.c,v 1.4 1997/08/19 21:31:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -37,6 +37,8 @@ # include <string.h> #endif +static char *strmake(char *str, int len); + /* ---------------------------------------------------------------- * PQ interface routines * ---------------------------------------------------------------- @@ -215,7 +217,7 @@ pqtest_PQexec(char *q) * utilities for pqtest_PQfn() * ---------------- */ -char * +static char * strmake(char *str, int len) { char *newstr; diff --git a/src/backend/nodes/equalfuncs.c b/src/backend/nodes/equalfuncs.c index 68903faae6d..4a8a072d33f 100644 --- a/src/backend/nodes/equalfuncs.c +++ b/src/backend/nodes/equalfuncs.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/nodes/equalfuncs.c,v 1.5 1997/01/10 20:17:43 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/nodes/equalfuncs.c,v 1.6 1997/08/19 21:31:36 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -26,6 +26,8 @@ #include "utils/elog.h" #include "storage/itemptr.h" +static bool equali(List *a, List *b); + /* * Stuff from primnodes.h */ @@ -703,7 +705,8 @@ equal(void *a, void *b) * * XXX temp hack. needs something like T_IntList */ -bool equali(List *a, List *b) +static bool +equali(List *a, List *b) { List *la = (List*)a; List *lb = (List*)b; diff --git a/src/backend/nodes/list.c b/src/backend/nodes/list.c index da4cfb40d7f..6dc010eff65 100644 --- a/src/backend/nodes/list.c +++ b/src/backend/nodes/list.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/nodes/list.c,v 1.3 1997/03/12 20:59:27 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/nodes/list.c,v 1.4 1997/08/19 21:31:39 momjian Exp $ * * NOTES * XXX a few of the following functions are duplicated to handle @@ -408,6 +408,7 @@ LispRemove(void *elem, List *list) return(list); } +#ifdef NOT_USED List * intLispRemove(int elem, List *list) { @@ -429,6 +430,7 @@ intLispRemove(int elem, List *list) } return(list); } +#endif List * set_difference(List *list1, List *list2) diff --git a/src/backend/nodes/nodeFuncs.c b/src/backend/nodes/nodeFuncs.c index d16614c23e6..e1e6bc6f140 100644 --- a/src/backend/nodes/nodeFuncs.c +++ b/src/backend/nodes/nodeFuncs.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/nodes/nodeFuncs.c,v 1.2 1996/10/31 10:42:56 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/nodes/nodeFuncs.c,v 1.3 1997/08/19 21:31:41 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -23,6 +23,8 @@ #include "nodes/nodeFuncs.h" #include "utils/lsyscache.h" +static bool var_is_inner(Var *var); + /* * single_node - * Returns t if node corresponds to a single-noded expression @@ -61,7 +63,7 @@ var_is_outer (Var *var) return((bool)(var->varno == OUTER)); } -bool +static bool var_is_inner (Var *var) { return ( (bool) (var->varno == INNER)); diff --git a/src/backend/nodes/print.c b/src/backend/nodes/print.c index 30553fbb5bf..0f92c189e51 100644 --- a/src/backend/nodes/print.c +++ b/src/backend/nodes/print.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/nodes/print.c,v 1.5 1997/08/12 20:15:27 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/nodes/print.c,v 1.6 1997/08/19 21:31:43 momjian Exp $ * * HISTORY * AUTHOR DATE MAJOR EVENT @@ -32,6 +32,9 @@ #include "nodes/nodes.h" #include "nodes/plannodes.h" #include "optimizer/clauses.h" + +static char *plannode_type (Plan* p); + /* * print-- * print contents of Node to stdout @@ -258,7 +261,7 @@ print_slot(TupleTableSlot *slot) debugtup(slot->val, slot->ttc_tupleDescriptor); } -char* +static char * plannode_type (Plan* p) { switch(nodeTag(p)) { diff --git a/src/backend/optimizer/path/costsize.c b/src/backend/optimizer/path/costsize.c index f2c4569e855..35453fb3870 100644 --- a/src/backend/optimizer/path/costsize.c +++ b/src/backend/optimizer/path/costsize.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/path/costsize.c,v 1.15 1997/04/24 15:49:30 vadim Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/path/costsize.c,v 1.16 1997/08/19 21:31:48 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -41,6 +41,7 @@ extern int NBuffers; static int compute_attribute_width(TargetEntry *tlistentry); static double base_log(double x, double b); +static int compute_targetlist_width(List *targetlist); int _disable_cost_ = 30000000; @@ -209,6 +210,7 @@ cost_sort(List *keys, int tuples, int width, bool noread) * Returns a flonum. * */ +#ifdef NOT_USED Cost cost_result(int tuples, int width) { @@ -218,6 +220,7 @@ cost_result(int tuples, int width) Assert(temp >= 0); return(temp); } +#endif /* * cost_nestloop-- @@ -386,7 +389,7 @@ compute_rel_width(Rel *rel) * * Returns the width of the tuple as a fixnum. */ -int +static int compute_targetlist_width(List *targetlist) { List *temp_tl; diff --git a/src/backend/optimizer/util/clauses.c b/src/backend/optimizer/util/clauses.c index c3e7d30bb13..153c11f9f42 100644 --- a/src/backend/optimizer/util/clauses.c +++ b/src/backend/optimizer/util/clauses.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/util/clauses.c,v 1.6 1997/01/22 06:30:57 vadim Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/util/clauses.c,v 1.7 1997/08/19 21:31:54 momjian Exp $ * * HISTORY * AUTHOR DATE MAJOR EVENT @@ -34,6 +34,8 @@ #include "optimizer/internal.h" #include "optimizer/var.h" +static bool agg_clause(Node *clause); + Expr * make_clause(int type, Node *oper, List *args) @@ -134,7 +136,7 @@ get_rightop(Expr *clause) * AGG clause functions *****************************************************************************/ -bool +static bool agg_clause(Node *clause) { return diff --git a/src/backend/optimizer/util/keys.c b/src/backend/optimizer/util/keys.c index ac0915b9096..4296deb7e98 100644 --- a/src/backend/optimizer/util/keys.c +++ b/src/backend/optimizer/util/keys.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/keys.c,v 1.1.1.1 1996/07/09 06:21:38 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/keys.c,v 1.2 1997/08/19 21:32:03 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -23,6 +23,7 @@ static Expr *matching2_tlvar(int var, List *tlist, bool (*test)()); +static bool equal_indexkey_var(int index_key, Var *var); /* * 1. index key @@ -69,7 +70,7 @@ match_indexkey_operand(int indexkey, Var *operand, Rel *rel) * fields of var node 'var'. * */ -bool +static bool equal_indexkey_var(int index_key, Var *var) { if (index_key == var->varattno) diff --git a/src/backend/optimizer/util/ordering.c b/src/backend/optimizer/util/ordering.c index 386753bd872..40699e81e0b 100644 --- a/src/backend/optimizer/util/ordering.c +++ b/src/backend/optimizer/util/ordering.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/ordering.c,v 1.2 1996/10/31 10:59:41 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/ordering.c,v 1.3 1997/08/19 21:32:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -18,6 +18,7 @@ #include "optimizer/internal.h" #include "optimizer/ordering.h" +static bool equal_sortops_order(Oid *ordering1, Oid *ordering2); /* * equal-path-path-ordering-- @@ -102,7 +103,7 @@ equal_merge_merge_ordering(MergeOrder *merge_ordering1, * equal_sort_ops_order - * Returns true iff the sort operators are in the same order. */ -bool +static bool equal_sortops_order(Oid *ordering1, Oid *ordering2) { int i = 0; diff --git a/src/backend/optimizer/util/tlist.c b/src/backend/optimizer/util/tlist.c index 522a2879d73..8048767455b 100644 --- a/src/backend/optimizer/util/tlist.c +++ b/src/backend/optimizer/util/tlist.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/util/tlist.c,v 1.2 1997/04/05 06:39:58 vadim Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/util/tlist.c,v 1.3 1997/08/19 21:32:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -532,10 +532,10 @@ get_expr(TargetEntry *tle) * append the group attribute to the target list if it's not already * in there. */ +#if 0 void AddGroupAttrToTlist(List *tlist, List *grpCl) { -#if 0 List *gl; int last_resdomno = length(tlist) + 1; @@ -557,8 +557,8 @@ AddGroupAttrToTlist(List *tlist, List *grpCl) tlist = lappend(tlist, MakeTLE(r, (Node*)var)); } } -#endif } +#endif /* was ExecTargetListLength() in execQual.c, moved here to reduce dependencies on the executor module */ diff --git a/src/backend/parser/analyze.c b/src/backend/parser/analyze.c index 78167e1a0d9..6c703b77814 100644 --- a/src/backend/parser/analyze.c +++ b/src/backend/parser/analyze.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.33 1997/08/18 20:53:00 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.34 1997/08/19 21:32:11 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -87,6 +87,7 @@ static void make_arguments(int nargs, List *fargs, Oid *input_typeids, static void AddAggToParseState(ParseState *pstate, Aggreg *aggreg); static void finalizeAggregates(ParseState *pstate, Query *qry); static void parseCheckAggregates(ParseState *pstate, Query *qry); +static ParseState* makeParseState(void); /***************************************************************************** * @@ -99,7 +100,7 @@ static void parseCheckAggregates(ParseState *pstate, Query *qry); * */ -ParseState* +static ParseState* makeParseState(void) { ParseState *pstate; diff --git a/src/backend/parser/catalog_utils.c b/src/backend/parser/catalog_utils.c index ebe970d13d7..43419883411 100644 --- a/src/backend/parser/catalog_utils.c +++ b/src/backend/parser/catalog_utils.c @@ -6,7 +6,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/parser/Attic/catalog_utils.c,v 1.20 1997/08/12 20:15:32 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/Attic/catalog_utils.c,v 1.21 1997/08/19 21:32:12 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -109,6 +109,9 @@ typedef struct _CandidateList { static Oid **argtype_inherit(int nargs, Oid *oid_array); static Oid **genxprod(InhPaths *arginh, int nargs); static int findsupers(Oid relid, Oid **supervec); +static bool check_typeid(Oid id); +static char *instr1(TypeTupleForm tp, char *string, int typlen); +static void op_error(char *op, Oid arg1, Oid arg2); /* check to see if a type id is valid, * returns true if it is. By using this call before calling @@ -116,7 +119,7 @@ static int findsupers(Oid relid, Oid **supervec); * can be produced because the caller typically has more context of * what's going on - jolly */ -bool +static bool check_typeid(Oid id) { return (SearchSysCacheTuple(TYPOID, @@ -784,6 +787,7 @@ getAttrName(Relation rd, int attrno) /* Given a typename and value, returns the ascii form of the value */ +#ifdef NOT_USED char * outstr(char *typename, /* Name of type of value */ char *value) /* Could be of any type */ @@ -795,6 +799,7 @@ outstr(char *typename, /* Name of type of value */ op = tp->typoutput; return((char *) fmgr(op, value)); } +#endif /* Given a Type and a string, return the internal form of that string */ char * @@ -805,7 +810,7 @@ instr2(Type tp, char *string, int typlen) /* Given a type structure and a string, returns the internal form of that string */ -char * +static char * instr1(TypeTupleForm tp, char *string, int typlen) { Oid op; @@ -1422,6 +1427,7 @@ get_typelem(Oid type_id) return (type->typelem); } +#ifdef NOT_USED char FindDelimiter(char *typename) { @@ -1440,12 +1446,13 @@ FindDelimiter(char *typename) delim = type->typdelim; return (delim); } +#endif /* * Give a somewhat useful error message when the operator for two types * is not found. */ -void +static void op_error(char *op, Oid arg1, Oid arg2) { Type tp1 = NULL, tp2 = NULL; diff --git a/src/backend/parser/dbcommands.c b/src/backend/parser/dbcommands.c index 1b8104d3a2a..f975937b5ad 100644 --- a/src/backend/parser/dbcommands.c +++ b/src/backend/parser/dbcommands.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/parser/Attic/dbcommands.c,v 1.5 1997/08/18 20:53:03 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/Attic/dbcommands.c,v 1.6 1997/08/19 21:32:14 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -38,6 +38,7 @@ static void check_permissions(char *command, char *dbname, Oid *dbIdP, Oid *userIdP); static HeapTuple get_pg_dbtup(char *command, char *dbname, Relation dbrel); +static void stop_vacuum(char *dbname); void createdb(char *dbname) @@ -241,7 +242,7 @@ check_permissions(char *command, * stop_vacuum() -- stop the vacuum daemon on the database, if one is * running. */ -void +static void stop_vacuum(char *dbname) { char filename[256]; diff --git a/src/backend/parser/parse_query.c b/src/backend/parser/parse_query.c index b9da0f5a966..e608a2dc6b9 100644 --- a/src/backend/parser/parse_query.c +++ b/src/backend/parser/parse_query.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/parser/Attic/parse_query.c,v 1.16 1997/05/31 07:10:25 vadim Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/Attic/parse_query.c,v 1.17 1997/08/19 21:32:16 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -38,6 +38,9 @@ #include "nodes/parsenodes.h" #include "nodes/makefuncs.h" +static void checkTargetTypes(ParseState *pstate, char *target_colname, + char *refname, char *colname); + Oid *param_type_info; int pfunc_num_args; @@ -755,7 +758,7 @@ handleTargetColname(ParseState *pstate, char **resname, * checkTargetTypes - * checks value and target column types */ -void +static void checkTargetTypes(ParseState *pstate, char *target_colname, char *refname, char *colname) { diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c index aed02bbdf9a..d644e1ff1a3 100644 --- a/src/backend/postmaster/postmaster.c +++ b/src/backend/postmaster/postmaster.c @@ -10,7 +10,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.51 1997/08/12 22:53:31 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.52 1997/08/19 21:32:27 momjian Exp $ * * NOTES * @@ -163,8 +163,8 @@ static void CleanupProc(int pid, int exitstatus); static int DoExec(StartupInfo *packet, int portFd); static void ExitPostmaster(int status); static void usage(const char *); -int ServerLoop(void); -int BackendStartup(StartupInfo *packet, Port *port, int *pidPtr); +static int ServerLoop(void); +static int BackendStartup(StartupInfo *packet, Port *port, int *pidPtr); static void send_error_reply(Port *port, const char *errormsg); extern char *optarg; @@ -432,7 +432,7 @@ usage(const char *progname) exit(1); } -int +static int ServerLoop(void) { int serverFd = ServerSock; @@ -943,7 +943,7 @@ CleanupProc(int pid, * otherwise. * */ -int +static int BackendStartup(StartupInfo *packet, /* client's startup packet */ Port *port, int *pidPtr) diff --git a/src/backend/storage/buffer/buf_table.c b/src/backend/storage/buffer/buf_table.c index c21c93dec7e..61e365ce55e 100644 --- a/src/backend/storage/buffer/buf_table.c +++ b/src/backend/storage/buffer/buf_table.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/buffer/buf_table.c,v 1.3 1996/11/03 04:56:59 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/buffer/buf_table.c,v 1.4 1997/08/19 21:32:34 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -153,6 +153,7 @@ BufTableInsert(BufferDesc *buf) } /* prints out collision stats for the buf table */ +#ifdef NOT_USED void DBG_LookupListCheck(int nlookup) { @@ -160,3 +161,4 @@ DBG_LookupListCheck(int nlookup) hash_stats("Shared",SharedBufHash); } +#endif diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 47b5d22b6c8..466728c4a46 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.18 1997/08/18 20:53:08 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.19 1997/08/19 21:32:39 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -30,12 +30,6 @@ * * WriteBuffer() -- WriteNoReleaseBuffer() + ReleaseBuffer() * - * DirtyBufferCopy() -- For a given dbid/relid/blockno, if the buffer is - * in the cache and is dirty, mark it clean and copy - * it to the requested location. This is a logical - * write, and has been installed to support the cache - * management code for write-once storage managers. - * * FlushBuffer() -- as above but never delayed write. * * BufferSync() -- flush all dirty buffers in the buffer pool. @@ -169,6 +163,7 @@ ReadBuffer(Relation reln, BlockNumber blockNum) * * XXX caller must have already acquired BufMgrLock */ +#ifdef NOT_USED static bool is_userbuffer(Buffer buffer) { @@ -178,7 +173,9 @@ is_userbuffer(Buffer buffer) return false; return true; } +#endif +#ifdef NOT_USED Buffer ReadBuffer_Debug(char *file, int line, @@ -198,6 +195,7 @@ refcount = %ld, file: %s, line: %d\n", } return buffer; } +#endif /* * ReadBufferWithBufferLock -- does the work of @@ -669,6 +667,7 @@ WriteBuffer(Buffer buffer) return(TRUE); } +#ifdef NOT_USED void WriteBuffer_Debug(char *file, int line, Buffer buffer) { @@ -682,8 +681,15 @@ refcount = %ld, file: %s, line: %d\n", PrivateRefCount[buffer - 1], file, line); } } +#endif /* + * DirtyBufferCopy() -- For a given dbid/relid/blockno, if the buffer is + * in the cache and is dirty, mark it clean and copy + * it to the requested location. This is a logical + * write, and has been installed to support the cache + * management code for write-once storage managers. + * * DirtyBufferCopy() -- Copy a given dirty buffer to the requested * destination. * @@ -695,6 +701,7 @@ refcount = %ld, file: %s, line: %d\n", * * NOTE: used by sony jukebox code in postgres 4.2 - ay 2/95 */ +#ifdef NOT_USED void DirtyBufferCopy(Oid dbid, Oid relid, BlockNumber blkno, char *dest) { @@ -722,6 +729,7 @@ DirtyBufferCopy(Oid dbid, Oid relid, BlockNumber blkno, char *dest) SpinRelease(BufMgrLock); } +#endif /* * FlushBuffer -- like WriteBuffer, but force the page to disk. @@ -1462,6 +1470,7 @@ blockNum=%d, flags=0x%x, refcount=%d %d)\n", * pool and start measuring some performance with a clean empty buffer * pool. */ +#ifdef NOT_USED void BufferPoolBlowaway() { @@ -1476,6 +1485,7 @@ BufferPoolBlowaway() BufTableDelete(&BufferDescriptors[i-1]); } } +#endif #undef IncrBufferRefCount #undef ReleaseBuffer @@ -1535,6 +1545,7 @@ ReleaseBuffer(Buffer buffer) return(STATUS_OK); } +#ifdef NOT_USED void IncrBufferRefCount_Debug(char *file, int line, Buffer buffer) { @@ -1548,7 +1559,9 @@ refcount = %ld, file: %s, line: %d\n", PrivateRefCount[buffer - 1], file, line); } } +#endif +#ifdef NOT_USED void ReleaseBuffer_Debug(char *file, int line, Buffer buffer) { @@ -1562,7 +1575,9 @@ refcount = %ld, file: %s, line: %d\n", PrivateRefCount[buffer - 1], file, line); } } +#endif +#ifdef NOT_USED int ReleaseAndReadBuffer_Debug(char *file, int line, @@ -1594,6 +1609,7 @@ refcount = %ld, file: %s, line: %d\n", } return b; } +#endif #ifdef BMTRACE diff --git a/src/backend/storage/buffer/freelist.c b/src/backend/storage/buffer/freelist.c index 7e1d5d7654d..f4e7bcdc57a 100644 --- a/src/backend/storage/buffer/freelist.c +++ b/src/backend/storage/buffer/freelist.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/buffer/freelist.c,v 1.3 1996/11/10 03:02:16 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/buffer/freelist.c,v 1.4 1997/08/19 21:32:44 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -109,6 +109,7 @@ PinBuffer(BufferDesc *buf) PrivateRefCount[b]++; } +#ifdef NOT_USED void PinBuffer_Debug(char *file, int line, BufferDesc *buf) { @@ -122,6 +123,7 @@ refcount = %ld, file: %s, line: %d\n", PrivateRefCount[buffer - 1], file, line); } } +#endif #undef UnpinBuffer @@ -148,6 +150,7 @@ UnpinBuffer(BufferDesc *buf) } } +#ifdef NOT_USED void UnpinBuffer_Debug(char *file, int line, BufferDesc *buf) { @@ -161,6 +164,7 @@ refcount = %ld, file: %s, line: %d\n", PrivateRefCount[buffer - 1], file, line); } } +#endif /* * GetFreeBuffer() -- get the 'next' buffer from the freelist. @@ -222,6 +226,7 @@ InitFreeList(bool init) /* * print out the free list and check for breaks. */ +#ifdef NOT_USED void DBG_FreeListCheck(int nfree) { @@ -256,6 +261,7 @@ DBG_FreeListCheck(int nfree) } } +#endif #ifdef NOT_USED /* diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c index 1b524ae0cee..03605332344 100644 --- a/src/backend/storage/file/fd.c +++ b/src/backend/storage/file/fd.c @@ -6,7 +6,7 @@ * Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $Id: fd.c,v 1.21 1997/08/18 02:14:50 momjian Exp $ + * $Id: fd.c,v 1.22 1997/08/19 21:32:48 momjian Exp $ * * NOTES: * @@ -503,6 +503,7 @@ FileAccess(File file) /* * Called when we get a shared invalidation message on some relation. */ +#ifdef NOT_USED void FileInvalidate(File file) { @@ -511,6 +512,7 @@ FileInvalidate(File file) LruDelete(file); } } +#endif /* VARARGS2 */ static File @@ -735,6 +737,7 @@ FileSeek(File file, long offset, int whence) /* * XXX not actually used but here for completeness */ +#ifdef NOT_USED long FileTell(File file) { @@ -742,6 +745,7 @@ FileTell(File file) file, VfdCache[file].fileName)); return VfdCache[file].seekPos; } +#endif int FileTruncate(File file, int offset) diff --git a/src/backend/storage/ipc/ipc.c b/src/backend/storage/ipc/ipc.c index b02beba9ec2..a5573e89151 100644 --- a/src/backend/storage/ipc/ipc.c +++ b/src/backend/storage/ipc/ipc.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.10 1997/01/08 08:32:01 bryanh Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.11 1997/08/19 21:32:54 momjian Exp $ * * NOTES * @@ -49,6 +49,8 @@ int UsePrivateMemory = 1; int UsePrivateMemory = 0; #endif +static void IpcMemoryDetach(int status, char *shmaddr); + /* ---------------------------------------------------------------- * exit() handling stuff * ---------------------------------------------------------------- @@ -312,6 +314,7 @@ IpcSemaphoreCreate(IpcSemaphoreKey semKey, /* */ /* note: the xxx_return variables are only used for debugging. */ /****************************************************************************/ +#ifdef NOT_USED static int IpcSemaphoreSet_return; void @@ -330,6 +333,7 @@ IpcSemaphoreSet(int semId, int semno, int value) IpcConfigTip(); } } +#endif /****************************************************************************/ /* IpcSemaphoreKill(key) - removes a semaphore */ @@ -513,7 +517,7 @@ IpcMemoryIdGet(IpcMemoryKey memKey, uint32 size) /* from a backend address space */ /* (only called by backends running under the postmaster) */ /****************************************************************************/ -void +static void IpcMemoryDetach(int status, char *shmaddr) { if (shmdt(shmaddr) < 0) { diff --git a/src/backend/storage/ipc/s_lock.c b/src/backend/storage/ipc/s_lock.c index d33e91fc39b..18438543c70 100644 --- a/src/backend/storage/ipc/s_lock.c +++ b/src/backend/storage/ipc/s_lock.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/ipc/Attic/s_lock.c,v 1.17 1997/08/17 02:39:54 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/ipc/Attic/s_lock.c,v 1.18 1997/08/19 21:33:01 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -45,9 +45,9 @@ #if defined(HAS_TEST_AND_SET) # if defined(__alpha__) && defined(linux) -extern long int tas(slock_t *lock); +static long int tas(slock_t *lock); # else -extern int tas(slock_t *lock); +static int tas(slock_t *lock); #endif #if defined (nextstep) @@ -383,7 +383,7 @@ S_INIT_LOCK(unsigned char *addr) #if defined(NEED_I386_TAS_ASM) -int +static int tas(slock_t *m) { slock_t res; @@ -415,7 +415,7 @@ S_INIT_LOCK(slock_t *lock) #if defined(__alpha__) && defined(linux) -long int +static long int tas(slock_t *m) { slock_t res; @@ -459,7 +459,7 @@ S_INIT_LOCK(slock_t *lock) #if defined(linux) && defined(sparc) -int +static int tas(slock_t *m) { slock_t res; @@ -492,7 +492,7 @@ S_INIT_LOCK(slock_t *lock) #if defined(NEED_NS32K_TAS_ASM) -int +static int tas(slock_t *m) { slock_t res = 0; diff --git a/src/backend/storage/ipc/shmqueue.c b/src/backend/storage/ipc/shmqueue.c index 2d968376d16..f727b5719f5 100644 --- a/src/backend/storage/ipc/shmqueue.c +++ b/src/backend/storage/ipc/shmqueue.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmqueue.c,v 1.2 1996/11/03 05:06:58 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmqueue.c,v 1.3 1997/08/19 21:33:06 momjian Exp $ * * NOTES * @@ -49,12 +49,14 @@ SHMQueueInit(SHM_QUEUE *queue) * SHMQueueIsDetached -- TRUE if element is not currently * in a queue. */ +#ifdef NOT_USED bool SHMQueueIsDetached(SHM_QUEUE *queue) { Assert(SHM_PTR_VALID(queue)); return ((queue)->prev == INVALID_OFFSET); } +#endif /* * SHMQueueElemInit -- clear an element's links @@ -146,6 +148,7 @@ dumpQ(SHM_QUEUE *q, char *s) * SHMQueueInsertHD -- put elem in queue between the queue head * and its "prev" element. */ +#ifdef NOT_USED void SHMQueueInsertHD(SHM_QUEUE *queue, SHM_QUEUE *elem) { @@ -168,6 +171,7 @@ SHMQueueInsertHD(SHM_QUEUE *queue, SHM_QUEUE *elem) dumpQ(queue, "in SHMQueueInsertHD: end"); #endif /* SHMQUEUE_DEBUG_HD */ } +#endif void SHMQueueInsertTL(SHM_QUEUE *queue, SHM_QUEUE *elem) diff --git a/src/backend/storage/ipc/spin.c b/src/backend/storage/ipc/spin.c index 4246b36b09d..118a597ff85 100644 --- a/src/backend/storage/ipc/spin.c +++ b/src/backend/storage/ipc/spin.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/ipc/Attic/spin.c,v 1.4 1997/01/14 01:53:11 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/ipc/Attic/spin.c,v 1.5 1997/08/19 21:33:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -49,13 +49,6 @@ CreateSpinlocks(IPCKey key) } bool -AttachSpinLocks(IPCKey key) -{ - /* the spin lock shared memory must have been attached by now */ - return(TRUE); -} - -bool InitSpinLocks(int init, IPCKey key) { extern SPINLOCK ShmemLock; @@ -100,16 +93,26 @@ SpinRelease(SPINLOCK lock) ExclusiveUnlock(lock); } -bool +#else /* HAS_TEST_AND_SET */ +/* Spinlocks are implemented using SysV semaphores */ + +static bool AttachSpinLocks(IPCKey key); +static bool SpinIsLocked(SPINLOCK lock); + + +static bool +AttachSpinLocks(IPCKey key) +{ + /* the spin lock shared memory must have been attached by now */ + return(TRUE); +} + +static bool SpinIsLocked(SPINLOCK lock) { return(!LockIsFree(lock)); } -#else /* HAS_TEST_AND_SET */ -/* Spinlocks are implemented using SysV semaphores */ - - /* * SpinAcquire -- try to grab a spinlock * @@ -135,7 +138,7 @@ SpinRelease(SPINLOCK lock) IpcSemaphoreUnlock(SpinLockId, lock, IpcExclusiveLock); } -bool +static bool SpinIsLocked(SPINLOCK lock) { int semval; @@ -176,7 +179,7 @@ CreateSpinlocks(IPCKey key) /* * Attach to existing spinlock set */ -bool +static bool AttachSpinLocks(IPCKey key) { IpcSemaphoreId id; diff --git a/src/backend/storage/large_object/inv_api.c b/src/backend/storage/large_object/inv_api.c index d8503038a74..ddf69a6527e 100644 --- a/src/backend/storage/large_object/inv_api.c +++ b/src/backend/storage/large_object/inv_api.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/large_object/inv_api.c,v 1.12 1997/08/12 22:54:04 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/large_object/inv_api.c,v 1.13 1997/08/19 21:33:10 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -296,6 +296,7 @@ inv_destroy(Oid lobjId) * updated so frequently, and postgres only appends tuples at the * end of relations. Once clustering works, we should fix this. */ +#ifdef NOT_USED int inv_stat(LargeObjectDesc *obj_desc, struct pgstat *stbuf) { @@ -325,6 +326,7 @@ inv_stat(LargeObjectDesc *obj_desc, struct pgstat *stbuf) return (0); } +#endif int inv_seek(LargeObjectDesc *obj_desc, int offset, int whence) diff --git a/src/backend/storage/lmgr/lmgr.c b/src/backend/storage/lmgr/lmgr.c index fa3fc9ee442..0f34f500596 100644 --- a/src/backend/storage/lmgr/lmgr.c +++ b/src/backend/storage/lmgr/lmgr.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lmgr.c,v 1.4 1997/01/10 20:18:47 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lmgr.c,v 1.5 1997/08/19 21:33:15 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -48,6 +48,8 @@ #include "storage/bufmgr.h" #include "access/transam.h" /* for AmiTransactionId */ +static void LRelIdAssign(LRelId *lRelId, Oid dbId, Oid relId); + /* ---------------- * * ---------------- @@ -134,12 +136,13 @@ RelationGetLRelId(Relation relation) * after it is created. * ---------------- */ +#ifdef NOT_USED Oid LRelIdGetDatabaseId(LRelId lRelId) { return (lRelId.dbId); } - +#endif /* * LRelIdGetRelationId -- @@ -155,23 +158,27 @@ LRelIdGetRelationId(LRelId lRelId) * DatabaseIdIsMyDatabaseId -- * True iff database object identifier is valid in my present database. */ +#ifdef NOT_USED bool DatabaseIdIsMyDatabaseId(Oid databaseId) { return (bool) (!OidIsValid(databaseId) || databaseId == MyDatabaseId); } +#endif /* * LRelIdContainsMyDatabaseId -- * True iff "lock" relation identifier is valid in my present database. */ +#ifdef NOT_USED bool LRelIdContainsMyDatabaseId(LRelId lRelId) { return (bool) (!OidIsValid(lRelId.dbId) || lRelId.dbId == MyDatabaseId); } +#endif /* * RelationInitLockInfo -- @@ -285,6 +292,7 @@ elog(DEBUG, "DiscardLockInfo: NULL relation->lockInfo") * RelationDiscardLockInfo -- * Discards the lock information in a relation descriptor. */ +#ifdef NOT_USED void RelationDiscardLockInfo(Relation relation) { @@ -296,6 +304,7 @@ RelationDiscardLockInfo(Relation relation) pfree(relation->lockInfo); relation->lockInfo = NULL; } +#endif /* * RelationSetLockForDescriptorOpen -- @@ -537,6 +546,7 @@ elog(DEBUG, "RelationSetLockForTupleRead(%s[%d,%d], 0x%x) called", \ * RelationSetLockForTupleRead -- * Sets tuple level read lock. */ +#ifdef NOT_USED void RelationSetLockForTupleRead(Relation relation, ItemPointer itemPointer) { @@ -625,6 +635,7 @@ RelationSetLockForTupleRead(Relation relation, ItemPointer itemPointer) */ MultiLockTuple(linfo, itemPointer, READ_LOCK); } +#endif /* ---------------- * RelationSetLockForReadPage @@ -890,6 +901,7 @@ RelationUnsetWIntentLock(Relation relation) * a WORM disk jukebox. Sometimes need exclusive access to extend a * file by a block. */ +#ifdef NOT_USED void RelationSetLockForExtend(Relation relation) { @@ -906,7 +918,9 @@ RelationSetLockForExtend(Relation relation) MultiLockReln((LockInfo) relation->lockInfo, EXTEND_LOCK); } +#endif +#ifdef NOT_USED void RelationUnsetLockForExtend(Relation relation) { @@ -923,11 +937,12 @@ RelationUnsetLockForExtend(Relation relation) MultiReleaseReln((LockInfo) relation->lockInfo, EXTEND_LOCK); } +#endif /* * Create an LRelid --- Why not just pass in a pointer to the storage? */ -void +static void LRelIdAssign(LRelId *lRelId, Oid dbId, Oid relId) { lRelId->dbId = dbId; diff --git a/src/backend/storage/lmgr/lock.c b/src/backend/storage/lmgr/lock.c index fc56f8c04ac..15ede2e0ed9 100644 --- a/src/backend/storage/lmgr/lock.c +++ b/src/backend/storage/lmgr/lock.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.10 1997/08/12 22:54:07 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.11 1997/08/19 21:33:19 momjian Exp $ * * NOTES * Outside modules can create a lock table and acquire/release @@ -48,6 +48,9 @@ #include "access/xact.h" #include "access/transam.h" +static int WaitOnLock(LOCKTAB *ltable, LockTableId tableId, LOCK *lock, + LOCKT lockt); + /*#define LOCK_MGR_DEBUG*/ #ifndef LOCK_MGR_DEBUG @@ -369,6 +372,7 @@ LockTabInit(char *tabName, * client to use different tableIds when acquiring/releasing * short term and long term locks. */ +#ifdef NOT_USED LockTableId LockTabRename(LockTableId tableId) { @@ -390,6 +394,7 @@ LockTabRename(LockTableId tableId) AllTables[newTableId] = AllTables[tableId]; return(newTableId); } +#endif /* * LockAcquire -- Check for lock conflicts, sleep if conflict found, @@ -753,7 +758,7 @@ LockResolveConflicts(LOCKTAB *ltable, return(STATUS_FOUND); } -int +static int WaitOnLock(LOCKTAB *ltable, LockTableId tableId, LOCK *lock, LOCKT lockt) { PROC_QUEUE *waitQueue = &(lock->waitProcs); diff --git a/src/backend/storage/lmgr/multi.c b/src/backend/storage/lmgr/multi.c index 1f9894fdb41..9cd3a36b48c 100644 --- a/src/backend/storage/lmgr/multi.c +++ b/src/backend/storage/lmgr/multi.c @@ -12,7 +12,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Attic/multi.c,v 1.3 1997/08/12 22:54:09 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Attic/multi.c,v 1.4 1997/08/19 21:33:25 momjian Exp $ * * NOTES: * (1) The lock.c module assumes that the caller here is doing @@ -29,6 +29,10 @@ #include "utils/rel.h" #include "miscadmin.h" /* MyDatabaseId */ +static bool MultiAcquire(LockTableId tableId, LOCKTAG *tag, LOCKT lockt, + LOCK_LEVEL level); +static bool MultiRelease(LockTableId tableId, LOCKTAG *tag, LOCKT lockt, + LOCK_LEVEL level); /* * INTENT indicates to higher level that a lower level lock has been @@ -186,7 +190,7 @@ MultiLockPage(LockInfo linfo, ItemPointer tidPtr, LOCKT lockt) * Returns: TRUE if lock is set, FALSE if not * Side Effects: */ -bool +static bool MultiAcquire(LockTableId tableId, LOCKTAG *tag, LOCKT lockt, @@ -288,6 +292,7 @@ MultiAcquire(LockTableId tableId, * Release a page in the multi-level lock table * ------------------ */ +#ifdef NOT_USED bool MultiReleasePage(LockInfo linfo, ItemPointer tidPtr, LOCKT lockt) { @@ -307,6 +312,7 @@ MultiReleasePage(LockInfo linfo, ItemPointer tidPtr, LOCKT lockt) return (MultiRelease(MultiTableId, &tag, lockt, PAGE_LEVEL)); } +#endif /* ------------------ * Release a relation in the multi-level lock table @@ -335,7 +341,7 @@ MultiReleaseReln(LockInfo linfo, LOCKT lockt) * * Returns: TRUE if successful, FALSE otherwise. */ -bool +static bool MultiRelease(LockTableId tableId, LOCKTAG *tag, LOCKT lockt, diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index db3b4e636b8..528bfa1e35d 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.17 1997/02/14 04:16:56 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.18 1997/08/19 21:33:29 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -46,7 +46,7 @@ * This is so that we can support more backends. (system-wide semaphore * sets run out pretty fast.) -ay 4/95 * - * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.17 1997/02/14 04:16:56 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.18 1997/08/19 21:33:29 momjian Exp $ */ #include <sys/time.h> #include <unistd.h> @@ -76,6 +76,9 @@ #include "storage/spin.h" #include "storage/proc.h" +static void HandleDeadLock(int sig); +static PROC *ProcWakeup(PROC *proc, int errType); + /* * timeout (in seconds) for resolving possible deadlock */ @@ -401,6 +404,7 @@ ProcKill(int exitStatus, int pid) * Returns: a pointer to the queue or NULL * Side Effects: Initializes the queue if we allocated one */ +#ifdef NOT_USED PROC_QUEUE * ProcQueueAlloc(char *name) { @@ -418,6 +422,7 @@ ProcQueueAlloc(char *name) } return(queue); } +#endif /* * ProcQueueInit -- initialize a shared memory process queue @@ -536,7 +541,7 @@ ProcSleep(PROC_QUEUE *queue, * remove the process from the wait queue and set its links invalid. * RETURN: the next process in the wait queue. */ -PROC * +static PROC * ProcWakeup(PROC *proc, int errType) { PROC *retProc; @@ -563,11 +568,13 @@ ProcWakeup(PROC *proc, int errType) /* * ProcGetId -- */ +#ifdef NOT_USED int ProcGetId() { return( MyProc->procId ); } +#endif /* * ProcLockWakeup -- routine for waking up processes when a lock is @@ -631,7 +638,7 @@ ProcAddLock(SHM_QUEUE *elem) * up my semaphore. * -------------------- */ -void +static void HandleDeadLock(int sig) { LOCK *lock; diff --git a/src/backend/storage/page/bufpage.c b/src/backend/storage/page/bufpage.c index bf150a27b90..ac142825741 100644 --- a/src/backend/storage/page/bufpage.c +++ b/src/backend/storage/page/bufpage.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/page/bufpage.c,v 1.6 1997/03/12 21:07:11 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/page/bufpage.c,v 1.7 1997/08/19 21:33:33 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -26,6 +26,9 @@ #include "lib/qsort.h" +static void PageIndexTupleDeleteAdjustLinePointers(PageHeader phdr, + char *location, Size size); + static bool PageManagerShuffle = true; /* default is shuffle mode */ /* ---------------------------------------------------------------- @@ -506,7 +509,7 @@ PageIndexTupleDelete(Page page, OffsetNumber offnum) * * This routine should never be called on an empty page. */ -void +static void PageIndexTupleDeleteAdjustLinePointers(PageHeader phdr, char *location, Size size) diff --git a/src/backend/storage/smgr/smgr.c b/src/backend/storage/smgr/smgr.c index ecf6a67d6d2..89ac5e92cb7 100644 --- a/src/backend/storage/smgr/smgr.c +++ b/src/backend/storage/smgr/smgr.c @@ -10,7 +10,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/smgr/smgr.c,v 1.7 1997/08/18 20:53:18 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/smgr/smgr.c,v 1.8 1997/08/19 21:33:38 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -23,6 +23,8 @@ #include "utils/rel.h" #include "utils/palloc.h" +static void smgrshutdown(int dummy); + typedef struct f_smgr { int (*smgr_init)(); /* may be NULL */ int (*smgr_shutdown)(); /* may be NULL */ @@ -100,7 +102,7 @@ smgrinit() return (SM_SUCCESS); } -void +static void smgrshutdown(int dummy) { int i; @@ -373,6 +375,7 @@ smgrcommit() return (SM_SUCCESS); } +#ifdef NOT_USED int smgrabort() { @@ -387,6 +390,7 @@ smgrabort() return (SM_SUCCESS); } +#endif bool smgriswo(int16 smgrno) diff --git a/src/backend/tcop/aclchk.c b/src/backend/tcop/aclchk.c index f0518903dc2..fade9d09826 100644 --- a/src/backend/tcop/aclchk.c +++ b/src/backend/tcop/aclchk.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/tcop/Attic/aclchk.c,v 1.12 1997/08/18 20:53:29 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/tcop/Attic/aclchk.c,v 1.13 1997/08/19 21:33:54 momjian Exp $ * * NOTES * See acl.h. @@ -36,6 +36,8 @@ #include "parser/catalog_utils.h" #include "fmgr.h" +static int32 aclcheck(Acl *acl, AclId id, AclIdType idtype, AclMode mode); + /* * Enable use of user relations in place of real system catalogs. */ @@ -257,7 +259,7 @@ in_group(AclId uid, AclId gid) * Returns 1 if the 'id' of type 'idtype' has ACL entries in 'acl' to satisfy * any one of the requirements of 'mode'. Returns 0 otherwise. */ -int32 +static int32 aclcheck(Acl *acl, AclId id, AclIdType idtype, AclMode mode) { register unsigned i; diff --git a/src/backend/tcop/dest.c b/src/backend/tcop/dest.c index bb8cf5ad4bc..6974251b1ea 100644 --- a/src/backend/tcop/dest.c +++ b/src/backend/tcop/dest.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/tcop/dest.c,v 1.6 1997/08/12 22:54:19 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/tcop/dest.c,v 1.7 1997/08/19 21:34:02 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -43,6 +43,9 @@ #include "commands/async.h" +static Oid GetAppendOid(void); +static void ResetAppendOid(void); + /* ---------------- * output functions * ---------------- @@ -317,7 +320,7 @@ BeginCommand(char *pname, static Oid AppendOid; -void +static void ResetAppendOid(void) { AppendOid = InvalidOid; @@ -346,7 +349,7 @@ UpdateAppendOid(Oid newoid) AppendOid = MULTI_TUPLE_APPEND; } -Oid +static Oid GetAppendOid(void) { if (AppendOid == MULTI_TUPLE_APPEND) diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c index dc593264ced..cd658704f03 100644 --- a/src/backend/tcop/postgres.c +++ b/src/backend/tcop/postgres.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.41 1997/08/14 16:11:15 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.42 1997/08/19 21:34:04 momjian Exp $ * * NOTES * this is the "main" module of the postgres backend and @@ -90,6 +90,8 @@ #include "libpq/pqsignal.h" #include "rewrite/rewriteHandler.h" /* for QueryRewrite() */ +static void quickdie(SIGNAL_ARGS); + /* ---------------- * global variables * ---------------- @@ -720,7 +722,7 @@ handle_warn(SIGNAL_ARGS) siglongjmp(Warn_restart, 1); } -void +static void quickdie(SIGNAL_ARGS) { elog(NOTICE, "I have been signalled by the postmaster."); @@ -1275,7 +1277,7 @@ PostgresMain(int argc, char *argv[]) */ if (IsUnderPostmaster == false) { puts("\nPOSTGRES backend interactive interface"); - puts("$Revision: 1.41 $ $Date: 1997/08/14 16:11:15 $"); + puts("$Revision: 1.42 $ $Date: 1997/08/19 21:34:04 $"); } /* ---------------- diff --git a/src/backend/tcop/pquery.c b/src/backend/tcop/pquery.c index 6e7713ced15..6f3087709fa 100644 --- a/src/backend/tcop/pquery.c +++ b/src/backend/tcop/pquery.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/tcop/pquery.c,v 1.5 1996/11/10 03:02:54 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/tcop/pquery.c,v 1.6 1997/08/19 21:34:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -39,6 +39,8 @@ #include "commands/command.h" static char* CreateOperationTag(int operationType); +static void ProcessQueryDesc(QueryDesc *queryDesc); + /* ---------------------------------------------------------------- * CreateQueryDesc @@ -199,7 +201,7 @@ ProcessPortal(char* portalName, * Read the comments for ProcessQuery() below... * ---------------------------------------------------------------- */ -void +static void ProcessQueryDesc(QueryDesc *queryDesc) { Query *parseTree; diff --git a/src/backend/utils/adt/acl.c b/src/backend/utils/adt/acl.c index c292dfe9995..33580a95125 100644 --- a/src/backend/utils/adt/acl.c +++ b/src/backend/utils/adt/acl.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/acl.c,v 1.12 1997/08/12 20:15:54 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/acl.c,v 1.13 1997/08/19 21:34:10 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -24,6 +24,7 @@ static char *getid(char *s, char *n); static int32 aclitemeq(AclItem *a1, AclItem *a2); static int32 aclitemgt(AclItem *a1, AclItem *a2); +static char *aclparse(char *s, AclItem *aip, unsigned *modechg); #define ACL_IDTYPE_GID_KEYWORD "group" #define ACL_IDTYPE_UID_KEYWORD "user" @@ -81,7 +82,7 @@ getid(char *s, char *n) * UID/GID, id type identifier and mode type values. * - loads 'modechg' with the mode change flag. */ -char * +static char * aclparse(char *s, AclItem *aip, unsigned *modechg) { HeapTuple htp; diff --git a/src/backend/utils/adt/arrayfuncs.c b/src/backend/utils/adt/arrayfuncs.c index 98849b22c91..48a78366b01 100644 --- a/src/backend/utils/adt/arrayfuncs.c +++ b/src/backend/utils/adt/arrayfuncs.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.14 1997/08/18 02:14:54 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.15 1997/08/19 21:34:18 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -68,7 +68,9 @@ static void _LOArrayRange(int st[], int endp[], int bsize, int srcfd, static void _ReadArray (int st[], int endp[], int bsize, int srcfd, int destfd, ArrayType *array, int isDestLO, bool *isNull); static ArrayCastAndSet(char *src, bool typbyval, int typlen, char *dest); - +static SanityCheckInput(int ndim, int n, int dim[], int lb[], int indx[]); +static int array_read(char *destptr, int eltsize, int nitems, char *srcptr); +static char *array_seek(char *ptr, int eltsize, int nitems); /*--------------------------------------------------------------------- * array_in : @@ -1189,7 +1191,7 @@ _AdvanceBy1word(char *str, char **word) } #endif -int +static int SanityCheckInput(int ndim, int n, int dim[], int lb[], int indx[]) { int i; @@ -1261,7 +1263,7 @@ _ArrayClipCount(int stI[], int endpI[], ArrayType *array) return count; } -char * +static char * array_seek(char *ptr, int eltsize, int nitems) { int i; @@ -1273,7 +1275,7 @@ array_seek(char *ptr, int eltsize, int nitems) return(ptr); } -int +static int array_read(char *destptr, int eltsize, int nitems, char *srcptr) { int i, inc, tmp; diff --git a/src/backend/utils/adt/chunk.c b/src/backend/utils/adt/chunk.c index 91773a8a7d5..3d9aec0d9e4 100644 --- a/src/backend/utils/adt/chunk.c +++ b/src/backend/utils/adt/chunk.c @@ -6,7 +6,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/chunk.c,v 1.5 1997/03/02 01:34:37 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/chunk.c,v 1.6 1997/08/19 21:34:27 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -57,6 +57,8 @@ static void read_chunk(int chunk_no[], int C[], char a_chunk[], int srcfd, static int write_chunk(struct varlena * a_chunk, int ofile); static int seek_and_read(int pos, int size, char buff[], int fp, int from); #endif +static int GetChunkSize(FILE *fd, int ndim, int dim[MAXDIM], int baseSize, + int d[MAXDIM]); /*------------------------------------------------------------------------ * _ChunkArray --- @@ -119,7 +121,7 @@ int cfd = 0; * returns the dimensions of the chunk in "d" *----------------------------------------------------------------------- */ -int +static int GetChunkSize(FILE *fd, int ndim, int dim[MAXDIM], diff --git a/src/backend/utils/adt/date.c b/src/backend/utils/adt/date.c index 70fc35cb694..e785bdb2bc8 100644 --- a/src/backend/utils/adt/date.c +++ b/src/backend/utils/adt/date.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.12 1997/08/12 22:54:26 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.13 1997/08/19 21:34:30 momjian Exp $ * * NOTES * This code is actually (almost) unused. @@ -92,7 +92,7 @@ static int sec_tab[] = { * Function prototypes -- internal to this file only */ -void reltime2tm(int32 time, struct tm *tm); +static void reltime2tm(int32 time, struct tm *tm); #if FALSE static int correct_unit(char unit[], int *unptr); @@ -178,7 +178,7 @@ char *reltimeout(int32 time) #define TMODULO(t,q,u) {q = (t / u); \ if (q != 0) t -= (q * u);} -void +static void reltime2tm(int32 time, struct tm *tm) { TMODULO(time, tm->tm_year, 31536000); diff --git a/src/backend/utils/adt/datetime.c b/src/backend/utils/adt/datetime.c index 2cf7324275b..171805e59d6 100644 --- a/src/backend/utils/adt/datetime.c +++ b/src/backend/utils/adt/datetime.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/datetime.c,v 1.10 1997/07/01 00:22:40 thomas Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/datetime.c,v 1.11 1997/08/19 21:34:32 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -25,6 +25,9 @@ #include "utils/datetime.h" #include "access/xact.h" +static int date2tm(DateADT dateVal, int *tzp, struct tm *tm, double *fsec, char **tzn); + + static int day_tab[2][12] = { {31,28,31,30,31,30,31,31,30,31,30,31}, {31,29,31,30,31,30,31,31,30,31,30,31} }; @@ -140,8 +143,6 @@ date_out(DateADT date) return(result); } /* date_out() */ -int date2tm(DateADT dateVal, int *tzp, struct tm *tm, double *fsec, char **tzn); - bool date_eq(DateADT dateVal1, DateADT dateVal2) { @@ -330,7 +331,7 @@ abstime_date(AbsoluteTime abstime) * that everything is GMT. So, convert to GMT, rotate to local time, * and then convert again to try to get the time zones correct. */ -int +static int date2tm(DateADT dateVal, int *tzp, struct tm *tm, double *fsec, char **tzn) { struct tm *tx; diff --git a/src/backend/utils/adt/datum.c b/src/backend/utils/adt/datum.c index 20bc38cc1a1..493843071cd 100644 --- a/src/backend/utils/adt/datum.c +++ b/src/backend/utils/adt/datum.c @@ -6,7 +6,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/datum.c,v 1.4 1996/12/14 07:56:05 vadim Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/datum.c,v 1.5 1997/08/19 21:34:33 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -131,6 +131,7 @@ datumCopy(Datum value, Oid type, bool byVal, Size len) * ONLY datums created by "datumCopy" can be freed! *------------------------------------------------------------------------- */ +#ifdef NOT_USED void datumFree(Datum value, Oid type, bool byVal, Size len) { @@ -148,6 +149,7 @@ datumFree(Datum value, Oid type, bool byVal, Size len) pfree(s); } } +#endif /*------------------------------------------------------------------------- * datumIsEqual diff --git a/src/backend/utils/adt/dt.c b/src/backend/utils/adt/dt.c index 1e205033e31..1fbca2d82c7 100644 --- a/src/backend/utils/adt/dt.c +++ b/src/backend/utils/adt/dt.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/dt.c,v 1.31 1997/07/29 16:09:38 thomas Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/dt.c,v 1.32 1997/08/19 21:34:34 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -31,6 +31,24 @@ #endif #include "utils/builtins.h" +static int DecodeDate(char *str, int fmask, int *tmask, struct tm *tm); +static int DecodeNumber( int flen, char *field, + int fmask, int *tmask, struct tm *tm, double *fsec); +static int DecodeNumberField( int len, char *str, + int fmask, int *tmask, struct tm *tm, double *fsec); +static int DecodeSpecial(int field, char *lowtoken, int *val); +static int DecodeTime(char *str, int fmask, int *tmask, + struct tm *tm, double *fsec); +static int DecodeTimezone( char *str, int *tzp); +static int DecodeUnits(int field, char *lowtoken, int *val); +static int EncodeSpecialDateTime(DateTime dt, char *str); +static datetkn *datebsearch(char *key, datetkn *base, unsigned int nel); +static DateTime dt2local( DateTime dt, int timezone); +static void dt2time(DateTime dt, int *hour, int *min, double *sec); +static int j2day( int jd); +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 ROUND_ALL 0 @@ -50,7 +68,7 @@ char *days[] = {"Sunday", "Monday", "Tuesday", "Wednesday", #define TMODULO(t,q,u) {q = ((t < 0)? ceil(t / u): floor(t / u)); \ if (q != 0) t -= rint(q * u);} -void GetEpochTime( struct tm *tm); +static void GetEpochTime( struct tm *tm); #define UTIME_MINYEAR (1901) #define UTIME_MINMONTH (12) @@ -265,6 +283,7 @@ datetime_finite(DateTime *datetime) } /* datetime_finite() */ +#ifdef NOT_USED bool timespan_finite(TimeSpan *timespan) { @@ -273,13 +292,13 @@ timespan_finite(TimeSpan *timespan) return(! TIMESPAN_NOT_FINITE(*timespan)); } /* timespan_finite() */ - +#endif /*---------------------------------------------------------- * Relational operators for datetime. *---------------------------------------------------------*/ -void +static void GetEpochTime( struct tm *tm) { struct tm *t0; @@ -1115,6 +1134,7 @@ timespan_text(TimeSpan *timespan) * Text type may not be null terminated, so copy to temporary string * then call the standard input routine. */ +#ifdef NOT_USED TimeSpan * text_timespan(text *str) { @@ -1134,7 +1154,7 @@ text_timespan(text *str) return(result); } /* text_timespan() */ - +#endif /* datetime_trunc() * Extract specified field from datetime. @@ -2005,7 +2025,7 @@ j2date( int jd, int *year, int *month, int *day) return; } /* j2date() */ -int +static int j2day( int date) { int day; @@ -2188,7 +2208,7 @@ printf( "tm2datetime- time is %f %02d:%02d:%02d %f\n", time, tm->tm_hour, tm->tm /* timespan2tm() * Convert a timespan data type to a tm structure. */ -int +static int timespan2tm(TimeSpan span, struct tm *tm, float8 *fsec) { double time; @@ -2222,7 +2242,7 @@ printf( "timespan2tm- %d %f = %04d-%02d-%02d %02d:%02d:%02d %.2f\n", span.month, return 0; } /* timespan2tm() */ -int +static int tm2timespan( struct tm *tm, double fsec, TimeSpan *span) { span->month = ((tm->tm_year*12)+tm->tm_mon); @@ -2238,7 +2258,7 @@ printf( "tm2timespan- %d %f = %04d-%02d-%02d %02d:%02d:%02d %.2f\n", span->month } /* tm2timespan() */ -DateTime +static DateTime dt2local(DateTime dt, int tz) { dt -= tz; @@ -2252,7 +2272,7 @@ time2t(const int hour, const int min, const double sec) return((((hour*60)+min)*60)+sec); } /* time2t() */ -void +static void dt2time(DateTime jd, int *hour, int *min, double *sec) { double time; @@ -2748,7 +2768,7 @@ printf( " %02d:%02d:%02d (%f)\n", tm->tm_hour, tm->tm_min, tm->tm_sec, *fsec); * Decode date string which includes delimiters. * Insist on a complete set of fields. */ -int +static int DecodeDate(char *str, int fmask, int *tmask, struct tm *tm) { double fsec; @@ -2835,7 +2855,7 @@ printf( "DecodeDate- illegal field %s value is %d\n", field[i], val); * Only check the lower limit on hours, since this same code * can be used to represent time spans. */ -int +static int DecodeTime(char *str, int fmask, int *tmask, struct tm *tm, double *fsec) { char *cp; @@ -2879,7 +2899,7 @@ DecodeTime(char *str, int fmask, int *tmask, struct tm *tm, double *fsec) /* DecodeNumber() * Interpret numeric field as a date value in context. */ -int +static int DecodeNumber( int flen, char *str, int fmask, int *tmask, struct tm *tm, double *fsec) { int val; @@ -2985,7 +3005,7 @@ printf( "DecodeNumber- (2) match %d (%s) as year\n", val, str); /* DecodeNumberField() * Interpret numeric string as a concatenated date field. */ -int +static int DecodeNumberField( int len, char *str, int fmask, int *tmask, struct tm *tm, double *fsec) { char *cp; @@ -3058,7 +3078,8 @@ printf( "DecodeNumberField- %s is time field fmask=%08x tmask=%08x\n", str, fmas /* DecodeTimezone() * Interpret string as a numeric timezone. */ -int DecodeTimezone( char *str, int *tzp) +static int +DecodeTimezone( char *str, int *tzp) { int tz; int hr, min; @@ -3095,7 +3116,7 @@ int DecodeTimezone( char *str, int *tzp) * Implement a cache lookup since it is likely that dates * will be related in format. */ -int +static int DecodeSpecial(int field, char *lowtoken, int *val) { int type; @@ -3351,7 +3372,7 @@ printf( " %02d:%02d:%02d\n", tm->tm_hour, tm->tm_min, tm->tm_sec); * Decode text string using lookup table. * This routine supports time interval decoding. */ -int +static int DecodeUnits(int field, char *lowtoken, int *val) { int type; @@ -3388,7 +3409,7 @@ DecodeUnits(int field, char *lowtoken, int *val) * Binary search -- from Knuth (6.2.1) Algorithm B. Special case like this * is WAY faster than the generic bsearch(). */ -datetkn * +static datetkn * datebsearch(char *key, datetkn *base, unsigned int nel) { register datetkn *last = base + nel - 1, *position; @@ -3414,7 +3435,8 @@ datebsearch(char *key, datetkn *base, unsigned int nel) /* EncodeSpecialDateTime() * Convert reserved datetime data type to string. */ -int EncodeSpecialDateTime(DateTime dt, char *str) +static int +EncodeSpecialDateTime(DateTime dt, char *str) { if (DATETIME_IS_RESERVED(dt)) { if (DATETIME_IS_INVALID(dt)) { diff --git a/src/backend/utils/adt/geo_ops.c b/src/backend/utils/adt/geo_ops.c index feea5559c06..0c06e45bef4 100644 --- a/src/backend/utils/adt/geo_ops.c +++ b/src/backend/utils/adt/geo_ops.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/geo_ops.c,v 1.14 1997/08/12 22:54:29 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/geo_ops.c,v 1.15 1997/08/19 21:34:39 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -28,8 +28,39 @@ #define PI 3.1415926536 #endif -int point_inside( Point *p, int npts, Point plist[]); -int lseg_crossing( double x, double y, double px, double py); +static int point_inside( Point *p, int npts, Point plist[]); +static int lseg_crossing( double x, double y, double px, double py); +static BOX *box_construct(double x1, double x2, double y1, double y2); +static BOX *box_copy(BOX *box); +static BOX *box_fill(BOX *result, double x1, double x2, double y1, double y2); +static double box_ht(BOX *box); +static double box_wd(BOX *box); +static double circle_ar(CIRCLE *circle); +static CIRCLE *circle_copy(CIRCLE *circle); +static LINE *line_construct_pm(Point *pt, double m); +static bool line_horizontal(LINE *line); +static Point *line_interpt(LINE *l1, LINE *l2); +static bool line_intersect(LINE *l1, LINE *l2); +static bool line_parallel(LINE *l1, LINE *l2); +static bool line_vertical(LINE *line); +static double lseg_dt(LSEG *l1, LSEG *l2); +static void make_bound_box(POLYGON *poly); +static PATH *path_copy(PATH *path); +static bool plist_same(int npts, Point p1[], Point p2[]); +static Point *point_construct(double x, double y); +static Point *point_copy(Point *pt); +static int single_decode(char *str, float8 *x, char **ss); +static int single_encode(float8 x, char *str); +static int pair_decode(char *str, float8 *x, float8 *y, char **s); +static int pair_encode(float8 x, float8 y, char *str); +static int pair_count(char *s, char delim); +static int path_decode(int opentype, int npts, char *str, int *isopen, char **ss, Point *p); +static char *path_encode( bool closed, int npts, Point *pt); +static void statlseg_construct(LSEG *lseg, Point *pt1, Point *pt2); +static double box_ar(BOX *box); +static Point *interpt_sl(LSEG *lseg, LINE *line); +static LINE *line_construct_pp(Point *pt1, Point *pt2); + /* * Delimiters for input and output strings. @@ -77,16 +108,7 @@ static int digits8 = P_MAXDIG; * and restore that order for text output - tgl 97/01/16 */ -int single_decode(char *str, float8 *x, char **ss); -int single_encode(float8 x, char *str); -int pair_decode(char *str, float8 *x, float8 *y, char **s); -int pair_encode(float8 x, float8 y, char *str); -int pair_count(char *s, char delim); -int path_decode(int opentype, int npts, char *str, int *isopen, char **ss, Point *p); - -char *path_encode( bool closed, int npts, Point *pt); - -int single_decode(char *str, float8 *x, char **s) +static int single_decode(char *str, float8 *x, char **s) { char *cp; @@ -106,13 +128,13 @@ fprintf( stderr, "single_decode- (%x) try decoding %s to %g\n", (cp-str), str, * return(TRUE); } /* single_decode() */ -int single_encode(float8 x, char *str) +static int single_encode(float8 x, char *str) { sprintf(str, "%.*g", digits8, x); return(TRUE); } /* single_encode() */ -int pair_decode(char *str, float8 *x, float8 *y, char **s) +static int pair_decode(char *str, float8 *x, float8 *y, char **s) { int has_delim; char *cp; @@ -142,13 +164,13 @@ int pair_decode(char *str, float8 *x, float8 *y, char **s) return(TRUE); } -int pair_encode(float8 x, float8 y, char *str) +static int pair_encode(float8 x, float8 y, char *str) { sprintf(str, "%.*g,%.*g", digits8, x, digits8, y); return(TRUE); } -int path_decode(int opentype, int npts, char *str, int *isopen, char **ss, Point *p) +static int path_decode(int opentype, int npts, char *str, int *isopen, char **ss, Point *p) { int depth = 0; char *s, *cp; @@ -200,7 +222,7 @@ int path_decode(int opentype, int npts, char *str, int *isopen, char **ss, Point return(TRUE); } /* path_decode() */ -char *path_encode( bool closed, int npts, Point *pt) +static char *path_encode( bool closed, int npts, Point *pt) { char *result = PALLOC(npts*(P_MAXLEN+3)+2); @@ -251,7 +273,7 @@ char *path_encode( bool closed, int npts, Point *pt) * '(1,3,2,4)' * require an odd number of delim characters in the string *-------------------------------------------------------------*/ -int pair_count(char *s, char delim) +static int pair_count(char *s, char delim) { int ndelim = 0; @@ -321,7 +343,7 @@ char *box_out(BOX *box) /* box_construct - fill in a new box. */ -BOX *box_construct(double x1, double x2, double y1, double y2) +static BOX *box_construct(double x1, double x2, double y1, double y2) { BOX *result = PALLOCTYPE(BOX); @@ -331,7 +353,7 @@ BOX *box_construct(double x1, double x2, double y1, double y2) /* box_fill - fill in a static box */ -BOX *box_fill(BOX *result, double x1, double x2, double y1, double y2) +static BOX *box_fill(BOX *result, double x1, double x2, double y1, double y2) { if (x1 > x2) { result->high.x = x1; @@ -354,7 +376,7 @@ BOX *box_fill(BOX *result, double x1, double x2, double y1, double y2) /* box_copy - copy a box */ -BOX *box_copy(BOX *box) +static BOX *box_copy(BOX *box) { BOX *result = PALLOCTYPE(BOX); @@ -563,7 +585,7 @@ Point *box_center(BOX *box) /* box_ar - returns the area of the box. */ -double box_ar(BOX *box) +static double box_ar(BOX *box) { return( box_wd(box) * box_ht(box) ); } @@ -572,7 +594,7 @@ double box_ar(BOX *box) /* box_wd - returns the width (length) of the box * (horizontal magnitude). */ -double box_wd(BOX *box) +static double box_wd(BOX *box) { return( box->high.x - box->low.x ); } @@ -581,7 +603,7 @@ double box_wd(BOX *box) /* box_ht - returns the height of the box * (vertical magnitude). */ -double box_ht(BOX *box) +static double box_ht(BOX *box) { return( box->high.y - box->low.y ); } @@ -590,7 +612,8 @@ double box_ht(BOX *box) /* box_dt - returns the distance between the * center points of two boxes. */ -double box_dt(BOX *box1, BOX *box2) +#ifdef NOT_USED +static double box_dt(BOX *box1, BOX *box2) { double result; Point *a, *b; @@ -603,6 +626,7 @@ double box_dt(BOX *box1, BOX *box2) PFREE(b); return(result); } +#endif /*---------------------------------------------------------- * Funky operations. @@ -661,7 +685,7 @@ LSEG *box_diagonal(BOX *box) * Internal form: Ax+By+C=0 *---------------------------------------------------------*/ -LINE * /* point-slope */ +static LINE * /* point-slope */ line_construct_pm(Point *pt, double m) { LINE *result = PALLOCTYPE(LINE); @@ -677,7 +701,7 @@ line_construct_pm(Point *pt, double m) } /* line_construct_pm() */ -LINE * /* two points */ +static LINE * /* two points */ line_construct_pp(Point *pt1, Point *pt2) { LINE *result = PALLOCTYPE(LINE); @@ -724,12 +748,12 @@ printf( "line_construct_pp- line is neither vertical nor horizontal (diffs x=%.* * Relative position routines. *---------------------------------------------------------*/ -bool line_intersect(LINE *l1, LINE *l2) +static bool line_intersect(LINE *l1, LINE *l2) { return( ! line_parallel(l1, l2) ); } -bool line_parallel(LINE *l1, LINE *l2) +static bool line_parallel(LINE *l1, LINE *l2) { #if FALSE return( FPeq(l1->m, l2->m) ); @@ -741,6 +765,7 @@ bool line_parallel(LINE *l1, LINE *l2) return(FPeq(l2->A, l1->A*(l2->B / l1->B))); } /* line_parallel() */ +#ifdef NOT_USED bool line_perp(LINE *l1, LINE *l2) { #if FALSE @@ -757,8 +782,9 @@ bool line_perp(LINE *l1, LINE *l2) return( FPeq(((l1->A * l2->B) / (l1->B * l2->A)), -1.0) ); } /* line_perp() */ +#endif -bool line_vertical(LINE *line) +static bool line_vertical(LINE *line) { #if FALSE return( FPeq(line->A, -1.0) && FPzero(line->B) ); @@ -766,7 +792,7 @@ bool line_vertical(LINE *line) return( FPzero(line->B) ); } /* line_vertical() */ -bool line_horizontal(LINE *line) +static bool line_horizontal(LINE *line) { #if FALSE return( FPzero(line->m) ); @@ -774,7 +800,7 @@ bool line_horizontal(LINE *line) return( FPzero(line->A) ); } /* line_horizontal() */ - +#ifdef NOT_USED bool line_eq(LINE *l1, LINE *l2) { double k; @@ -792,7 +818,7 @@ bool line_eq(LINE *l1, LINE *l2) FPeq(l1->B, k * l2->B) && FPeq(l1->C, k * l2->C) ); } - +#endif /*---------------------------------------------------------- * Line arithmetic routines. @@ -821,7 +847,7 @@ line_distance(LINE *l1, LINE *l2) /* line_interpt() * Point where two lines l1, l2 intersect (if any) */ -Point * +static Point * line_interpt(LINE *l1, LINE *l2) { Point *result; @@ -985,8 +1011,6 @@ bool path_n_ge(PATH *p1, PATH *p2) * Conversion operators. *---------------------------------------------------------*/ -PATH *path_copy(PATH *path); - bool path_isclosed( PATH *path) { @@ -1155,7 +1179,7 @@ double *path_length(PATH *path) } /* path_length() */ - +#ifdef NOT_USED double path_ln(PATH *path) { double result; @@ -1167,6 +1191,7 @@ double path_ln(PATH *path) return(result); } /* path_ln() */ +#endif /*********************************************************************** ** @@ -1213,7 +1238,7 @@ point_out(Point *pt) } /* point_out() */ -Point *point_construct(double x, double y) +static Point *point_construct(double x, double y) { Point *result = PALLOCTYPE(Point); @@ -1223,7 +1248,7 @@ Point *point_construct(double x, double y) } -Point *point_copy(Point *pt) +static Point *point_copy(Point *pt) { Point *result; @@ -1392,7 +1417,7 @@ LSEG *lseg_construct(Point *pt1, Point *pt2) } /* like lseg_construct, but assume space already allocated */ -void statlseg_construct(LSEG *lseg, Point *pt1, Point *pt2) +static void statlseg_construct(LSEG *lseg, Point *pt1, Point *pt2) { lseg->p[0].x = pt1->x; lseg->p[0].y = pt1->y; @@ -1489,7 +1514,7 @@ double *lseg_distance(LSEG *l1, LSEG *l2) } /* distance between l1, l2 */ -double +static double lseg_dt(LSEG *l1, LSEG *l2) { double *d, result; @@ -1833,7 +1858,7 @@ printf( "dist_cpoly- segment %d distance is %f\n", (i+1), *d); * lines and boxes, since there are typically two. *-------------------------------------------------------------------*/ -Point *interpt_sl(LSEG *lseg, LINE *line) +static Point *interpt_sl(LSEG *lseg, LINE *line) { LINE *tmp; Point *p; @@ -2194,7 +2219,7 @@ bool inter_lb(LINE *line, BOX *box) /*--------------------------------------------------------------------- * Make the smallest bounding box for the given polygon. *---------------------------------------------------------------------*/ -void make_bound_box(POLYGON *poly) +static void make_bound_box(POLYGON *poly) { int i; double x1,y1,x2,y2; @@ -3286,9 +3311,7 @@ bool circle_ge(CIRCLE *circle1, CIRCLE *circle2) * actual value. *---------------------------------------------------------*/ -CIRCLE *circle_copy(CIRCLE *circle); - -CIRCLE * +static CIRCLE * circle_copy(CIRCLE *circle) { CIRCLE *result; @@ -3494,7 +3517,7 @@ Point *circle_center(CIRCLE *circle) /* circle_ar - returns the area of the circle. */ -double circle_ar(CIRCLE *circle) +static double circle_ar(CIRCLE *circle) { return(PI*(circle->radius*circle->radius)); } @@ -3503,6 +3526,7 @@ double circle_ar(CIRCLE *circle) /* circle_dt - returns the distance between the * center points of two circlees. */ +#ifdef NOT_USED double circle_dt(CIRCLE *circle1, CIRCLE *circle2) { double result; @@ -3511,7 +3535,7 @@ double circle_dt(CIRCLE *circle1, CIRCLE *circle2) return(result); } - +#endif /*---------------------------------------------------------- * Conversion operators. @@ -3657,7 +3681,7 @@ CIRCLE *poly_circle(POLYGON *poly) #define HIT_IT INT_MAX -int +static int point_inside( Point *p, int npts, Point plist[]) { double x0, y0; @@ -3716,7 +3740,7 @@ point_inside( Point *p, int npts, Point plist[]) * It returns HIT_IT if the segment contains (0,0) */ -int +static int lseg_crossing( double x, double y, double px, double py) { double z; @@ -3756,7 +3780,7 @@ lseg_crossing( double x, double y, double px, double py) } /* lseg_crossing() */ -bool +static bool plist_same(int npts, Point p1[], Point p2[]) { int i, ii, j; diff --git a/src/backend/utils/adt/geo_selfuncs.c b/src/backend/utils/adt/geo_selfuncs.c index 94070ea2ee6..f0f7bc48d5f 100644 --- a/src/backend/utils/adt/geo_selfuncs.c +++ b/src/backend/utils/adt/geo_selfuncs.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/geo_selfuncs.c,v 1.2 1997/03/14 23:20:20 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/geo_selfuncs.c,v 1.3 1997/08/19 21:34:40 momjian Exp $ * * XXX These are totally bogus. * @@ -65,6 +65,7 @@ areajoinsel(Oid opid, * below) a given box? */ +#ifdef NOT_USED float64 leftsel(Oid opid, Oid relid, @@ -78,7 +79,9 @@ leftsel(Oid opid, *result = 1.0 / 6.0; return(result); } +#endif +#ifdef NOT_USED float64 leftjoinsel(Oid opid, Oid relid, @@ -92,10 +95,12 @@ leftjoinsel(Oid opid, *result = 1.0 / 6.0; return(result); } +#endif /* * contsel -- How likely is a box to contain (be contained by) a given box? */ +#ifdef NOT_USED float64 contsel(Oid opid, Oid relid, @@ -109,7 +114,9 @@ contsel(Oid opid, *result = 1.0 / 10.0; return(result); } +#endif +#ifdef NOT_USED float64 contjoinsel(Oid opid, Oid relid, @@ -123,3 +130,4 @@ contjoinsel(Oid opid, *result = 1.0 / 10.0; return(result); } +#endif diff --git a/src/backend/utils/adt/like.c b/src/backend/utils/adt/like.c index b92bb814fbb..50b31514b2a 100644 --- a/src/backend/utils/adt/like.c +++ b/src/backend/utils/adt/like.c @@ -22,6 +22,8 @@ #include "utils/palloc.h" #include "utils/builtins.h" /* where the function declarations go */ +static int like(char *text, char *p); + /* * interface routines called by the function manager */ @@ -139,7 +141,7 @@ bool textnlike(struct varlena *s, struct varlena *p) } -/* $Revision: 1.5 $ +/* $Revision: 1.6 $ ** "like.c" A first attempt at a LIKE operator for Postgres95. ** ** Originally written by Rich $alz, mirror!rs, Wed Nov 26 19:03:17 EST 1986. @@ -214,7 +216,7 @@ DoMatch(register char *text, register char *p) /* ** User-level routine. Returns TRUE or FALSE. */ -int +static int like(char *text, char *p) { if (p[0] == '%' && p[1] == '\0') diff --git a/src/backend/utils/adt/nabstime.c b/src/backend/utils/adt/nabstime.c index 0c85cae8642..0e56a2816ee 100644 --- a/src/backend/utils/adt/nabstime.c +++ b/src/backend/utils/adt/nabstime.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/nabstime.c,v 1.30 1997/08/12 22:54:32 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/nabstime.c,v 1.31 1997/08/19 21:34:42 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -30,6 +30,7 @@ #include "utils/builtins.h" #include "access/xact.h" +static AbsoluteTime tm2abstime(struct tm *tm, int tz); #define MIN_DAYNUM -24856 /* December 13, 1901 */ #define MAX_DAYNUM 24854 /* January 18, 2038 */ @@ -170,7 +171,7 @@ printf( "datetime2tm- (localtime) %d.%02d.%02d %02d:%02d:%02d %s dst=%d\n", * Convert a tm structure to abstime. * Note that tm has full year (not 1900-based) and 1-based month. */ -AbsoluteTime +static AbsoluteTime tm2abstime( struct tm *tm, int tz) { int day, sec; diff --git a/src/backend/utils/adt/name.c b/src/backend/utils/adt/name.c index 6c48aa8bcd4..7ef599b3dee 100644 --- a/src/backend/utils/adt/name.c +++ b/src/backend/utils/adt/name.c @@ -11,7 +11,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/name.c,v 1.5 1997/08/18 20:53:41 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/name.c,v 1.6 1997/08/19 21:34:45 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -130,10 +130,12 @@ int namecpy(Name n1, Name n2) return(0); } +#ifdef NOT_USED int namecat(Name n1, Name n2) { return(namestrcat(n1, n2->data)); /* n2 can't be any longer than n1 */ } +#endif int namecmp(Name n1, Name n2) { @@ -149,6 +151,7 @@ namestrcpy(Name name, char *str) return(0); } +#ifdef NOT_USED int namestrcat(Name name, char *str) { int i; @@ -165,6 +168,7 @@ int namestrcat(Name name, char *str) } return(0); } +#endif int namestrcmp(Name name, char *str) @@ -182,6 +186,7 @@ namestrcmp(Name name, char *str) * PRIVATE ROUTINES * *****************************************************************************/ +#ifdef NOT_USED uint32 NameComputeLength(Name name) { @@ -195,3 +200,4 @@ NameComputeLength(Name name) } return (uint32)length; } +#endif diff --git a/src/backend/utils/adt/not_in.c b/src/backend/utils/adt/not_in.c index 5222f3d2986..a78e7dc31ce 100644 --- a/src/backend/utils/adt/not_in.c +++ b/src/backend/utils/adt/not_in.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/not_in.c,v 1.2 1996/11/06 06:49:53 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/not_in.c,v 1.3 1997/08/19 21:34:48 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -29,6 +29,8 @@ #include "access/relscan.h" #include "utils/builtins.h" /* where function decls go */ +static int my_varattno(Relation rd, char *a); + /* ---------------------------------------------------------------- * * ---------------------------------------------------------------- @@ -107,7 +109,7 @@ bool oidnotin(Oid the_oid, char *compare) * If varattno (in parser/catalog_utils.h) ever is added to * cinterface.a, this routine should go away */ -int my_varattno(Relation rd, char *a) +static int my_varattno(Relation rd, char *a) { int i; diff --git a/src/backend/utils/adt/numutils.c b/src/backend/utils/adt/numutils.c index 8e944de3fa6..7f14317a700 100644 --- a/src/backend/utils/adt/numutils.c +++ b/src/backend/utils/adt/numutils.c @@ -10,7 +10,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/numutils.c,v 1.12 1997/08/12 22:54:34 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/numutils.c,v 1.13 1997/08/19 21:34:51 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -134,6 +134,7 @@ ltoa(int32 l, char *a) ** stars ("*****") and returns zero. Normal return is the width ** of the output field (sometimes shorter than 'width'). */ +#ifdef NOT_USED int ftoa(double value, char *ascii, int width, int prec1, char format) { @@ -286,6 +287,7 @@ ftoa(double value, char *ascii, int width, int prec1, char format) return (avail); #endif /* !BSD44_derived */ } +#endif /* ** atof1 - ASCII TO FLOATING CONVERSION @@ -315,6 +317,7 @@ ftoa(double value, char *ascii, int width, int prec1, char format) ** Side Effects: ** clobbers *val. */ +#ifdef NOT_USED int atof1(char *str, double *val) { @@ -404,3 +407,4 @@ atof1(char *str, double *val) *val = v; return (0); } +#endif diff --git a/src/backend/utils/adt/varlena.c b/src/backend/utils/adt/varlena.c index 91bfdfaca23..7c25cfd67b8 100644 --- a/src/backend/utils/adt/varlena.c +++ b/src/backend/utils/adt/varlena.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/varlena.c,v 1.17 1997/07/29 16:12:07 thomas Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/varlena.c,v 1.18 1997/08/19 21:34:54 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -81,6 +81,7 @@ byteain(char *inputText) * BUGS: Extremely unportable as things shoved can be string * representations of structs, etc. */ +#ifdef NOT_USED struct varlena * shove_bytes(unsigned char *stuff, int len) { @@ -93,7 +94,7 @@ shove_bytes(unsigned char *stuff, int len) len - sizeof(int32)); return(result); } - +#endif /* @@ -202,7 +203,7 @@ textout(struct varlena *vlena) * returns the actual length of a text* (which may be less than * the VARSIZE of the text*) */ - +#ifdef NOT_USED int textlen (text* t) { int i = 0; @@ -212,6 +213,7 @@ int textlen (text* t) i++; return i; } +#endif /* * textcat - diff --git a/src/backend/utils/cache/catcache.c b/src/backend/utils/cache/catcache.c index 6cba6487512..10289e03231 100644 --- a/src/backend/utils/cache/catcache.c +++ b/src/backend/utils/cache/catcache.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/cache/catcache.c,v 1.6 1996/12/04 03:06:09 bryanh Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/cache/catcache.c,v 1.7 1997/08/19 21:34:58 momjian Exp $ * * Notes: * XXX This needs to use exception.h to handle recovery when @@ -34,6 +34,14 @@ #include "catalog/pg_type.h" /* for OID of int28 type */ #include "lib/dllist.h" +static void CatCacheRemoveCTup(CatCache *cache, Dlelem *e); +static Index CatalogCacheComputeHashIndex(struct catcache *cacheInP); +static Index CatalogCacheComputeTupleHashIndex(struct catcache *cacheInOutP, + Relation relation, HeapTuple tuple); +static void CatalogCacheInitializeCache(struct catcache *cache, + Relation relation); +static long comphash(long l, char *v); + /* ---------------- * variables, macros and other stuff * @@ -106,7 +114,7 @@ static long eqproc[] = { #define CatalogCacheInitializeCache_DEBUG2 #endif -void +static void CatalogCacheInitializeCache(struct catcache *cache, Relation relation) { @@ -249,12 +257,14 @@ CatalogCacheInitializeCache(struct catcache *cache, * XXX temporary function * -------------------------------- */ +#ifdef NOT_USED void CatalogCacheSetId(CatCache *cacheInOutP, int id) { Assert(id == InvalidCatalogCacheId || id >= 0); cacheInOutP->id = id; } +#endif /* ---------------- * comphash -- @@ -266,7 +276,7 @@ CatalogCacheSetId(CatCache *cacheInOutP, int id) * v is the attribute value ("Datum") * ---------------- */ -long +static long comphash(long l, register char *v) { long i; @@ -305,7 +315,7 @@ comphash(long l, register char *v) * CatalogCacheComputeHashIndex * -------------------------------- */ -Index +static Index CatalogCacheComputeHashIndex(struct catcache *cacheInP) { Index hashIndex; @@ -346,7 +356,7 @@ CatalogCacheComputeHashIndex(struct catcache *cacheInP) * CatalogCacheComputeTupleHashIndex * -------------------------------- */ -Index +static Index CatalogCacheComputeTupleHashIndex(struct catcache *cacheInOutP, Relation relation, HeapTuple tuple) @@ -410,7 +420,7 @@ CatalogCacheComputeTupleHashIndex(struct catcache *cacheInOutP, * CatCacheRemoveCTup * -------------------------------- */ -void +static void CatCacheRemoveCTup(CatCache *cache, Dlelem *elt) { CatCTup *ct; diff --git a/src/backend/utils/cache/inval.c b/src/backend/utils/cache/inval.c index bf1ae049606..4f52e4e5f4c 100644 --- a/src/backend/utils/cache/inval.c +++ b/src/backend/utils/cache/inval.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/cache/inval.c,v 1.3 1996/11/08 05:59:55 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/cache/inval.c,v 1.4 1997/08/19 21:35:06 momjian Exp $ * * Note - this code is real crufty... * @@ -31,6 +31,13 @@ #include "catalog/catname.h" /* XXX to support hacks below */ #include "utils/syscache.h" /* XXX to support the hacks below */ +static InvalidationEntry InvalidationEntryAllocate(uint16 size); +static void LocalInvalidInvalidate(LocalInvalid invalid, void (*function)()); +static LocalInvalid LocalInvalidRegister(LocalInvalid invalid, + InvalidationEntry entry); +static void getmyrelids(void); + + /* ---------------- * private invalidation structures * ---------------- @@ -83,7 +90,7 @@ Oid MyAMOPRelationId = InvalidOid; * Allocates an invalidation entry. * -------------------------------- */ -InvalidationEntry +static InvalidationEntry InvalidationEntryAllocate(uint16 size) { InvalidationEntryData *entryDataP; @@ -98,7 +105,7 @@ InvalidationEntryAllocate(uint16 size) * Returns a new local cache invalidation state containing a new entry. * -------------------------------- */ -LocalInvalid +static LocalInvalid LocalInvalidRegister(LocalInvalid invalid, InvalidationEntry entry) { @@ -116,7 +123,7 @@ LocalInvalidRegister(LocalInvalid invalid, * invalidation state. * -------------------------------- */ -void +static void LocalInvalidInvalidate(LocalInvalid invalid, void (*function)()) { InvalidationEntryData *entryDataP; @@ -230,7 +237,7 @@ RelationIdRegisterLocalInvalid(Oid relationId, Oid objectId) * getmyrelids * -------------------------------- */ -void +static void getmyrelids() { HeapTuple tuple; diff --git a/src/backend/utils/cache/lsyscache.c b/src/backend/utils/cache/lsyscache.c index d9228fe72b3..9de0c3fb89b 100644 --- a/src/backend/utils/cache/lsyscache.c +++ b/src/backend/utils/cache/lsyscache.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/cache/lsyscache.c,v 1.2 1996/10/31 05:55:32 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/cache/lsyscache.c,v 1.3 1997/08/19 21:35:11 momjian Exp $ * * NOTES * Eventually, the index information should go through here, too. @@ -434,6 +434,7 @@ get_typbyval(Oid typid) * not. Returns 1 if by value, 0 if by reference. * */ +#ifdef NOT_USED char get_typalign(Oid typid) { @@ -446,6 +447,7 @@ get_typalign(Oid typid) else return ('i'); } +#endif /* * get_typdefault - @@ -469,6 +471,7 @@ get_typdefault(Oid typid) * It returns the null char if the cache lookup fails... * */ +#ifdef NOT_USED char get_typtype(Oid typid) { @@ -482,4 +485,4 @@ get_typtype(Oid typid) return('\0'); } } - +#endif diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c index 585d82fc126..c29e8c839d8 100644 --- a/src/backend/utils/cache/relcache.c +++ b/src/backend/utils/cache/relcache.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.14 1997/08/19 04:44:21 vadim Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.15 1997/08/19 21:35:13 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -85,6 +85,12 @@ #include "catalog/index.h" #include "fmgr.h" +static void RelationFlushRelation(Relation *relationPtr, + bool onlyFlushReferenceCountZero); +static Relation RelationNameCacheGetRelation(char *relationName); +static void init_irels(void); +static void write_irels(void); + /* ---------------- * defines * ---------------- @@ -1075,7 +1081,7 @@ RelationIdCacheGetRelation(Oid relationId) * RelationNameCacheGetRelation * -------------------------------- */ -Relation +static Relation RelationNameCacheGetRelation(char *relationName) { Relation rd; @@ -1185,6 +1191,7 @@ RelationNameGetRelation(char *relationName) * old "getreldesc" interface. * ---------------- */ +#ifdef NOT_USED Relation getreldesc(char *relationName) { @@ -1197,6 +1204,7 @@ getreldesc(char *relationName) return RelationNameGetRelation(relationName); } +#endif /* ---------------------------------------------------------------- * cache invalidation support routines @@ -1221,7 +1229,7 @@ RelationClose(Relation relation) * anything anymore. * -------------------------------- */ -void +static void RelationFlushRelation(Relation *relationPtr, bool onlyFlushReferenceCountZero) { @@ -1606,7 +1614,7 @@ RelationInitialize(void) /* pg_attnumind, pg_classnameind, pg_classoidind */ #define Num_indices_bootstrap 3 -void +static void init_irels(void) { Size len; @@ -1746,7 +1754,7 @@ init_irels(void) } } -void +static void write_irels(void) { int len; diff --git a/src/backend/utils/error/exc.c b/src/backend/utils/error/exc.c index a1b185fcd0f..3366996fad1 100644 --- a/src/backend/utils/error/exc.c +++ b/src/backend/utils/error/exc.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/exc.c,v 1.14 1997/08/12 22:54:46 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/exc.c,v 1.15 1997/08/19 21:35:17 momjian Exp $ * * NOTE * XXX this code needs improvement--check for state violations and @@ -24,6 +24,11 @@ #include "utils/exc.h" #include "storage/ipc.h" +static void ExcUnCaught(Exception *excP, ExcDetail detail, ExcData data, + ExcMessage message); +static void ExcPrint(Exception *excP, ExcDetail detail, ExcData data, + ExcMessage message); + /* * Global Variables */ @@ -86,7 +91,7 @@ EnableExceptionHandling(bool on) ExceptionHandlingEnabled = on; } -void +static void ExcPrint(Exception *excP, ExcDetail detail, ExcData data, @@ -129,12 +134,15 @@ ExcPrint(Exception *excP, fflush(stderr); } +#ifdef NOT_USED ExcProc * ExcGetUnCaught(void) { return (ExcUnCaughtP); } +#endif +#ifdef NOT_USED ExcProc * ExcSetUnCaught(ExcProc *newP) { @@ -144,8 +152,9 @@ ExcSetUnCaught(ExcProc *newP) return (oldP); } +#endif -void +static void ExcUnCaught(Exception *excP, ExcDetail detail, ExcData data, diff --git a/src/backend/utils/fmgr/fmgr.c b/src/backend/utils/fmgr/fmgr.c index 99fb7d8c9d6..1da0ab18773 100644 --- a/src/backend/utils/fmgr/fmgr.c +++ b/src/backend/utils/fmgr/fmgr.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/fmgr/fmgr.c,v 1.2 1996/11/08 06:00:14 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/fmgr/fmgr.c,v 1.3 1997/08/19 21:35:21 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -207,6 +207,7 @@ fmgr(Oid procedureId, ... ) * * func_ptr, func_id, n_arguments, args... */ +#ifdef NOT_USED char * fmgr_ptr(func_ptr user_fn, Oid func_id, ...) { @@ -230,6 +231,7 @@ fmgr_ptr(func_ptr user_fn, Oid func_id, ...) return(fmgr_c(user_fn, func_id, n_arguments, &values, &isNull)); } +#endif /* * This routine is not well thought out. When I get around to adding a diff --git a/src/backend/utils/hash/hashfn.c b/src/backend/utils/hash/hashfn.c index 7c11724ded8..3b2f0ec19a9 100644 --- a/src/backend/utils/hash/hashfn.c +++ b/src/backend/utils/hash/hashfn.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/hash/hashfn.c,v 1.2 1996/11/03 06:54:16 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/hash/hashfn.c,v 1.3 1997/08/19 21:35:33 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -125,6 +125,7 @@ tag_hash(int *key, int keysize) * instructions. If this routine is heavily used enough, it's * worth the ugly coding */ +#ifdef NOT_USED long disk_hash(char *key) { @@ -154,5 +155,5 @@ disk_hash(char *key) } return(n); } - +#endif diff --git a/src/backend/utils/init/miscinit.c b/src/backend/utils/init/miscinit.c index acf9297233c..2fe002bd914 100644 --- a/src/backend/utils/init/miscinit.c +++ b/src/backend/utils/init/miscinit.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/init/miscinit.c,v 1.5 1997/04/27 19:20:37 thomas Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/init/miscinit.c,v 1.6 1997/08/19 21:35:44 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -101,6 +101,7 @@ ExitPostgres(ExitStatus status) * Exceptions: * none */ +#ifdef NOT_USED void AbortPostgres() { @@ -115,6 +116,7 @@ AbortPostgres() else exitpg(FatalExitStatus); } +#endif /* ---------------- * StatusBackendExit diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c index 253814f33da..f338cc83c70 100644 --- a/src/backend/utils/init/postinit.c +++ b/src/backend/utils/init/postinit.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.10 1997/08/12 22:54:54 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.11 1997/08/19 21:35:50 momjian Exp $ * * NOTES * InitPostgres() is the function called from PostgresMain @@ -71,6 +71,11 @@ #include "port-protos.h" #include "libpq/libpq-be.h" +static void InitCommunication(void); +static void InitMyDatabaseId(void); +static void InitStdio(void); +static void InitUserid(void); + static IPCKey PostgresIpcKey; @@ -108,7 +113,7 @@ static IPCKey PostgresIpcKey; * database directory but before we open any relations. * -------------------------------- */ -void +static void InitMyDatabaseId() { int dbfd; @@ -334,7 +339,7 @@ DoChdirAndInitDatabaseNameAndPath(char *name) { * initializes crap associated with the user id. * -------------------------------- */ -void +static void InitUserid() { setuid(geteuid()); @@ -351,7 +356,7 @@ InitUserid() * This does not set MyBackendId. MyBackendTag is set, however. * -------------------------------- */ -void +static void InitCommunication() { char *postid; @@ -460,7 +465,7 @@ InitCommunication() * they all seem to do stuff associated with io. * -------------------------------- */ -void +static void InitStdio() { DebugFileOpen(); diff --git a/src/backend/utils/mmgr/aset.c b/src/backend/utils/mmgr/aset.c index 41908232065..8e0482de38c 100644 --- a/src/backend/utils/mmgr/aset.c +++ b/src/backend/utils/mmgr/aset.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/mmgr/aset.c,v 1.4 1996/11/10 03:03:45 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/mmgr/aset.c,v 1.5 1997/08/19 21:35:54 momjian Exp $ * * NOTE * XXX This is a preliminary implementation which lacks fail-fast @@ -25,6 +25,10 @@ # include <string.h> #endif +static void AllocPointerDump(AllocPointer pointer); +static int AllocSetIterate(AllocSet set, + void (*function)(AllocPointer pointer)); + #undef AllocSetReset #undef malloc #undef free @@ -273,7 +277,7 @@ AllocSetRealloc(AllocSet set, AllocPointer pointer, Size size) * Exceptions: * BadArg if set is invalid. */ -int +static int AllocSetIterate(AllocSet set, void (*function)(AllocPointer pointer)) { @@ -295,6 +299,7 @@ AllocSetIterate(AllocSet set, return (count); } +#ifdef NOT_USED int AllocSetCount(AllocSet set) { @@ -310,6 +315,7 @@ AllocSetCount(AllocSet set) } return count; } +#endif /* * Private routines @@ -367,7 +373,7 @@ AllocPointerGetNext(AllocPointer pointer) * XXX AllocPointerDump -- * Displays allocated pointer. */ -void +static void AllocPointerDump(AllocPointer pointer) { printf("\t%-10ld@ %0#lx\n", ((long*)pointer)[-1], (long)pointer); /* XXX */ diff --git a/src/backend/utils/mmgr/mcxt.c b/src/backend/utils/mmgr/mcxt.c index e03948ff04e..df2eb480817 100644 --- a/src/backend/utils/mmgr/mcxt.c +++ b/src/backend/utils/mmgr/mcxt.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/mmgr/mcxt.c,v 1.2 1996/11/08 06:00:54 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/mmgr/mcxt.c,v 1.3 1997/08/19 21:35:57 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -281,6 +281,7 @@ MemoryContextRealloc(MemoryContext context, * ??? * BadArgumentsErr if firstTime is true for subsequent calls. */ +#ifdef NOT_USED char* MemoryContextGetName(MemoryContext context) { @@ -289,6 +290,7 @@ MemoryContextGetName(MemoryContext context) return (context->method->getName(context)); } +#endif /* * PointerGetAllocSize -- @@ -301,6 +303,7 @@ MemoryContextGetName(MemoryContext context) * ??? * BadArgumentsErr if firstTime is true for subsequent calls. */ +#ifdef NOT_USED Size PointerGetAllocSize(Pointer pointer) { @@ -309,6 +312,7 @@ PointerGetAllocSize(Pointer pointer) return (PSIZE(pointer)); } +#endif /* * MemoryContextSwitchTo -- diff --git a/src/backend/utils/mmgr/oset.c b/src/backend/utils/mmgr/oset.c index 478fe1516ab..d413cb5cb6f 100644 --- a/src/backend/utils/mmgr/oset.c +++ b/src/backend/utils/mmgr/oset.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/mmgr/Attic/oset.c,v 1.1.1.1 1996/07/09 06:22:09 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/mmgr/Attic/oset.c,v 1.2 1997/08/19 21:35:59 momjian Exp $ * * NOTE * XXX This is a preliminary implementation which lacks fail-fast @@ -89,6 +89,7 @@ OrderedSetGetHead(OrderedSet set) /* * OrderedSetGetTail -- */ +#ifdef NOT_USED Pointer OrderedSetGetTail(OrderedSet set) { @@ -100,6 +101,7 @@ OrderedSetGetTail(OrderedSet set) } return (NULL); } +#endif /* * OrderedElemGetPredecessor -- diff --git a/src/backend/utils/mmgr/portalmem.c b/src/backend/utils/mmgr/portalmem.c index 23e600ce244..7f1674d88db 100644 --- a/src/backend/utils/mmgr/portalmem.c +++ b/src/backend/utils/mmgr/portalmem.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/mmgr/portalmem.c,v 1.4 1997/08/12 22:54:57 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/mmgr/portalmem.c,v 1.5 1997/08/19 21:36:04 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -91,6 +91,12 @@ #include "utils/portal.h" +static void CollectNamedPortals(Portal *portalP, int destroy); +static Portal PortalHeapMemoryGetPortal(PortalHeapMemory context); +static PortalVariableMemory PortalHeapMemoryGetVariableMemory(PortalHeapMemory context); +static void PortalResetHeapMemory(Portal portal); +static Portal PortalVariableMemoryGetPortal(PortalVariableMemory context); + /* ---------------- * ALLOCFREE_ERROR_ABORT * define this if you want a core dump when you try to @@ -413,7 +419,7 @@ PortalNameIsSpecial(char *pname) * entry *before* we destroy anything (destroying updates the hashtable * and screws up the sequential walk of the table). -mer 17 Aug 1992 */ -void +static void CollectNamedPortals(Portal *portalP, int destroy) { static Portal *portalList = (Portal *)NULL; @@ -800,7 +806,7 @@ PortalDestroy(Portal *portalP) * BadArg if mode is invalid. * ---------------- */ -void +static void PortalResetHeapMemory(Portal portal) { PortalHeapMemory context; @@ -929,7 +935,7 @@ PortalGetHeapMemory(Portal portal) * BadState if called when disabled. * BadArg if context is invalid. */ -Portal +static Portal PortalVariableMemoryGetPortal(PortalVariableMemory context) { return ((Portal)((char *)context - offsetof (PortalD, variable))); @@ -943,7 +949,7 @@ PortalVariableMemoryGetPortal(PortalVariableMemory context) * BadState if called when disabled. * BadArg if context is invalid. */ -Portal +static Portal PortalHeapMemoryGetPortal(PortalHeapMemory context) { return ((Portal)((char *)context - offsetof (PortalD, heap))); @@ -957,6 +963,7 @@ PortalHeapMemoryGetPortal(PortalHeapMemory context) * BadState if called when disabled. * BadArg if context is invalid. */ +#ifdef NOT_USED PortalHeapMemory PortalVariableMemoryGetHeapMemory(PortalVariableMemory context) { @@ -964,6 +971,7 @@ PortalVariableMemoryGetHeapMemory(PortalVariableMemory context) - offsetof (PortalD, variable) + offsetof (PortalD, heap))); } +#endif /* * PortalHeapMemoryGetVariableMemory -- @@ -973,7 +981,7 @@ PortalVariableMemoryGetHeapMemory(PortalVariableMemory context) * BadState if called when disabled. * BadArg if context is invalid. */ -PortalVariableMemory +static PortalVariableMemory PortalHeapMemoryGetVariableMemory(PortalHeapMemory context) { return ((PortalVariableMemory)((char *)context diff --git a/src/backend/utils/sort/psort.c b/src/backend/utils/sort/psort.c index a5f43deece2..d7829401810 100644 --- a/src/backend/utils/sort/psort.c +++ b/src/backend/utils/sort/psort.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/sort/Attic/psort.c,v 1.16 1997/08/18 02:14:56 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/sort/Attic/psort.c,v 1.17 1997/08/19 21:36:06 momjian Exp $ * * NOTES * Sorts the first relation into the second relation. @@ -64,6 +64,18 @@ #include "miscadmin.h" #include "storage/fd.h" +static bool createrun(Sort *node, FILE *file, bool *empty); +static void destroytape(FILE *file); +static void dumptuples(FILE *file, Sort *node); +static FILE *gettape(void); +static void initialrun(Sort *node, bool *empty); +static void inittapes(Sort *node); +static void merge(Sort *node, struct tape *dest); +static FILE *mergeruns(Sort *node); +static HeapTuple tuplecopy(HeapTuple tup); + + + #define TEMPDIR "./" static long shortzero = 0; /* used to delimit runs */ @@ -157,7 +169,7 @@ psort_begin(Sort *node, int nkeys, ScanKey key) * Returns: * number of allocated tapes */ -void +static void inittapes(Sort *node) { register int i; @@ -194,17 +206,6 @@ inittapes(Sort *node) } /* - * resetpsort - resets (pfrees) palloc'd memory for an aborted Xaction - * - * Not implemented yet. - */ -void -resetpsort() -{ - ; -} - -/* * PUTTUP - writes the next tuple * ENDRUN - mark end of run * GETLEN - reads the length of the next tuple @@ -266,7 +267,7 @@ resetpsort() * I (perhaps prematurely) combined the 2 algorithms. * Also, perhaps allocate tapes when needed. Split into 2 funcs. */ -void +static void initialrun(Sort *node, bool *empty) { /* register struct tuple *tup; */ @@ -341,7 +342,7 @@ initialrun(Sort *node, bool *empty) * FALSE iff process through end of relation * Tuples contains the tuples for the following run upon exit */ -bool +static bool createrun(Sort *node, FILE *file, bool *empty) { register HeapTuple lasttuple; @@ -429,7 +430,7 @@ createrun(Sort *node, FILE *file, bool *empty) * This should eventually go there under that name? And this will * then use palloc directly (see version -r1.2). */ -HeapTuple +static HeapTuple tuplecopy(HeapTuple tup) { HeapTuple rettup; @@ -449,7 +450,7 @@ tuplecopy(HeapTuple tup) * Returns: * file of tuples in order */ -FILE * +static FILE * mergeruns(Sort *node) { register struct tape *tp; @@ -475,7 +476,7 @@ mergeruns(Sort *node) * merge - handles a single merge of the tape * (polyphase merge Alg.D(D5)--Knuth, Vol.3, p271) */ -void +static void merge(Sort *node, struct tape *dest) { register HeapTuple tup; @@ -571,7 +572,7 @@ merge(Sort *node, struct tape *dest) /* * dumptuples - stores all the tuples in tree into file */ -void +static void dumptuples(FILE *file, Sort *node) { register struct leftist *tp; @@ -736,7 +737,7 @@ static struct tapelst *Tapes = NULL; * Open stream for writing/reading. * NULL if unable to open temporary file. */ -FILE * +static FILE * gettape() { register struct tapelst *tp; @@ -777,7 +778,8 @@ gettape() /* * resettape - resets the tape to size 0 */ -void +#ifdef NOT_USED +static void resettape(FILE *file) { register struct tapelst *tp; @@ -796,6 +798,7 @@ resettape(FILE *file) elog(FATAL, "could not freopen temporary file"); } } +#endif /* * distroytape - unlinks the tape @@ -806,7 +809,7 @@ resettape(FILE *file) * Possible bugs: * Exits instead of returning status, if given invalid tape. */ -void +static void destroytape(FILE *file) { register struct tapelst *tp, *tq; diff --git a/src/backend/utils/time/tqual.c b/src/backend/utils/time/tqual.c index 5c2f8271fa8..a5843004733 100644 --- a/src/backend/utils/time/tqual.c +++ b/src/backend/utils/time/tqual.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/time/tqual.c,v 1.2 1997/03/28 07:05:28 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/time/tqual.c,v 1.3 1997/08/19 21:36:12 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -26,6 +26,16 @@ #include "utils/tqual.h" +static AbsoluteTime TimeQualGetEndTime(TimeQual qual); +static AbsoluteTime TimeQualGetSnapshotTime(TimeQual qual); +static AbsoluteTime TimeQualGetStartTime(TimeQual qual); +static bool TimeQualIncludesNow(TimeQual qual); +static bool TimeQualIndicatesDisableValidityChecking(TimeQual qual); +static bool TimeQualIsLegal(TimeQual qual); +static bool TimeQualIsRanged(TimeQual qual); +static bool TimeQualIsSnapshot(TimeQual qual); +static bool TimeQualIsValid(TimeQual qual); + /* * TimeQualMode -- * Mode indicator for treatment of time qualifications. @@ -114,7 +124,7 @@ static bool HeapTupleSatisfiesUpperUnboundedInternalTimeQual(HeapTuple tuple, * TimeQualIsValid -- * True iff time qualification is valid. */ -bool +static bool TimeQualIsValid(TimeQual qual) { bool hasStartTime; @@ -162,7 +172,7 @@ TimeQualIsValid(TimeQual qual) * Note: * Assumes time qualification is valid. */ -bool +static bool TimeQualIsLegal(TimeQual qual) { Assert(TimeQualIsValid(qual)); @@ -221,7 +231,7 @@ TimeQualIsLegal(TimeQual qual) * Note: * Assumes time qualification is valid. */ -bool +static bool TimeQualIncludesNow(TimeQual qual) { Assert(TimeQualIsValid(qual)); @@ -251,6 +261,7 @@ TimeQualIncludesNow(TimeQual qual) * Assumes time qualification is valid. * XXX may not be needed? */ +#ifdef NOT_USED bool TimeQualIncludesPast(TimeQual qual) { @@ -263,6 +274,7 @@ TimeQualIncludesPast(TimeQual qual) /* otherwise, must check archive (setting locks as appropriate) */ return (true); } +#endif /* * TimeQualIsSnapshot -- @@ -271,7 +283,7 @@ TimeQualIncludesPast(TimeQual qual) * Note: * Assumes time qualification is valid. */ -bool +static bool TimeQualIsSnapshot(TimeQual qual) { Assert(TimeQualIsValid(qual)); @@ -290,7 +302,7 @@ TimeQualIsSnapshot(TimeQual qual) * Note: * Assumes time qualification is valid. */ -bool +static bool TimeQualIsRanged(TimeQual qual) { Assert(TimeQualIsValid(qual)); @@ -310,7 +322,7 @@ TimeQualIsRanged(TimeQual qual) * Note: * XXX This should not be implemented since this does not make sense. */ -bool +static bool TimeQualIndicatesDisableValidityChecking(TimeQual qual) { Assert (TimeQualIsValid(qual)); @@ -332,7 +344,7 @@ TimeQualIndicatesDisableValidityChecking(TimeQual qual) * Note: * Assumes time qual is valid snapshot time qual. */ -AbsoluteTime +static AbsoluteTime TimeQualGetSnapshotTime(TimeQual qual) { Assert(TimeQualIsSnapshot(qual)); @@ -347,7 +359,7 @@ TimeQualGetSnapshotTime(TimeQual qual) * Note: * Assumes time qual is valid ranged time qual. */ -AbsoluteTime +static AbsoluteTime TimeQualGetStartTime(TimeQual qual) { Assert(TimeQualIsRanged(qual)); @@ -362,7 +374,7 @@ TimeQualGetStartTime(TimeQual qual) * Note: * Assumes time qual is valid ranged time qual. */ -AbsoluteTime +static AbsoluteTime TimeQualGetEndTime(TimeQual qual) { Assert(TimeQualIsRanged(qual)); diff --git a/src/bin/pg_dump/common.c b/src/bin/pg_dump/common.c index 1fdd8486720..15729fe7b3a 100644 --- a/src/bin/pg_dump/common.c +++ b/src/bin/pg_dump/common.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/bin/pg_dump/common.c,v 1.12 1997/06/02 02:51:49 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/bin/pg_dump/common.c,v 1.13 1997/08/19 21:36:25 momjian Exp $ * * Modifications - 6/12/96 - dave@bensoft.com - version 1.13.dhb.2 * @@ -35,6 +35,15 @@ #include "pg_dump.h" +static char** findParentsByOid(TableInfo* tbinfo, int numTables, + InhInfo* inhinfo, int numInherits, + const char *oid, + int *numParents); +static int findTableByOid(TableInfo *tbinfo, int numTables, const char *oid); +static void flagInhAttrs(TableInfo* tbinfo, int numTables, + InhInfo* inhinfo, int numInherits); +static int strInArray(const char* pattern, char** arr, int arr_size); + /* * findTypeByOid * given an oid of a type, return its typename @@ -95,7 +104,7 @@ findOprByOid(OprInfo *oprinfo, int numOprs, const char *oid) * returns NULL if none */ -char** +static char** findParentsByOid(TableInfo* tblinfo, int numTables, InhInfo* inhinfo, int numInherits, const char *oid, int *numParentsPtr) @@ -173,7 +182,7 @@ parseArgTypes(char **argtypes, const char* str) * */ -int +static int strInArray(const char* pattern, char** arr, int arr_size) { int i; @@ -316,7 +325,7 @@ dumpSchemaIdx(FILE *fout, int *numTablesPtr, const char *tablename, * modifies tblinfo * */ -void +static void flagInhAttrs(TableInfo* tblinfo, int numTables, InhInfo* inhinfo, int numInherits) { @@ -373,7 +382,7 @@ findTableByName(TableInfo* tblinfo, int numTables, const char* relname) * NOTE: should hash this, but just do linear search for now */ -int +static int findTableByOid(TableInfo* tblinfo, int numTables, const char* oid) { int i; diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c index efd411d20d8..6c32da2e717 100644 --- a/src/bin/pg_dump/pg_dump.c +++ b/src/bin/pg_dump/pg_dump.c @@ -21,7 +21,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.37 1997/08/19 04:44:38 vadim Exp $ + * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.38 1997/08/19 21:36:40 momjian Exp $ * * Modifications - 6/10/96 - dave@bensoft.com - version 1.13.dhb * @@ -68,6 +68,13 @@ #include "pg_dump.h" static void dumpSequence (FILE* fout, TableInfo tbinfo); +static char *checkForQuote(const char* s); +static void clearTableInfo(TableInfo*, int); +static void dumpOneFunc(FILE* fout, FuncInfo* finfo, int i, + TypeInfo *tinfo, int numTypes); +static int findLastBuiltinOid(void); +static bool isViewRule(char *relname); +static void setMaxOid(FILE *fout); extern char *optarg; extern int optind, opterr; @@ -139,7 +146,7 @@ exit_nicely(PGconn* conn) * Determine if the relation is a VIEW * */ -bool +static bool isViewRule(char *relname) { PGresult *res; @@ -776,7 +783,7 @@ clearFuncInfo (FuncInfo *fun, int numFuncs) free(fun); } -void +static void clearTableInfo(TableInfo *tblinfo, int numTables) { int i,j; @@ -1482,7 +1489,7 @@ dumpFuncs(FILE* fout, FuncInfo* finfo, int numFuncs, * */ -void +static void dumpOneFunc(FILE* fout, FuncInfo* finfo, int i, TypeInfo *tinfo, int numTypes) { @@ -1956,6 +1963,7 @@ dumpIndices(FILE* fout, IndInfo* indinfo, int numIndices, * the attrmap passed in tells how to map the attributes copied in to the * attributes copied out */ +#ifdef NOT_USED void dumpTuples(PGresult *res, FILE *fout, int* attrmap) { @@ -1998,13 +2006,14 @@ dumpTuples(PGresult *res, FILE *fout, int* attrmap) free (outVals); } } +#endif /* * setMaxOid - * find the maximum oid and generate a COPY statement to set it */ -void +static void setMaxOid(FILE *fout) { PGresult *res; @@ -2053,7 +2062,7 @@ setMaxOid(FILE *fout) * this is probably not foolproof but comes close */ -int +static int findLastBuiltinOid(void) { PGresult* res; @@ -2083,7 +2092,7 @@ findLastBuiltinOid(void) * checkForQuote: * checks a string for quote characters and quotes them */ -char* +static char* checkForQuote(const char* s) { char *r; diff --git a/src/bin/pg_dump/pg_dump.h b/src/bin/pg_dump/pg_dump.h index a8df2db03ea..a537a3ff6ba 100644 --- a/src/bin/pg_dump/pg_dump.h +++ b/src/bin/pg_dump/pg_dump.h @@ -5,7 +5,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: pg_dump.h,v 1.18 1997/08/19 04:44:40 vadim Exp $ + * $Id: pg_dump.h,v 1.19 1997/08/19 21:36:45 momjian Exp $ * * Modifications - 6/12/96 - dave@bensoft.com - version 1.13.dhb.2 * @@ -167,20 +167,11 @@ extern void dumpSchemaIdx(FILE* fout, extern char* findTypeByOid(TypeInfo* tinfo, int numTypes, const char* oid); extern char* findOprByOid(OprInfo *oprinfo, int numOprs, const char *oid); extern int findFuncByName(FuncInfo* finfo, int numFuncs, const char* name); -extern char** findParentsByOid(TableInfo* tbinfo, int numTables, - InhInfo* inhinfo, int numInherits, - const char *oid, - int *numParents); extern int findTableByName(TableInfo *tbinfo, int numTables, const char *relname); -extern int findTableByOid(TableInfo *tbinfo, int numTables, const char *oid); -extern void flagInhAttrs(TableInfo* tbinfo, int numTables, - InhInfo* inhinfo, int numInherits); extern void check_conn_and_db(void); -extern int strInArray(const char* pattern, char** arr, int arr_size); extern void parseArgTypes(char **argtypes, const char* str); extern int isArchiveName(const char*); -extern bool isViewRule(char *relname); /* * version specific routines @@ -195,7 +186,6 @@ extern void clearInhInfo(InhInfo*, int); extern void clearIndInfo(IndInfo*, int); extern void clearOprInfo(OprInfo*, int); extern void clearTypeInfo(TypeInfo*, int); -extern void clearTableInfo(TableInfo*, int); extern OprInfo* getOperators(int *numOperators); extern TableInfo* getTables(int *numTables); @@ -210,8 +200,6 @@ extern void dumpAggs(FILE* fout, AggInfo* agginfo, int numAggregates, TypeInfo *tinfo, int numTypes); extern void dumpOprs(FILE* fout, OprInfo* agginfo, int numOperators, TypeInfo *tinfo, int numTypes); -extern void dumpOneFunc(FILE* fout, FuncInfo* finfo, int i, - TypeInfo *tinfo, int numTypes); extern void dumpTables(FILE* fout, TableInfo* tbinfo, int numTables, InhInfo *inhinfo, int numInherits, TypeInfo *tinfo, int numTypes, const char *tablename, @@ -219,12 +207,6 @@ extern void dumpTables(FILE* fout, TableInfo* tbinfo, int numTables, extern void dumpIndices(FILE* fout, IndInfo* indinfo, int numIndices, TableInfo* tbinfo, int numTables, const char *tablename); -extern void dumpTuples(PGresult *res, FILE *fout, int *attrmap); -extern void setMaxOid(FILE *fout); -extern char* checkForQuote(const char* s); -extern int findLastBuiltinOid(void); - - /* largest query string size */ #define MAXQUERYLEN 5000 diff --git a/src/bin/psql/psql.c b/src/bin/psql/psql.c index b8947606be5..f7d0245091a 100644 --- a/src/bin/psql/psql.c +++ b/src/bin/psql/psql.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.83 1997/08/19 04:45:02 vadim Exp $ + * $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.84 1997/08/19 21:36:51 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -88,18 +88,18 @@ static void prompt_for_password(char *username, char *password); static char * make_connect_string(char *host, char *port, char *dbname, char *username, char *password); -char *gets_noreadline(char *prompt, FILE * source); -char *gets_readline(char *prompt, FILE * source); -char *gets_fromFile(char *prompt, FILE * source); -int listAllDbs(PsqlSettings * settings); -void +static char *gets_noreadline(char *prompt, FILE * source); +static char *gets_readline(char *prompt, FILE * source); +static char *gets_fromFile(char *prompt, FILE * source); +static int listAllDbs(PsqlSettings * settings); +static void SendQuery(bool * success_p, PsqlSettings * settings, const char *query, const bool copy_in, const bool copy_out, FILE * copystream); -int +static int HandleSlashCmds(PsqlSettings * settings, char *line, char *query); -int MainLoop(PsqlSettings * settings, FILE * source); +static int MainLoop(PsqlSettings * settings, FILE * source); /* probably should move this into libpq */ void PQprint(FILE * fp, @@ -107,7 +107,7 @@ PQprint(FILE * fp, PQprintOpt * po ); -FILE *setFout(PsqlSettings * ps, char *fname); +static FILE *setFout(PsqlSettings * ps, char *fname); /* * usage print out usage for command line arguments @@ -226,7 +226,7 @@ PSQLexec(PsqlSettings * ps, char *query) * */ -int +static int listAllDbs(PsqlSettings * ps) { PGresult *results; @@ -495,7 +495,7 @@ typedef char *(*READ_ROUTINE) (char *prompt, FILE * source); * gets_noreadline prompt source gets a line of input without calling * readline, the source is ignored */ -char * +static char * gets_noreadline(char *prompt, FILE * source) { fputs(prompt, stdout); @@ -507,7 +507,7 @@ gets_noreadline(char *prompt, FILE * source) * gets_readline prompt source the routine to get input from GNU readline(), * the source is ignored the prompt argument is used as the prompting string */ -char * +static char * gets_readline(char *prompt, FILE * source) { char *s; @@ -529,7 +529,7 @@ gets_readline(char *prompt, FILE * source) * the routine to read from a file, the prompt argument is ignored the source * argument is a FILE * */ -char * +static char * gets_fromFile(char *prompt, FILE * source) { char *line; @@ -557,7 +557,7 @@ gets_fromFile(char *prompt, FILE * source) * SendQuery: send the query string to the backend return *success_p = 1 if * the query executed successfully returns *success_p = 0 otherwise */ -void +static void SendQuery(bool * success_p, PsqlSettings * settings, const char *query, const bool copy_in, const bool copy_out, FILE * copystream) { @@ -1120,7 +1120,7 @@ do_shell(const char *command) * this line, continue building up query 2 - terminate processing of this * query entirely, 3 - new query supplied by edit */ -int +static int HandleSlashCmds(PsqlSettings * settings, char *line, char *query) @@ -1416,7 +1416,7 @@ HandleSlashCmds(PsqlSettings * settings, * db_ptr must be initialized and set */ -int +static int MainLoop(PsqlSettings * settings, FILE * source) { char *line; /* line of input */ @@ -1901,7 +1901,7 @@ handleCopyIn(PGresult * res, const bool mustprompt, FILE * copystream) * try to open fname and return a FILE *, if it fails, use stdout, instead */ -FILE * +static FILE * setFout(PsqlSettings * ps, char *fname) { if (ps->queryFout && ps->queryFout != stdout) { diff --git a/src/bin/psql/stringutils.c b/src/bin/psql/stringutils.c index 4f7a510784a..6237aa5e301 100644 --- a/src/bin/psql/stringutils.c +++ b/src/bin/psql/stringutils.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/bin/psql/stringutils.c,v 1.8 1997/02/13 08:31:57 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/bin/psql/stringutils.c,v 1.9 1997/08/19 21:36:56 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -28,8 +28,8 @@ and both sides of a string */ /* MODIFIES the string passed in and returns the head of it */ - -char *leftTrim(char *s) +#ifdef NOT_USED +static char *leftTrim(char *s) { char *s2 = s; int shift=0; @@ -45,6 +45,7 @@ char *leftTrim(char *s) return s2; } +#endif char *rightTrim(char *s) { @@ -59,11 +60,13 @@ char *rightTrim(char *s) return s; } -char *doubleTrim(char *s) +#ifdef NOT_USED +static char *doubleTrim(char *s) { strcpy(s,leftTrim(rightTrim(s))); return s; } +#endif #ifdef STRINGUTILS_TEST void testStringUtils() diff --git a/src/bin/psql/stringutils.h b/src/bin/psql/stringutils.h index 11da94449ea..c6f037ec716 100644 --- a/src/bin/psql/stringutils.h +++ b/src/bin/psql/stringutils.h @@ -5,7 +5,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: stringutils.h,v 1.3 1996/11/26 03:20:08 bryanh Exp $ + * $Id: stringutils.h,v 1.4 1997/08/19 21:36:58 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -27,9 +27,7 @@ /* removes whitespaces from the left, right and both sides of a string */ /* MODIFIES the string passed in and returns the head of it */ -extern char *leftTrim(char *s); extern char *rightTrim(char *s); -extern char *doubleTrim(char *s); #ifdef STRINGUTILS_TEST extern void testStringUtils(); diff --git a/src/include/access/genam.h b/src/include/access/genam.h index b18a9291bb7..a6a3fd9d2f7 100644 --- a/src/include/access/genam.h +++ b/src/include/access/genam.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: genam.h,v 1.6 1997/01/10 09:36:29 vadim Exp $ + * $Id: genam.h,v 1.7 1997/08/19 21:37:13 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -34,8 +34,6 @@ extern IndexScanDesc index_beginscan(Relation relation, bool scanFromEnd, uint16 numberOfKeys, ScanKey key); extern void index_rescan(IndexScanDesc scan, bool scanFromEnd, ScanKey key); extern void index_endscan(IndexScanDesc scan); -extern void index_markpos(IndexScanDesc scan); -extern void index_restrpos(IndexScanDesc scan); extern RetrieveIndexResult index_getnext(IndexScanDesc scan, ScanDirection direction); extern RegProcedure index_getprocid(Relation irel, AttrNumber attnum, @@ -47,9 +45,6 @@ extern Datum GetIndexValue(HeapTuple tuple, TupleDesc hTupDesc, /* in genam.c */ extern IndexScanDesc RelationGetIndexScan(Relation relation, bool scanFromEnd, uint16 numberOfKeys, ScanKey key); -extern void IndexScanRestart(IndexScanDesc scan, bool scanFromEnd, - ScanKey key); -extern void IndexScanEnd(IndexScanDesc scan); extern void IndexScanMarkPosition(IndexScanDesc scan); extern void IndexScanRestorePosition(IndexScanDesc scan); diff --git a/src/include/access/gist.h b/src/include/access/gist.h index 1fc4a7112b0..1e8efc18e0f 100644 --- a/src/include/access/gist.h +++ b/src/include/access/gist.h @@ -183,24 +183,13 @@ extern void gistbuild(Relation heap, extern InsertIndexResult gistinsert(Relation r, Datum *datum, char *nulls,ItemPointer ht_ctid, Relation heapRel); extern void _gistdump(Relation r); -extern char *text_range_out(TXTRANGE *r); -extern char *int_range_out(INTRANGE *r); extern void gistfreestack(GISTSTACK *s); extern void initGISTstate(GISTSTATE *giststate, Relation index); extern void gistdentryinit(GISTSTATE *giststate, GISTENTRY *e, char *pr, Relation r, Page pg, OffsetNumber o, int b, bool l) ; -extern void gistcentryinit(GISTSTATE *giststate, GISTENTRY *e, char *pr, - Relation r, Page pg, OffsetNumber o, int b, bool l) ; extern StrategyNumber RelationGetGISTStrategy(Relation, AttrNumber, RegProcedure); /* gistget.c */ extern RetrieveIndexResult gistgettuple(IndexScanDesc s, ScanDirection dir); -extern bool gistindex_keytest(IndexTuple tuple, TupleDesc tupdesc, - int scanKeySize, ScanKey key, GISTSTATE *giststate, - Relation r, Page p, OffsetNumber offset); - -/* giststrat.c */ -extern bool RelationInvokeGISTStrategy(Relation r, AttrNumber attnum, - StrategyNumber s, Datum left, Datum right); #endif /* GIST_H */ diff --git a/src/include/access/giststrat.h b/src/include/access/giststrat.h index 7bf35ad768c..74f370b745d 100644 --- a/src/include/access/giststrat.h +++ b/src/include/access/giststrat.h @@ -17,7 +17,5 @@ extern StrategyNumber RelationGetGISTStrategy(Relation r, AttrNumber attnum, RegProcedure proc); -extern bool RelationInvokeGISTStrategy(Relation r, AttrNumber attnum, - StrategyNumber s, Datum left, Datum right); #endif /* GISTSTRAT_H */ diff --git a/src/include/access/hash.h b/src/include/access/hash.h index 52a0955aff4..c01bb55d45d 100644 --- a/src/include/access/hash.h +++ b/src/include/access/hash.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: hash.h,v 1.6 1997/01/10 09:36:32 vadim Exp $ + * $Id: hash.h,v 1.7 1997/08/19 21:37:27 momjian Exp $ * * NOTES * modeled after Margo Seltzer's hash implementation for unix. @@ -322,13 +322,6 @@ extern bool _hash_step(IndexScanDesc scan, Buffer *bufP, ScanDirection dir, Buffer metabuf); -/* hashstrat.c */ -extern StrategyNumber _hash_getstrat(Relation rel, AttrNumber attno, - RegProcedure proc); -extern bool _hash_invokestrat(Relation rel, AttrNumber attno, - StrategyNumber strat, Datum left, Datum right); - - /* hashutil.c */ extern ScanKey _hash_mkscankey(Relation rel, IndexTuple itup, HashMetaPage metap); diff --git a/src/include/access/heapam.h b/src/include/access/heapam.h index bcc974f18ee..f16a3bec536 100644 --- a/src/include/access/heapam.h +++ b/src/include/access/heapam.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: heapam.h,v 1.6 1996/11/10 03:04:37 momjian Exp $ + * $Id: heapam.h,v 1.7 1997/08/19 21:37:30 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -88,7 +88,6 @@ extern HeapAccessStatistics heap_access_stats; /* in stats.c */ /* heapam.c */ extern void doinsert(Relation relation, HeapTuple tup); -extern void SetHeapAccessMethodImmediateInvalidation(bool on); extern Relation heap_open(Oid relationId); extern Relation heap_openr(char *relationName); @@ -115,14 +114,11 @@ extern void DataFill(char *data, TupleDesc tupleDesc, extern int heap_attisnull(HeapTuple tup, int attnum); extern int heap_sysattrlen(AttrNumber attno); extern bool heap_sysattrbyval(AttrNumber attno); -extern char *heap_getsysattr(HeapTuple tup, Buffer b, int attnum); extern char *fastgetattr(HeapTuple tup, int attnum, TupleDesc att, bool *isnull); extern char *heap_getattr(HeapTuple tup, Buffer b, int attnum, TupleDesc att, bool *isnull); extern HeapTuple heap_copytuple(HeapTuple tuple); -extern void heap_deformtuple(HeapTuple tuple, TupleDesc tdesc, - Datum values[], char nulls[]); extern HeapTuple heap_formtuple(TupleDesc tupleDescriptor, Datum value[], char nulls[]); extern HeapTuple heap_modifytuple(HeapTuple tuple, Buffer buffer, @@ -130,11 +126,7 @@ extern HeapTuple heap_modifytuple(HeapTuple tuple, Buffer buffer, HeapTuple heap_addheader(uint32 natts, int structlen, char *structure); /* in common/heap/stats.c */ -extern void InitHeapAccessStatistics(void); -extern void ResetHeapAccessStatistics(void); -extern HeapAccessStatistics GetHeapAccessStatistics(void); extern void PrintHeapAccessStatistics(HeapAccessStatistics stats); -extern void PrintAndFreeHeapAccessStatistics(HeapAccessStatistics stats); extern void initam(void); /* hio.c */ diff --git a/src/include/access/istrat.h b/src/include/access/istrat.h index 5cae0084cee..59b4bffa5b1 100644 --- a/src/include/access/istrat.h +++ b/src/include/access/istrat.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: istrat.h,v 1.4 1996/11/05 10:37:04 scrappy Exp $ + * $Id: istrat.h,v 1.5 1997/08/19 21:37:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -47,21 +47,12 @@ */ #define IndexStrategyIsValid(s) PointerIsValid(s) -extern ScanKey StrategyMapGetScanKeyEntry(StrategyMap map, - StrategyNumber strategyNumber); extern StrategyMap IndexStrategyGetStrategyMap(IndexStrategy indexStrategy, StrategyNumber maxStrategyNum, AttrNumber attrNum); extern Size AttributeNumberGetIndexStrategySize(AttrNumber maxAttributeNumber, StrategyNumber maxStrategyNumber); -extern bool StrategyOperatorIsValid(StrategyOperator operator, - StrategyNumber maxStrategy); -extern bool StrategyTermIsValid(StrategyTerm term, - StrategyNumber maxStrategy); -extern bool StrategyExpressionIsValid(StrategyExpression expression, - StrategyNumber maxStrategy); -extern bool StrategyEvaluationIsValid(StrategyEvaluation evaluation); extern StrategyNumber RelationGetStrategy(Relation relation, AttrNumber attributeNumber, StrategyEvaluation evaluation, RegProcedure procedure); diff --git a/src/include/access/itup.h b/src/include/access/itup.h index 51d1be853ee..45e19fd8494 100644 --- a/src/include/access/itup.h +++ b/src/include/access/itup.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: itup.h,v 1.4 1996/11/05 07:20:09 scrappy Exp $ + * $Id: itup.h,v 1.5 1997/08/19 21:37:33 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -88,8 +88,6 @@ typedef struct PredInfo { /* indextuple.h */ extern IndexTuple index_formtuple(TupleDesc tupleDescriptor, Datum value[], char null[]); -extern char *fastgetiattr(IndexTuple tup, int attnum, - TupleDesc att, bool *isnull); extern Datum index_getattr(IndexTuple tuple, AttrNumber attNum, TupleDesc tupDesc, bool *isNullOutP); extern RetrieveIndexResult diff --git a/src/include/access/nbtree.h b/src/include/access/nbtree.h index 71aae9e81c9..89f1085929a 100644 --- a/src/include/access/nbtree.h +++ b/src/include/access/nbtree.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: nbtree.h,v 1.13 1997/05/30 18:40:02 vadim Exp $ + * $Id: nbtree.h,v 1.14 1997/08/19 21:37:35 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -219,7 +219,6 @@ extern bool _bt_itemcmp(Relation rel, Size keysz, BTItem item1, BTItem item2, * prototypes for functions in nbtpage.c */ extern void _bt_metapinit(Relation rel); -extern void _bt_checkmeta(Relation rel); extern Buffer _bt_getroot(Relation rel, int access); extern Buffer _bt_getbuf(Relation rel, BlockNumber blkno, int access); extern void _bt_relbuf(Relation rel, Buffer buf, int access); @@ -228,8 +227,6 @@ extern void _bt_wrtnorelbuf(Relation rel, Buffer buf); extern void _bt_pageinit(Page page, Size size); extern void _bt_metaproot(Relation rel, BlockNumber rootbknum, int level); extern Buffer _bt_getstackbuf(Relation rel, BTStack stack, int access); -extern void _bt_setpagelock(Relation rel, BlockNumber blkno, int access); -extern void _bt_unsetpagelock(Relation rel, BlockNumber blkno, int access); extern void _bt_pagedel(Relation rel, ItemPointer tid); /* @@ -274,7 +271,6 @@ extern OffsetNumber _bt_binsrch(Relation rel, Buffer buf, int keysz, extern RetrieveIndexResult _bt_next(IndexScanDesc scan, ScanDirection dir); extern RetrieveIndexResult _bt_first(IndexScanDesc scan, ScanDirection dir); extern bool _bt_step(IndexScanDesc scan, Buffer *bufP, ScanDirection dir); -extern int _bt_compare(Relation rel, TupleDesc itupdesc, Page page, int keysz, ScanKey scankey, OffsetNumber offnum); /* * prototypes for functions in nbtstrat.c @@ -291,8 +287,6 @@ extern ScanKey _bt_mkscankey(Relation rel, IndexTuple itup); extern void _bt_freeskey(ScanKey skey); extern void _bt_freestack(BTStack stack); extern void _bt_orderkeys(Relation relation, BTScanOpaque so); -extern bool _bt_checkqual(IndexScanDesc scan, IndexTuple itup); -extern bool _bt_checkforkeys(IndexScanDesc scan, IndexTuple itup, Size keysz); extern bool _bt_checkkeys (IndexScanDesc scan, IndexTuple tuple, Size *keysok); extern BTItem _bt_formitem(IndexTuple itup); @@ -300,13 +294,8 @@ extern BTItem _bt_formitem(IndexTuple itup); * prototypes for functions in nbtsort.c */ extern void *_bt_spoolinit(Relation index, int ntapes, bool isunique); -extern void *_bt_pagestate(Relation index, int flags, int level, bool doupper); -extern BTItem _bt_minitem(Page opage, BlockNumber oblkno, int atend); -extern BTItem _bt_buildadd(Relation index, void *pstate, BTItem bti, int flags); -extern void _bt_uppershutdown(Relation index, BTPageState *state); extern void _bt_spooldestroy(void *spool); extern void _bt_spool(Relation index, BTItem btitem, void *spool); -extern void _bt_upperbuild(Relation index); extern void _bt_leafbuild(Relation index, void *spool); #endif /* NBTREE_H */ diff --git a/src/include/access/rtree.h b/src/include/access/rtree.h index 01dfc62fa1d..c134d3dbbed 100644 --- a/src/include/access/rtree.h +++ b/src/include/access/rtree.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: rtree.h,v 1.5 1997/01/10 09:36:34 vadim Exp $ + * $Id: rtree.h,v 1.6 1997/08/19 21:37:36 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -132,10 +132,6 @@ extern void _rtdump(Relation r); extern void rtadjscans(Relation r, int op, BlockNumber blkno, OffsetNumber offnum); /* rtstrat.h */ -extern StrategyNumber RelationGetRTStrategy(Relation r, - AttrNumber attnum, RegProcedure proc); -extern bool RelationInvokeRTStrategy(Relation r, AttrNumber attnum, - StrategyNumber s, Datum left, Datum right); extern RegProcedure RTMapOperator(Relation r, AttrNumber attnum, RegProcedure proc); diff --git a/src/include/access/transam.h b/src/include/access/transam.h index b3d227fdc74..1d794594872 100644 --- a/src/include/access/transam.h +++ b/src/include/access/transam.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: transam.h,v 1.6 1996/11/27 07:30:28 vadim Exp $ + * $Id: transam.h,v 1.7 1997/08/19 21:37:38 momjian Exp $ * * NOTES * Transaction System Version 101 now support proper oid @@ -140,34 +140,17 @@ typedef VariableRelationContentsData *VariableRelationContents; /* * prototypes for functions in transam/transam.c */ -extern int RecoveryCheckingEnabled(void); -extern void SetRecoveryCheckingEnabled(bool state); -extern bool TransactionLogTest(TransactionId transactionId, XidStatus status); -extern void TransactionLogUpdate(TransactionId transactionId, - XidStatus status); extern AbsoluteTime TransactionIdGetCommitTime(TransactionId transactionId); -extern void TransRecover(Relation logRelation); extern void InitializeTransactionLog(void); extern bool TransactionIdDidCommit(TransactionId transactionId); extern bool TransactionIdDidAbort(TransactionId transactionId); extern void TransactionIdCommit(TransactionId transactionId); extern void TransactionIdAbort(TransactionId transactionId); -extern void TransactionIdSetInProgress(TransactionId transactionId); /* in transam/transsup.c */ extern void AmiTransactionOverride(bool flag); extern void TransComputeBlockNumber(Relation relation, TransactionId transactionId, BlockNumber *blockNumberOutP); -extern XidStatus TransBlockGetLastTransactionIdStatus(Block tblock, - TransactionId baseXid, TransactionId *returnXidP); -extern XidStatus TransBlockGetXidStatus(Block tblock, - TransactionId transactionId); -extern void TransBlockSetXidStatus(Block tblock, - TransactionId transactionId, XidStatus xstatus); -extern AbsoluteTime TransBlockGetCommitTime(Block tblock, - TransactionId transactionId); -extern void TransBlockSetCommitTime(Block tblock, - TransactionId transactionId, AbsoluteTime commitTime); extern XidStatus TransBlockNumberGetXidStatus(Relation relation, BlockNumber blockNumber, TransactionId xid, bool *failP); extern void TransBlockNumberSetXidStatus(Relation relation, @@ -178,19 +161,11 @@ extern AbsoluteTime TransBlockNumberGetCommitTime(Relation relation, extern void TransBlockNumberSetCommitTime(Relation relation, BlockNumber blockNumber, TransactionId xid, AbsoluteTime xtime, bool *failP); -extern void TransGetLastRecordedTransaction(Relation relation, - TransactionId xid, bool *failP); /* in transam/varsup.c */ -extern void VariableRelationGetNextXid(TransactionId *xidP); -extern void VariableRelationGetLastXid(TransactionId *xidP); extern void VariableRelationPutNextXid(TransactionId xid); -extern void VariableRelationPutLastXid(TransactionId xid); -extern void VariableRelationGetNextOid(Oid *oid_return); -extern void VariableRelationPutNextOid(Oid *oidP); extern void GetNewTransactionId(TransactionId *xid); extern void UpdateLastCommittedXid(TransactionId xid); -extern void GetNewObjectIdBlock(Oid *oid_return, int oid_block_size); extern void GetNewObjectId(Oid *oid_return); extern void CheckMaxObjectId(Oid assigned_oid); diff --git a/src/include/access/xact.h b/src/include/access/xact.h index fa0f35b7def..ef148c6b9b6 100644 --- a/src/include/access/xact.h +++ b/src/include/access/xact.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: xact.h,v 1.4 1996/11/10 03:04:42 momjian Exp $ + * $Id: xact.h,v 1.5 1997/08/19 21:37:40 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -66,30 +66,14 @@ extern CommandId GetCurrentCommandId(void); extern AbsoluteTime GetCurrentTransactionStartTime(void); extern bool TransactionIdIsCurrentTransactionId(TransactionId xid); extern bool CommandIdIsCurrentCommandId(CommandId cid); -extern void ClearCommandIdCounterOverflowFlag(void); extern void CommandCounterIncrement(void); extern void InitializeTransactionSystem(void); -extern void AtStart_Cache(void); -extern void AtStart_Locks(void); -extern void AtStart_Memory(void); -extern void RecordTransactionCommit(void); -extern void AtCommit_Cache(void); -extern void AtCommit_Locks(void); -extern void AtCommit_Memory(void); -extern void RecordTransactionAbort(void); -extern void AtAbort_Cache(void); -extern void AtAbort_Locks(void); -extern void AtAbort_Memory(void); -extern void StartTransaction(void); extern bool CurrentXactInProgress(void); -extern void CommitTransaction(void); -extern void AbortTransaction(void); extern void StartTransactionCommand(void); extern void CommitTransactionCommand(void); extern void AbortCurrentTransaction(void); extern void BeginTransactionBlock(void); extern void EndTransactionBlock(void); -extern void AbortTransactionBlock(void); extern bool IsTransactionBlock(void); extern void UserAbortTransactionBlock(void); @@ -105,7 +89,6 @@ extern void TransactionIdStore(TransactionId transactionId, TransactionId *destination); extern bool TransactionIdEquals(TransactionId id1, TransactionId id2); extern bool TransactionIdIsLessThan(TransactionId id1, TransactionId id2); -extern void TransactionIdIncrement(TransactionId *transactionId); extern void TransactionIdAdd(TransactionId *xid, int value); #endif /* XACT_H */ diff --git a/src/include/bootstrap/bootstrap.h b/src/include/bootstrap/bootstrap.h index 707451b17e6..12e28495e40 100644 --- a/src/include/bootstrap/bootstrap.h +++ b/src/include/bootstrap/bootstrap.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: bootstrap.h,v 1.4 1996/11/08 06:43:28 scrappy Exp $ + * $Id: bootstrap.h,v 1.5 1997/08/19 21:37:42 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -50,16 +50,9 @@ extern char *LexIDStr(int ident_num); extern void DefineAttr(char *name, char *type, int attnum); extern void InsertOneValue(Oid objectid, char *value, int i); extern void InsertOneNull(int i); -extern bool BootstrapAlreadySeen(Oid id); -extern void cleanup(void); -extern int gettype(char *type); -extern AttributeTupleForm AllocateAttribute(void); extern char* MapArrayTypeName(char *s); extern char* CleanUpStr(char *s); extern int EnterString (char *str); -extern int CompHash (char *str, int len); -extern hashnode *FindStr (char *str, int length, hashnode *mderef); -extern hashnode *AddStr(char *str, int strlength, int mderef); extern void build_indices(void); #endif /* BOOTSTRAP_H */ diff --git a/src/include/catalog/heap.h b/src/include/catalog/heap.h index 2259c5e0839..643b5198f09 100644 --- a/src/include/catalog/heap.h +++ b/src/include/catalog/heap.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: heap.h,v 1.3 1996/11/10 03:04:44 momjian Exp $ + * $Id: heap.h,v 1.4 1997/08/19 21:37:47 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -17,28 +17,15 @@ extern Relation heap_creatr(char *relname, unsigned smgr, TupleDesc att); -extern int RelationAlreadyExists(Relation pg_class_desc, char relname[]); -extern void addNewRelationType(char *typeName, Oid new_rel_oid); - -extern void AddPgRelationTuple(Relation pg_class_desc, - Relation new_rel_desc, Oid new_rel_oid, int arch, unsigned natts); - extern Oid heap_create(char relname[], char *typename, int arch, unsigned smgr, TupleDesc tupdesc); -extern void RelationRemoveInheritance(Relation relation); -extern void RelationRemoveIndexes(Relation relation); -extern void DeletePgRelationTuple(Relation rdesc); -extern void DeletePgAttributeTuples(Relation rdesc); -extern void DeletePgTypeTuple(Relation rdesc); extern void heap_destroy(char relname[]); extern void heap_destroyr(Relation r); extern void InitTempRelList(void); -extern void AddToTempRelList(Relation r); -extern void RemoveFromTempRelList(Relation r); extern void DestroyTempRels(void); #endif /* HEAP_H */ diff --git a/src/include/catalog/pg_type.h b/src/include/catalog/pg_type.h index 9ed1094c1b1..33ee2dbf569 100644 --- a/src/include/catalog/pg_type.h +++ b/src/include/catalog/pg_type.h @@ -7,7 +7,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: pg_type.h,v 1.12 1997/05/26 16:55:23 thomas Exp $ + * $Id: pg_type.h,v 1.13 1997/08/19 21:37:54 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -315,8 +315,6 @@ DATA(insert OID = 1296 ( timestamp PGUID 4 19 t b t \054 0 0 timestamp_in t * prototypes for functions in pg_type.c */ extern Oid TypeGet(char *typeName, bool *defined); -extern Oid TypeShellMakeWithOpenRelation(Relation pg_type_desc, - char *typeName); extern Oid TypeShellMake(char *typeName); extern Oid TypeCreate(char *typeName, Oid relationOid, diff --git a/src/include/commands/async.h b/src/include/commands/async.h index c572c64243c..7bae5c6f4b4 100644 --- a/src/include/commands/async.h +++ b/src/include/commands/async.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: async.h,v 1.4 1996/11/08 06:01:49 momjian Exp $ + * $Id: async.h,v 1.5 1997/08/19 21:38:03 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -20,10 +20,7 @@ extern void Async_Notify(char *relname); extern void Async_NotifyAtCommit(void); extern void Async_NotifyAtAbort(void); extern void Async_Listen(char *relname, int pid); -extern void Async_Unlisten(char *relname, int pid); -extern void Async_UnlistenOnExit(int code, char *relname); extern GlobalMemory notifyContext; -extern void Async_NotifyFrontEnd(void); #endif /* ASYNC_H */ diff --git a/src/include/commands/cluster.h b/src/include/commands/cluster.h index e588c88a3e2..45ba116212e 100644 --- a/src/include/commands/cluster.h +++ b/src/include/commands/cluster.h @@ -5,7 +5,7 @@ * * Copyright (c) 1994-5, Regents of the University of California * - * $Id: cluster.h,v 1.1 1996/08/28 07:21:42 scrappy Exp $ + * $Id: cluster.h,v 1.2 1997/08/19 21:38:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -23,8 +23,5 @@ * functions */ extern void cluster(char oldrelname[], char oldindexname[]); -extern Relation copy_heap(Oid OIDOldHeap); -extern void copy_index(Oid OIDOldIndex, Oid OIDNewHeap); -extern void rebuildheap(Oid OIDNewHeap, Oid OIDOldHeap, Oid OIDOldIndex); #endif /* CLUSTER_H */ diff --git a/src/include/commands/command.h b/src/include/commands/command.h index 850da5681b1..d91d7b3a913 100644 --- a/src/include/commands/command.h +++ b/src/include/commands/command.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: command.h,v 1.3 1996/11/06 08:05:02 scrappy Exp $ + * $Id: command.h,v 1.4 1997/08/19 21:38:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -18,16 +18,6 @@ extern MemoryContext PortalExecutorHeapMemory; /* - * PortalCleanup -- - * Cleans up the query state of the portal. - * - * Exceptions: - * BadArg if portal invalid. - */ -extern void PortalCleanup(Portal portal); - - -/* * PerformPortalFetch -- * Performs the POSTQUEL function FETCH. Fetches count (or all if 0) * tuples in portal with name in the forward direction iff goForward. @@ -45,6 +35,8 @@ extern void PerformPortalFetch(char *name, bool forward, int count, */ extern void PerformPortalClose(char *name, CommandDest dest); +extern void PortalCleanup(Portal portal); + /* * PerformAddAttribute -- * Performs the POSTQUEL function ADD. diff --git a/src/include/commands/version.h b/src/include/commands/version.h index 227fcaeaaa5..1b3e5169d99 100644 --- a/src/include/commands/version.h +++ b/src/include/commands/version.h @@ -6,19 +6,11 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: version.h,v 1.3 1996/11/06 10:29:33 scrappy Exp $ + * $Id: version.h,v 1.4 1997/08/19 21:38:10 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef VERSION_H #define VERSION_H - - -extern void DefineVersion(char *name, char *fromRelname, char *date); -extern void VersionCreate(char *vname, char *bname); -extern void VersionAppend(char *vname, char *bname); -extern void VersionRetrieve(char *vname, char *bname, char *snapshot); -extern void VersionDelete(char *vname, char *bname, char *snapshot); -extern void VersionReplace(char *vname, char *bname, char *snapshot); #endif /* VERSION_H */ diff --git a/src/include/executor/execFlatten.h b/src/include/executor/execFlatten.h index e42d5e09d97..6a7f26a729b 100644 --- a/src/include/executor/execFlatten.h +++ b/src/include/executor/execFlatten.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: execFlatten.h,v 1.1 1996/08/28 07:22:04 scrappy Exp $ + * $Id: execFlatten.h,v 1.2 1997/08/19 21:38:12 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -17,8 +17,6 @@ extern Datum ExecEvalIter(Iter *iterNode, ExprContext *econtext, bool *resultIsN extern void ExecEvalFjoin(TargetEntry *tlist, ExprContext *econtext, bool *isNullVect, bool *fj_isDone); -extern bool FjoinBumpOuterNodes(TargetEntry *tlist, ExprContext *econtext, DatumPtr results, char *nulls); - #endif /* EXECFLATTEN_H */ diff --git a/src/include/executor/executor.h b/src/include/executor/executor.h index c3a58716c53..6a525fbece0 100644 --- a/src/include/executor/executor.h +++ b/src/include/executor/executor.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: executor.h,v 1.8 1997/05/31 16:52:19 momjian Exp $ + * $Id: executor.h,v 1.9 1997/08/19 21:38:16 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -29,9 +29,6 @@ extern void ExecOpenScanR(Oid relOid, int nkeys, ScanKey skeys, bool isindex, ScanDirection dir, TimeQual timeRange, Relation *returnRelation, Pointer *returnScanDesc); -extern Relation ExecOpenR(Oid relationOid, bool isindex); -extern Pointer ExecBeginScan(Relation relation, int nkeys, ScanKey skeys, - bool isindex, ScanDirection dir, TimeQual time_range); extern void ExecCloseR(Plan *node); extern void ExecReScan(Plan *node, ExprContext *exprCtxt, Plan *parent); extern HeapScanDesc ExecReScanR(Relation relDesc, HeapScanDesc scanDesc, @@ -52,7 +49,6 @@ extern HeapTuple ExecRemoveJunk(JunkFilter *junkfilter, TupleTableSlot *slot); /* * prototypes from functions in execMain.c */ -extern int ExecutorLimit(int limit); extern TupleDesc ExecutorStart(QueryDesc *queryDesc, EState *estate); extern TupleTableSlot* ExecutorRun(QueryDesc *queryDesc, EState *estate, int feature, int count); extern void ExecutorEnd(QueryDesc *queryDesc, EState *estate); @@ -73,31 +69,13 @@ extern int execConstLen; extern Datum ExecExtractResult(TupleTableSlot *slot, AttrNumber attnum, bool *isNull); -extern Datum ExecEvalVar(Var *variable, ExprContext *econtext, bool *isNull); extern Datum ExecEvalParam(Param *expression, ExprContext *econtext, bool *isNull); -extern char *GetAttributeByNum(TupleTableSlot *slot, AttrNumber attrno, - bool *isNull); -extern char *att_by_num(TupleTableSlot *slot, AttrNumber attrno, - bool *isNull); /* stop here */ extern char *GetAttributeByName(TupleTableSlot *slot, char *attname, bool *isNull); -extern char *att_by_name(TupleTableSlot *slot, char *attname, bool *isNull); -extern void ExecEvalFuncArgs(FunctionCachePtr fcache, ExprContext *econtext, - List *argList, Datum argV[], bool *argIsDone); -extern Datum ExecMakeFunctionResult(Node *node, List *arguments, - ExprContext *econtext, bool *isNull, bool *isDone); -extern Datum ExecEvalOper(Expr *opClause, ExprContext *econtext, - bool *isNull); -extern Datum ExecEvalFunc(Expr *funcClause, ExprContext *econtext, - bool *isNull, bool *isDone); -extern Datum ExecEvalNot(Expr *notclause, ExprContext *econtext, bool *isNull); -extern Datum ExecEvalOr(Expr *orExpr, ExprContext *econtext, bool *isNull); -extern Datum ExecEvalAnd(Expr *andExpr, ExprContext *econtext, bool *isNull); extern Datum ExecEvalExpr(Node *expression, ExprContext *econtext, bool *isNull, bool *isDone); -extern bool ExecQualClause(Node *clause, ExprContext *econtext); extern bool ExecQual(List *qual, ExprContext *econtext); extern int ExecTargetListLength(List *targetlist); extern TupleTableSlot *ExecProject(ProjectionInfo *projInfo, bool *isDone); @@ -118,24 +96,17 @@ extern TupleTableSlot* ExecStoreTuple(HeapTuple tuple, Buffer buffer, bool shouldFree); extern TupleTableSlot* ExecClearTuple(TupleTableSlot* slot); -extern bool ExecSlotPolicy(TupleTableSlot *slot); extern bool ExecSetSlotPolicy(TupleTableSlot *slot, bool shouldFree); extern TupleDesc ExecSetSlotDescriptor(TupleTableSlot *slot, TupleDesc tupdesc); extern void ExecSetSlotDescriptorIsNew(TupleTableSlot *slot, bool isNew); -extern TupleDesc ExecSetNewSlotDescriptor(TupleTableSlot *slot, - TupleDesc tupdesc); -extern Buffer ExecSetSlotBuffer(TupleTableSlot *slot, Buffer b); extern void ExecIncrSlotBufferRefcnt(TupleTableSlot *slot); extern bool TupIsNull(TupleTableSlot* slot); -extern bool ExecSlotDescriptorIsNew(TupleTableSlot *slot); extern void ExecInitResultTupleSlot(EState *estate, CommonState *commonstate); extern void ExecInitScanTupleSlot(EState *estate, CommonScanState *commonscanstate); extern void ExecInitMarkedTupleSlot(EState *estate, MergeJoinState *mergestate); extern void ExecInitOuterTupleSlot(EState *estate, HashJoinState *hashstate); -extern void ExecInitHashTupleSlot(EState *estate, HashJoinState *hashstate); -extern TupleTableSlot *NodeGetResultTupleSlot(Plan *node); extern TupleDesc ExecGetTupType(Plan *node); extern TupleDesc ExecTypeFromTL(List *targetList); @@ -144,7 +115,6 @@ extern TupleDesc ExecTypeFromTL(List *targetList); * prototypes from functions in execTuples.c */ extern void ResetTupleCount(void); -extern void DisplayTupleCount(FILE *statfp); extern void ExecAssignNodeBaseInfo(EState *estate, CommonState *basenode, Plan *parent); extern void ExecAssignExprContext(EState *estate, CommonState *commonstate); @@ -154,24 +124,18 @@ extern void ExecAssignResultTypeFromOuterPlan(Plan *node, CommonState *commonstate); extern void ExecAssignResultTypeFromTL(Plan *node, CommonState *commonstate); extern TupleDesc ExecGetResultType(CommonState *commonstate); -extern void ExecFreeResultType(CommonState *commonstate); extern void ExecAssignProjectionInfo(Plan *node, CommonState *commonstate); extern void ExecFreeProjectionInfo(CommonState *commonstate); extern TupleDesc ExecGetScanType(CommonScanState *csstate); -extern void ExecFreeScanType(CommonScanState *csstate); extern void ExecAssignScanType(CommonScanState *csstate, TupleDesc tupDesc); extern void ExecAssignScanTypeFromOuterPlan(Plan *node, CommonScanState *csstate); extern AttributeTupleForm ExecGetTypeInfo(Relation relDesc); -extern void ExecGetIndexKeyInfo(IndexTupleForm indexTuple, int *numAttsOutP, - AttrNumber **attsOutP, FuncIndexInfoPtr fInfoP); extern void ExecOpenIndices(Oid resultRelationOid, RelationInfo *resultRelationInfo); extern void ExecCloseIndices(RelationInfo *resultRelationInfo); -extern IndexTuple ExecFormIndexTuple(HeapTuple heapTuple, - Relation heapRelation, Relation indexRelation, IndexInfo *indexInfo); extern void ExecInsertIndexTuples(TupleTableSlot *slot, ItemPointer tupleid, EState *estate, bool is_update); extern void resetVarAttrLenForCreateTable(TupleDesc tupType); diff --git a/src/include/executor/nodeAppend.h b/src/include/executor/nodeAppend.h index 76c6c91a391..f2ac25c2aee 100644 --- a/src/include/executor/nodeAppend.h +++ b/src/include/executor/nodeAppend.h @@ -6,14 +6,13 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: nodeAppend.h,v 1.1 1996/08/28 07:22:15 scrappy Exp $ + * $Id: nodeAppend.h,v 1.2 1997/08/19 21:38:19 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef NODEAPPEND_H #define NODEAPPEND_H -extern bool exec_append_initialize_next(Append *node); extern bool ExecInitAppend(Append *node, EState *estate, Plan *parent); extern int ExecCountSlotsAppend(Append *node); extern TupleTableSlot *ExecProcAppend(Append *node); diff --git a/src/include/executor/nodeHash.h b/src/include/executor/nodeHash.h index 2427958d145..b588b44531b 100644 --- a/src/include/executor/nodeHash.h +++ b/src/include/executor/nodeHash.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: nodeHash.h,v 1.1 1996/08/28 07:22:18 scrappy Exp $ + * $Id: nodeHash.h,v 1.2 1997/08/19 21:38:20 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -17,19 +17,15 @@ extern TupleTableSlot *ExecHash(Hash *node); extern bool ExecInitHash(Hash *node, EState *estate, Plan *parent); extern int ExecCountSlotsHash(Hash *node); extern void ExecEndHash(Hash *node); -extern RelativeAddr hashTableAlloc(int size, HashJoinTable hashtable); extern HashJoinTable ExecHashTableCreate(Hash *node); extern void ExecHashTableInsert(HashJoinTable hashtable, ExprContext *econtext, Var *hashkey, File *batches); extern void ExecHashTableDestroy(HashJoinTable hashtable); extern int ExecHashGetBucket(HashJoinTable hashtable, ExprContext *econtext, Var *hashkey); -extern void ExecHashOverflowInsert(HashJoinTable hashtable, HashBucket bucket, - HeapTuple heapTuple); extern HeapTuple ExecScanHashBucket(HashJoinState *hjstate, HashBucket bucket, HeapTuple curtuple, List *hjclauses, ExprContext *econtext); -extern int ExecHashPartition(Hash *node); extern void ExecHashTableReset(HashJoinTable hashtable, int ntuples); #endif /* NODEHASH_H */ diff --git a/src/include/executor/nodeHashjoin.h b/src/include/executor/nodeHashjoin.h index 8930b5b4993..62f02c976c6 100644 --- a/src/include/executor/nodeHashjoin.h +++ b/src/include/executor/nodeHashjoin.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: nodeHashjoin.h,v 1.1 1996/08/28 07:22:19 scrappy Exp $ + * $Id: nodeHashjoin.h,v 1.2 1997/08/19 21:38:22 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,13 +21,8 @@ extern int ExecCountSlotsHashJoin(HashJoin *node); extern void ExecEndHashJoin(HashJoin *node); -extern int ExecHashJoinNewBatch(HashJoinState *hjstate); - extern char *ExecHashJoinSaveTuple(HeapTuple heapTuple, char *buffer, File file, char *position); -extern int ExecHashJoinGetBatch(int bucketno, HashJoinTable hashtable, - int nbatch); - #endif /* NODEHASHJOIN_H */ diff --git a/src/include/executor/nodeMergejoin.h b/src/include/executor/nodeMergejoin.h index 5199165e355..3b96ac50c5c 100644 --- a/src/include/executor/nodeMergejoin.h +++ b/src/include/executor/nodeMergejoin.h @@ -6,25 +6,13 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: nodeMergejoin.h,v 1.2 1996/11/10 03:05:09 momjian Exp $ + * $Id: nodeMergejoin.h,v 1.3 1997/08/19 21:38:22 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef NODEMERGEJOIN_H #define NODEMERGEJOIN_H -extern bool MergeCompare(List *eqQual, List *compareQual, ExprContext *econtext); - -extern void ExecMergeTupleDumpInner(ExprContext *econtext); - -extern void ExecMergeTupleDumpOuter(ExprContext *econtext); - -extern void ExecMergeTupleDumpMarked(ExprContext *econtext, - MergeJoinState *mergestate); - -extern void ExecMergeTupleDump(ExprContext *econtext, - MergeJoinState *mergestate); - extern TupleTableSlot *ExecMergeJoin(MergeJoin *node); extern bool ExecInitMergeJoin(MergeJoin *node, EState *estate, Plan *parent); diff --git a/src/include/executor/nodeSeqscan.h b/src/include/executor/nodeSeqscan.h index 166037f8c4d..99cb83e431c 100644 --- a/src/include/executor/nodeSeqscan.h +++ b/src/include/executor/nodeSeqscan.h @@ -6,17 +6,14 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: nodeSeqscan.h,v 1.1 1996/08/28 07:22:24 scrappy Exp $ + * $Id: nodeSeqscan.h,v 1.2 1997/08/19 21:38:23 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef NODESEQSCAN_H #define NODESEQSCAN_H -extern TupleTableSlot *SeqNext(SeqScan *node); extern TupleTableSlot *ExecSeqScan(SeqScan *node); -extern Oid InitScanRelation(SeqScan *node, EState *estate, - CommonScanState *scanstate, Plan *outerPlan); extern bool ExecInitSeqScan(SeqScan *node, EState *estate, Plan *parent); extern int ExecCountSlotsSeqScan(SeqScan *node); extern void ExecEndSeqScan(SeqScan *node); diff --git a/src/include/lib/dllist.h b/src/include/lib/dllist.h index 8e18470f878..4c4534b974c 100644 --- a/src/include/lib/dllist.h +++ b/src/include/lib/dllist.h @@ -26,7 +26,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: dllist.h,v 1.3 1996/11/10 03:05:16 momjian Exp $ + * $Id: dllist.h,v 1.4 1997/08/19 21:38:28 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -56,15 +56,13 @@ extern Dlelem* DLNewElem(void* val); extern void DLFreeElem(Dlelem*); extern Dlelem* DLGetHead(Dllist*); extern Dlelem* DLGetTail(Dllist*); -extern void* DLGetHeadVal(Dllist*); -extern void* DLGetTailVal(Dllist*); +extern Dlelem* DLRemTail(Dllist* l); extern Dlelem* DLGetPred(Dlelem*); /* get predecessor */ extern Dlelem* DLGetSucc(Dlelem*); /* get successor */ extern void DLRemove(Dlelem*); /* removes node from list*/ extern void DLAddHead(Dllist* list, Dlelem* node); extern void DLAddTail(Dllist* list, Dlelem* node); extern Dlelem* DLRemHead(Dllist* list); /* remove and return the head */ -extern Dlelem* DLRemTail(Dllist* list); /* remove and return the tail */ #define DLE_VAL(x) (x->dle_val) diff --git a/src/include/lib/lispsort.h b/src/include/lib/lispsort.h index 3d13de381bb..872b14959a3 100644 --- a/src/include/lib/lispsort.h +++ b/src/include/lib/lispsort.h @@ -6,13 +6,11 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: lispsort.h,v 1.1 1996/08/28 07:22:39 scrappy Exp $ + * $Id: lispsort.h,v 1.2 1997/08/19 21:38:30 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef LISPSORT_H #define LISPSORT_H -extern List *lisp_qsort(List *the_list, int (*compare)()); - #endif /* LISPSORT_H */ diff --git a/src/include/libpq/auth.h b/src/include/libpq/auth.h index e04a9ce66f4..40a97cdfb44 100644 --- a/src/include/libpq/auth.h +++ b/src/include/libpq/auth.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: auth.h,v 1.3 1996/11/06 10:29:54 scrappy Exp $ + * $Id: auth.h,v 1.4 1997/08/19 21:38:34 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -36,7 +36,6 @@ extern MsgType fe_getauthsvc(); extern char *fe_getauthname(void); extern int be_recvauth(MsgType msgtype, Port *port, char *username, StartupInfo* sp); extern void be_setauthsvc(char *name); -extern int be_getauthsvc(MsgType msgtype); /* the value that matches any dbName value when doing host based authentication*/ diff --git a/src/include/libpq/libpq-be.h b/src/include/libpq/libpq-be.h index aed1595b707..1d87f17421d 100644 --- a/src/include/libpq/libpq-be.h +++ b/src/include/libpq/libpq-be.h @@ -7,7 +7,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: libpq-be.h,v 1.3 1996/11/10 03:05:18 momjian Exp $ + * $Id: libpq-be.h,v 1.4 1997/08/19 21:38:37 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -45,7 +45,6 @@ extern char *PQfn(int fnid, int *result_buf, int result_len, int result_is_int, PQArgBlock *args, int nargs); extern char *PQexec(char *query); extern int pqtest_PQexec(char *q); -extern char *strmake(char *str, int len); extern int pqtest_PQfn(char *q); extern int32 pqtest(struct varlena *vlena); diff --git a/src/include/miscadmin.h b/src/include/miscadmin.h index e579a6dcd8e..e3566638832 100644 --- a/src/include/miscadmin.h +++ b/src/include/miscadmin.h @@ -11,7 +11,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: miscadmin.h,v 1.10 1997/08/14 16:11:41 momjian Exp $ + * $Id: miscadmin.h,v 1.11 1997/08/19 21:37:03 momjian Exp $ * * NOTES * some of the information in this file will be moved to @@ -172,10 +172,6 @@ typedef int16 ExitStatus; /* XXX are there any other meaningful exit codes? */ /* in utils/init/postinit.c */ -extern void InitMyDatabaseId(void); -extern void InitUserid(void); -extern void InitCommunication(void); -extern void InitStdio(void); extern bool PostgresIsInitialized; @@ -183,7 +179,6 @@ extern void InitPostgres(char *name); /* in miscinit.c */ extern void ExitPostgres(ExitStatus status); -extern void AbortPostgres(void); extern void StatusBackendExit(int status); extern void StatusPostmasterExit(int status); diff --git a/src/include/nodes/nodeFuncs.h b/src/include/nodes/nodeFuncs.h index 40bde8ae16b..12a0ca97813 100644 --- a/src/include/nodes/nodeFuncs.h +++ b/src/include/nodes/nodeFuncs.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: nodeFuncs.h,v 1.1 1996/08/28 01:57:35 scrappy Exp $ + * $Id: nodeFuncs.h,v 1.2 1997/08/19 21:38:43 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -15,7 +15,6 @@ extern bool single_node(Node *node); extern bool var_is_outer(Var *var); -extern bool var_is_inner(Var *var); extern bool var_is_rel(Var *var); extern Oper *replace_opid(Oper *oper); extern bool non_null(Expr *c); diff --git a/src/include/nodes/pg_list.h b/src/include/nodes/pg_list.h index b67b31bb194..b3848fb59fa 100644 --- a/src/include/nodes/pg_list.h +++ b/src/include/nodes/pg_list.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: pg_list.h,v 1.4 1997/03/12 21:11:23 scrappy Exp $ + * $Id: pg_list.h,v 1.5 1997/08/19 21:38:51 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -89,6 +89,7 @@ extern List *makeList(void *elem, ...); extern List *lappend(List *list, void *obj); extern List *lremove(void *elem, List *list); extern void freeList(List *list); +extern List *LispRemove(void *elem, List *list); extern void *nth(int n, List *l); extern void set_nth(List *l, int n, void *elem); @@ -103,14 +104,11 @@ extern int nthi(int n, List *l); extern List *nreverse(List *); extern List *set_difference(List *, List *); extern List *set_differencei(List *, List *); -extern List *LispRemove(void *, List *); -extern List *intLispRemove(int, List *); extern List *LispUnion(List *foo, List *bar); extern List *LispUnioni(List *foo, List *bar); extern bool same(List *foo, List *bar); /* should be in nodes.h but needs List */ -extern bool equali(List *a, List *b); /* in copyfuncs.c */ extern List *listCopy(List *); diff --git a/src/include/nodes/print.h b/src/include/nodes/print.h index c9123fdcf3e..0e2585f1de1 100644 --- a/src/include/nodes/print.h +++ b/src/include/nodes/print.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: print.h,v 1.1 1996/11/10 03:05:23 momjian Exp $ + * $Id: print.h,v 1.2 1997/08/19 21:38:54 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -26,7 +26,6 @@ extern void print_expr(Node *expr, List *rtable); extern void print_keys(List *keys, List *rtable); extern void print_tl(List *tlist, List *rtable); extern void print_slot(TupleTableSlot *slot); -extern char* plannode_type (Plan* p); extern void print_plan_recursive (Plan* p, Query *parsetree, int indentLevel, char* label); extern void print_plan (Plan* p, Query* parsetree); diff --git a/src/include/optimizer/clauses.h b/src/include/optimizer/clauses.h index 64ecbb789c8..c9a880b030b 100644 --- a/src/include/optimizer/clauses.h +++ b/src/include/optimizer/clauses.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: clauses.h,v 1.2 1996/11/06 09:19:16 scrappy Exp $ + * $Id: clauses.h,v 1.3 1997/08/19 21:39:01 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,8 +21,6 @@ extern Expr *make_opclause(Oper *op, Var *leftop, Var *rightop); extern Var *get_leftop(Expr *clause); extern Var *get_rightop(Expr *clause); -extern bool agg_clause(Node *clause); - extern bool is_funcclause(Node *clause); extern Expr *make_funcclause(Func *func, List *funcargs); diff --git a/src/include/optimizer/cost.h b/src/include/optimizer/cost.h index 97bcba20eec..f045e47b0bf 100644 --- a/src/include/optimizer/cost.h +++ b/src/include/optimizer/cost.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: cost.h,v 1.1 1996/08/28 07:23:12 scrappy Exp $ + * $Id: cost.h,v 1.2 1997/08/19 21:39:18 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -30,7 +30,6 @@ extern Cost cost_index(Oid indexid, int expected_indexpages, Cost selec, int relpages, int reltuples, int indexpages, int indextuples, bool is_injoin); extern Cost cost_sort(List *keys, int tuples, int width, bool noread); -extern Cost cost_result(int tuples, int width); extern Cost cost_nestloop(Cost outercost, Cost innercost, int outertuples, int innertuples, int outerpages, bool is_indexjoin); extern Cost cost_mergesort(Cost outercost, Cost innercost, @@ -41,7 +40,6 @@ extern Cost cost_hashjoin(Cost outercost, Cost innercost, List *outerkeys, int outerwidth, int innerwidth); extern int compute_rel_size(Rel *rel); extern int compute_rel_width(Rel *rel); -extern int compute_targetlist_width(List *targetlist); extern int compute_joinrel_size(JoinPath *joinpath); extern int page_size(int tuples, int width); diff --git a/src/include/optimizer/keys.h b/src/include/optimizer/keys.h index 17be635f4e8..29c16d5cbb0 100644 --- a/src/include/optimizer/keys.h +++ b/src/include/optimizer/keys.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: keys.h,v 1.1 1996/08/28 07:23:16 scrappy Exp $ + * $Id: keys.h,v 1.2 1997/08/19 21:39:25 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -14,7 +14,6 @@ #define KEYS_H extern bool match_indexkey_operand(int indexkey, Var *operand, Rel *rel); -extern bool equal_indexkey_var(int index_key, Var *var); extern Var *extract_subkey(JoinKey *jk, int which_subkey); extern bool samekeys(List *keys1, List *keys2); extern List *collect_index_pathkeys(int *index_keys, List *tlist); diff --git a/src/include/optimizer/ordering.h b/src/include/optimizer/ordering.h index 5ae5df0b85b..098691a2d18 100644 --- a/src/include/optimizer/ordering.h +++ b/src/include/optimizer/ordering.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: ordering.h,v 1.2 1996/11/06 09:27:29 scrappy Exp $ + * $Id: ordering.h,v 1.3 1997/08/19 21:39:29 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,6 +21,4 @@ extern bool equal_path_merge_ordering(Oid *path_ordering, MergeOrder *merge_ordering); extern bool equal_merge_merge_ordering(MergeOrder *merge_ordering1, MergeOrder *merge_ordering2); -extern bool equal_sortops_order(Oid *ordering1, Oid *ordering2); - #endif /* ORDERING_H */ diff --git a/src/include/optimizer/tlist.h b/src/include/optimizer/tlist.h index b70916c10b9..efffa8b444e 100644 --- a/src/include/optimizer/tlist.h +++ b/src/include/optimizer/tlist.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: tlist.h,v 1.1 1996/08/28 07:23:28 scrappy Exp $ + * $Id: tlist.h,v 1.2 1997/08/19 21:39:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -31,6 +31,4 @@ extern List *copy_vars(List *target, List *source); extern List *flatten_tlist(List *tlist); extern List *flatten_tlist_vars(List *full_tlist, List *flat_tlist); -extern void AddGroupAttrToTlist(List *tlist, List *grpCl); - #endif /* TLIST_H */ diff --git a/src/include/parser/catalog_utils.h b/src/include/parser/catalog_utils.h index 4be3c7edec9..dc4a7f90fa5 100644 --- a/src/include/parser/catalog_utils.h +++ b/src/include/parser/catalog_utils.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: catalog_utils.h,v 1.9 1997/05/22 00:16:28 scrappy Exp $ + * $Id: catalog_utils.h,v 1.10 1997/08/19 21:39:33 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -19,7 +19,6 @@ typedef HeapTuple Type; typedef HeapTuple Operator; -extern bool check_typeid(Oid id); extern Type get_id_type(Oid id); extern char *get_id_typname(Oid id); extern Type type(char *); @@ -38,9 +37,7 @@ extern int varattno(Relation rd, char *a); extern bool varisset(Relation rd, char *name); extern int nf_varattno(Relation rd, char *a); extern char *getAttrName(Relation rd, int attrno); -extern char *outstr(char *typename, char *value); extern char *instr2(Type tp, char *string, int typlen); -extern char *instr1(TypeTupleForm tp, char *string, int typlen); extern Oid GetArrayElementType(Oid typearray); extern Oid funcid_get_rettype(Oid funcid); extern bool func_get_detail(char *funcname, int nargs, Oid *oid_array, @@ -50,8 +47,6 @@ extern Oid typeid_get_retoutfunc(Oid type_id); extern Oid typeid_get_relid(Oid type_id); extern Oid get_typrelid(Type typ); extern Oid get_typelem(Oid type_id); -extern char FindDelimiter(char *typename); -extern void op_error(char *op, Oid arg1, Oid arg2); extern void func_error(char *caller, char *funcname, int nargs, Oid *argtypes); extern void agg_error(char *caller, char *aggname, Oid basetypeID); diff --git a/src/include/parser/dbcommands.h b/src/include/parser/dbcommands.h index 2dd77122bb0..86a0b47fd6b 100644 --- a/src/include/parser/dbcommands.h +++ b/src/include/parser/dbcommands.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: dbcommands.h,v 1.1 1996/08/28 07:23:53 scrappy Exp $ + * $Id: dbcommands.h,v 1.2 1997/08/19 21:39:35 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -22,7 +22,6 @@ extern void createdb(char *dbname); extern void destroydb(char *dbname); -void stop_vacuum(char *dbname); #endif /* DBCOMMANDS_H */ diff --git a/src/include/parser/parse_query.h b/src/include/parser/parse_query.h index d8062dc5ed7..d87556707a1 100644 --- a/src/include/parser/parse_query.h +++ b/src/include/parser/parse_query.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: parse_query.h,v 1.7 1996/11/30 18:07:02 momjian Exp $ + * $Id: parse_query.h,v 1.8 1997/08/19 21:39:37 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -53,8 +53,6 @@ extern Node *parser_typecast2(Node *expr, Oid exprType, Type tp, int typlen); extern Aggreg *ParseAgg(char *aggname, Oid basetype, Node *target); extern void handleTargetColname(ParseState *pstate, char **resname, char *refname, char *colname); -extern void checkTargetTypes(ParseState *pstate, char *target_colname, - char *refname, char *colname); /* * analyze.c @@ -66,7 +64,6 @@ extern int NumLevels; #endif Oid exprType(Node *expr); -ParseState* makeParseState(void); QueryTreeList *parse_analyze(List *querytree_list); /* define in parse_query.c, used in gram.y */ diff --git a/src/include/storage/buf_internals.h b/src/include/storage/buf_internals.h index 63a85916c08..24d22bd9c9a 100644 --- a/src/include/storage/buf_internals.h +++ b/src/include/storage/buf_internals.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: buf_internals.h,v 1.13 1997/08/03 02:38:25 momjian Exp $ + * $Id: buf_internals.h,v 1.14 1997/08/19 21:39:41 momjian Exp $ * * NOTE * If BUFFERPAGE0 is defined, then 0 will be used as a @@ -63,7 +63,7 @@ struct buftag{ (a)->blockNum = xx_blockNum;\ (a)->relId = RelationGetLRelId(xx_reln); \ } - +#ifdef NOT_USED #define COPY_BUFFERTAG(a,b)\ { \ (a)->blockNum = (b)->blockNum;\ @@ -73,7 +73,7 @@ struct buftag{ #define EQUAL_BUFFERTAG(a,b) \ (((a)->blockNum == (b)->blockNum) &&\ (OID_Equal((a)->relId.relId,(b)->relId.relId))) - +#endif #define BAD_BUFFER_ID(bid) ((bid<1) || (bid>(NBuffers))) #define INVALID_DESCRIPTOR (-3) @@ -199,17 +199,14 @@ extern void AddBufferToFreelist(BufferDesc *bf); extern void PinBuffer(BufferDesc *buf); extern void PinBuffer_Debug(char *file, int line, BufferDesc *buf); extern void UnpinBuffer(BufferDesc *buf); -extern void UnpinBuffer_Debug(char *file, int line, BufferDesc *buf); extern BufferDesc *GetFreeBuffer(void); extern void InitFreeList(bool init); -extern void DBG_FreeListCheck(int nfree); /* buf_table.c */ extern void InitBufTable(void); extern BufferDesc *BufTableLookup(BufferTag *tagPtr); extern bool BufTableDelete(BufferDesc *buf); extern bool BufTableInsert(BufferDesc *buf); -extern void DBG_LookupListCheck(int nlookup); /* bufmgr.c */ extern BufferDesc *BufferDescriptors; diff --git a/src/include/storage/bufmgr.h b/src/include/storage/bufmgr.h index fc239caeed6..c0ec42ddb83 100644 --- a/src/include/storage/bufmgr.h +++ b/src/include/storage/bufmgr.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: bufmgr.h,v 1.10 1997/03/28 07:06:53 scrappy Exp $ + * $Id: bufmgr.h,v 1.11 1997/08/19 21:39:45 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -74,12 +74,7 @@ extern int ShowPinTrace; extern Buffer RelationGetBufferWithBuffer(Relation relation, BlockNumber blockNumber, Buffer buffer); extern Buffer ReadBuffer(Relation reln, BlockNumber blockNum); -extern Buffer ReadBuffer_Debug(char *file, int line, Relation reln, - BlockNumber blockNum); extern int WriteBuffer(Buffer buffer); -extern void WriteBuffer_Debug(char *file, int line, Buffer buffer); -extern void DirtyBufferCopy(Oid dbid, Oid relid, BlockNumber blkno, - char *dest); extern int WriteNoReleaseBuffer(Buffer buffer); extern Buffer ReleaseAndReadBuffer(Buffer buffer, Relation relation, BlockNumber blockNum); @@ -100,17 +95,9 @@ extern void DropBuffers(Oid dbid); extern void PrintBufferDescs(void); extern void PrintPinnedBufs(void); extern int BufferShmemSize(void); -extern void BufferPoolBlowaway(void); extern void IncrBufferRefCount(Buffer buffer); extern int ReleaseBuffer(Buffer buffer); -extern void IncrBufferRefCount_Debug(char *file, int line, Buffer buffer); -extern void ReleaseBuffer_Debug(char *file, int line, Buffer buffer); -extern int ReleaseAndReadBuffer_Debug(char *file, - int line, - Buffer buffer, - Relation relation, - BlockNumber blockNum); extern void BufferRefCountReset(int *refcountsave); extern void BufferRefCountRestore(int *refcountsave); extern int SetBufferWriteMode (int mode); diff --git a/src/include/storage/bufpage.h b/src/include/storage/bufpage.h index f8d9f7f97c1..7304b6115aa 100644 --- a/src/include/storage/bufpage.h +++ b/src/include/storage/bufpage.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: bufpage.h,v 1.7 1996/11/05 06:10:57 scrappy Exp $ + * $Id: bufpage.h,v 1.8 1997/08/19 21:39:47 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -253,8 +253,6 @@ extern void PageRepairFragmentation(Page page); extern Size PageGetFreeSpace(Page page); extern void PageManagerModeSet(PageManagerMode mode); extern void PageIndexTupleDelete(Page page, OffsetNumber offset); -extern void PageIndexTupleDeleteAdjustLinePointers(PageHeader phdr, - char *location, Size size); #endif /* BUFPAGE_H */ diff --git a/src/include/storage/fd.h b/src/include/storage/fd.h index 9d5a1e81970..bd76109ac0e 100644 --- a/src/include/storage/fd.h +++ b/src/include/storage/fd.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: fd.h,v 1.7 1997/08/18 02:15:04 momjian Exp $ + * $Id: fd.h,v 1.8 1997/08/19 21:39:48 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -60,7 +60,6 @@ struct pgstat { /* just the fields we need from stat structure */ /* * prototypes for functions in fd.c */ -extern void FileInvalidate(File file); extern File FileNameOpenFile(FileName fileName, int fileFlags, int fileMode); extern File PathNameOpenFile(FileName fileName, int fileFlags, int fileMode); extern void FileClose(File file); @@ -68,7 +67,6 @@ extern void FileUnlink(File file); extern int FileRead(File file, char *buffer, int amount); extern int FileWrite(File file, char *buffer, int amount); extern long FileSeek(File file, long offset, int whence); -extern long FileTell(File file); extern int FileTruncate(File file, int offset); extern int FileSync(File file); extern int FileNameUnlink(char *filename); diff --git a/src/include/storage/ipc.h b/src/include/storage/ipc.h index d0f17b92276..69f8b2ba862 100644 --- a/src/include/storage/ipc.h +++ b/src/include/storage/ipc.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: ipc.h,v 1.16 1997/03/12 21:12:27 scrappy Exp $ + * $Id: ipc.h,v 1.17 1997/08/19 21:39:50 momjian Exp $ * * NOTES * This file is very architecture-specific. This stuff should actually @@ -92,7 +92,6 @@ extern int on_exitpg(void (*function)(), caddr_t arg); extern IpcSemaphoreId IpcSemaphoreCreate(IpcSemaphoreKey semKey, int semNum, int permission, int semStartValue, int removeOnExit, int *status); -extern void IpcSemaphoreSet(int semId, int semno, int value); extern void IpcSemaphoreKill(IpcSemaphoreKey key); extern void IpcSemaphoreLock(IpcSemaphoreId semId, int sem, int lock); extern void IpcSemaphoreUnlock(IpcSemaphoreId semId, int sem, int lock); @@ -101,7 +100,6 @@ extern int IpcSemaphoreGetValue(IpcSemaphoreId semId, int sem); extern IpcMemoryId IpcMemoryCreate(IpcMemoryKey memKey, uint32 size, int permission); extern IpcMemoryId IpcMemoryIdGet(IpcMemoryKey memKey, uint32 size); -extern void IpcMemoryDetach(int status, char *shmaddr); extern char *IpcMemoryAttach(IpcMemoryId memId); extern void IpcMemoryKill(IpcMemoryKey memKey); extern void CreateAndInitSLockMemory(IPCKey key); diff --git a/src/include/storage/large_object.h b/src/include/storage/large_object.h index 24492571f44..b5ee9cc068a 100644 --- a/src/include/storage/large_object.h +++ b/src/include/storage/large_object.h @@ -7,7 +7,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: large_object.h,v 1.3 1996/11/05 06:10:58 scrappy Exp $ + * $Id: large_object.h,v 1.4 1997/08/19 21:39:52 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -49,7 +49,6 @@ extern LargeObjectDesc *inv_create(int flags); extern LargeObjectDesc *inv_open(Oid lobjId, int flags); extern void inv_close(LargeObjectDesc *obj_desc); extern int inv_destroy(Oid lobjId); -extern int inv_stat(LargeObjectDesc *obj_desc, struct pgstat *stbuf); extern int inv_seek(LargeObjectDesc *obj_desc, int offset, int whence); extern int inv_tell(LargeObjectDesc *obj_desc); extern int inv_read(LargeObjectDesc *obj_desc, char *buf, int nbytes); diff --git a/src/include/storage/lmgr.h b/src/include/storage/lmgr.h index 097ecb3f183..0d65b29ba0b 100644 --- a/src/include/storage/lmgr.h +++ b/src/include/storage/lmgr.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: lmgr.h,v 1.4 1996/11/08 06:02:18 momjian Exp $ + * $Id: lmgr.h,v 1.5 1997/08/19 21:39:54 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -38,19 +38,13 @@ typedef LockInfoData *LockInfo; extern LRelId RelationGetLRelId(Relation relation); -extern Oid LRelIdGetDatabaseId(LRelId lRelId); extern Oid LRelIdGetRelationId(LRelId lRelId); -extern bool DatabaseIdIsMyDatabaseId(Oid databaseId); -extern bool LRelIdContainsMyDatabaseId(LRelId lRelId); extern void RelationInitLockInfo(Relation relation); -extern void RelationDiscardLockInfo(Relation relation); extern void RelationSetLockForDescriptorOpen(Relation relation); extern void RelationSetLockForRead(Relation relation); extern void RelationUnsetLockForRead(Relation relation); extern void RelationSetLockForWrite(Relation relation); extern void RelationUnsetLockForWrite(Relation relation); -extern void RelationSetLockForTupleRead(Relation relation, - ItemPointer itemPointer); /* used in vaccum.c */ extern void RelationSetLockForWritePage(Relation relation, @@ -69,9 +63,6 @@ extern void RelationSetRIntentLock(Relation relation); extern void RelationUnsetRIntentLock(Relation relation); extern void RelationSetWIntentLock(Relation relation); extern void RelationUnsetWIntentLock(Relation relation); -extern void RelationSetLockForExtend(Relation relation); -extern void RelationUnsetLockForExtend(Relation relation); -extern void LRelIdAssign(LRelId *lRelId, Oid dbId, Oid relId); /* single.c */ extern bool SingleLockReln(LockInfo linfo, LOCKT lockt, int action); diff --git a/src/include/storage/lock.h b/src/include/storage/lock.h index 49e8915dc73..25b851dac3d 100644 --- a/src/include/storage/lock.h +++ b/src/include/storage/lock.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: lock.h,v 1.4 1997/02/12 05:25:13 scrappy Exp $ + * $Id: lock.h,v 1.5 1997/08/19 21:39:55 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -199,12 +199,9 @@ extern void InitLocks(void); extern void LockDisable(int status); extern LockTableId LockTabInit(char *tabName, MASK *conflictsP, int *prioP, int ntypes); -extern LockTableId LockTabRename(LockTableId tableId); extern bool LockAcquire(LockTableId tableId, LOCKTAG *lockName, LOCKT lockt); extern int LockResolveConflicts(LOCKTAB *ltable, LOCK *lock, LOCKT lockt, TransactionId xid); -extern int WaitOnLock(LOCKTAB *ltable, LockTableId tableId, LOCK *lock, - LOCKT lockt); extern bool LockRelease(LockTableId tableId, LOCKTAG *lockName, LOCKT lockt); extern void GrantLock(LOCK *lock, LOCKT lockt); extern bool LockReleaseAll(LockTableId tableId, SHM_QUEUE *lockQueue); diff --git a/src/include/storage/multilev.h b/src/include/storage/multilev.h index fd2f39f1d79..d077455d872 100644 --- a/src/include/storage/multilev.h +++ b/src/include/storage/multilev.h @@ -7,7 +7,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: multilev.h,v 1.2 1996/11/05 06:11:01 scrappy Exp $ + * $Id: multilev.h,v 1.3 1997/08/19 21:39:56 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -53,11 +53,6 @@ extern LockTableId InitMultiLevelLockm(void); extern bool MultiLockReln(LockInfo linfo, LOCKT lockt); extern bool MultiLockTuple(LockInfo linfo, ItemPointer tidPtr, LOCKT lockt); extern bool MultiLockPage(LockInfo linfo, ItemPointer tidPtr, LOCKT lockt); -extern bool MultiAcquire(LockTableId tableId, LOCKTAG *tag, LOCKT lockt, - LOCK_LEVEL level); -extern bool MultiReleasePage(LockInfo linfo, ItemPointer tidPtr, LOCKT lockt); extern bool MultiReleaseReln(LockInfo linfo, LOCKT lockt); -extern bool MultiRelease(LockTableId tableId, LOCKTAG *tag, LOCKT lockt, - LOCK_LEVEL level); #endif /* MULTILEV_H */ diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index d9208949162..4e0b9b27806 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: proc.h,v 1.4 1997/02/14 04:18:51 momjian Exp $ + * $Id: proc.h,v 1.5 1997/08/19 21:39:58 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -99,15 +99,11 @@ extern bool ProcRemove(int pid); /* extern bool ProcKill(int exitStatus, int pid); */ /* make static in storage/lmgr/proc.c -- jolly */ -extern PROC_QUEUE *ProcQueueAlloc(char *name); extern void ProcQueueInit(PROC_QUEUE *queue); extern int ProcSleep(PROC_QUEUE *queue, SPINLOCK spinlock, int token, int prio, LOCK *lock); -extern PROC *ProcWakeup(PROC *proc, int errType); -extern int ProcGetId(void); extern int ProcLockWakeup(PROC_QUEUE *queue, char * ltable, char * lock); extern void ProcAddLock(SHM_QUEUE *elem); -extern void HandleDeadLock(int sig); extern void ProcReleaseSpins(PROC *proc); extern void ProcFreeAllSemaphores(void); diff --git a/src/include/storage/shmem.h b/src/include/storage/shmem.h index 3415a4e8bc8..fb52742d362 100644 --- a/src/include/storage/shmem.h +++ b/src/include/storage/shmem.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: shmem.h,v 1.4 1996/11/27 07:32:10 vadim Exp $ + * $Id: shmem.h,v 1.5 1997/08/19 21:40:01 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -94,10 +94,8 @@ typedef struct { * prototypes for functions in shmqueue.c */ extern void SHMQueueInit(SHM_QUEUE *queue); -extern bool SHMQueueIsDetached(SHM_QUEUE *queue); extern void SHMQueueElemInit(SHM_QUEUE *queue); extern void SHMQueueDelete(SHM_QUEUE *queue); -extern void SHMQueueInsertHD(SHM_QUEUE *queue, SHM_QUEUE *elem); extern void SHMQueueInsertTL(SHM_QUEUE *queue, SHM_QUEUE *elem); extern void SHMQueueFirst(SHM_QUEUE *queue, Pointer *nextPtrPtr, SHM_QUEUE *nextQueue); diff --git a/src/include/storage/smgr.h b/src/include/storage/smgr.h index 561b948163c..32f4be36357 100644 --- a/src/include/storage/smgr.h +++ b/src/include/storage/smgr.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: smgr.h,v 1.6 1996/11/27 07:33:42 vadim Exp $ + * $Id: smgr.h,v 1.7 1997/08/19 21:40:03 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -23,7 +23,6 @@ #define DEFAULT_SMGR 0 extern int smgrinit(void); -extern void smgrshutdown(int dummy); extern int smgrcreate(int16 which, Relation reln); extern int smgrunlink(int16 which, Relation reln); extern int smgrextend(int16 which, Relation reln, char *buffer); @@ -40,7 +39,6 @@ extern int smgrblindwrt(int16 which, char *dbname, char *relname, Oid dbid, extern int smgrnblocks(int16 which, Relation reln); extern int smgrtruncate(int16 which, Relation reln, int nblocks); extern int smgrcommit(void); -extern int smgrabort(void); extern bool smgriswo(int16 smgrno); diff --git a/src/include/storage/spin.h b/src/include/storage/spin.h index 9e45bd78819..0000af883b1 100644 --- a/src/include/storage/spin.h +++ b/src/include/storage/spin.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: spin.h,v 1.2 1996/11/05 06:11:08 scrappy Exp $ + * $Id: spin.h,v 1.3 1997/08/19 21:40:03 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -28,11 +28,8 @@ typedef int SPINLOCK; extern bool CreateSpinlocks(IPCKey key); -extern bool AttachSpinLocks(IPCKey key); extern bool InitSpinLocks(int init, IPCKey key); - extern void SpinAcquire(SPINLOCK lock); extern void SpinRelease(SPINLOCK lock); -extern bool SpinIsLocked(SPINLOCK lock); #endif /* SPIN_H */ diff --git a/src/include/tcop/dest.h b/src/include/tcop/dest.h index 9e2f7688ec2..1148b28e73f 100644 --- a/src/include/tcop/dest.h +++ b/src/include/tcop/dest.h @@ -26,7 +26,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: dest.h,v 1.5 1997/01/08 08:39:10 bryanh Exp $ + * $Id: dest.h,v 1.6 1997/08/19 21:40:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -69,8 +69,6 @@ extern void NullCommand(CommandDest dest); extern void BeginCommand(char *pname, int operation, TupleDesc attinfo, bool isIntoRel, bool isIntoPortal, char *tag, CommandDest dest); -extern void ResetAppendOid(void); extern void UpdateAppendOid(Oid newoid); -extern Oid GetAppendOid(void); #endif /* DEST_H */ diff --git a/src/include/tcop/pquery.h b/src/include/tcop/pquery.h index 7aec9aa0390..9f45684c5b5 100644 --- a/src/include/tcop/pquery.h +++ b/src/include/tcop/pquery.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: pquery.h,v 1.3 1996/11/10 03:06:09 momjian Exp $ + * $Id: pquery.h,v 1.4 1997/08/19 21:40:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -27,8 +27,6 @@ extern void ProcessPortal(char *portalName, Query *parseTree, Plan *plan, EState *state, TupleDesc attinfo, CommandDest dest); -extern void ProcessQueryDesc(QueryDesc *queryDesc); - extern void ProcessQuery(Query *parsetree, Plan *plan, char *argv[], Oid *typev, int nargs, CommandDest dest); diff --git a/src/include/tcop/tcopprot.h b/src/include/tcop/tcopprot.h index a64388c985b..15af78b84fd 100644 --- a/src/include/tcop/tcopprot.h +++ b/src/include/tcop/tcopprot.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: tcopprot.h,v 1.3 1996/11/10 03:06:11 momjian Exp $ + * $Id: tcopprot.h,v 1.4 1997/08/19 21:40:10 momjian Exp $ * * OLD COMMENTS * This file was created so that other c files could get the two @@ -30,7 +30,6 @@ extern void pg_eval_dest(char *query_string, char **argv, Oid *typev, #endif /* BOOTSTRAP_HEADER */ extern void handle_warn(SIGNAL_ARGS); -extern void quickdie(SIGNAL_ARGS); extern void die(SIGNAL_ARGS); extern int PostgresMain(int argc, char *argv[]); extern void ResetUsage(void); diff --git a/src/include/utils/acl.h b/src/include/utils/acl.h index 6aa5b72b7f0..5d9451d9689 100644 --- a/src/include/utils/acl.h +++ b/src/include/utils/acl.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: acl.h,v 1.6 1997/05/22 00:16:41 scrappy Exp $ + * $Id: acl.h,v 1.7 1997/08/19 21:40:18 momjian Exp $ * * NOTES * For backward-compatability purposes we have to allow there @@ -128,7 +128,6 @@ extern char *aclcheck_error_strings[]; /* * routines used internally (parser, etc.) */ -extern char *aclparse(char *s, AclItem *aip, unsigned *modechg); extern Acl *aclownerdefault(AclId ownerid); extern Acl *acldefault(void); extern Acl *aclinsert3(Acl *old_acl, AclItem *mod_aip, unsigned modechg); @@ -154,7 +153,6 @@ extern int32 aclcontains(Acl *acl, AclItem *aip); extern void ChangeAcl(char *relname, AclItem *mod_aip, unsigned modechg); extern AclId get_grosysid(char *groname); extern char *get_groname(AclId grosysid); -extern int32 aclcheck(Acl *acl, AclId id, AclIdType idtype, AclMode mode); /* XXX move these elsewhere -pma */ extern int32 pg_aclcheck(char *relname, char *usename, AclMode mode); diff --git a/src/include/utils/array.h b/src/include/utils/array.h index d27f89691e8..2e574323637 100644 --- a/src/include/utils/array.h +++ b/src/include/utils/array.h @@ -10,7 +10,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: array.h,v 1.3 1996/11/04 07:18:39 scrappy Exp $ + * $Id: array.h,v 1.4 1997/08/19 21:40:21 momjian Exp $ * * NOTES * XXX the data array should be LONGALIGN'd -- notice that the array @@ -125,9 +125,6 @@ extern char *array_assgn(ArrayType *array, int n, int upperIndx[], int lowerIndx[], ArrayType *newArr, int reftype, int len, bool *isNull); extern int array_eq (ArrayType *array1, ArrayType *array2); -extern SanityCheckInput(int ndim, int n, int dim[], int lb[], int indx[]); -extern char *array_seek(char *ptr, int eltsize, int nitems); -extern int array_read(char *destptr, int eltsize, int nitems, char *srcptr); extern int _LOtransfer(char **destfd, int size, int nitems, char **srcfd, int isSrcLO, int isDestLO); @@ -154,8 +151,6 @@ extern int next_tuple(int n, int curr[], int span[]); */ extern char * _ChunkArray(int fd, FILE *afd, int ndim, int dim[], int baseSize, int *nbytes, char *chunkfile); -extern int GetChunkSize(FILE *fd, int ndim, int dim[MAXDIM], int baseSize, - int d[MAXDIM]); extern int _ReadChunkArray(int st[], int endp[], int bsize, int fp, char *destfp, ArrayType *array, int isDestLO, bool *isNull); extern struct varlena *_ReadChunkArray1El(int st[], int bsize, int fp, diff --git a/src/include/utils/builtins.h b/src/include/utils/builtins.h index 7599deb9adb..9a28e1f3ca6 100644 --- a/src/include/utils/builtins.h +++ b/src/include/utils/builtins.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: builtins.h,v 1.20 1997/07/29 16:16:10 thomas Exp $ + * $Id: builtins.h,v 1.21 1997/08/19 21:40:26 momjian Exp $ * * NOTES * This should normally only be included by fmgr.h. @@ -166,11 +166,8 @@ extern bool namegt(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 namecat(Name n1, Name n2); extern int namestrcpy(Name name, char *str); -extern int namestrcat(Name name, char *str); extern int namestrcmp(Name name, char *str); -extern uint32 NameComputeLength(Name name); /* numutils.c */ /* XXX hack. HP-UX has a ltoa (with different arguments) already. */ @@ -180,8 +177,6 @@ extern uint32 NameComputeLength(Name name); extern int32 pg_atoi(char *s, int size, int c); extern void itoa(int i, char *a); extern void ltoa(int32 l, char *a); -extern int ftoa(double value, char *ascii, int width, int prec1, char format); -extern int atof1(char *str, double *val); /* * Per-opclass comparison functions for new btrees. These are @@ -261,6 +256,7 @@ extern DateTime *datetime_in(char *str); extern char *datetime_out(DateTime *datetime); extern TimeSpan *timespan_in(char *str); extern char *timespan_out(TimeSpan *timespan); +extern int datetime2tm( DateTime dt, int *tzp, struct tm *tm, double *fsec, char **tzn); /* filename.c */ extern char *filename_in(char *file); @@ -341,6 +337,7 @@ extern bool float84gt(float64 arg1, float32 arg2); extern bool float84ge(float64 arg1, float32 arg2); /* geo_ops.c, geo_selfuncs.c */ +extern double *box_area(BOX *box); /* misc.c */ extern bool nullvalue(Datum value, bool *isNull); @@ -356,7 +353,6 @@ extern int32 userfntest(int i); /* not_in.c */ extern bool int4notin(int16 not_in_arg, char *relation_and_attr); extern bool oidnotin(Oid the_oid, char *compare); -extern int my_varattno(Relation rd, char *a); /* oid.c */ extern Oid *oid8in(char *oidString); @@ -462,11 +458,9 @@ extern uint32 hashvarchar(struct varlena *key); /* varlena.c */ extern struct varlena *byteain(char *inputText); -extern struct varlena *shove_bytes(unsigned char *stuff, int len); extern char *byteaout(struct varlena *vlena); extern struct varlena *textin(char *inputText); extern char *textout(struct varlena *vlena); -extern int textlen (text* t); extern text *textcat(text* t1, text* t2); extern bool texteq(struct varlena *arg1, struct varlena *arg2); extern bool textne(struct varlena *arg1, struct varlena *arg2); @@ -525,7 +519,6 @@ extern bool namelike(NameData *n, struct varlena *p); extern bool namenlike(NameData *s, struct varlena *p); extern bool textlike(struct varlena *s, struct varlena *p); extern bool textnlike(struct varlena *s, struct varlena *p); -extern int like(char *text, char *p); /* oracle_compat.c */ diff --git a/src/include/utils/catcache.h b/src/include/utils/catcache.h index 98ad9230991..70a40c3e0a5 100644 --- a/src/include/utils/catcache.h +++ b/src/include/utils/catcache.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: catcache.h,v 1.4 1996/11/04 11:51:15 scrappy Exp $ + * $Id: catcache.h,v 1.5 1997/08/19 21:40:28 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -61,14 +61,6 @@ typedef struct catcache { extern struct catcache *Caches; extern GlobalMemory CacheCxt; -extern void CatalogCacheInitializeCache(struct catcache *cache, - Relation relation); -extern void CatalogCacheSetId(CatCache *cacheInOutP, int id); -extern long comphash(long l, char *v); -extern Index CatalogCacheComputeHashIndex(struct catcache *cacheInP); -extern Index CatalogCacheComputeTupleHashIndex(struct catcache *cacheInOutP, - Relation relation, HeapTuple tuple); -extern void CatCacheRemoveCTup(CatCache *cache, Dlelem *e); extern void CatalogCacheIdInvalidate(int cacheId, Index hashIndex, ItemPointer pointer); extern void ResetSystemCache(void); diff --git a/src/include/utils/dt.h b/src/include/utils/dt.h index fb8c26d9800..da98e780fab 100644 --- a/src/include/utils/dt.h +++ b/src/include/utils/dt.h @@ -8,7 +8,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: dt.h,v 1.15 1997/07/29 16:16:12 thomas Exp $ + * $Id: dt.h,v 1.16 1997/08/19 21:40:30 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -270,14 +270,12 @@ extern bool timespan_lt(TimeSpan *span1, TimeSpan *span2); extern bool timespan_le(TimeSpan *span1, TimeSpan *span2); extern bool timespan_ge(TimeSpan *span1, TimeSpan *span2); extern bool timespan_gt(TimeSpan *span1, TimeSpan *span2); -extern bool timespan_finite(TimeSpan *span); extern TimeSpan *timespan_smaller(TimeSpan *span1, TimeSpan *span2); extern TimeSpan *timespan_larger(TimeSpan *span1, TimeSpan *span2); extern text *datetime_text(DateTime *datetime); extern DateTime *text_datetime(text *str); extern text *timespan_text(TimeSpan *timespan); -extern TimeSpan *text_timespan(text *str); extern DateTime *datetime_trunc(text *units, DateTime *datetime); extern TimeSpan *timespan_trunc(text *units, TimeSpan *timespan); extern float64 datetime_part(text *units, DateTime *datetime); @@ -296,46 +294,26 @@ extern TimeSpan *datetime_age(DateTime *dt1, DateTime *dt2); extern void GetCurrentTime(struct tm *tm); extern DateTime SetDateTime(DateTime datetime); 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 timespan2tm(TimeSpan span, struct tm *tm, float8 *fsec); -extern int tm2timespan(struct tm *tm, double fsec, TimeSpan *span); - -extern DateTime dt2local( DateTime dt, int timezone); extern void j2date( int jd, int *year, int *month, int *day); extern int date2j( int year, int month, int day); -extern int j2day( int jd); extern double time2t(const int hour, const int min, const double sec); -extern void dt2time(DateTime dt, int *hour, int *min, double *sec); extern int ParseDateTime( char *timestr, char *lowstr, char *field[], int ftype[], int maxfields, int *numfields); extern int DecodeDateTime( char *field[], int ftype[], int nf, int *dtype, struct tm *tm, double *fsec, int *tzp); -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); -extern int DecodeNumberField( int len, char *str, - int fmask, int *tmask, struct tm *tm, double *fsec); -extern int DecodeTime(char *str, - int fmask, int *tmask, struct tm *tm, double *fsec); + extern int DecodeTimeOnly( char *field[], int ftype[], int nf, int *dtype, struct tm *tm, double *fsec); -extern int DecodeTimezone( char *str, int *tzp); -extern int DecodeSpecial(int field, char *lowtoken, int *val); extern int DecodeDateDelta( char *field[], int ftype[], int nf, int *dtype, struct tm *tm, double *fsec); -extern int DecodeUnits(int field, char *lowtoken, int *val); -extern int EncodeSpecialDateTime(DateTime dt, char *str); extern int EncodeDateOnly(struct tm *tm, int style, char *str); extern int EncodeTimeOnly(struct tm *tm, double fsec, 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 datetkn *datebsearch(char *key, datetkn *base, unsigned int nel); - #endif /* DT_H */ diff --git a/src/include/utils/exc.h b/src/include/utils/exc.h index e3cc43b34c0..12bfdfc4c80 100644 --- a/src/include/utils/exc.h +++ b/src/include/utils/exc.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: exc.h,v 1.6 1996/12/10 07:04:22 bryanh Exp $ + * $Id: exc.h,v 1.7 1997/08/19 21:40:32 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -75,14 +75,6 @@ typedef void ExcProc(Exception*, ExcDetail, ExcData, ExcMessage); * prototypes for functions in exc.c */ extern void EnableExceptionHandling(bool on); -extern void ExcPrint(Exception *excP, ExcDetail detail, ExcData data, - ExcMessage message); -extern ExcProc *ExcGetUnCaught(void); -extern ExcProc *ExcSetUnCaught(ExcProc *newP); -extern void ExcUnCaught(Exception *excP, ExcDetail detail, ExcData data, - ExcMessage message); -extern void ExcUnCaught(Exception *excP, ExcDetail detail, ExcData data, - ExcMessage message); extern void ExcRaise(Exception *excP, ExcDetail detail, ExcData data, diff --git a/src/include/utils/geo_decls.h b/src/include/utils/geo_decls.h index 034dee7743f..cac5ac811e8 100644 --- a/src/include/utils/geo_decls.h +++ b/src/include/utils/geo_decls.h @@ -5,7 +5,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: geo_decls.h,v 1.6 1997/07/29 16:16:13 thomas Exp $ + * $Id: geo_decls.h,v 1.7 1997/08/19 21:40:34 momjian Exp $ * * NOTE * These routines do *not* use the float types from adt/. @@ -140,8 +140,6 @@ typedef struct { /* public point routines */ extern Point *point_in(char *str); extern char *point_out(Point *pt); -extern Point *point_construct(double x, double y); -extern Point *point_copy(Point *pt); extern bool point_left(Point *pt1, Point *pt2); extern bool point_right(Point *pt1, Point *pt2); extern bool point_above(Point *pt1, Point *pt2); @@ -182,7 +180,6 @@ extern double *dist_pb(Point *pt, BOX *box); extern double *dist_sl(LSEG *lseg, LINE *line); extern double *dist_sb(LSEG *lseg, BOX *box); extern double *dist_lb(LINE *line, BOX *box); -extern Point *interpt_sl(LSEG *lseg, LINE *line); extern Point *close_pl(Point *pt, LINE *line); extern Point *close_ps(Point *pt, LSEG *lseg); extern Point *close_pb(Point *pt, BOX *box); @@ -201,9 +198,6 @@ extern bool inter_lb(LINE *line, BOX *box); /* private routines */ extern LSEG *lseg_construct(Point *pt1, Point *pt2); -extern void statlseg_construct(LSEG *lseg, Point *pt1, Point *pt2); -extern double lseg_dt(LSEG *l1, LSEG *l2); -extern void make_bound_box(POLYGON *poly); /* public box routines */ extern BOX *box_in(char *str); @@ -224,7 +218,6 @@ extern bool box_eq(BOX *box1, BOX *box2); extern bool box_le(BOX *box1, BOX *box2); extern bool box_ge(BOX *box1, BOX *box2); extern Point *box_center(BOX *box); -extern double *box_area(BOX *box); extern double *box_width(BOX *box); extern double *box_height(BOX *box); extern double *box_distance(BOX *box1, BOX *box2); @@ -233,13 +226,7 @@ extern BOX *box_intersect(BOX *box1, BOX *box2); extern LSEG *box_diagonal(BOX *box); /* private routines */ -extern BOX *box_construct(double x1, double x2, double y1, double y2); -extern BOX *box_fill(BOX *result, double x1, double x2, double y1, double y2); -extern BOX *box_copy(BOX *box); -extern double box_ar(BOX *box); -extern double box_wd(BOX *box); -extern double box_ht(BOX *box); extern double box_dt(BOX *box1, BOX *box2); extern BOX *box(Point *p1, Point *p2); @@ -249,16 +236,7 @@ extern BOX *box_mul(BOX *box, Point *p); extern BOX *box_div(BOX *box, Point *p); /* private line routines */ -extern LINE *line_construct_pm(Point *pt, double m); -extern LINE *line_construct_pp(Point *pt1, Point *pt2); -extern bool line_intersect(LINE *l1, LINE *l2); -extern bool line_parallel(LINE *l1, LINE *l2); -extern bool line_perp(LINE *l1, LINE *l2); -extern bool line_vertical(LINE *line); -extern bool line_horizontal(LINE *line); -extern bool line_eq(LINE *l1, LINE *l2); extern double *line_distance(LINE *l1, LINE *l2); -extern Point *line_interpt(LINE *l1, LINE *l2); /* public path routines */ extern PATH *path_in(char *str); @@ -292,10 +270,6 @@ extern POLYGON *path_poly(PATH *path); extern PATH *upgradepath(PATH *path); extern bool isoldpath(PATH *path); -/* private routines */ -extern double path_ln(PATH *path); -extern bool plist_same(int npts, Point p1[], Point p2[]); - /* public polygon routines */ extern POLYGON *poly_in(char *s); extern char *poly_out(POLYGON *poly); @@ -348,7 +322,6 @@ extern CIRCLE *circle_add_pt(CIRCLE *circle, Point *point); extern CIRCLE *circle_sub_pt(CIRCLE *circle, Point *point); extern CIRCLE *circle_mul_pt(CIRCLE *circle, Point *point); extern CIRCLE *circle_div_pt(CIRCLE *circle, Point *point); -extern double *circle_area(CIRCLE *circle); extern double *circle_diameter(CIRCLE *circle); extern double *circle_radius(CIRCLE *circle); extern double *circle_distance(CIRCLE *circle1, CIRCLE *circle2); @@ -362,7 +335,7 @@ extern CIRCLE *poly_circle(POLYGON *poly); extern POLYGON *circle_poly(int npts, CIRCLE *circle); /* private routines */ -extern double circle_ar(CIRCLE *circle); +extern double *circle_area(CIRCLE *circle); extern double circle_dt(CIRCLE *circle1, CIRCLE *circle2); /* geo_selfuncs.c */ @@ -370,13 +343,5 @@ extern float64 areasel(Oid opid, Oid relid, AttrNumber attno, char *value, int32 flag); extern float64 areajoinsel(Oid opid, Oid relid, AttrNumber attno, char *value, int32 flag); -extern float64 leftsel(Oid opid, Oid relid, AttrNumber attno, - char *value, int32 flag); -extern float64 leftjoinsel(Oid opid, Oid relid, AttrNumber attno, - char *value, int32 flag); -extern float64 contsel(Oid opid, Oid relid, AttrNumber attno, - char *value, int32 flag); -extern float64 contjoinsel(Oid opid, Oid relid, AttrNumber attno, - char *value, int32 flag); #endif /* GEO_DECLS_H */ diff --git a/src/include/utils/hsearch.h b/src/include/utils/hsearch.h index bdf221bc2d7..3f5727fba0f 100644 --- a/src/include/utils/hsearch.h +++ b/src/include/utils/hsearch.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: hsearch.h,v 1.2 1996/10/31 09:51:20 scrappy Exp $ + * $Id: hsearch.h,v 1.3 1997/08/19 21:40:35 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -135,6 +135,5 @@ extern long *hash_seq(HTAB *hashp); */ extern long string_hash(char *key, int keysize); extern long tag_hash(int *key, int keysize); -extern long disk_hash(char *key); #endif /* HSEARCH_H */ diff --git a/src/include/utils/inval.h b/src/include/utils/inval.h index d54d8c5ab66..0c993f5964b 100644 --- a/src/include/utils/inval.h +++ b/src/include/utils/inval.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: inval.h,v 1.3 1996/11/04 11:51:18 scrappy Exp $ + * $Id: inval.h,v 1.4 1997/08/19 21:40:37 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -42,14 +42,5 @@ typedef InvalidationEntry LocalInvalid; #define EmptyLocalInvalid NULL -extern InvalidationEntry InvalidationEntryAllocate(uint16 size); - -extern LocalInvalid LocalInvalidRegister(LocalInvalid invalid, - InvalidationEntry entry); - -extern void LocalInvalidInvalidate(LocalInvalid invalid, void (*function)()); - -extern void getmyrelids(void); - #endif /* INVAL_H */ diff --git a/src/include/utils/lsyscache.h b/src/include/utils/lsyscache.h index 7e1bf907b8b..82f465814e3 100644 --- a/src/include/utils/lsyscache.h +++ b/src/include/utils/lsyscache.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: lsyscache.h,v 1.2 1996/11/04 11:51:20 scrappy Exp $ + * $Id: lsyscache.h,v 1.3 1997/08/19 21:40:40 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -37,10 +37,8 @@ extern struct varlena * get_relstub(Oid relid, int no, bool *islast); extern Oid get_ruleid(char *rulename); extern Oid get_eventrelid(Oid ruleid); extern int16 get_typlen(Oid typid); -extern char get_typalign(Oid typid); extern bool get_typbyval(Oid typid); extern struct varlena *get_typdefault(Oid typid); -extern char get_typtype(Oid typid); #endif /* LSYSCACHE_H */ diff --git a/src/include/utils/mcxt.h b/src/include/utils/mcxt.h index 21d405bc88f..9d0b649f40e 100644 --- a/src/include/utils/mcxt.h +++ b/src/include/utils/mcxt.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: mcxt.h,v 1.4 1996/11/04 11:51:21 scrappy Exp $ + * $Id: mcxt.h,v 1.5 1997/08/19 21:40:41 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -43,8 +43,6 @@ extern Pointer MemoryContextRealloc(MemoryContext context, Pointer pointer, Size size); extern void MemoryContextFree(MemoryContext context, Pointer pointer); -extern char *MemoryContextGetName(MemoryContext context); -extern Size PointerGetAllocSize(Pointer pointer); extern MemoryContext MemoryContextSwitchTo(MemoryContext context); extern GlobalMemory CreateGlobalMemory(char *name); extern void GlobalMemoryDestroy(GlobalMemory context); diff --git a/src/include/utils/memutils.h b/src/include/utils/memutils.h index b6f013cdbe1..979b9f79844 100644 --- a/src/include/utils/memutils.h +++ b/src/include/utils/memutils.h @@ -15,7 +15,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: memutils.h,v 1.6 1997/03/12 21:13:19 scrappy Exp $ + * $Id: memutils.h,v 1.7 1997/08/19 21:40:43 momjian Exp $ * * NOTES * some of the information in this file will be moved to @@ -120,7 +120,6 @@ struct OrderedSetData { extern void OrderedSetInit(OrderedSet set, Offset offset); extern bool OrderedSetContains(OrderedSet set, OrderedElem elem); extern Pointer OrderedSetGetHead(OrderedSet set); -extern Pointer OrderedSetGetTail(OrderedSet set); extern Pointer OrderedElemGetPredecessor(OrderedElem elem); extern Pointer OrderedElemGetSuccessor(OrderedElem elem); extern void OrderedElemPop(OrderedElem elem); @@ -226,12 +225,6 @@ extern void AllocSetFree(AllocSet set, AllocPointer pointer); extern AllocPointer AllocSetRealloc(AllocSet set, AllocPointer pointer, Size size); -extern int AllocSetIterate(AllocSet set, - void (*function)(AllocPointer pointer)); - -extern int AllocSetCount(AllocSet set); - -extern void AllocPointerDump(AllocPointer pointer); extern void AllocSetDump(AllocSet set); /***************************************************************************** diff --git a/src/include/utils/nabstime.h b/src/include/utils/nabstime.h index 0d6888e1d7e..4db0fefa50c 100644 --- a/src/include/utils/nabstime.h +++ b/src/include/utils/nabstime.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: nabstime.h,v 1.9 1997/07/29 16:16:14 thomas Exp $ + * $Id: nabstime.h,v 1.10 1997/08/19 21:40:47 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -112,7 +112,6 @@ extern DateTime *abstime_datetime(AbsoluteTime abstime); extern bool AbsoluteTimeIsBefore(AbsoluteTime time1, AbsoluteTime time2); extern bool AbsoluteTimeIsAfter(AbsoluteTime time1, AbsoluteTime time2); -extern AbsoluteTime tm2abstime(struct tm *tm, int tz); extern void abstime2tm(AbsoluteTime time, int *tzp, struct tm *tm, char *tzn); #endif /* NABSTIME_H */ diff --git a/src/include/utils/portal.h b/src/include/utils/portal.h index b385097f197..49f907c3f0b 100644 --- a/src/include/utils/portal.h +++ b/src/include/utils/portal.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: portal.h,v 1.3 1996/11/04 11:51:22 scrappy Exp $ + * $Id: portal.h,v 1.4 1997/08/19 21:40:48 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -62,7 +62,6 @@ struct PortalD { #define VACPNAME "<vacuum>" extern bool PortalNameIsSpecial(char *pname); -extern void CollectNamedPortals(Portal *portalP, int destroy); extern void AtEOXact_portals(void); extern void EnablePortalManager(bool on); extern Portal GetPortalByName(char *name); @@ -74,15 +73,10 @@ extern QueryDesc *PortalGetQueryDesc(Portal portal); extern EState *PortalGetState(Portal portal); extern Portal CreatePortal(char *name); extern void PortalDestroy(Portal *portalP); -extern void PortalResetHeapMemory(Portal portal); extern void StartPortalAllocMode(AllocMode mode, Size limit); extern void EndPortalAllocMode(void); extern PortalVariableMemory PortalGetVariableMemory(Portal portal); extern PortalHeapMemory PortalGetHeapMemory(Portal portal); -extern Portal PortalVariableMemoryGetPortal(PortalVariableMemory context); -extern Portal PortalHeapMemoryGetPortal(PortalHeapMemory context); -extern PortalHeapMemory PortalVariableMemoryGetHeapMemory(PortalVariableMemory context); -extern PortalVariableMemory PortalHeapMemoryGetVariableMemory(PortalHeapMemory context); /* estimate of the maximum number of open portals a user would have, * used in initially sizing the PortalHashTable in EnablePortalManager() diff --git a/src/include/utils/psort.h b/src/include/utils/psort.h index c6c6c29fb91..d7f979c8ff7 100644 --- a/src/include/utils/psort.h +++ b/src/include/utils/psort.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: psort.h,v 1.6 1997/08/06 07:02:49 momjian Exp $ + * $Id: psort.h,v 1.7 1997/08/19 21:40:48 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -96,22 +96,9 @@ if (1) CODE; else /* psort.c */ extern bool psort_begin(Sort *node, int nkeys, ScanKey key); -extern void inittapes(Sort *node); -extern void resetpsort(void); -extern void initialrun(Sort *node, bool *empty); -extern bool createrun(Sort *node, FILE *file, bool *empty); -extern HeapTuple tuplecopy(HeapTuple tup); -extern FILE *mergeruns(Sort *node); -extern void merge(Sort *node, struct tape *dest); - -extern void dumptuples(FILE *file, Sort *node); extern HeapTuple psort_grabtuple(Sort *node); extern void psort_markpos(Sort *node); extern void psort_restorepos(Sort *node); extern void psort_end(Sort *node); -extern FILE *gettape(void); -extern void resettape(FILE *file); -extern void destroytape(FILE *file); - #endif /* PSORT_H */ diff --git a/src/include/utils/relcache.h b/src/include/utils/relcache.h index 81880cf0905..7b1a0c2196b 100644 --- a/src/include/utils/relcache.h +++ b/src/include/utils/relcache.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: relcache.h,v 1.5 1997/06/04 09:01:49 vadim Exp $ + * $Id: relcache.h,v 1.6 1997/08/19 21:40:49 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -19,14 +19,10 @@ * relation lookup routines */ extern Relation RelationIdCacheGetRelation(Oid relationId); -extern Relation RelationNameCacheGetRelation(char *relationName); extern Relation RelationIdGetRelation(Oid relationId); extern Relation RelationNameGetRelation(char *relationName); -extern Relation getreldesc(char *relationName); extern void RelationClose(Relation relation); -extern void RelationFlushRelation(Relation *relationPtr, - bool onlyFlushReferenceCountZero); extern void RelationForgetRelation(Oid rid); extern void RelationIdInvalidateRelationCacheByRelationId(Oid relationId); @@ -38,8 +34,5 @@ extern void RelationCacheInvalidate(bool onlyFlushReferenceCountZero); extern void RelationRegisterRelation(Relation relation); extern void RelationPurgeLocalRelation(bool xactComitted); extern void RelationInitialize(void); -extern void init_irels(void); -extern void write_irels(void); - #endif /* RELCACHE_H */ diff --git a/src/include/utils/tqual.h b/src/include/utils/tqual.h index dc8139266d4..9c45ce0650c 100644 --- a/src/include/utils/tqual.h +++ b/src/include/utils/tqual.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: tqual.h,v 1.5 1996/11/04 07:18:46 scrappy Exp $ + * $Id: tqual.h,v 1.6 1997/08/19 21:40:50 momjian Exp $ * * NOTE * It may be desirable to allow time qualifications to indicate @@ -34,16 +34,6 @@ extern TimeQual SelfTimeQual; extern void setheapoverride(bool on); extern bool heapisoverride(void); -extern bool TimeQualIsValid(TimeQual qual); -extern bool TimeQualIsLegal(TimeQual qual); -extern bool TimeQualIncludesNow(TimeQual qual); -extern bool TimeQualIncludesPast(TimeQual qual); -extern bool TimeQualIsSnapshot(TimeQual qual); -extern bool TimeQualIsRanged(TimeQual qual); -extern bool TimeQualIndicatesDisableValidityChecking(TimeQual qual); -extern AbsoluteTime TimeQualGetSnapshotTime(TimeQual qual); -extern AbsoluteTime TimeQualGetStartTime(TimeQual qual); -extern AbsoluteTime TimeQualGetEndTime(TimeQual qual); extern TimeQual TimeFormSnapshotTimeQual(AbsoluteTime time); extern TimeQual TimeFormRangedTimeQual(AbsoluteTime startTime, AbsoluteTime endTime); diff --git a/src/test/regress/regress.c b/src/test/regress/regress.c index 5309e7bd513..f6937365889 100644 --- a/src/test/regress/regress.c +++ b/src/test/regress/regress.c @@ -1,5 +1,5 @@ /* - * $Header: /cvsroot/pgsql/src/test/regress/regress.c,v 1.8 1997/08/12 22:55:25 momjian Exp $ + * $Header: /cvsroot/pgsql/src/test/regress/regress.c,v 1.9 1997/08/19 21:40:56 momjian Exp $ */ #include <float.h> /* faked on sunos */ @@ -30,7 +30,7 @@ extern char *reverse_c16 (char *string); /* ** Distance from a point to a path */ -double * + double * regress_dist_ptpath(pt, path) Point *pt; PATH *path; @@ -70,7 +70,7 @@ regress_dist_ptpath(pt, path) /* this essentially does a cartesian product of the lsegs in the two paths, and finds the min distance between any two lsegs */ -double * + double * regress_path_dist(p1, p2) PATH *p1; PATH *p2; @@ -97,7 +97,7 @@ regress_path_dist(p1, p2) return(min); } -PATH * + PATH * poly2path(poly) POLYGON *poly; { @@ -119,7 +119,7 @@ poly2path(poly) } /* return the point where two paths intersect. Assumes that they do. */ -Point * + Point * interpt_pp(p1,p2) PATH *p1; PATH *p2; @@ -154,7 +154,7 @@ interpt_pp(p1,p2) /* like lseg_construct, but assume space already allocated */ -void + void regress_lseg_construct(lseg, pt1, pt2) LSEG *lseg; Point *pt1; @@ -168,7 +168,7 @@ regress_lseg_construct(lseg, pt1, pt2) } -char overpaid(tuple) + char overpaid(tuple) TUPLE tuple; { bool isnull; @@ -188,13 +188,13 @@ typedef struct { double radius; } WIDGET; -extern WIDGET *widget_in (char *str); -extern char *widget_out (WIDGET *widget); -extern int pt_in_widget (Point *point, WIDGET *widget); + WIDGET *widget_in (char *str); + char *widget_out (WIDGET *widget); + int pt_in_widget (Point *point, WIDGET *widget); #define NARGS 3 -WIDGET * + WIDGET * widget_in(str) char *str; { @@ -219,7 +219,7 @@ char *str; return(result); } -char * + char * widget_out(widget) WIDGET *widget; { @@ -234,7 +234,7 @@ widget_out(widget) return(result); } -int + int pt_in_widget(point, widget) Point *point; WIDGET *widget; @@ -246,7 +246,7 @@ pt_in_widget(point, widget) #define ABS(X) ((X) > 0 ? (X) : -(X)) -int + int boxarea(box) BOX *box; @@ -259,7 +259,7 @@ BOX *box; return (width * height); } -char * + char * reverse_c16(string) char *string; { |