diff options
| author | Bruce Momjian | 1997-09-08 21:56:23 +0000 |
|---|---|---|
| committer | Bruce Momjian | 1997-09-08 21:56:23 +0000 |
| commit | 59f6a57e59fe8353f9edaa3703516ea67e06672b (patch) | |
| tree | 1b083fb66cf0be3890480a1ed5fb077dd7293790 /src/include/nodes | |
| parent | 075cede74858a9a04e97097b1ccd555121516c20 (diff) | |
Used modified version of indent that understands over 100 typedefs.
Diffstat (limited to 'src/include/nodes')
| -rw-r--r-- | src/include/nodes/execnodes.h | 38 | ||||
| -rw-r--r-- | src/include/nodes/memnodes.h | 6 | ||||
| -rw-r--r-- | src/include/nodes/nodeFuncs.h | 12 | ||||
| -rw-r--r-- | src/include/nodes/nodes.h | 8 | ||||
| -rw-r--r-- | src/include/nodes/params.h | 4 | ||||
| -rw-r--r-- | src/include/nodes/parsenodes.h | 124 | ||||
| -rw-r--r-- | src/include/nodes/pg_list.h | 42 | ||||
| -rw-r--r-- | src/include/nodes/plannodes.h | 32 | ||||
| -rw-r--r-- | src/include/nodes/primnodes.h | 20 | ||||
| -rw-r--r-- | src/include/nodes/print.h | 16 | ||||
| -rw-r--r-- | src/include/nodes/relation.h | 40 |
11 files changed, 171 insertions, 171 deletions
diff --git a/src/include/nodes/execnodes.h b/src/include/nodes/execnodes.h index a2cafdc6426..7a6fdcab94e 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.11 1997/09/08 20:58:40 momjian Exp $ + * $Id: execnodes.h,v 1.12 1997/09/08 21:52:40 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -40,7 +40,7 @@ typedef struct IndexInfo AttrNumber *ii_KeyAttributeNumbers; FuncIndexInfoPtr ii_FuncIndexInfo; Node *ii_Predicate; -} IndexInfo; +} IndexInfo; /* ---------------- * RelationInfo information @@ -65,7 +65,7 @@ typedef struct RelationInfo int ri_NumIndices; RelationPtr ri_IndexRelationDescs; IndexInfo **ri_IndexRelationInfo; -} RelationInfo; +} RelationInfo; /* ---------------- * ExprContext @@ -90,7 +90,7 @@ typedef struct ExprContext List *ecxt_range_table; Datum *ecxt_values; /* precomputed values for aggreg */ char *ecxt_nulls; /* null flags for aggreg values */ -} ExprContext; +} ExprContext; /* ---------------- * ProjectionInfo node information @@ -116,7 +116,7 @@ typedef struct ProjectionInfo Datum *pi_tupValue; ExprContext *pi_exprContext; TupleTableSlot *pi_slot; -} ProjectionInfo; +} ProjectionInfo; /* ---------------- * JunkFilter @@ -157,7 +157,7 @@ typedef struct JunkFilter int jf_cleanLength; TupleDesc jf_cleanTupType; AttrNumber *jf_cleanMap; -} JunkFilter; +} JunkFilter; /* ---------------- * EState information @@ -205,7 +205,7 @@ typedef struct EState int *es_refcount; uint32 es_processed; /* # of tuples processed */ Oid es_lastoid; /* last oid processed (by INSERT) */ -} EState; +} EState; /* ---------------- * Executor Type information needed by plannodes.h @@ -265,7 +265,7 @@ typedef struct CommonState ExprContext *cs_ExprContext; ProjectionInfo *cs_ProjInfo; bool cs_TupFromTlist; -} CommonState; +} CommonState; /* ---------------------------------------------------------------- @@ -293,7 +293,7 @@ typedef struct ResultState { CommonState cstate; /* its first field is NodeTag */ int rs_done; -} ResultState; +} ResultState; /* ---------------- * AppendState information @@ -362,7 +362,7 @@ typedef struct CommonScanState Relation css_currentRelation; HeapScanDesc css_currentScanDesc; TupleTableSlot *css_ScanTupleSlot; -} CommonScanState; +} CommonScanState; /* ---------------- * IndexScanState information @@ -400,7 +400,7 @@ typedef struct IndexScanState Pointer iss_RuntimeKeyInfo; RelationPtr iss_RelationDescs; IndexScanDescPtr iss_ScanDescs; -} IndexScanState; +} IndexScanState; /* ---------------------------------------------------------------- @@ -444,7 +444,7 @@ typedef struct NestLoopState { JoinState jstate; /* its first field is NodeTag */ bool nl_PortalFlag; -} NestLoopState; +} NestLoopState; /* ---------------- * MergeJoinState information @@ -473,7 +473,7 @@ typedef struct MergeJoinState List *mj_ISortopO; int mj_JoinState; TupleTableSlot *mj_MarkedTupleSlot; -} MergeJoinState; +} MergeJoinState; /* ---------------- * HashJoinState information @@ -523,7 +523,7 @@ typedef struct HashJoinState int hj_OuterReadBlk; TupleTableSlot *hj_OuterTupleSlot; TupleTableSlot *hj_HashTupleSlot; -} HashJoinState; +} HashJoinState; /* ---------------------------------------------------------------- @@ -562,7 +562,7 @@ typedef struct MaterialState CommonScanState csstate; /* its first field is NodeTag */ bool mat_Flag; Relation mat_TempRelation; -} MaterialState; +} MaterialState; /* --------------------- * AggregateState information @@ -587,7 +587,7 @@ typedef struct GroupState bool grp_useLastTuple; /* last tuple not processed yet */ bool grp_done; TupleTableSlot *grp_lastSlot; -} GroupState; +} GroupState; /* ---------------- * SortState information @@ -626,7 +626,7 @@ typedef struct SortState bool sort_Flag; ScanKey sort_Keys; bool cleaned; -} SortState; +} SortState; /* ---------------- * UniqueState information @@ -670,7 +670,7 @@ typedef struct HashState { CommonState cstate; /* its first field is NodeTag */ File *hashBatches; -} HashState; +} HashState; /* ----------------------- * TeeState information @@ -697,6 +697,6 @@ typedef struct TeeState MemoryContext tee_mcxt; HeapScanDesc tee_leftScanDesc; HeapScanDesc tee_rightScanDesc; -} TeeState; +} TeeState; #endif /* EXECNODES_H */ diff --git a/src/include/nodes/memnodes.h b/src/include/nodes/memnodes.h index aa1050af16c..e3104996d4b 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.6 1997/09/08 02:37:19 momjian Exp $ + * $Id: memnodes.h,v 1.7 1997/09/08 21:52:44 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. @@ -48,10 +48,10 @@ typedef struct MemoryContextMethodsData { - Pointer(*alloc) (); + Pointer (*alloc) (); void (*free_p) (); /* need to use free as a #define, so can't * use free */ - Pointer(*realloc) (); + Pointer (*realloc) (); char *(*getName) (); void (*dump) (); } *MemoryContextMethods; diff --git a/src/include/nodes/nodeFuncs.h b/src/include/nodes/nodeFuncs.h index b1fe7469610..de5ad32ab50 100644 --- a/src/include/nodes/nodeFuncs.h +++ b/src/include/nodes/nodeFuncs.h @@ -6,17 +6,17 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: nodeFuncs.h,v 1.4 1997/09/08 02:37:20 momjian Exp $ + * $Id: nodeFuncs.h,v 1.5 1997/09/08 21:52:45 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef NODEFUNCS_H #define NODEFUNCS_H -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); -extern bool non_null(Expr * c); +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); +extern bool non_null(Expr *c); #endif /* NODEFUNCS_H */ diff --git a/src/include/nodes/nodes.h b/src/include/nodes/nodes.h index 73c7b84cba9..93b071a6504 100644 --- a/src/include/nodes/nodes.h +++ b/src/include/nodes/nodes.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: nodes.h,v 1.13 1997/09/08 02:37:21 momjian Exp $ + * $Id: nodes.h,v 1.14 1997/09/08 21:52:47 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -209,7 +209,7 @@ typedef enum NodeTag T_SortClause, T_GroupClause, T_SubSelect -} NodeTag; +} NodeTag; /* * The first field of a node of any type is gauranteed to be the NodeTag. @@ -220,7 +220,7 @@ typedef enum NodeTag typedef struct Node { NodeTag type; -} Node; +} Node; #define nodeTag(_node_) ((Node*)_node_)->type @@ -303,7 +303,7 @@ typedef enum CmdType CMD_NOTIFY, CMD_UTILITY /* cmds like create, destroy, copy, * vacuum, etc. */ -} CmdType; +} CmdType; #endif /* NODES_H */ diff --git a/src/include/nodes/params.h b/src/include/nodes/params.h index d3e8bd86e8a..083c5faed41 100644 --- a/src/include/nodes/params.h +++ b/src/include/nodes/params.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: params.h,v 1.5 1997/09/08 02:37:22 momjian Exp $ + * $Id: params.h,v 1.6 1997/09/08 21:52:48 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -83,7 +83,7 @@ typedef struct ParamListInfoData bool isnull; bool byval; Datum value; -} ParamListInfoData; +} ParamListInfoData; typedef ParamListInfoData *ParamListInfo; diff --git a/src/include/nodes/parsenodes.h b/src/include/nodes/parsenodes.h index 97890a37a85..ff5759cd058 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.26 1997/09/08 20:58:47 momjian Exp $ + * $Id: parsenodes.h,v 1.27 1997/09/08 21:52:49 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -64,7 +64,7 @@ typedef struct Query List *join_relation_list_; /* list of relations generated by * joins */ bool query_is_archival_; /* archival query flag */ -} Query; +} Query; /***************************************************************************** @@ -98,7 +98,7 @@ typedef struct ChangeACLStmt struct AclItem *aclitem; unsigned modechg; List *relNames; -} ChangeACLStmt; +} ChangeACLStmt; /* ---------------------- * Close Portal Statement @@ -108,7 +108,7 @@ typedef struct ClosePortalStmt { NodeTag type; char *portalname; /* name of the portal (cursor) */ -} ClosePortalStmt; +} ClosePortalStmt; /* ---------------------- * Copy Statement @@ -123,7 +123,7 @@ typedef struct CopyStmt int direction; /* TO or FROM */ char *filename; /* if NULL, use stdin/stdout */ char *delimiter; /* delimiter character, \t by default */ -} CopyStmt; +} CopyStmt; /* ---------------------- * Create Table Statement @@ -145,19 +145,19 @@ typedef struct CreateStmt int location; /* smgrid (-1 if none) */ int archiveLoc; /* smgrid (-1 if none) */ List *constraints; /* list of constraints (ConstaintDef) */ -} CreateStmt; +} CreateStmt; typedef enum ConstrType { CONSTR_NONE, CONSTR_CHECK /* type of constaints */ -} ConstrType; +} ConstrType; typedef struct ConstraintDef { ConstrType type; char *name; /* name */ void *def; /* definition */ -} ConstraintDef; +} ConstraintDef; /* ---------------------- * Create/Drop TRIGGER Statements @@ -178,14 +178,14 @@ typedef struct CreateTrigStmt char *text; /* AS 'text' */ List *attr; /* UPDATE OF a, b,... (NI) or NULL */ char *when; /* WHEN 'a > 10 ...' (NI) or NULL */ -} CreateTrigStmt; +} CreateTrigStmt; typedef struct DropTrigStmt { NodeTag type; char *trigname; /* TRIGGER' name */ char *relname; /* triggered relation */ -} DropTrigStmt; +} DropTrigStmt; /* ---------------------- * Create SEQUENCE Statement @@ -197,7 +197,7 @@ typedef struct CreateSeqStmt NodeTag type; char *seqname; /* the relation to create */ List *options; -} CreateSeqStmt; +} CreateSeqStmt; /* ---------------------- * Create Version Statement @@ -210,7 +210,7 @@ typedef struct VersionStmt int direction; /* FORWARD | BACKWARD */ char *fromRelname; /* relation to create a version */ char *date; /* date of the snapshot */ -} VersionStmt; +} VersionStmt; /* ---------------------- * Create {Operator|Type|Aggregate} Statement @@ -222,7 +222,7 @@ typedef struct DefineStmt int defType; /* OPERATOR|P_TYPE|AGGREGATE */ char *defname; List *definition; /* a list of DefElem */ -} DefineStmt; +} DefineStmt; /* ---------------------- * Drop Table Statement @@ -233,7 +233,7 @@ typedef struct DestroyStmt NodeTag type; List *relNames; /* relations to be dropped */ bool sequence; -} DestroyStmt; +} DestroyStmt; /* ---------------------- * Extend Index Statement @@ -246,7 +246,7 @@ typedef struct ExtendStmt Node *whereClause; /* qualifications */ List *rangetable; /* range table, filled in by * transformStmt() */ -} ExtendStmt; +} ExtendStmt; /* ---------------------- * Begin Recipe Statement @@ -256,7 +256,7 @@ typedef struct RecipeStmt { NodeTag type; char *recipeName; /* name of the recipe */ -} RecipeStmt; +} RecipeStmt; /* ---------------------- * Fetch Statement @@ -268,7 +268,7 @@ typedef struct FetchStmt int direction; /* FORWARD or BACKWARD */ int howMany; /* amount to fetch ("ALL" --> 0) */ char *portalname; /* name of portal (cursor) */ -} FetchStmt; +} FetchStmt; /* ---------------------- * Create Index Statement @@ -287,7 +287,7 @@ typedef struct IndexStmt * transformStmt() */ bool *lossy; /* is index lossy? */ bool unique; /* is index unique? */ -} IndexStmt; +} IndexStmt; /* ---------------------- * Move Statement (Not implemented) @@ -300,7 +300,7 @@ typedef struct MoveStmt bool to; int where; char *portalname; -} MoveStmt; +} MoveStmt; /* ---------------------- * Create Function Statement @@ -317,7 +317,7 @@ typedef struct ProcedureStmt List *withClause; /* a list of ParamString */ char *as; /* the SQL statement or filename */ char *language; /* C or SQL */ -} ProcedureStmt; +} ProcedureStmt; /* ---------------------- * Purge Statement @@ -329,7 +329,7 @@ typedef struct PurgeStmt char *relname; /* relation to purge */ char *beforeDate; /* purge before this date */ char *afterDate; /* purge after this date */ -} PurgeStmt; +} PurgeStmt; /* ---------------------- * Drop Aggregate Statement @@ -340,7 +340,7 @@ typedef struct RemoveAggrStmt NodeTag type; char *aggname; /* aggregate to drop */ char *aggtype; /* for this type */ -} RemoveAggrStmt; +} RemoveAggrStmt; /* ---------------------- * Drop Function Statement @@ -351,7 +351,7 @@ typedef struct RemoveFuncStmt NodeTag type; char *funcname; /* function to drop */ List *args; /* types of the arguments */ -} RemoveFuncStmt; +} RemoveFuncStmt; /* ---------------------- * Drop Operator Statement @@ -362,7 +362,7 @@ typedef struct RemoveOperStmt NodeTag type; char *opname; /* operator to drop */ List *args; /* types of the arguments */ -} RemoveOperStmt; +} RemoveOperStmt; /* ---------------------- * Drop {Type|Index|Rule|View} Statement @@ -373,7 +373,7 @@ typedef struct RemoveStmt NodeTag type; int removeType; /* P_TYPE|INDEX|RULE|VIEW */ char *name; /* name to drop */ -} RemoveStmt; +} RemoveStmt; /* ---------------------- * Alter Table Statement @@ -388,7 +388,7 @@ typedef struct RenameStmt * the new name. Otherwise, rename this * column name. */ char *newname; /* the new name */ -} RenameStmt; +} RenameStmt; /* ---------------------- * Create Rule Statement @@ -403,7 +403,7 @@ typedef struct RuleStmt struct Attr *object; /* object affected */ bool instead; /* is a 'do instead'? */ List *actions; /* the action statements */ -} RuleStmt; +} RuleStmt; /* ---------------------- * Notify Statement @@ -413,7 +413,7 @@ typedef struct NotifyStmt { NodeTag type; char *relname; /* relation to notify */ -} NotifyStmt; +} NotifyStmt; /* ---------------------- * Listen Statement @@ -423,7 +423,7 @@ typedef struct ListenStmt { NodeTag type; char *relname; /* relation to listen on */ -} ListenStmt; +} ListenStmt; /* ---------------------- * {Begin|Abort|End} Transaction Statement @@ -433,7 +433,7 @@ typedef struct TransactionStmt { NodeTag type; int command; /* BEGIN|END|ABORT */ -} TransactionStmt; +} TransactionStmt; /* ---------------------- * Create View Statement @@ -444,7 +444,7 @@ typedef struct ViewStmt NodeTag type; char *viewname; /* name of the view */ Query *query; /* the SQL statement */ -} ViewStmt; +} ViewStmt; /* ---------------------- * Load Statement @@ -454,7 +454,7 @@ typedef struct LoadStmt { NodeTag type; char *filename; /* file to load */ -} LoadStmt; +} LoadStmt; /* ---------------------- * Createdb Statement @@ -464,7 +464,7 @@ typedef struct CreatedbStmt { NodeTag type; char *dbname; /* database to create */ -} CreatedbStmt; +} CreatedbStmt; /* ---------------------- * Destroydb Statement @@ -474,7 +474,7 @@ typedef struct DestroydbStmt { NodeTag type; char *dbname; /* database to drop */ -} DestroydbStmt; +} DestroydbStmt; /* ---------------------- * Cluster Statement (support pbrown's cluster index implementation) @@ -485,7 +485,7 @@ typedef struct ClusterStmt NodeTag type; char *relname; /* relation being indexed */ char *indexname; /* original index defined */ -} ClusterStmt; +} ClusterStmt; /* ---------------------- * Vacuum Statement @@ -498,7 +498,7 @@ typedef struct VacuumStmt bool analyze; /* analyze data */ char *vacrel; /* table to vacuum */ List *va_spec; /* columns to analyse */ -} VacuumStmt; +} VacuumStmt; /* ---------------------- * Explain Statement @@ -509,7 +509,7 @@ typedef struct ExplainStmt NodeTag type; Query *query; /* the query */ bool verbose; /* print plan info */ -} ExplainStmt; +} ExplainStmt; /* ---------------------- * Set Statement @@ -521,7 +521,7 @@ typedef struct VariableSetStmt NodeTag type; char *name; char *value; -} VariableSetStmt; +} VariableSetStmt; /* ---------------------- * Show Statement @@ -532,7 +532,7 @@ typedef struct VariableShowStmt { NodeTag type; char *name; -} VariableShowStmt; +} VariableShowStmt; /* ---------------------- * Reset Statement @@ -543,7 +543,7 @@ typedef struct VariableResetStmt { NodeTag type; char *name; -} VariableResetStmt; +} VariableResetStmt; /***************************************************************************** @@ -573,7 +573,7 @@ typedef struct DeleteStmt NodeTag type; char *relname; /* relation to delete from */ Node *whereClause; /* qualifications */ -} DeleteStmt; +} DeleteStmt; /* ---------------------- * Update Statement @@ -586,7 +586,7 @@ typedef struct ReplaceStmt List *targetList; /* the target list (of ResTarget) */ Node *whereClause; /* qualifications */ List *fromClause; /* the from clause */ -} ReplaceStmt; +} ReplaceStmt; /* ---------------------- * Create Cursor Statement @@ -603,7 +603,7 @@ typedef struct CursorStmt Node *whereClause; /* qualifications */ List *groupClause; /* group by clause */ List *sortClause; /* sort clause (a list of SortGroupBy's) */ -} CursorStmt; +} CursorStmt; /* ---------------------- * Select Statement @@ -621,7 +621,7 @@ typedef struct RetrieveStmt Node *havingClause; /* having conditional-expression */ List *selectClause; /* subselect parameters */ List *sortClause; /* sort clause (a list of SortGroupBy's) */ -} RetrieveStmt; +} RetrieveStmt; /**************************************************************************** @@ -640,7 +640,7 @@ typedef struct SubSelect Node *whereClause; /* qualifications */ List *groupClause; /* group by clause */ Node *havingClause; /* having conditional-expression */ -} SubSelect; +} SubSelect; /* * TypeName - specifies a type in definitions @@ -653,7 +653,7 @@ typedef struct TypeName bool setof; /* is a set? */ List *arrayBounds; /* array bounds */ int typlen; /* length for char() and varchar() */ -} TypeName; +} TypeName; /* * ParamNo - specifies a parameter reference @@ -663,7 +663,7 @@ typedef struct ParamNo NodeTag type; int number; /* the number of the parameter */ TypeName *typename; /* the typecast */ -} ParamNo; +} ParamNo; /* * A_Expr - binary expressions @@ -714,7 +714,7 @@ typedef struct ColumnDef TypeName *typename; /* type of column */ bool is_not_null; /* flag to NOT NULL constraint */ char *defval; /* default value of column */ -} ColumnDef; +} ColumnDef; /* * Ident - @@ -730,7 +730,7 @@ typedef struct Ident List *indirection; /* array references */ bool isRel; /* is a relation - filled in by * transformExpr() */ -} Ident; +} Ident; /* * FuncCall - a function/aggregate invocation @@ -740,7 +740,7 @@ typedef struct FuncCall NodeTag type; char *funcname; /* name of function */ List *args; /* the arguments (list of exprs) */ -} FuncCall; +} FuncCall; /* * A_Indices - array reference or bounds ([lidx:uidx] or [uidx]) @@ -763,7 +763,7 @@ typedef struct ResTarget List *indirection; /* array references */ Node *val; /* the value of the result (A_Expr or * Attr) (or A_Const) */ -} ResTarget; +} ResTarget; /* * ParamString - used in with clauses @@ -773,7 +773,7 @@ typedef struct ParamString NodeTag type; char *name; char *val; -} ParamString; +} ParamString; /* * TimeRange - specifies a time range @@ -783,7 +783,7 @@ typedef struct TimeRange NodeTag type; char *startDate; char *endDate; /* snapshot if NULL */ -} TimeRange; +} TimeRange; /* * RelExpr - relation expressions @@ -794,7 +794,7 @@ typedef struct RelExpr char *relname; /* the relation name */ bool inh; /* inheritance query */ TimeRange *timeRange; /* the time range */ -} RelExpr; +} RelExpr; /* * SortGroupBy - for order by clause @@ -806,7 +806,7 @@ typedef struct SortGroupBy char *range; char *name; /* name of column to sort on */ char *useOp; /* operator to use */ -} SortGroupBy; +} SortGroupBy; /* * RangeVar - range variable, used in from clauses @@ -816,7 +816,7 @@ typedef struct RangeVar NodeTag type; RelExpr *relExpr; /* the relation expression */ char *name; /* the name to be referenced (optional) */ -} RangeVar; +} RangeVar; /* * IndexElem - index parameters (used in create index) @@ -828,7 +828,7 @@ typedef struct IndexElem List *args; /* if not NULL, function index */ char *class; TypeName *tname; /* type of index's keys (optional) */ -} IndexElem; +} IndexElem; /* * DefElem - @@ -839,7 +839,7 @@ typedef struct DefElem NodeTag type; char *defname; Node *arg; /* a (Value *) or a (TypeName *) */ -} DefElem; +} DefElem; /**************************************************************************** @@ -859,7 +859,7 @@ typedef struct TargetEntry Resdom *resdom; /* fjoin overload this to be a list?? */ Fjoin *fjoin; Node *expr; /* can be a list too */ -} TargetEntry; +} TargetEntry; /* * RangeTblEntry - @@ -885,7 +885,7 @@ typedef struct RangeTblEntry bool archive; /* filled in by plan_archive */ bool inFromCl; /* comes from From Clause */ TimeQual timeQual; /* filled in by pg_plan */ -} RangeTblEntry; +} RangeTblEntry; /* * SortClause - @@ -896,7 +896,7 @@ typedef struct SortClause NodeTag type; Resdom *resdom; /* attributes in tlist to be sorted */ Oid opoid; /* sort operators */ -} SortClause; +} SortClause; /* * GroupClause - @@ -907,6 +907,6 @@ typedef struct GroupClause NodeTag type; TargetEntry *entry; /* attributes to group on */ Oid grpOpoid; /* the sort operator to use */ -} GroupClause; +} GroupClause; #endif /* PARSENODES_H */ diff --git a/src/include/nodes/pg_list.h b/src/include/nodes/pg_list.h index 166ce53bd63..e3e3574193d 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.7 1997/09/08 02:37:24 momjian Exp $ + * $Id: pg_list.h,v 1.8 1997/09/08 21:52:51 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -33,7 +33,7 @@ typedef struct Value long ival; double dval; } val; -} Value; +} Value; #define intVal(v) (((Value *)v)->val.ival) #define floatVal(v) (((Value *)v)->val.dval) @@ -53,7 +53,7 @@ typedef struct List int int_value; } elem; struct List *next; -} List; +} List; #define NIL ((List *) NULL) @@ -81,36 +81,36 @@ typedef struct List /* * function prototypes in nodes/list.c */ -extern int length(List * list); -extern List *append(List * list1, List * list2); -extern List *nconc(List * list1, List * list2); -extern List *lcons(void *datum, List * list); -extern bool member(void *foo, List * bar); +extern int length(List *list); +extern List *append(List *list1, List *list2); +extern List *nconc(List *list1, List *list2); +extern List *lcons(void *datum, List *list); +extern bool member(void *foo, List *bar); extern Value *makeInteger(long i); extern Value *makeFloat(double d); extern Value *makeString(char *str); 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 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); +extern void *nth(int n, List *l); +extern void set_nth(List *l, int n, void *elem); -List *lconsi(int datum, List * list); -List *lappendi(List * list, int datum); +List *lconsi(int datum, List *list); +List *lappendi(List *list, int datum); extern bool intMember(int, List *); -extern List *intAppend(List * list1, List * list2); +extern List *intAppend(List *list1, List *list2); -extern int nthi(int n, List * l); +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 *LispUnion(List * foo, List * bar); -extern List *LispUnioni(List * foo, List * bar); -extern bool same(List * foo, List * bar); +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 */ diff --git a/src/include/nodes/plannodes.h b/src/include/nodes/plannodes.h index c20b9b63764..77447935b80 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.9 1997/09/08 20:58:48 momjian Exp $ + * $Id: plannodes.h,v 1.10 1997/09/08 21:52:53 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -75,7 +75,7 @@ typedef struct Plan List *qual; /* Node* or List* ?? */ struct Plan *lefttree; struct Plan *righttree; -} Plan; +} Plan; /* ---------------- * these are are defined to avoid confusion problems with "left" @@ -116,7 +116,7 @@ typedef struct Result Plan plan; Node *resconstantqual; ResultState *resstate; -} Result; +} Result; /* ---------------- * append node @@ -141,7 +141,7 @@ typedef struct Scan Plan plan; Index scanrelid; /* relid is index into the range table */ CommonScanState *scanstate; -} Scan; +} Scan; /* ---------------- * sequential scan node @@ -159,7 +159,7 @@ typedef struct IndexScan List *indxid; List *indxqual; IndexScanState *indxstate; -} IndexScan; +} IndexScan; /* * ========== @@ -181,7 +181,7 @@ typedef struct NestLoop { Join join; NestLoopState *nlstate; -} NestLoop; +} NestLoop; /* ---------------- * merge join node @@ -195,7 +195,7 @@ typedef struct MergeJoin Oid *mergerightorder;/* inner sort operator */ Oid *mergeleftorder; /* outer sort operator */ MergeJoinState *mergestate; -} MergeJoin; +} MergeJoin; /* ---------------- * hash join (probe) node @@ -211,7 +211,7 @@ typedef struct HashJoin IpcMemoryKey hashjointablekey; int hashjointablesize; bool hashdone; -} HashJoin; +} HashJoin; /* --------------- * aggregate node @@ -242,7 +242,7 @@ typedef struct Group int numCols; /* number of group columns */ AttrNumber *grpColIdx; /* index into the target list */ GroupState *grpstate; -} Group; +} Group; /* * ========== @@ -254,7 +254,7 @@ typedef struct Temp Plan plan; Oid tempid; int keycount; -} Temp; +} Temp; /* ---------------- * materialization node @@ -266,7 +266,7 @@ typedef struct Material Oid tempid; int keycount; MaterialState *matstate; -} Material; +} Material; /* ---------------- * sort node @@ -280,7 +280,7 @@ typedef struct Sort SortState *sortstate; void *psortstate; bool cleaned; -} Sort; +} Sort; /* ---------------- * unique node @@ -296,7 +296,7 @@ typedef struct Unique AttrNumber uniqueAttrNum; /* attribute number of attribute to select * distinct on */ UniqueState *uniquestate; -} Unique; +} Unique; /* ---------------- * hash build node @@ -310,7 +310,7 @@ typedef struct Hash HashJoinTable hashtable; IpcMemoryKey hashtablekey; int hashtablesize; -} Hash; +} Hash; /* --------------------- * choose node @@ -320,7 +320,7 @@ typedef struct Choose { Plan plan; List *chooseplanlist; -} Choose; +} Choose; /* ------------------- * Tee node information @@ -340,6 +340,6 @@ typedef struct Tee List *rtentries; /* the range table for the plan below the * Tee may be different than the parent * plans */ -} Tee; +} Tee; #endif /* PLANNODES_H */ diff --git a/src/include/nodes/primnodes.h b/src/include/nodes/primnodes.h index 733a7c06ff2..f0706d1392e 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.10 1997/09/08 20:58:50 momjian Exp $ + * $Id: primnodes.h,v 1.11 1997/09/08 21:52:58 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -46,7 +46,7 @@ typedef struct Resdom Index reskey; Oid reskeyop; int resjunk; -} Resdom; +} Resdom; /* ------------- * Fjoin @@ -73,7 +73,7 @@ typedef struct Fjoin List *fj_innerNode; DatumPtr fj_results; BoolPtr fj_alwaysDone; -} Fjoin; +} Fjoin; /* ---------------- * Expr @@ -87,7 +87,7 @@ typedef struct Fjoin typedef enum OpType { OP_EXPR, FUNC_EXPR, OR_EXPR, AND_EXPR, NOT_EXPR -} OpType; +} OpType; typedef struct Expr { @@ -96,7 +96,7 @@ typedef struct Expr OpType opType; /* type of the op */ Node *oper; /* could be Oper or Func */ List *args; /* list of argument nodes */ -} Expr; +} Expr; /* ---------------- * Var @@ -124,7 +124,7 @@ typedef struct Var Oid vartype; Index varnoold; /* only used by optimizer */ AttrNumber varoattno; /* only used by optimizer */ -} Var; +} Var; /* ---------------- * Oper @@ -154,7 +154,7 @@ typedef struct Oper Oid opresulttype; int opsize; FunctionCachePtr op_fcache; -} Oper; +} Oper; /* ---------------- @@ -183,7 +183,7 @@ typedef struct Const bool constbyval; bool constisset; bool constiscast; -} Const; +} Const; /* ---------------- * Param @@ -220,7 +220,7 @@ typedef struct Param char *paramname; Oid paramtype; List *param_tlist; -} Param; +} Param; /* ---------------- @@ -248,7 +248,7 @@ typedef struct Func FunctionCachePtr func_fcache; List *func_tlist; List *func_planlist; -} Func; +} Func; /* ---------------- * Aggreg diff --git a/src/include/nodes/print.h b/src/include/nodes/print.h index bef8ce3a6ce..bd384e864d2 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.4 1997/09/08 02:37:28 momjian Exp $ + * $Id: print.h,v 1.5 1997/09/08 21:52:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,14 +21,14 @@ extern void print(void *obj); extern void pprint(void *obj); -extern void print_rt(List * rtable); -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 void print_rt(List *rtable); +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 void -print_plan_recursive(Plan * p, Query * parsetree, +print_plan_recursive(Plan *p, Query *parsetree, int indentLevel, char *label); -extern void print_plan(Plan * p, Query * parsetree); +extern void print_plan(Plan *p, Query *parsetree); #endif /* PRINT_H */ diff --git a/src/include/nodes/relation.h b/src/include/nodes/relation.h index 4dfcb6692dc..8c2fb363a92 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.6 1997/09/08 02:37:29 momjian Exp $ + * $Id: relation.h,v 1.7 1997/09/08 21:53:01 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -106,9 +106,9 @@ typedef struct Rel List *joininfo; /* join clauses */ List *innerjoin; List *superrels; -} Rel; +} Rel; -extern Var *get_expr(TargetEntry * foo); +extern Var *get_expr(TargetEntry *foo); typedef struct MergeOrder { @@ -118,12 +118,12 @@ typedef struct MergeOrder Oid right_operator; Oid left_type; Oid right_type; -} MergeOrder; +} MergeOrder; typedef enum OrderType { MERGE_ORDER, SORTOP_ORDER -} OrderType; +} OrderType; typedef struct PathOrder { @@ -133,7 +133,7 @@ typedef struct PathOrder Oid *sortop; MergeOrder *merge; } ord; -} PathOrder; +} PathOrder; typedef struct Path { @@ -150,7 +150,7 @@ typedef struct Path Cost outerjoincost; Relid joinid; List *locclauseinfo; -} Path; +} Path; typedef struct IndexPath { @@ -159,7 +159,7 @@ typedef struct IndexPath List *indexqual; int *indexkeys; /* to transform heap attnos into index * ones */ -} IndexPath; +} IndexPath; typedef struct JoinPath { @@ -167,7 +167,7 @@ typedef struct JoinPath List *pathclauseinfo; Path *outerjoinpath; Path *innerjoinpath; -} JoinPath; +} JoinPath; typedef struct MergePath { @@ -175,7 +175,7 @@ typedef struct MergePath List *path_mergeclauses; List *outersortkeys; List *innersortkeys; -} MergePath; +} MergePath; typedef struct HashPath { @@ -183,7 +183,7 @@ typedef struct HashPath List *path_hashclauses; List *outerhashkeys; List *innerhashkeys; -} HashPath; +} HashPath; /****** * Keys @@ -194,14 +194,14 @@ typedef struct OrderKey NodeTag type; int attribute_number; Index array_index; -} OrderKey; +} OrderKey; typedef struct JoinKey { NodeTag type; Var *outer; Var *inner; -} JoinKey; +} JoinKey; /******* * clause info @@ -221,26 +221,26 @@ typedef struct CInfo /* hashjoin only */ Oid hashjoinoperator; Relid cinfojoinid; -} CInfo; +} CInfo; typedef struct JoinMethod { NodeTag type; List *jmkeys; List *clauses; -} JoinMethod; +} JoinMethod; typedef struct HInfo { JoinMethod jmethod; Oid hashop; -} HInfo; +} HInfo; typedef struct MInfo { JoinMethod jmethod; MergeOrder *m_ordering; -} MInfo; +} MInfo; typedef struct JInfo { @@ -250,7 +250,7 @@ typedef struct JInfo bool mergesortable; bool hashjoinable; bool inactive; -} JInfo; +} JInfo; typedef struct Iter { @@ -258,7 +258,7 @@ typedef struct Iter Node *iterexpr; Oid itertype; /* type of the iter expr (use for type * checking) */ -} Iter; +} Iter; /* ** Stream: @@ -292,6 +292,6 @@ typedef struct Stream bool groupup; Cost groupcost; Cost groupsel; -} Stream; +} Stream; #endif /* RELATION_H */ |
