database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-26 12:21:12 +03:00
Code Activity

Cleanup of prototypes. FIx for PQtrace start/stop several times.

Browse Source
This commit is contained in:
Bruce Momjian
1998-01-14 15:48:51 +00:00
parent d8972c62b4
commit cb3ce64f2e
5 changed files with 34 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,7 +26,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.37 1998/01/07 21:02:39 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.38 1998/01/14 15:48:09 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -57,28 +57,22 @@
/* decls for local routines only used within this module */ /* decls for local routines only used within this module */
static void static void ExecCheckPerms(CmdType operation, int resultRelation, List *rangeTable,
ExecCheckPerms(CmdType operation, int resultRelation, List *rangeTable,
Query *parseTree); Query *parseTree);
static TupleDesc static TupleDesc InitPlan(CmdType operation, Query *parseTree,
InitPlan(CmdType operation, Query *parseTree,
Plan *plan, EState *estate); Plan *plan, EState *estate);
static void EndPlan(Plan *plan, EState *estate); static void EndPlan(Plan *plan, EState *estate);
static TupleTableSlot * static TupleTableSlot * ExecutePlan(EState *estate, Plan *plan,
ExecutePlan(EState *estate, Plan *plan,
Query *parseTree, CmdType operation, Query *parseTree, CmdType operation,
int numberTuples, ScanDirection direction, int numberTuples, ScanDirection direction,
void (*printfunc) ()); void (*printfunc) ());
static void ExecRetrieve(TupleTableSlot *slot, void (*printfunc) (), static void ExecRetrieve(TupleTableSlot *slot, void (*printfunc) (),
EState *estate); EState *estate);
static void static void ExecAppend(TupleTableSlot *slot, ItemPointer tupleid,
ExecAppend(TupleTableSlot *slot, ItemPointer tupleid,
EState *estate); EState *estate);
static void static void ExecDelete(TupleTableSlot *slot, ItemPointer tupleid,
ExecDelete(TupleTableSlot *slot, ItemPointer tupleid,
EState *estate); EState *estate);
static void static void ExecReplace(TupleTableSlot *slot, ItemPointer tupleid,
ExecReplace(TupleTableSlot *slot, ItemPointer tupleid,
EState *estate, Query *parseTree); EState *estate, Query *parseTree);
/* end of local decls */ /* end of local decls */

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

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/optimizer/plan/setrefs.c,v 1.12 1998/01/07 21:04:13 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/setrefs.c,v 1.13 1998/01/14 15:48:21 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -36,11 +36,9 @@
static void set_join_tlist_references(Join *join); static void set_join_tlist_references(Join *join);
static void set_tempscan_tlist_references(SeqScan *tempscan); static void set_tempscan_tlist_references(SeqScan *tempscan);
static void set_temp_tlist_references(Temp *temp); static void set_temp_tlist_references(Temp *temp);
static List * static List *replace_clause_joinvar_refs(Expr *clause,
replace_clause_joinvar_refs(Expr *clause,
List *outer_tlist, List *inner_tlist); List *outer_tlist, List *inner_tlist);
static List * static List *replace_subclause_joinvar_refs(List *clauses,
replace_subclause_joinvar_refs(List *clauses,
List *outer_tlist, List *inner_tlist); List *outer_tlist, List *inner_tlist);
static Var *replace_joinvar_refs(Var *var, List *outer_tlist, List *inner_tlist); static Var *replace_joinvar_refs(Var *var, List *outer_tlist, List *inner_tlist);
static List *tlist_temp_references(Oid tempid, List *tlist); static List *tlist_temp_references(Oid tempid, List *tlist);

