diff options
| author | Bruce Momjian | 1999-05-25 16:15:34 +0000 |
|---|---|---|
| committer | Bruce Momjian | 1999-05-25 16:15:34 +0000 |
| commit | 07842084fe3e11041f83563c851236395f481470 (patch) | |
| tree | ab9960e67325bec5a97b8b4dd4b2075ce60cc420 /src/include/nodes | |
| parent | 4b04b01aaa460f1e52980f24173dc7a4535efd2d (diff) | |
pgindent run over code.
Diffstat (limited to 'src/include/nodes')
| -rw-r--r-- | src/include/nodes/execnodes.h | 89 | ||||
| -rw-r--r-- | src/include/nodes/makefuncs.h | 46 | ||||
| -rw-r--r-- | src/include/nodes/memnodes.h | 6 | ||||
| -rw-r--r-- | src/include/nodes/parsenodes.h | 28 | ||||
| -rw-r--r-- | src/include/nodes/plannodes.h | 5 | ||||
| -rw-r--r-- | src/include/nodes/primnodes.h | 4 | ||||
| -rw-r--r-- | src/include/nodes/relation.h | 35 |
7 files changed, 108 insertions, 105 deletions
diff --git a/src/include/nodes/execnodes.h b/src/include/nodes/execnodes.h index cdc713eafe1..134fa3e833f 100644 --- a/src/include/nodes/execnodes.h +++ b/src/include/nodes/execnodes.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: execnodes.h,v 1.28 1999/05/18 21:34:26 tgl Exp $ + * $Id: execnodes.h,v 1.29 1999/05/25 16:14:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -194,28 +194,28 @@ typedef struct JunkFilter */ typedef struct EState { - NodeTag type; - ScanDirection es_direction; - Snapshot es_snapshot; - List *es_range_table; - RelationInfo *es_result_relation_info; - List **es_result_relation_constraints; - Relation es_into_relation_descriptor; - ParamListInfo es_param_list_info; - ParamExecData *es_param_exec_vals; /* this is for subselects */ - int es_BaseId; - TupleTable es_tupleTable; - JunkFilter *es_junkFilter; - int *es_refcount; - uint32 es_processed; /* # of tuples processed */ - Oid es_lastoid; /* last oid processed (by INSERT) */ - List *es_rowMark; /* not good place, but there is no other */ + NodeTag type; + ScanDirection es_direction; + Snapshot es_snapshot; + List *es_range_table; + RelationInfo *es_result_relation_info; + List **es_result_relation_constraints; + Relation es_into_relation_descriptor; + ParamListInfo es_param_list_info; + ParamExecData *es_param_exec_vals; /* this is for subselects */ + int es_BaseId; + TupleTable es_tupleTable; + JunkFilter *es_junkFilter; + int *es_refcount; + uint32 es_processed; /* # of tuples processed */ + Oid es_lastoid; /* last oid processed (by INSERT) */ + List *es_rowMark; /* not good place, but there is no other */ /* Below is to re-evaluate plan qual in READ COMMITTED mode */ - struct Plan *es_origPlan; - Pointer es_evalPlanQual; - bool *es_evTupleNull; - HeapTuple *es_evTuple; - bool es_useEvalPlan; + struct Plan *es_origPlan; + Pointer es_evalPlanQual; + bool *es_evTupleNull; + HeapTuple *es_evTuple; + bool es_useEvalPlan; } EState; /* ---------------- @@ -404,16 +404,16 @@ typedef struct CommonScanState */ typedef struct IndexScanState { - CommonState cstate; /* its first field is NodeTag */ - int iss_NumIndices; - int iss_IndexPtr; - int iss_MarkIndexPtr; - ScanKey *iss_ScanKeys; - int *iss_NumScanKeys; - Pointer iss_RuntimeKeyInfo; - RelationPtr iss_RelationDescs; - IndexScanDescPtr iss_ScanDescs; - HeapTupleData iss_htup; + CommonState cstate; /* its first field is NodeTag */ + int iss_NumIndices; + int iss_IndexPtr; + int iss_MarkIndexPtr; + ScanKey *iss_ScanKeys; + int *iss_NumScanKeys; + Pointer iss_RuntimeKeyInfo; + RelationPtr iss_RelationDescs; + IndexScanDescPtr iss_ScanDescs; + HeapTupleData iss_htup; } IndexScanState; @@ -517,10 +517,10 @@ typedef struct MergeJoinState typedef struct HashJoinState { JoinState jstate; /* its first field is NodeTag */ - HashJoinTable hj_HashTable; - int hj_CurBucketNo; - HashJoinTuple hj_CurTuple; - Var *hj_InnerHashKey; + HashJoinTable hj_HashTable; + int hj_CurBucketNo; + HashJoinTuple hj_CurTuple; + Var *hj_InnerHashKey; TupleTableSlot *hj_OuterTupleSlot; TupleTableSlot *hj_HashTupleSlot; } HashJoinState; @@ -689,16 +689,17 @@ typedef struct HashState */ typedef struct TeeState { - CommonState cstate; /* its first field is NodeTag */ - int tee_leftPlace, - tee_rightPlace, - tee_lastPlace; - char *tee_bufferRelname; - Relation tee_bufferRel; + CommonState cstate; /* its first field is NodeTag */ + int tee_leftPlace, + tee_rightPlace, + tee_lastPlace; + char *tee_bufferRelname; + Relation tee_bufferRel; MemoryContext tee_mcxt; - HeapScanDesc tee_leftScanDesc, - tee_rightScanDesc; + HeapScanDesc tee_leftScanDesc, + tee_rightScanDesc; } TeeState; + #endif #endif /* EXECNODES_H */ diff --git a/src/include/nodes/makefuncs.h b/src/include/nodes/makefuncs.h index 178afdff185..4cc34024a7c 100644 --- a/src/include/nodes/makefuncs.h +++ b/src/include/nodes/makefuncs.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: makefuncs.h,v 1.17 1999/05/17 17:03:42 momjian Exp $ + * $Id: makefuncs.h,v 1.18 1999/05/25 16:14:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -18,35 +18,35 @@ #include <utils/fcache.h> extern Oper *makeOper(Oid opno, - Oid opid, - Oid opresulttype, - int opsize, - FunctionCachePtr op_fcache); + Oid opid, + Oid opresulttype, + int opsize, + FunctionCachePtr op_fcache); extern Var *makeVar(Index varno, - AttrNumber varattno, - Oid vartype, - int32 vartypmod, - Index varlevelsup, - Index varnoold, - AttrNumber varoattno); + AttrNumber varattno, + Oid vartype, + int32 vartypmod, + Index varlevelsup, + Index varnoold, + AttrNumber varoattno); extern TargetEntry *makeTargetEntry(Resdom *resdom, Node *expr); extern Resdom *makeResdom(AttrNumber resno, - Oid restype, - int32 restypmod, - char *resname, - Index reskey, - Oid reskeyop, - bool resjunk); + Oid restype, + int32 restypmod, + char *resname, + Index reskey, + Oid reskeyop, + bool resjunk); extern Const *makeConst(Oid consttype, - int constlen, - Datum constvalue, - bool constisnull, - bool constbyval, - bool constisset, - bool constiscast); + int constlen, + Datum constvalue, + bool constisnull, + bool constbyval, + bool constisset, + bool constiscast); #endif /* MAKEFUNC_H */ diff --git a/src/include/nodes/memnodes.h b/src/include/nodes/memnodes.h index a44e1fb31a7..7259cb1b0f7 100644 --- a/src/include/nodes/memnodes.h +++ b/src/include/nodes/memnodes.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: memnodes.h,v 1.11 1999/03/07 23:03:31 tgl Exp $ + * $Id: memnodes.h,v 1.12 1999/05/25 16:14:09 momjian Exp $ * * XXX the typedefs in this file are different from the other ???nodes.h; * they are pointers to structures instead of the structures themselves. @@ -23,7 +23,7 @@ #include <nodes/nodes.h> /* - * MemoryContext + * MemoryContext * A logical context in which memory allocations occur. * * The types of memory contexts can be thought of as members of the @@ -95,7 +95,7 @@ typedef struct PortalHeapMemoryData } *PortalHeapMemory; /* - * MemoryContextIsValid + * MemoryContextIsValid * True iff memory context is valid. */ #define MemoryContextIsValid(context) \ diff --git a/src/include/nodes/parsenodes.h b/src/include/nodes/parsenodes.h index fed516ccfb8..441ffd9b01c 100644 --- a/src/include/nodes/parsenodes.h +++ b/src/include/nodes/parsenodes.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: parsenodes.h,v 1.72 1999/05/12 15:02:04 wieck Exp $ + * $Id: parsenodes.h,v 1.73 1999/05/25 16:14:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -60,8 +60,8 @@ typedef struct Query * BY */ Node *havingQual; /* qualification of each group */ - /***S*I***/ - List *intersectClause; + /***S*I***/ + List *intersectClause; List *unionClause; /* unions are linked under the previous * query */ @@ -590,7 +590,7 @@ typedef struct LockStmt NodeTag type; char *relname; /* relation to lock */ int mode; /* lock mode */ -} LockStmt; +} LockStmt; /***************************************************************************** * Optimizable Statements @@ -614,7 +614,7 @@ typedef struct InsertStmt List *unionClause; /* union subselect parameters */ bool unionall; /* union without unique sort */ /***S*I***/ - List *intersectClause; + List *intersectClause; List *forUpdate; /* FOR UPDATE clause */ } InsertStmt; @@ -748,7 +748,7 @@ typedef struct CaseExpr Node *arg; /* implicit equality comparison argument */ List *args; /* the arguments (list of WHEN clauses) */ Node *defresult; /* the default result (ELSE clause) */ -} CaseExpr; +} CaseExpr; /* * CaseWhen - an argument to a CASE expression @@ -758,7 +758,7 @@ typedef struct CaseWhen NodeTag type; Node *expr; /* comparison expression */ Node *result; /* substitution result */ -} CaseWhen; +} CaseWhen; /* * ColumnDef - column definition (used in various creates) @@ -896,7 +896,7 @@ typedef struct JoinExpr RangeVar *larg; Node *rarg; List *quals; -} JoinExpr; +} JoinExpr; /**************************************************************************** @@ -964,14 +964,14 @@ typedef struct GroupClause Index tleGroupref; /* reference into targetlist */ } GroupClause; -#define ROW_MARK_FOR_UPDATE (1 << 0) -#define ROW_ACL_FOR_UPDATE (1 << 1) +#define ROW_MARK_FOR_UPDATE (1 << 0) +#define ROW_ACL_FOR_UPDATE (1 << 1) typedef struct RowMark { - NodeTag type; - Index rti; /* index in Query->rtable */ - bits8 info; /* as above */ -} RowMark; + NodeTag type; + Index rti; /* index in Query->rtable */ + bits8 info; /* as above */ +} RowMark; #endif /* PARSENODES_H */ diff --git a/src/include/nodes/plannodes.h b/src/include/nodes/plannodes.h index 0805665b065..ffa45b0bfe9 100644 --- a/src/include/nodes/plannodes.h +++ b/src/include/nodes/plannodes.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: plannodes.h,v 1.25 1999/05/18 21:34:26 tgl Exp $ + * $Id: plannodes.h,v 1.26 1999/05/25 16:14:10 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -264,7 +264,7 @@ typedef struct Noname Plan plan; Oid nonameid; int keycount; -} Noname; +} Noname; /* ---------------- * materialization node @@ -339,6 +339,7 @@ typedef struct Tee * Tee may be different than the parent * plans */ } Tee; + #endif /* --------------------- diff --git a/src/include/nodes/primnodes.h b/src/include/nodes/primnodes.h index d19673f6353..8028e07a94c 100644 --- a/src/include/nodes/primnodes.h +++ b/src/include/nodes/primnodes.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: primnodes.h,v 1.27 1999/05/17 17:03:44 momjian Exp $ + * $Id: primnodes.h,v 1.28 1999/05/25 16:14:11 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -273,7 +273,7 @@ typedef struct Aggref Node *target; int aggno; bool usenulls; -} Aggref; +} Aggref; /* ---------------- * SubLink diff --git a/src/include/nodes/relation.h b/src/include/nodes/relation.h index 2d47243c405..4f45a6cafcc 100644 --- a/src/include/nodes/relation.h +++ b/src/include/nodes/relation.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: relation.h,v 1.30 1999/05/12 15:02:08 wieck Exp $ + * $Id: relation.h,v 1.31 1999/05/25 16:14:12 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -84,7 +84,7 @@ typedef struct RelOptInfo /* materialization information */ List *targetlist; List *pathlist; /* Path structures */ - struct Path *cheapestpath; + struct Path *cheapestpath; bool pruneable; /* used solely by indices: */ @@ -100,7 +100,7 @@ typedef struct RelOptInfo List *restrictinfo; /* RestrictInfo structures */ List *joininfo; /* JoinInfo structures */ List *innerjoin; -} RelOptInfo; +} RelOptInfo; extern Var *get_expr(TargetEntry *foo); extern Var *get_groupclause_expr(GroupClause *groupClause, List *targetList); @@ -129,7 +129,7 @@ typedef struct PathOrder { Oid *sortop; MergeOrder *merge; - } ord; + } ord; } PathOrder; typedef struct Path @@ -141,12 +141,12 @@ typedef struct Path NodeTag pathtype; - PathOrder *pathorder; + PathOrder *pathorder; - List *pathkeys; /* This is a List of List of Var nodes. - * See the top of optimizer/path/pathkeys.c - * for more information. - */ + List *pathkeys; /* This is a List of List of Var nodes. + * See the top of + * optimizer/path/pathkeys.c for more + * information. */ Cost outerjoincost; Relids joinid; List *loc_restrictinfo; @@ -157,7 +157,8 @@ typedef struct IndexPath Path path; List *indexid; List *indexqual; - int *indexkeys; /* to transform heap attnos into index ones */ + int *indexkeys; /* to transform heap attnos into index + * ones */ } IndexPath; typedef struct NestPath @@ -166,7 +167,7 @@ typedef struct NestPath List *pathinfo; Path *outerjoinpath; Path *innerjoinpath; -} NestPath; +} NestPath; typedef NestPath JoinPath; @@ -222,7 +223,7 @@ typedef struct RestrictInfo /* hashjoin only */ Oid hashjoinoperator; Relids restrictinfojoinid; -} RestrictInfo; +} RestrictInfo; typedef struct JoinMethod { @@ -235,13 +236,13 @@ typedef struct HashInfo { JoinMethod jmethod; Oid hashop; -} HashInfo; +} HashInfo; typedef struct MergeInfo { JoinMethod jmethod; MergeOrder *m_ordering; -} MergeInfo; +} MergeInfo; typedef struct JoinInfo { @@ -250,7 +251,7 @@ typedef struct JoinInfo List *jinfo_restrictinfo; bool mergejoinable; bool hashjoinable; -} JoinInfo; +} JoinInfo; typedef struct Iter { @@ -261,10 +262,10 @@ typedef struct Iter } Iter; /* - * Stream: + * Stream: * A stream represents a root-to-leaf path in a plan tree (i.e. a tree of * JoinPaths and Paths). The stream includes pointers to all Path nodes, - * as well as to any clauses that reside above Path nodes. This structure + * as well as to any clauses that reside above Path nodes. This structure * is used to make Path nodes and clauses look similar, so that Predicate * Migration can run. * |
