diff options
Diffstat (limited to 'src/include')
74 files changed, 82 insertions, 524 deletions
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); |