11
src/backend/utils/cache/relcache.c vendored
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.32 1998/01/07 21:06:13 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.33 1998/01/14 15:48:32 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -257,14 +257,11 @@ static HeapTuple ScanPgRelation(RelationBuildDescInfo buildinfo);
static HeapTuple scan_pg_rel_seq(RelationBuildDescInfo buildinfo); static HeapTuple scan_pg_rel_seq(RelationBuildDescInfo buildinfo);
static HeapTuple scan_pg_rel_ind(RelationBuildDescInfo buildinfo); static HeapTuple scan_pg_rel_ind(RelationBuildDescInfo buildinfo);
static Relation AllocateRelationDesc(u_int natts, Form_pg_class relp); static Relation AllocateRelationDesc(u_int natts, Form_pg_class relp);
static void static void RelationBuildTupleDesc(RelationBuildDescInfo buildinfo,
RelationBuildTupleDesc(RelationBuildDescInfo buildinfo,
Relation relation, u_int natts); Relation relation, u_int natts);
static void static void build_tupdesc_seq(RelationBuildDescInfo buildinfo,
build_tupdesc_seq(RelationBuildDescInfo buildinfo,
Relation relation, u_int natts); Relation relation, u_int natts);
static void static void build_tupdesc_ind(RelationBuildDescInfo buildinfo,
build_tupdesc_ind(RelationBuildDescInfo buildinfo,
Relation relation, u_int natts); Relation relation, u_int natts);
static Relation RelationBuildDesc(RelationBuildDescInfo buildinfo); static Relation RelationBuildDesc(RelationBuildDescInfo buildinfo);
static void IndexedAccessMethodInitialize(Relation relation); static void IndexedAccessMethodInitialize(Relation relation);

56
src/include/executor/executor.h
View File

