diff options
Diffstat (limited to 'src/include/nodes')
| -rw-r--r-- | src/include/nodes/execnodes.h | 19 | ||||
| -rw-r--r-- | src/include/nodes/params.h | 8 | ||||
| -rw-r--r-- | src/include/nodes/parsenodes.h | 37 | ||||
| -rw-r--r-- | src/include/nodes/pg_list.h | 52 | ||||
| -rw-r--r-- | src/include/nodes/plannodes.h | 4 | ||||
| -rw-r--r-- | src/include/nodes/primnodes.h | 21 | ||||
| -rw-r--r-- | src/include/nodes/relation.h | 18 | ||||
| -rw-r--r-- | src/include/nodes/value.h | 4 |
8 files changed, 81 insertions, 82 deletions
diff --git a/src/include/nodes/execnodes.h b/src/include/nodes/execnodes.h index 9cc3b47cea6..b9782e3b6c1 100644 --- a/src/include/nodes/execnodes.h +++ b/src/include/nodes/execnodes.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/nodes/execnodes.h,v 1.118 2004/08/29 04:13:07 momjian Exp $ + * $PostgreSQL: pgsql/src/include/nodes/execnodes.h,v 1.119 2004/08/29 05:06:57 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -290,7 +290,7 @@ typedef struct EState /* Basic state for all query types: */ ScanDirection es_direction; /* current scan direction */ Snapshot es_snapshot; /* time qual to use */ - Snapshot es_crosscheck_snapshot; /* crosscheck time qual for RI */ + Snapshot es_crosscheck_snapshot; /* crosscheck time qual for RI */ List *es_range_table; /* List of RangeTableEntrys */ /* Info about target table for insert/update/delete queries: */ @@ -315,7 +315,7 @@ typedef struct EState List *es_rowMark; /* not good place, but there is no other */ bool es_instrument; /* true requests runtime instrumentation */ - bool es_select_into; /* true if doing SELECT INTO */ + bool es_select_into; /* true if doing SELECT INTO */ bool es_into_oids; /* true to generate OIDs in SELECT INTO */ List *es_exprcontexts; /* List of ExprContexts within EState */ @@ -403,15 +403,15 @@ typedef HASH_SEQ_STATUS TupleHashIterator; typedef struct ExprState ExprState; typedef Datum (*ExprStateEvalFunc) (ExprState *expression, - ExprContext *econtext, - bool *isNull, - ExprDoneCond *isDone); + ExprContext *econtext, + bool *isNull, + ExprDoneCond *isDone); struct ExprState { NodeTag type; Expr *expr; /* associated Expr node */ - ExprStateEvalFunc evalfunc; /* routine to run to execute node */ + ExprStateEvalFunc evalfunc; /* routine to run to execute node */ }; /* ---------------- @@ -498,8 +498,9 @@ typedef struct FuncExprState /* * Flag to remember whether we have registered a shutdown callback for - * this FuncExprState. We do so only if setArgsValid has been true at - * least once (since all the callback is for is to clear setArgsValid). + * this FuncExprState. We do so only if setArgsValid has been true at + * least once (since all the callback is for is to clear + * setArgsValid). */ bool shutdown_reg; /* a shutdown callback is registered */ diff --git a/src/include/nodes/params.h b/src/include/nodes/params.h index 68b8e7c7a81..6ae6d522173 100644 --- a/src/include/nodes/params.h +++ b/src/include/nodes/params.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/nodes/params.h,v 1.26 2004/08/29 04:13:07 momjian Exp $ + * $PostgreSQL: pgsql/src/include/nodes/params.h,v 1.27 2004/08/29 05:06:57 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -56,7 +56,7 @@ * * kind : the kind of parameter (PARAM_NAMED or PARAM_NUM) * name : the parameter name (valid if kind == PARAM_NAMED) - * id : the parameter id (valid if kind == PARAM_NUM) + * id : the parameter id (valid if kind == PARAM_NUM) * ptype : the type of the parameter value * isnull : true if the value is null (if so 'value' is undefined) * value : the value that has to be substituted in the place @@ -109,7 +109,7 @@ typedef struct ParamExecData /* Functions found in src/backend/nodes/params.c */ extern ParamListInfo copyParamList(ParamListInfo from); extern ParamListInfo lookupParam(ParamListInfo paramList, int thisParamKind, - const char *thisParamName, AttrNumber thisParamId, - bool noError); + const char *thisParamName, AttrNumber thisParamId, + bool noError); #endif /* PARAMS_H */ diff --git a/src/include/nodes/parsenodes.h b/src/include/nodes/parsenodes.h index 8dd91a9412b..8b46366bd97 100644 --- a/src/include/nodes/parsenodes.h +++ b/src/include/nodes/parsenodes.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/nodes/parsenodes.h,v 1.268 2004/08/29 04:13:07 momjian Exp $ + * $PostgreSQL: pgsql/src/include/nodes/parsenodes.h,v 1.269 2004/08/29 05:06:57 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -279,7 +279,7 @@ typedef struct A_Indices * * Note: as of Postgres 8.0, we don't support arrays of composite values, * so cases in which a field select follows a subscript aren't actually - * semantically legal. However the parser is prepared to handle such. + * semantically legal. However the parser is prepared to handle such. */ typedef struct A_Indirection { @@ -449,8 +449,8 @@ typedef struct DefElem * * In RELATION RTEs, the colnames in both alias and eref are indexed by * physical attribute number; this means there must be colname entries for - * dropped columns. When building an RTE we insert empty strings ("") for - * dropped columns. Note however that a stored rule may have nonempty + * dropped columns. When building an RTE we insert empty strings ("") for + * dropped columns. Note however that a stored rule may have nonempty * colnames for columns dropped since the rule was created (and for that * matter the colnames might be out of date due to column renamings). * The same comments apply to FUNCTION RTEs when the function's return type @@ -458,9 +458,9 @@ typedef struct DefElem * * In JOIN RTEs, the colnames in both alias and eref are one-to-one with * joinaliasvars entries. A JOIN RTE will omit columns of its inputs when - * those columns are known to be dropped at parse time. Again, however, + * those columns are known to be dropped at parse time. Again, however, * a stored rule might contain entries for columns dropped since the rule - * was created. (This is only possible for columns not actually referenced + * was created. (This is only possible for columns not actually referenced * in the rule.) * * inh is TRUE for relation references that should be expanded to include @@ -478,7 +478,7 @@ typedef struct DefElem * expansion of '*'. * * requiredPerms and checkAsUser specify run-time access permissions - * checks to be performed at query startup. The user must have *all* + * checks to be performed at query startup. The user must have *all* * of the permissions that are OR'd together in requiredPerms (zero * indicates no permissions checking). If checkAsUser is not zero, * then do the permissions checks using the access rights of that user, @@ -654,8 +654,7 @@ typedef enum ContainsOids MUST_NOT_HAVE_OIDS, /* WITHOUT OIDS explicitely specified */ DEFAULT_OIDS /* neither specified; use the default, * which is the value of the - * default_with_oids GUC var - */ + * default_with_oids GUC var */ } ContainsOids; typedef struct SelectStmt @@ -665,8 +664,8 @@ typedef struct SelectStmt /* * These fields are used only in "leaf" SelectStmts. * - * into, intoColNames and intoHasOids are a kluge; they belong - * somewhere else... + * into, intoColNames and intoHasOids are a kluge; they belong somewhere + * else... */ List *distinctClause; /* NULL, list of DISTINCT ON exprs, or * lcons(NIL,NIL) for all (SELECT @@ -778,7 +777,7 @@ typedef struct CreateSchemaStmt NodeTag type; char *schemaname; /* the name of the schema to create */ char *authid; /* the owner of the created schema */ - char *tablespacename; /* default tablespace for schema, or NULL */ + char *tablespacename; /* default tablespace for schema, or NULL */ List *schemaElts; /* schema components (list of parsenodes) */ } CreateSchemaStmt; @@ -813,8 +812,8 @@ typedef enum AlterTableType AT_AddIndex, /* add index */ AT_ReAddIndex, /* internal to commands/tablecmds.c */ AT_AddConstraint, /* add constraint */ - AT_ProcessedConstraint, /* pre-processed add constraint - * (local in parser/analyze.c) */ + AT_ProcessedConstraint, /* pre-processed add constraint (local in + * parser/analyze.c) */ AT_DropConstraint, /* drop constraint */ AT_DropConstraintQuietly, /* drop constraint, no error/warning * (local in commands/tablecmds.c) */ @@ -958,9 +957,9 @@ typedef struct CreateStmt List *inhRelations; /* relations to inherit from (list of * inhRelation) */ List *constraints; /* constraints (list of Constraint nodes) */ - ContainsOids hasoids; /* should it have OIDs? */ + ContainsOids hasoids; /* should it have OIDs? */ OnCommitAction oncommit; /* what do we do at COMMIT? */ - char *tablespacename; /* table space to use, or NULL */ + char *tablespacename; /* table space to use, or NULL */ } CreateStmt; /* ---------- @@ -1054,7 +1053,7 @@ typedef struct FkConstraint /* ---------------------- - * Create/Drop Table Space Statements + * Create/Drop Table Space Statements * ---------------------- */ @@ -1463,7 +1462,7 @@ typedef struct RenameStmt } RenameStmt; /* ---------------------- - * Alter Object Owner Statement + * Alter Object Owner Statement * ---------------------- */ typedef struct AlterOwnerStmt @@ -1709,7 +1708,7 @@ typedef struct LockStmt NodeTag type; List *relations; /* relations to lock */ int mode; /* lock mode */ - bool nowait; /* no wait mode */ + bool nowait; /* no wait mode */ } LockStmt; /* ---------------------- diff --git a/src/include/nodes/pg_list.h b/src/include/nodes/pg_list.h index 5913fde9dc5..c35e7c64ba1 100644 --- a/src/include/nodes/pg_list.h +++ b/src/include/nodes/pg_list.h @@ -18,8 +18,8 @@ * We support three types of lists: * * T_List: lists of pointers - * (in practice usually pointers to Nodes, but not always; - * declared as "void *" to minimize casting annoyances) + * (in practice usually pointers to Nodes, but not always; + * declared as "void *" to minimize casting annoyances) * T_IntList: lists of integers * T_OidList: lists of Oids * @@ -30,7 +30,7 @@ * Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/nodes/pg_list.h,v 1.48 2004/08/29 04:13:07 momjian Exp $ + * $PostgreSQL: pgsql/src/include/nodes/pg_list.h,v 1.49 2004/08/29 05:06:57 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -44,21 +44,21 @@ typedef struct ListCell ListCell; typedef struct List { - NodeTag type; /* T_List, T_IntList, or T_OidList */ - int length; - ListCell *head; - ListCell *tail; + NodeTag type; /* T_List, T_IntList, or T_OidList */ + int length; + ListCell *head; + ListCell *tail; } List; struct ListCell { union { - void *ptr_value; - int int_value; - Oid oid_value; - } data; - ListCell *next; + void *ptr_value; + int int_value; + Oid oid_value; + } data; + ListCell *next; }; /* @@ -98,9 +98,8 @@ list_length(List *l) extern ListCell *list_head(List *l); extern ListCell *list_tail(List *l); -extern int list_length(List *l); - -#endif /* __GNUC__ */ +extern int list_length(List *l); +#endif /* __GNUC__ */ /* * NB: There is an unfortunate legacy from a previous incarnation of @@ -149,12 +148,12 @@ extern int list_length(List *l); #define list_make1_int(x1) lcons_int(x1, NIL) #define list_make2_int(x1,x2) lcons_int(x1, list_make1_int(x2)) #define list_make3_int(x1,x2,x3) lcons_int(x1, list_make2_int(x2, x3)) -#define list_make4_int(x1,x2,x3,x4) lcons_int(x1, list_make3_int(x2, x3, x4)) +#define list_make4_int(x1,x2,x3,x4) lcons_int(x1, list_make3_int(x2, x3, x4)) #define list_make1_oid(x1) lcons_oid(x1, NIL) #define list_make2_oid(x1,x2) lcons_oid(x1, list_make1_oid(x2)) #define list_make3_oid(x1,x2,x3) lcons_oid(x1, list_make2_oid(x2, x3)) -#define list_make4_oid(x1,x2,x3,x4) lcons_oid(x1, list_make3_oid(x2, x3, x4)) +#define list_make4_oid(x1,x2,x3,x4) lcons_oid(x1, list_make3_oid(x2, x3, x4)) /* * foreach - @@ -173,11 +172,11 @@ extern int list_length(List *l); /* * forboth - - * a convenience macro for advancing through two linked lists - * simultaneously. This macro loops through both lists at the same - * time, stopping when either list runs out of elements. Depending - * on the requirements of the call site, it may also be wise to - * assert that the lengths of the two lists are equal. + * a convenience macro for advancing through two linked lists + * simultaneously. This macro loops through both lists at the same + * time, stopping when either list runs out of elements. Depending + * on the requirements of the call site, it may also be wise to + * assert that the lengths of the two lists are equal. */ #define forboth(cell1, list1, cell2, list2) \ for ((cell1) = list_head(list1), (cell2) = list_head(list2); \ @@ -200,8 +199,8 @@ extern List *list_concat(List *list1, List *list2); extern List *list_truncate(List *list, int new_size); extern void *list_nth(List *list, int n); -extern int list_nth_int(List *list, int n); -extern Oid list_nth_oid(List *list, int n); +extern int list_nth_int(List *list, int n); +extern Oid list_nth_oid(List *list, int n); extern bool list_member(List *list, void *datum); extern bool list_member_ptr(List *list, void *datum); @@ -297,8 +296,7 @@ extern List *list_copy_tail(List *list, int nskip); #define listCopy(list) list_copy(list) -extern int length(List *list); - -#endif /* ENABLE_LIST_COMPAT */ +extern int length(List *list); +#endif /* ENABLE_LIST_COMPAT */ #endif /* PG_LIST_H */ diff --git a/src/include/nodes/plannodes.h b/src/include/nodes/plannodes.h index 8804dda90be..852cf34832b 100644 --- a/src/include/nodes/plannodes.h +++ b/src/include/nodes/plannodes.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/nodes/plannodes.h,v 1.74 2004/08/29 04:13:07 momjian Exp $ + * $PostgreSQL: pgsql/src/include/nodes/plannodes.h,v 1.75 2004/08/29 05:06:57 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -167,7 +167,7 @@ typedef struct IndexScan List *indxstrategy; /* list of sublists of strategy numbers */ List *indxsubtype; /* list of sublists of strategy subtypes */ List *indxlossy; /* list of sublists of lossy flags (ints) */ - ScanDirection indxorderdir; /* forward or backward or don't care */ + ScanDirection indxorderdir; /* forward or backward or don't care */ } IndexScan; /* ---------------- diff --git a/src/include/nodes/primnodes.h b/src/include/nodes/primnodes.h index f7f52939940..9eb1514c288 100644 --- a/src/include/nodes/primnodes.h +++ b/src/include/nodes/primnodes.h @@ -10,7 +10,7 @@ * Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/nodes/primnodes.h,v 1.103 2004/08/29 04:13:07 momjian Exp $ + * $PostgreSQL: pgsql/src/include/nodes/primnodes.h,v 1.104 2004/08/29 05:06:57 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -33,14 +33,14 @@ * Notes: * * In a SELECT's targetlist, resno should always be equal to the item's - * ordinal position (counting from 1). However, in an INSERT or UPDATE + * ordinal position (counting from 1). However, in an INSERT or UPDATE * targetlist, resno represents the attribute number of the destination * column for the item; so there may be missing or out-of-order resnos. * It is even legal to have duplicated resnos; consider * UPDATE table SET arraycol[1] = ..., arraycol[2] = ..., ... * The two meanings come together in the executor, because the planner * transforms INSERT/UPDATE tlists into a normalized form with exactly - * one entry for each column of the destination table. Before that's + * one entry for each column of the destination table. Before that's * happened, however, it is risky to assume that resno == position. * Generally get_tle_by_resno() should be used rather than list_nth() * to fetch tlist entries by resno, and only in SELECT should you assume @@ -49,9 +49,9 @@ * resname is required to represent the correct column name in non-resjunk * entries of top-level SELECT targetlists, since it will be used as the * column title sent to the frontend. In most other contexts it is only - * a debugging aid, and may be wrong or even NULL. (In particular, it may + * a debugging aid, and may be wrong or even NULL. (In particular, it may * be wrong in a tlist from a stored rule, if the referenced column has been - * renamed by ALTER TABLE since the rule was made. Also, the planner tends + * renamed by ALTER TABLE since the rule was made. Also, the planner tends * to store NULL rather than look up a valid name for tlist entries in * non-toplevel plan nodes.) In resjunk entries, resname should be either * a specific system-generated name (such as "ctid") or NULL; anything else @@ -100,7 +100,7 @@ typedef struct Resdom * * Note: colnames is a list of Value nodes (always strings). In Alias structs * associated with RTEs, there may be entries corresponding to dropped - * columns; these are normally empty strings (""). See parsenodes.h for info. + * columns; these are normally empty strings (""). See parsenodes.h for info. */ typedef struct Alias { @@ -553,7 +553,7 @@ typedef struct FieldSelect * portion of a column. * * A single FieldStore can actually represent updates of several different - * fields. The parser only generates FieldStores with single-element lists, + * fields. The parser only generates FieldStores with single-element lists, * but the planner will collapse multiple updates of the same base column * into one FieldStore. * ---------------- @@ -601,7 +601,7 @@ typedef struct RelabelType * and the testexpr in the second case. * * In the raw grammar output for the second form, the condition expressions - * of the WHEN clauses are just the comparison values. Parse analysis + * of the WHEN clauses are just the comparison values. Parse analysis * converts these to valid boolean expressions of the form * CaseTestExpr '=' compexpr * where the CaseTestExpr node is a placeholder that emits the correct @@ -669,10 +669,10 @@ typedef struct ArrayExpr * * Note: the list of fields must have a one-for-one correspondence with * physical fields of the associated rowtype, although it is okay for it - * to be shorter than the rowtype. That is, the N'th list element must + * to be shorter than the rowtype. That is, the N'th list element must * match up with the N'th physical field. When the N'th physical field * is a dropped column (attisdropped) then the N'th list element can just - * be a NULL constant. (This case can only occur for named composite types, + * be a NULL constant. (This case can only occur for named composite types, * not RECORD types, since those are built from the RowExpr itself rather * than vice versa.) It is important not to assume that length(args) is * the same as the number of columns logically present in the rowtype. @@ -682,6 +682,7 @@ typedef struct RowExpr Expr xpr; List *args; /* the fields */ Oid row_typeid; /* RECORDOID or a composite type's ID */ + /* * Note: we deliberately do NOT store a typmod. Although a typmod * will be associated with specific RECORD types at runtime, it will diff --git a/src/include/nodes/relation.h b/src/include/nodes/relation.h index 5e091a1ff17..4b1fcd6782d 100644 --- a/src/include/nodes/relation.h +++ b/src/include/nodes/relation.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/nodes/relation.h,v 1.98 2004/08/29 04:13:07 momjian Exp $ + * $PostgreSQL: pgsql/src/include/nodes/relation.h,v 1.99 2004/08/29 05:06:57 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -244,7 +244,7 @@ typedef struct RelOptInfo * * The indexprs and indpred expressions have been run through * prepqual.c and eval_const_expressions() for ease of matching to - * WHERE clauses. indpred is in implicit-AND form. + * WHERE clauses. indpred is in implicit-AND form. */ typedef struct IndexOptInfo @@ -443,7 +443,7 @@ typedef struct MaterialPath * * This is unlike the other Path nodes in that it can actually generate * different plans: either hash-based or sort-based implementation, or a - * no-op if the input path can be proven distinct already. The decision + * no-op if the input path can be proven distinct already. The decision * is sufficiently localized that it's not worth having separate Path node * types. (Note: in the no-op case, we could eliminate the UniquePath node * entirely and just return the subpath; but it's convenient to have a @@ -587,7 +587,7 @@ typedef struct HashPath * because they used no other rels. That's what the is_pushed_down flag is * for; it tells us that a qual came from a point above the join of the * specific set of base rels that it uses (or that the JoinInfo structures - * claim it uses). A clause that originally came from WHERE will *always* + * claim it uses). A clause that originally came from WHERE will *always* * have its is_pushed_down flag set; a clause that came from an INNER JOIN * condition, but doesn't use all the rels being joined, will also have * is_pushed_down set because it will get attached to some lower joinrel. @@ -620,16 +620,16 @@ typedef struct RestrictInfo Expr *clause; /* the represented clause of WHERE or JOIN */ - bool is_pushed_down; /* TRUE if clause was pushed down in level */ + bool is_pushed_down; /* TRUE if clause was pushed down in level */ - bool valid_everywhere; /* TRUE if valid on every level */ + bool valid_everywhere; /* TRUE if valid on every level */ /* * This flag is set true if the clause looks potentially useful as a * merge or hash join clause, that is if it is a binary opclause with - * nonoverlapping sets of relids referenced in the left and right sides. - * (Whether the operator is actually merge or hash joinable isn't - * checked, however.) + * nonoverlapping sets of relids referenced in the left and right + * sides. (Whether the operator is actually merge or hash joinable + * isn't checked, however.) */ bool can_join; diff --git a/src/include/nodes/value.h b/src/include/nodes/value.h index ac017089d95..b04acc6427c 100644 --- a/src/include/nodes/value.h +++ b/src/include/nodes/value.h @@ -6,7 +6,7 @@ * * Copyright (c) 2003, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/include/nodes/value.h,v 1.2 2004/07/12 01:00:45 momjian Exp $ + * $PostgreSQL: pgsql/src/include/nodes/value.h,v 1.3 2004/08/29 05:06:57 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -58,4 +58,4 @@ extern Value *makeFloat(char *numericStr); extern Value *makeString(char *str); extern Value *makeBitString(char *str); -#endif /* VALUE_H */ +#endif /* VALUE_H */ |