diff options
| author | Bruce Momjian <bruce@momjian.us> | 2001-10-28 06:26:15 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2001-10-28 06:26:15 +0000 |
| commit | 6783b2372ef13c141649840a836ff0a954ea1d4d (patch) | |
| tree | 81c727b2b08930bcf3ab7107c84ef59f1f68a78d /src/include/nodes | |
| parent | c29797deeb5dfca61b8959344b682b4c32fe53a1 (diff) | |
| download | postgresql-6783b2372ef13c141649840a836ff0a954ea1d4d.tar.gz | |
Another pgindent run. Fixes enum indenting, and improves #endif
spacing. Also adds space for one-line comments.
Diffstat (limited to 'src/include/nodes')
| -rw-r--r-- | src/include/nodes/execnodes.h | 11 | ||||
| -rw-r--r-- | src/include/nodes/makefuncs.h | 3 | ||||
| -rw-r--r-- | src/include/nodes/nodeFuncs.h | 3 | ||||
| -rw-r--r-- | src/include/nodes/nodes.h | 373 | ||||
| -rw-r--r-- | src/include/nodes/params.h | 3 | ||||
| -rw-r--r-- | src/include/nodes/parsenodes.h | 46 | ||||
| -rw-r--r-- | src/include/nodes/pg_list.h | 3 | ||||
| -rw-r--r-- | src/include/nodes/plannodes.h | 11 | ||||
| -rw-r--r-- | src/include/nodes/primnodes.h | 7 | ||||
| -rw-r--r-- | src/include/nodes/print.h | 3 | ||||
| -rw-r--r-- | src/include/nodes/readfuncs.h | 3 | ||||
| -rw-r--r-- | src/include/nodes/relation.h | 13 |
12 files changed, 244 insertions, 235 deletions
diff --git a/src/include/nodes/execnodes.h b/src/include/nodes/execnodes.h index 69f0597f81..63b679da3d 100644 --- a/src/include/nodes/execnodes.h +++ b/src/include/nodes/execnodes.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: execnodes.h,v 1.64 2001/10/25 05:50:01 momjian Exp $ + * $Id: execnodes.h,v 1.65 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -98,11 +98,9 @@ typedef struct ExprContext */ typedef enum { - ExprSingleResult, /* expression does not return a - * set */ - ExprMultipleResult, /* this result is an element of a - * set */ - ExprEndResult /* there are no more elements in the set */ + ExprSingleResult, /* expression does not return a set */ + ExprMultipleResult, /* this result is an element of a set */ + ExprEndResult /* there are no more elements in the set */ } ExprDoneCond; /* @@ -753,4 +751,5 @@ typedef struct TeeState tee_rightScanDesc; } TeeState; #endif + #endif /* EXECNODES_H */ diff --git a/src/include/nodes/makefuncs.h b/src/include/nodes/makefuncs.h index 9a4dc6e734..2887440be1 100644 --- a/src/include/nodes/makefuncs.h +++ b/src/include/nodes/makefuncs.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: makefuncs.h,v 1.28 2001/10/25 05:50:04 momjian Exp $ + * $Id: makefuncs.h,v 1.29 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -45,4 +45,5 @@ extern Const *makeConst(Oid consttype, extern Const *makeNullConst(Oid consttype); extern Attr *makeAttr(char *relname, char *attname); + #endif /* MAKEFUNC_H */ diff --git a/src/include/nodes/nodeFuncs.h b/src/include/nodes/nodeFuncs.h index f26db84063..abf380bb60 100644 --- a/src/include/nodes/nodeFuncs.h +++ b/src/include/nodes/nodeFuncs.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: nodeFuncs.h,v 1.14 2001/10/25 05:50:04 momjian Exp $ + * $Id: nodeFuncs.h,v 1.15 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -20,4 +20,5 @@ extern bool single_node(Node *node); extern bool var_is_outer(Var *var); extern bool var_is_rel(Var *var); extern Oper *replace_opid(Oper *oper); + #endif /* NODEFUNCS_H */ diff --git a/src/include/nodes/nodes.h b/src/include/nodes/nodes.h index 66ca855f9a..234d5afeae 100644 --- a/src/include/nodes/nodes.h +++ b/src/include/nodes/nodes.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: nodes.h,v 1.94 2001/10/25 05:50:04 momjian Exp $ + * $Id: nodes.h,v 1.95 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -23,211 +23,211 @@ */ typedef enum NodeTag { - T_Invalid = 0, + T_Invalid = 0, /* * TAGS FOR PLAN NODES (plannodes.h) */ - T_Plan = 10, - T_Result, - T_Append, - T_Scan, - T_SeqScan, - T_IndexScan, - T_Join, - T_NestLoop, - T_MergeJoin, - T_HashJoin, - T_Limit, - T_Material, - T_Sort, - T_Agg, - T_Unique, - T_Hash, - T_SetOp, - T_Group, - T_SubPlan, - T_TidScan, - T_SubqueryScan, + T_Plan = 10, + T_Result, + T_Append, + T_Scan, + T_SeqScan, + T_IndexScan, + T_Join, + T_NestLoop, + T_MergeJoin, + T_HashJoin, + T_Limit, + T_Material, + T_Sort, + T_Agg, + T_Unique, + T_Hash, + T_SetOp, + T_Group, + T_SubPlan, + T_TidScan, + T_SubqueryScan, /* * TAGS FOR PRIMITIVE NODES (primnodes.h) */ - T_Resdom = 100, - T_Fjoin, - T_Expr, - T_Var, - T_Oper, - T_Const, - T_Param, - T_Aggref, - T_SubLink, - T_Func, - T_FieldSelect, - T_ArrayRef, - T_Iter, - T_RelabelType, - T_RangeTblRef, - T_FromExpr, - T_JoinExpr, + T_Resdom = 100, + T_Fjoin, + T_Expr, + T_Var, + T_Oper, + T_Const, + T_Param, + T_Aggref, + T_SubLink, + T_Func, + T_FieldSelect, + T_ArrayRef, + T_Iter, + T_RelabelType, + T_RangeTblRef, + T_FromExpr, + T_JoinExpr, /* * TAGS FOR PLANNER NODES (relation.h) */ - T_RelOptInfo = 200, - T_Path, - T_IndexPath, - T_NestPath, - T_MergePath, - T_HashPath, - T_TidPath, - T_AppendPath, - T_PathKeyItem, - T_RestrictInfo, - T_JoinInfo, - T_Stream, - T_IndexOptInfo, + T_RelOptInfo = 200, + T_Path, + T_IndexPath, + T_NestPath, + T_MergePath, + T_HashPath, + T_TidPath, + T_AppendPath, + T_PathKeyItem, + T_RestrictInfo, + T_JoinInfo, + T_Stream, + T_IndexOptInfo, /* * TAGS FOR EXECUTOR NODES (execnodes.h) */ - T_IndexInfo = 300, - T_ResultRelInfo, - T_TupleCount, - T_TupleTableSlot, - T_ExprContext, - T_ProjectionInfo, - T_JunkFilter, - T_EState, - T_BaseNode, - T_CommonState, - T_ResultState, - T_AppendState, - T_CommonScanState, - T_ScanState, - T_IndexScanState, - T_JoinState, - T_NestLoopState, - T_MergeJoinState, - T_HashJoinState, - T_MaterialState, - T_AggState, - T_GroupState, - T_SortState, - T_UniqueState, - T_HashState, - T_TidScanState, - T_SubqueryScanState, - T_SetOpState, - T_LimitState, + T_IndexInfo = 300, + T_ResultRelInfo, + T_TupleCount, + T_TupleTableSlot, + T_ExprContext, + T_ProjectionInfo, + T_JunkFilter, + T_EState, + T_BaseNode, + T_CommonState, + T_ResultState, + T_AppendState, + T_CommonScanState, + T_ScanState, + T_IndexScanState, + T_JoinState, + T_NestLoopState, + T_MergeJoinState, + T_HashJoinState, + T_MaterialState, + T_AggState, + T_GroupState, + T_SortState, + T_UniqueState, + T_HashState, + T_TidScanState, + T_SubqueryScanState, + T_SetOpState, + T_LimitState, /* * TAGS FOR MEMORY NODES (memnodes.h) */ - T_MemoryContext = 400, - T_AllocSetContext, + T_MemoryContext = 400, + T_AllocSetContext, /* * TAGS FOR VALUE NODES (pg_list.h) */ - T_Value = 500, - T_List, - T_Integer, - T_Float, - T_String, - T_BitString, - T_Null, + T_Value = 500, + T_List, + T_Integer, + T_Float, + T_String, + T_BitString, + T_Null, /* * TAGS FOR PARSE TREE NODES (parsenodes.h) */ - T_Query = 600, - T_InsertStmt, - T_DeleteStmt, - T_UpdateStmt, - T_SelectStmt, - T_AlterTableStmt, - T_SetOperationStmt, - T_GrantStmt, - T_ClosePortalStmt, - T_ClusterStmt, - T_CopyStmt, - T_CreateStmt, - T_VersionStmt, - T_DefineStmt, - T_DropStmt, - T_TruncateStmt, - T_CommentStmt, - T_FetchStmt, - T_IndexStmt, - T_ProcedureStmt, - T_RemoveAggrStmt, - T_RemoveFuncStmt, - T_RemoveOperStmt, - T_RenameStmt, - T_RuleStmt, - T_NotifyStmt, - T_ListenStmt, - T_UnlistenStmt, - T_TransactionStmt, - T_ViewStmt, - T_LoadStmt, - T_CreatedbStmt, - T_DropdbStmt, - T_VacuumStmt, - T_ExplainStmt, - T_CreateSeqStmt, - T_VariableSetStmt, - T_VariableShowStmt, - T_VariableResetStmt, - T_CreateTrigStmt, - T_DropTrigStmt, - T_CreatePLangStmt, - T_DropPLangStmt, - T_CreateUserStmt, - T_AlterUserStmt, - T_DropUserStmt, - T_LockStmt, - T_ConstraintsSetStmt, - T_CreateGroupStmt, - T_AlterGroupStmt, - T_DropGroupStmt, - T_ReindexStmt, - T_CheckPointStmt, - - T_A_Expr = 700, - T_Attr, - T_A_Const, - T_ParamNo, - T_Ident, - T_FuncCall, - T_A_Indices, - T_ResTarget, - T_TypeCast, - T_RangeSubselect, - T_SortGroupBy, - T_RangeVar, - T_TypeName, - T_IndexElem, - T_ColumnDef, - T_Constraint, - T_DefElem, - T_TargetEntry, - T_RangeTblEntry, - T_SortClause, - T_GroupClause, - T_NullTest, - T_BooleanTest, - T_CaseExpr, - T_CaseWhen, - T_FkConstraint, - T_PrivGrantee, + T_Query = 600, + T_InsertStmt, + T_DeleteStmt, + T_UpdateStmt, + T_SelectStmt, + T_AlterTableStmt, + T_SetOperationStmt, + T_GrantStmt, + T_ClosePortalStmt, + T_ClusterStmt, + T_CopyStmt, + T_CreateStmt, + T_VersionStmt, + T_DefineStmt, + T_DropStmt, + T_TruncateStmt, + T_CommentStmt, + T_FetchStmt, + T_IndexStmt, + T_ProcedureStmt, + T_RemoveAggrStmt, + T_RemoveFuncStmt, + T_RemoveOperStmt, + T_RenameStmt, + T_RuleStmt, + T_NotifyStmt, + T_ListenStmt, + T_UnlistenStmt, + T_TransactionStmt, + T_ViewStmt, + T_LoadStmt, + T_CreatedbStmt, + T_DropdbStmt, + T_VacuumStmt, + T_ExplainStmt, + T_CreateSeqStmt, + T_VariableSetStmt, + T_VariableShowStmt, + T_VariableResetStmt, + T_CreateTrigStmt, + T_DropTrigStmt, + T_CreatePLangStmt, + T_DropPLangStmt, + T_CreateUserStmt, + T_AlterUserStmt, + T_DropUserStmt, + T_LockStmt, + T_ConstraintsSetStmt, + T_CreateGroupStmt, + T_AlterGroupStmt, + T_DropGroupStmt, + T_ReindexStmt, + T_CheckPointStmt, + + T_A_Expr = 700, + T_Attr, + T_A_Const, + T_ParamNo, + T_Ident, + T_FuncCall, + T_A_Indices, + T_ResTarget, + T_TypeCast, + T_RangeSubselect, + T_SortGroupBy, + T_RangeVar, + T_TypeName, + T_IndexElem, + T_ColumnDef, + T_Constraint, + T_DefElem, + T_TargetEntry, + T_RangeTblEntry, + T_SortClause, + T_GroupClause, + T_NullTest, + T_BooleanTest, + T_CaseExpr, + T_CaseWhen, + T_FkConstraint, + T_PrivGrantee, /* * TAGS FOR FUNCTION-CALL CONTEXT AND RESULTINFO NODES (see fmgr.h) */ - T_TriggerData = 800, /* in commands/trigger.h */ - T_ReturnSetInfo /* in nodes/execnodes.h */ + T_TriggerData = 800, /* in commands/trigger.h */ + T_ReturnSetInfo /* in nodes/execnodes.h */ } NodeTag; @@ -313,14 +313,14 @@ typedef double Cost; /* execution cost (in page-access units) */ */ typedef enum CmdType { - CMD_UNKNOWN, - CMD_SELECT, /* select stmt (formerly retrieve) */ - CMD_UPDATE, /* update stmt (formerly replace) */ - CMD_INSERT, /* insert stmt (formerly append) */ - CMD_DELETE, - CMD_UTILITY, /* cmds like create, destroy, copy, + CMD_UNKNOWN, + CMD_SELECT, /* select stmt (formerly retrieve) */ + CMD_UPDATE, /* update stmt (formerly replace) */ + CMD_INSERT, /* insert stmt (formerly append) */ + CMD_DELETE, + CMD_UTILITY, /* cmds like create, destroy, copy, * vacuum, etc. */ - CMD_NOTHING /* dummy command for instead nothing rules + CMD_NOTHING /* dummy command for instead nothing rules * with qual */ } CmdType; @@ -340,11 +340,11 @@ typedef enum JoinType /* * The canonical kinds of joins */ - JOIN_INNER, /* matching tuple pairs only */ - JOIN_LEFT, /* pairs + unmatched outer tuples */ - JOIN_FULL, /* pairs + unmatched outer + unmatched + JOIN_INNER, /* matching tuple pairs only */ + JOIN_LEFT, /* pairs + unmatched outer tuples */ + JOIN_FULL, /* pairs + unmatched outer + unmatched * inner */ - JOIN_RIGHT, /* pairs + unmatched inner tuples */ + JOIN_RIGHT, /* pairs + unmatched inner tuples */ /* * SQL92 considers UNION JOIN to be a kind of join, so list it here @@ -352,7 +352,7 @@ typedef enum JoinType * join in the executor. (The planner must convert it to an Append * plan.) */ - JOIN_UNION + JOIN_UNION /* * Eventually we will have some additional join types for efficient @@ -364,4 +364,5 @@ typedef enum JoinType ((jointype) == JOIN_LEFT || \ (jointype) == JOIN_FULL || \ (jointype) == JOIN_RIGHT) + #endif /* NODES_H */ diff --git a/src/include/nodes/params.h b/src/include/nodes/params.h index 5c55d6cf35..e15643806a 100644 --- a/src/include/nodes/params.h +++ b/src/include/nodes/params.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: params.h,v 1.14 2001/10/25 05:50:04 momjian Exp $ + * $Id: params.h,v 1.15 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -99,4 +99,5 @@ typedef struct ParamExecData Datum value; bool isnull; } ParamExecData; + #endif /* PARAMS_H */ diff --git a/src/include/nodes/parsenodes.h b/src/include/nodes/parsenodes.h index 2458a543fb..1abd7ba365 100644 --- a/src/include/nodes/parsenodes.h +++ b/src/include/nodes/parsenodes.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: parsenodes.h,v 1.148 2001/10/25 05:50:04 momjian Exp $ + * $Id: parsenodes.h,v 1.149 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -79,7 +79,7 @@ typedef struct Query * commit to the exact set of child tables at parse time. This field * ought to go in some sort of TopPlan plan node, not in the Query. */ - List *resultRelations; /* integer list of RT indexes, or NIL */ + List *resultRelations; /* integer list of RT indexes, or NIL */ /* internal to planner */ List *base_rel_list; /* list of base-relation RelOptInfos */ @@ -93,9 +93,9 @@ typedef struct Query typedef enum InhOption { - INH_NO, /* Do NOT scan child tables */ - INH_YES, /* DO scan child tables */ - INH_DEFAULT /* Use current SQL_inheritance option */ + INH_NO, /* Do NOT scan child tables */ + INH_YES, /* DO scan child tables */ + INH_DEFAULT /* Use current SQL_inheritance option */ } InhOption; /***************************************************************************** @@ -228,18 +228,17 @@ typedef struct CreateStmt typedef enum ConstrType /* types of constraints */ { - CONSTR_NULL, /* not SQL92, but a lot of people expect + CONSTR_NULL, /* not SQL92, but a lot of people expect * it */ - CONSTR_NOTNULL, - CONSTR_DEFAULT, - CONSTR_CHECK, - CONSTR_PRIMARY, - CONSTR_UNIQUE, - CONSTR_ATTR_DEFERRABLE, /* attributes for previous - * constraint node */ - CONSTR_ATTR_NOT_DEFERRABLE, - CONSTR_ATTR_DEFERRED, - CONSTR_ATTR_IMMEDIATE + CONSTR_NOTNULL, + CONSTR_DEFAULT, + CONSTR_CHECK, + CONSTR_PRIMARY, + CONSTR_UNIQUE, + CONSTR_ATTR_DEFERRABLE, /* attributes for previous constraint node */ + CONSTR_ATTR_NOT_DEFERRABLE, + CONSTR_ATTR_DEFERRED, + CONSTR_ATTR_IMMEDIATE } ConstrType; typedef struct Constraint @@ -864,10 +863,10 @@ typedef struct UpdateStmt */ typedef enum SetOperation { - SETOP_NONE = 0, - SETOP_UNION, - SETOP_INTERSECT, - SETOP_EXCEPT + SETOP_NONE = 0, + SETOP_UNION, + SETOP_INTERSECT, + SETOP_EXCEPT } SetOperation; typedef struct SelectStmt @@ -1054,7 +1053,7 @@ typedef struct CaseWhen typedef enum NullTestType { - IS_NULL, IS_NOT_NULL + IS_NULL, IS_NOT_NULL } NullTestType; typedef struct NullTest @@ -1076,7 +1075,7 @@ typedef struct NullTest typedef enum BoolTestType { - IS_TRUE, IS_NOT_TRUE, IS_FALSE, IS_NOT_FALSE, IS_UNKNOWN, IS_NOT_UNKNOWN + IS_TRUE, IS_NOT_TRUE, IS_FALSE, IS_NOT_FALSE, IS_UNKNOWN, IS_NOT_UNKNOWN } BoolTestType; typedef struct BooleanTest @@ -1341,7 +1340,7 @@ typedef struct RangeTblEntry typedef struct SortClause { NodeTag type; - Index tleSortGroupRef; /* reference into targetlist */ + Index tleSortGroupRef; /* reference into targetlist */ Oid sortop; /* the sort operator to use */ } SortClause; @@ -1354,4 +1353,5 @@ typedef struct SortClause * nodetags...). We have routines that operate interchangeably on both. */ typedef SortClause GroupClause; + #endif /* PARSENODES_H */ diff --git a/src/include/nodes/pg_list.h b/src/include/nodes/pg_list.h index db303e2da8..20792b2d40 100644 --- a/src/include/nodes/pg_list.h +++ b/src/include/nodes/pg_list.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_list.h,v 1.24 2001/10/25 05:50:05 momjian Exp $ + * $Id: pg_list.h,v 1.25 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -147,4 +147,5 @@ extern void freeList(List *list); /* in copyfuncs.c */ extern List *listCopy(List *list); + #endif /* PG_LIST_H */ diff --git a/src/include/nodes/plannodes.h b/src/include/nodes/plannodes.h index be66b92fce..746732984c 100644 --- a/src/include/nodes/plannodes.h +++ b/src/include/nodes/plannodes.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: plannodes.h,v 1.51 2001/10/25 05:50:05 momjian Exp $ + * $Id: plannodes.h,v 1.52 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -373,10 +373,10 @@ typedef struct Unique */ typedef enum SetOpCmd { - SETOPCMD_INTERSECT, - SETOPCMD_INTERSECT_ALL, - SETOPCMD_EXCEPT, - SETOPCMD_EXCEPT_ALL + SETOPCMD_INTERSECT, + SETOPCMD_INTERSECT_ALL, + SETOPCMD_EXCEPT, + SETOPCMD_EXCEPT_ALL } SetOpCmd; typedef struct SetOp @@ -463,4 +463,5 @@ typedef struct SubPlan bool needShutdown; /* TRUE = need to shutdown subplan */ HeapTuple curTuple; /* copy of most recent tuple from subplan */ } SubPlan; + #endif /* PLANNODES_H */ diff --git a/src/include/nodes/primnodes.h b/src/include/nodes/primnodes.h index b9bada1332..a5892738c0 100644 --- a/src/include/nodes/primnodes.h +++ b/src/include/nodes/primnodes.h @@ -10,7 +10,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: primnodes.h,v 1.55 2001/10/25 05:50:05 momjian Exp $ + * $Id: primnodes.h,v 1.56 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -103,7 +103,7 @@ typedef struct Fjoin */ typedef enum OpType { - OP_EXPR, FUNC_EXPR, OR_EXPR, AND_EXPR, NOT_EXPR, SUBPLAN_EXPR + OP_EXPR, FUNC_EXPR, OR_EXPR, AND_EXPR, NOT_EXPR, SUBPLAN_EXPR } OpType; typedef struct Expr @@ -345,7 +345,7 @@ typedef struct Aggref */ typedef enum SubLinkType { - EXISTS_SUBLINK, ALL_SUBLINK, ANY_SUBLINK, MULTIEXPR_SUBLINK, EXPR_SUBLINK + EXISTS_SUBLINK, ALL_SUBLINK, ANY_SUBLINK, MULTIEXPR_SUBLINK, EXPR_SUBLINK } SubLinkType; @@ -549,4 +549,5 @@ typedef struct FromExpr List *fromlist; /* List of join subtrees */ Node *quals; /* qualifiers on join, if any */ } FromExpr; + #endif /* PRIMNODES_H */ diff --git a/src/include/nodes/print.h b/src/include/nodes/print.h index c40daed69e..939587ccee 100644 --- a/src/include/nodes/print.h +++ b/src/include/nodes/print.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: print.h,v 1.14 2001/10/25 05:50:05 momjian Exp $ + * $Id: print.h,v 1.15 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -32,4 +32,5 @@ extern void print_slot(TupleTableSlot *slot); extern void print_plan_recursive(Plan *p, Query *parsetree, int indentLevel, char *label); extern void print_plan(Plan *p, Query *parsetree); + #endif /* PRINT_H */ diff --git a/src/include/nodes/readfuncs.h b/src/include/nodes/readfuncs.h index f770e28c69..fbfccd91b2 100644 --- a/src/include/nodes/readfuncs.h +++ b/src/include/nodes/readfuncs.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: readfuncs.h,v 1.12 2001/10/25 05:50:05 momjian Exp $ + * $Id: readfuncs.h,v 1.13 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -27,4 +27,5 @@ extern void *nodeRead(bool read_car_only); * prototypes for functions in readfuncs.c */ extern Node *parsePlanString(void); + #endif /* READFUNCS_H */ diff --git a/src/include/nodes/relation.h b/src/include/nodes/relation.h index 117b95f73e..b3f10b5b2c 100644 --- a/src/include/nodes/relation.h +++ b/src/include/nodes/relation.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: relation.h,v 1.59 2001/10/25 05:50:05 momjian Exp $ + * $Id: relation.h,v 1.60 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -32,7 +32,7 @@ typedef List *Relids; */ typedef enum CostSelector { - STARTUP_COST, TOTAL_COST + STARTUP_COST, TOTAL_COST } CostSelector; /*---------- @@ -221,7 +221,7 @@ typedef struct IndexOptInfo Oid *ordering; /* OIDs of sort operators for each column */ Oid relam; /* OID of the access method (in pg_am) */ - RegProcedure amcostestimate; /* OID of the access method's cost fcn */ + RegProcedure amcostestimate; /* OID of the access method's cost fcn */ Oid indproc; /* if a functional index */ List *indpred; /* if a partial index */ @@ -339,7 +339,7 @@ typedef struct TidPath { Path path; List *tideval; - Relids unjoined_relids; /* some rels not yet part of my Path */ + Relids unjoined_relids; /* some rels not yet part of my Path */ } TidPath; /* @@ -525,7 +525,7 @@ typedef struct RestrictInfo Oid hashjoinoperator; /* copy of clause operator */ /* cache space for hashclause processing; -1 if not yet set */ - Selectivity left_bucketsize; /* avg bucketsize of left side */ + Selectivity left_bucketsize; /* avg bucketsize of left side */ Selectivity right_bucketsize; /* avg bucketsize of right side */ } RestrictInfo; @@ -546,7 +546,7 @@ typedef struct RestrictInfo typedef struct JoinInfo { NodeTag type; - Relids unjoined_relids; /* some rels not yet part of my RelOptInfo */ + Relids unjoined_relids; /* some rels not yet part of my RelOptInfo */ List *jinfo_restrictinfo; /* relevant RestrictInfos */ } JoinInfo; @@ -587,4 +587,5 @@ typedef struct Stream Cost groupcost; Selectivity groupsel; } Stream; + #endif /* RELATION_H */ |