@ -6,7 +6,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: executor.h,v 1.16 1997/11/26 03:54:23 momjian Exp $ * $Id: executor.h,v 1.17 1998/01/14 15:48:43 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -26,14 +26,12 @@
/* /*
* prototypes from functions in execAmi.c * prototypes from functions in execAmi.c
*/ */
extern void extern void ExecOpenScanR(Oid relOid, int nkeys, ScanKey skeys, bool isindex,
ExecOpenScanR(Oid relOid, int nkeys, ScanKey skeys, bool isindex,
ScanDirection dir, Relation *returnRelation, ScanDirection dir, Relation *returnRelation,
Pointer *returnScanDesc); Pointer *returnScanDesc);
extern void ExecCloseR(Plan *node); extern void ExecCloseR(Plan *node);
extern void ExecReScan(Plan *node, ExprContext *exprCtxt, Plan *parent); extern void ExecReScan(Plan *node, ExprContext *exprCtxt, Plan *parent);
extern HeapScanDesc extern HeapScanDesc ExecReScanR(Relation relDesc, HeapScanDesc scanDesc,
ExecReScanR(Relation relDesc, HeapScanDesc scanDesc,
ScanDirection direction, int nkeys, ScanKey skeys); ScanDirection direction, int nkeys, ScanKey skeys);
extern void ExecMarkPos(Plan *node); extern void ExecMarkPos(Plan *node);
extern void ExecRestrPos(Plan *node); extern void ExecRestrPos(Plan *node);
@ -43,8 +41,7 @@ extern Relation ExecCreatR(TupleDesc tupType, Oid relationOid);
* prototypes from functions in execJunk.c * prototypes from functions in execJunk.c
*/ */
extern JunkFilter *ExecInitJunkFilter(List *targetList); extern JunkFilter *ExecInitJunkFilter(List *targetList);
extern bool extern bool ExecGetJunkAttribute(JunkFilter *junkfilter, TupleTableSlot *slot,
ExecGetJunkAttribute(JunkFilter *junkfilter, TupleTableSlot *slot,
char *attrName, Datum *value, bool *isNull); char *attrName, Datum *value, bool *isNull);
extern HeapTuple ExecRemoveJunk(JunkFilter *junkfilter, TupleTableSlot *slot); extern HeapTuple ExecRemoveJunk(JunkFilter *junkfilter, TupleTableSlot *slot);
@ -71,20 +68,16 @@ extern void ExecEndNode(Plan *node, Plan *parent);
extern bool execConstByVal; extern bool execConstByVal;
extern int execConstLen; extern int execConstLen;
extern Datum extern Datum ExecExtractResult(TupleTableSlot *slot, AttrNumber attnum,
ExecExtractResult(TupleTableSlot *slot, AttrNumber attnum,
bool *isNull); bool *isNull);
extern Datum extern Datum ExecEvalParam(Param *expression, ExprContext *econtext,
ExecEvalParam(Param *expression, ExprContext *econtext,
bool *isNull); bool *isNull);
/* stop here */ /* stop here */
extern char *GetAttributeByNum(TupleTableSlot *slot, AttrNumber attrno, extern char *GetAttributeByNum(TupleTableSlot *slot, AttrNumber attrno,
bool *isNull); bool *isNull);
extern char * extern char *GetAttributeByName(TupleTableSlot *slot, char *attname, bool *isNull);
GetAttributeByName(TupleTableSlot *slot, char *attname, bool *isNull); extern Datum ExecEvalExpr(Node *expression, ExprContext *econtext, bool *isNull,
extern Datum
ExecEvalExpr(Node *expression, ExprContext *econtext, bool *isNull,
bool *isDone); bool *isDone);
extern bool ExecQual(List *qual, ExprContext *econtext); extern bool ExecQual(List *qual, ExprContext *econtext);
extern int ExecTargetListLength(List *targetlist); extern int ExecTargetListLength(List *targetlist);
@ -101,22 +94,19 @@ extern TupleTableSlot *ExecScan(Scan *node, TupleTableSlot *(*accessMtd) ());
extern TupleTable ExecCreateTupleTable(int initialSize); extern TupleTable ExecCreateTupleTable(int initialSize);
extern void ExecDestroyTupleTable(TupleTable table, bool shouldFree); extern void ExecDestroyTupleTable(TupleTable table, bool shouldFree);
extern TupleTableSlot *ExecAllocTableSlot(TupleTable table); extern TupleTableSlot *ExecAllocTableSlot(TupleTable table);
extern TupleTableSlot * extern TupleTableSlot *ExecStoreTuple(HeapTuple tuple,
ExecStoreTuple(HeapTuple tuple,
TupleTableSlot *slot, TupleTableSlot *slot,
Buffer buffer, Buffer buffer,
bool shouldFree); bool shouldFree);
extern TupleTableSlot *ExecClearTuple(TupleTableSlot *slot); extern TupleTableSlot *ExecClearTuple(TupleTableSlot *slot);
extern bool ExecSetSlotPolicy(TupleTableSlot *slot, bool shouldFree); extern bool ExecSetSlotPolicy(TupleTableSlot *slot, bool shouldFree);
extern TupleDesc extern TupleDesc ExecSetSlotDescriptor(TupleTableSlot *slot,
ExecSetSlotDescriptor(TupleTableSlot *slot,
TupleDesc tupdesc); TupleDesc tupdesc);
extern void ExecSetSlotDescriptorIsNew(TupleTableSlot *slot, bool isNew); extern void ExecSetSlotDescriptorIsNew(TupleTableSlot *slot, bool isNew);
extern void ExecIncrSlotBufferRefcnt(TupleTableSlot *slot); extern void ExecIncrSlotBufferRefcnt(TupleTableSlot *slot);
extern bool TupIsNull(TupleTableSlot *slot); extern bool TupIsNull(TupleTableSlot *slot);
extern void ExecInitResultTupleSlot(EState *estate, CommonState *commonstate); extern void ExecInitResultTupleSlot(EState *estate, CommonState *commonstate);
extern void extern void ExecInitScanTupleSlot(EState *estate,
ExecInitScanTupleSlot(EState *estate,
CommonScanState *commonscanstate); CommonScanState *commonscanstate);
extern void ExecInitMarkedTupleSlot(EState *estate, MergeJoinState *mergestate); extern void ExecInitMarkedTupleSlot(EState *estate, MergeJoinState *mergestate);
extern void ExecInitOuterTupleSlot(EState *estate, HashJoinState *hashstate); extern void ExecInitOuterTupleSlot(EState *estate, HashJoinState *hashstate);
@ -128,39 +118,31 @@ extern TupleDesc ExecTypeFromTL(List *targetList);
* prototypes from functions in execTuples.c * prototypes from functions in execTuples.c
*/ */
extern void ResetTupleCount(void); extern void ResetTupleCount(void);
extern void extern void ExecAssignNodeBaseInfo(EState *estate, CommonState *basenode,
ExecAssignNodeBaseInfo(EState *estate, CommonState *basenode,
Plan *parent); Plan *parent);
extern void ExecAssignExprContext(EState *estate, CommonState *commonstate); extern void ExecAssignExprContext(EState *estate, CommonState *commonstate);
extern void extern void ExecAssignResultType(CommonState *commonstate,
ExecAssignResultType(CommonState *commonstate,
TupleDesc tupDesc); TupleDesc tupDesc);
extern void extern void ExecAssignResultTypeFromOuterPlan(Plan *node,
ExecAssignResultTypeFromOuterPlan(Plan *node,
CommonState *commonstate); CommonState *commonstate);
extern void ExecAssignResultTypeFromTL(Plan *node, CommonState *commonstate); extern void ExecAssignResultTypeFromTL(Plan *node, CommonState *commonstate);
extern TupleDesc ExecGetResultType(CommonState *commonstate); extern TupleDesc ExecGetResultType(CommonState *commonstate);
extern void ExecAssignProjectionInfo(Plan *node, CommonState *commonstate); extern void ExecAssignProjectionInfo(Plan *node, CommonState *commonstate);
extern void ExecFreeProjectionInfo(CommonState *commonstate); extern void ExecFreeProjectionInfo(CommonState *commonstate);
extern TupleDesc ExecGetScanType(CommonScanState *csstate); extern TupleDesc ExecGetScanType(CommonScanState *csstate);
extern void extern void ExecAssignScanType(CommonScanState *csstate,
ExecAssignScanType(CommonScanState *csstate,
TupleDesc tupDesc); TupleDesc tupDesc);
extern void extern void ExecAssignScanTypeFromOuterPlan(Plan *node,
ExecAssignScanTypeFromOuterPlan(Plan *node,
CommonScanState *csstate); CommonScanState *csstate);
extern AttributeTupleForm ExecGetTypeInfo(Relation relDesc); extern AttributeTupleForm ExecGetTypeInfo(Relation relDesc);
extern void extern void ExecOpenIndices(Oid resultRelationOid,
ExecOpenIndices(Oid resultRelationOid,
RelationInfo *resultRelationInfo); RelationInfo *resultRelationInfo);
extern void ExecCloseIndices(RelationInfo *resultRelationInfo); extern void ExecCloseIndices(RelationInfo *resultRelationInfo);
extern void extern void ExecInsertIndexTuples(TupleTableSlot *slot, ItemPointer tupleid,
ExecInsertIndexTuples(TupleTableSlot *slot, ItemPointer tupleid,
EState *estate, bool is_update); EState *estate, bool is_update);
extern void resetVarAttrLenForCreateTable(TupleDesc tupType); extern void resetVarAttrLenForCreateTable(TupleDesc tupType);
extern void extern void setVarAttrLenForCreateTable(TupleDesc tupType,
setVarAttrLenForCreateTable(TupleDesc tupType,
List *targetList, List *rangeTable); List *targetList, List *rangeTable);

3
src/interfaces/libpq/fe-connect.c
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.55 1998/01/13 14:57:25 vadim Exp $ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.56 1998/01/14 15:48:51 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -1331,7 +1331,6 @@ PQuntrace(PGconn *conn)
if (conn->Pfdebug) if (conn->Pfdebug)
{ {
fflush(conn->Pfdebug); fflush(conn->Pfdebug);
fclose(conn->Pfdebug);
conn->Pfdebug = NULL; conn->Pfdebug = NULL;
} }
} }