From f99a569a2ee3763b4ae174e81250c95ca0fdcbb6 Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Wed, 4 Oct 2006 00:30:14 +0000
Subject: pgindent run for 8.2.

---
 src/include/nodes/params.h     |  4 +--
 src/include/nodes/parsenodes.h | 71 ++++++++++++++++++------------------
 src/include/nodes/primnodes.h  |  6 ++--
 src/include/nodes/relation.h   | 81 ++++++++++++++++++++++--------------------
 4 files changed, 83 insertions(+), 79 deletions(-)

(limited to 'src/include/nodes')

diff --git a/src/include/nodes/params.h b/src/include/nodes/params.h
index 3a93d75f30..48ac42ef3a 100644
--- a/src/include/nodes/params.h
+++ b/src/include/nodes/params.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/nodes/params.h,v 1.32 2006/09/06 20:40:48 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/nodes/params.h,v 1.33 2006/10/04 00:30:09 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -35,7 +35,7 @@
  * ----------------
  */
 
-#define PARAM_FLAG_CONST	0x0001			/* parameter is constant */
+#define PARAM_FLAG_CONST	0x0001		/* parameter is constant */
 
 typedef struct ParamExternData
 {
diff --git a/src/include/nodes/parsenodes.h b/src/include/nodes/parsenodes.h
index 0b9de4905d..29f68f7fff 100644
--- a/src/include/nodes/parsenodes.h
+++ b/src/include/nodes/parsenodes.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/nodes/parsenodes.h,v 1.330 2006/09/05 21:08:36 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/nodes/parsenodes.h,v 1.331 2006/10/04 00:30:09 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -57,7 +57,7 @@ typedef uint32 AclMode;			/* a bitmask of privilege bits */
 #define ACL_USAGE		(1<<8)	/* for languages and namespaces */
 #define ACL_CREATE		(1<<9)	/* for namespaces and databases */
 #define ACL_CREATE_TEMP (1<<10) /* for databases */
-#define ACL_CONNECT		(1<<11)	/* for databases */
+#define ACL_CONNECT		(1<<11) /* for databases */
 #define N_ACL_RIGHTS	12		/* 1 plus the last 1<<x */
 #define ACL_NO_RIGHTS	0
 /* Currently, SELECT ... FOR UPDATE/FOR SHARE requires UPDATE privileges */
@@ -93,9 +93,9 @@ typedef struct Query
 								 * INSERT/UPDATE/DELETE; 0 for SELECT */
 
 	RangeVar   *into;			/* target relation for SELECT INTO */
-	List	   *intoOptions;		/* options from WITH clause */
+	List	   *intoOptions;	/* options from WITH clause */
 	OnCommitAction intoOnCommit;	/* what do we do at COMMIT? */
-	char	   *intoTableSpaceName;	/* table space to use, or NULL */
+	char	   *intoTableSpaceName;		/* table space to use, or NULL */
 
 	bool		hasAggs;		/* has aggregates in tlist or havingQual */
 	bool		hasSubLinks;	/* has subquery SubLink */
@@ -134,17 +134,17 @@ typedef struct Query
 	List	   *resultRelations;	/* integer list of RT indexes, or NIL */
 
 	/*
-	 * If the query has a returningList then the planner will store a list
-	 * of processed targetlists (one per result relation) here.  We must
-	 * have a separate RETURNING targetlist for each result rel because
-	 * column numbers may vary within an inheritance tree.  In the targetlists,
-	 * Vars referencing the result relation will have their original varno
-	 * and varattno, while Vars referencing other rels will be converted
-	 * to have varno OUTER and varattno referencing a resjunk entry in the
-	 * top plan node's targetlist.  XXX This field ought to go in some sort of
-	 * TopPlan plan node, not in the Query.
+	 * If the query has a returningList then the planner will store a list of
+	 * processed targetlists (one per result relation) here.  We must have a
+	 * separate RETURNING targetlist for each result rel because column
+	 * numbers may vary within an inheritance tree.  In the targetlists, Vars
+	 * referencing the result relation will have their original varno and
+	 * varattno, while Vars referencing other rels will be converted to have
+	 * varno OUTER and varattno referencing a resjunk entry in the top plan
+	 * node's targetlist.  XXX This field ought to go in some sort of TopPlan
+	 * plan node, not in the Query.
 	 */
-	List	   *returningLists;		/* list of lists of TargetEntry, or NIL */
+	List	   *returningLists; /* list of lists of TargetEntry, or NIL */
 } Query;
 
 
@@ -375,8 +375,8 @@ typedef struct RangeFunction
 	NodeTag		type;
 	Node	   *funccallnode;	/* untransformed function call tree */
 	Alias	   *alias;			/* table alias & optional column aliases */
-	List	   *coldeflist;		/* list of ColumnDef nodes to describe
-								 * result of function returning RECORD */
+	List	   *coldeflist;		/* list of ColumnDef nodes to describe result
+								 * of function returning RECORD */
 } RangeFunction;
 
 /*
@@ -414,7 +414,7 @@ typedef struct InhRelation
 {
 	NodeTag		type;
 	RangeVar   *relation;
-	List       *options;
+	List	   *options;
 } InhRelation;
 
 /*
@@ -563,7 +563,7 @@ typedef struct RangeTblEntry
 	 */
 	Node	   *funcexpr;		/* expression tree for func call */
 	List	   *funccoltypes;	/* OID list of column type OIDs */
-	List	   *funccoltypmods;	/* integer list of column typmods */
+	List	   *funccoltypmods; /* integer list of column typmods */
 
 	/*
 	 * Fields valid for a values RTE (else NIL):
@@ -717,15 +717,15 @@ typedef struct SelectStmt
 	/*
 	 * These fields are used only in "leaf" SelectStmts.
 	 *
-	 * into, intoColNames, intoOptions, intoOnCommit, and
-	 * intoTableSpaceName are a kluge; they belong somewhere else...
+	 * into, intoColNames, intoOptions, intoOnCommit, and intoTableSpaceName
+	 * are a kluge; they belong somewhere else...
 	 */
 	List	   *distinctClause; /* NULL, list of DISTINCT ON exprs, or
 								 * lcons(NIL,NIL) for all (SELECT DISTINCT) */
 	RangeVar   *into;			/* target table (for select into table) */
 	List	   *intoColNames;	/* column names for into table */
 	List	   *intoOptions;	/* options from WITH clause */
-	OnCommitAction	intoOnCommit;		/* what do we do at COMMIT? */
+	OnCommitAction intoOnCommit;	/* what do we do at COMMIT? */
 	char	   *intoTableSpaceName;		/* table space to use, or NULL */
 	List	   *targetList;		/* the target list (of ResTarget) */
 	List	   *fromClause;		/* the FROM clause */
@@ -735,11 +735,11 @@ typedef struct SelectStmt
 
 	/*
 	 * In a "leaf" node representing a VALUES list, the above fields are all
-	 * null, and instead this field is set.  Note that the elements of
-	 * the sublists are just expressions, without ResTarget decoration.
-	 * Also note that a list element can be DEFAULT (represented as a
-	 * SetToDefault node), regardless of the context of the VALUES list.
-	 * It's up to parse analysis to reject that where not valid.
+	 * null, and instead this field is set.  Note that the elements of the
+	 * sublists are just expressions, without ResTarget decoration. Also note
+	 * that a list element can be DEFAULT (represented as a SetToDefault
+	 * node), regardless of the context of the VALUES list. It's up to parse
+	 * analysis to reject that where not valid.
 	 */
 	List	   *valuesLists;	/* untransformed list of expression lists */
 
@@ -1014,7 +1014,7 @@ typedef struct GrantRoleStmt
  *		Copy Statement
  *
  * We support "COPY relation FROM file", "COPY relation TO file", and
- * "COPY (query) TO file".  In any given CopyStmt, exactly one of "relation"
+ * "COPY (query) TO file".	In any given CopyStmt, exactly one of "relation"
  * and "query" must be non-NULL.  Note: "query" is a SelectStmt before
  * parse analysis, and a Query afterwards.
  * ----------------------
@@ -1055,7 +1055,8 @@ typedef struct CreateStmt
 	char	   *tablespacename; /* table space to use, or NULL */
 } CreateStmt;
 
-typedef enum CreateStmtLikeOption {
+typedef enum CreateStmtLikeOption
+{
 	CREATE_TABLE_LIKE_INCLUDING_DEFAULTS,
 	CREATE_TABLE_LIKE_EXCLUDING_DEFAULTS,
 	CREATE_TABLE_LIKE_INCLUDING_CONSTRAINTS,
@@ -1917,13 +1918,13 @@ typedef struct PrepareStmt
 
 typedef struct ExecuteStmt
 {
-	NodeTag			type;
-	char		   *name;				/* The name of the plan to execute */
-	RangeVar	   *into;				/* Optional table to store results in */
-	List		   *intoOptions;		/* Options from WITH clause */
-	OnCommitAction	into_on_commit;		/* What do we do at COMMIT? */
-	char		   *into_tbl_space;		/* Tablespace to use, or NULL */
-	List		   *params;				/* Values to assign to parameters */
+	NodeTag		type;
+	char	   *name;			/* The name of the plan to execute */
+	RangeVar   *into;			/* Optional table to store results in */
+	List	   *intoOptions;	/* Options from WITH clause */
+	OnCommitAction into_on_commit;		/* What do we do at COMMIT? */
+	char	   *into_tbl_space; /* Tablespace to use, or NULL */
+	List	   *params;			/* Values to assign to parameters */
 } ExecuteStmt;
 
 
diff --git a/src/include/nodes/primnodes.h b/src/include/nodes/primnodes.h
index c84bab9287..841d85336e 100644
--- a/src/include/nodes/primnodes.h
+++ b/src/include/nodes/primnodes.h
@@ -10,7 +10,7 @@
  * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/nodes/primnodes.h,v 1.116 2006/09/28 20:51:42 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/nodes/primnodes.h,v 1.117 2006/10/04 00:30:09 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -155,7 +155,7 @@ typedef struct Const
  *				For historical reasons, such parameters are numbered from 0.
  *				These numbers are independent of PARAM_EXTERN numbers.
  *
- *		PARAM_SUBLINK:  The parameter represents an output column of a SubLink
+ *		PARAM_SUBLINK:	The parameter represents an output column of a SubLink
  *				node's sub-select.  The column number is contained in the
  *				`paramid' field.  (This type of Param is converted to
  *				PARAM_EXEC during planning.)
@@ -366,7 +366,7 @@ typedef struct BoolExpr
  *
  * NOTE: in the raw output of gram.y, testexpr contains just the raw form
  * of the lefthand expression (if any), and operName is the String name of
- * the combining operator.  Also, subselect is a raw parsetree.  During parse
+ * the combining operator.	Also, subselect is a raw parsetree.  During parse
  * analysis, the parser transforms testexpr into a complete boolean expression
  * that compares the lefthand value(s) to PARAM_SUBLINK nodes representing the
  * output columns of the subselect.  And subselect is transformed to a Query.
diff --git a/src/include/nodes/relation.h b/src/include/nodes/relation.h
index 471d8e209e..d39e924227 100644
--- a/src/include/nodes/relation.h
+++ b/src/include/nodes/relation.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/nodes/relation.h,v 1.127 2006/09/19 22:49:53 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/nodes/relation.h,v 1.128 2006/10/04 00:30:09 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -52,7 +52,7 @@ typedef struct QualCost
  *
  * This struct is conventionally called "root" in all the planner routines.
  * It holds links to all of the planner's working state, in addition to the
- * original Query.  Note that at present the planner extensively modifies
+ * original Query.	Note that at present the planner extensively modifies
  * the passed-in Query data structure; someday that should stop.
  *----------
  */
@@ -69,8 +69,8 @@ typedef struct PlannerInfo
 	 * does not correspond to a base relation, such as a join RTE or an
 	 * unreferenced view RTE; or if the RelOptInfo hasn't been made yet.
 	 */
-	struct RelOptInfo **simple_rel_array;	/* All 1-relation RelOptInfos */
-	int			simple_rel_array_size;		/* allocated size of array */
+	struct RelOptInfo **simple_rel_array;		/* All 1-relation RelOptInfos */
+	int			simple_rel_array_size;	/* allocated size of array */
 
 	/*
 	 * join_rel_list is a list of all join-relation RelOptInfos we have
@@ -101,7 +101,7 @@ typedef struct PlannerInfo
 
 	List	   *in_info_list;	/* list of InClauseInfos */
 
-	List	   *append_rel_list;		/* list of AppendRelInfos */
+	List	   *append_rel_list;	/* list of AppendRelInfos */
 
 	List	   *query_pathkeys; /* desired pathkeys for query_planner(), and
 								 * actual pathkeys afterwards */
@@ -109,14 +109,14 @@ typedef struct PlannerInfo
 	List	   *group_pathkeys; /* groupClause pathkeys, if any */
 	List	   *sort_pathkeys;	/* sortClause pathkeys, if any */
 
-	double		total_table_pages;	/* # of pages in all tables of query */
+	double		total_table_pages;		/* # of pages in all tables of query */
 
 	double		tuple_fraction; /* tuple_fraction passed to query_planner */
 
 	bool		hasJoinRTEs;	/* true if any RTEs are RTE_JOIN kind */
 	bool		hasOuterJoins;	/* true if any RTEs are outer joins */
 	bool		hasHavingQual;	/* true if havingQual was non-null */
-	bool		hasPseudoConstantQuals;	/* true if any RestrictInfo has
+	bool		hasPseudoConstantQuals; /* true if any RestrictInfo has
 										 * pseudoconstant = true */
 } PlannerInfo;
 
@@ -144,7 +144,7 @@ typedef struct PlannerInfo
  * Currently the only kind of otherrels are those made for member relations
  * of an "append relation", that is an inheritance set or UNION ALL subquery.
  * An append relation has a parent RTE that is a base rel, which represents
- * the entire append relation.  The member RTEs are otherrels.  The parent
+ * the entire append relation.	The member RTEs are otherrels.	The parent
  * is present in the query join tree but the members are not.  The member
  * RTEs and otherrels are used to plan the scans of the individual tables or
  * subqueries of the append set; then the parent baserel is given an Append
@@ -736,7 +736,7 @@ typedef struct HashPath
  *
  * The pseudoconstant flag is set true if the clause contains no Vars of
  * the current query level and no volatile functions.  Such a clause can be
- * pulled out and used as a one-time qual in a gating Result node.  We keep
+ * pulled out and used as a one-time qual in a gating Result node.	We keep
  * pseudoconstant clauses in the same lists as other RestrictInfos so that
  * the regular clause-pushing machinery can assign them to the correct join
  * level, but they need to be treated specially for cost and selectivity
@@ -757,7 +757,7 @@ typedef struct RestrictInfo
 
 	bool		can_join;		/* see comment above */
 
-	bool		pseudoconstant;	/* see comment above */
+	bool		pseudoconstant; /* see comment above */
 
 	/* The set of relids (varnos) actually referenced in the clause: */
 	Relids		clause_relids;
@@ -836,7 +836,7 @@ typedef struct InnerIndexscanInfo
  * Outer join info.
  *
  * One-sided outer joins constrain the order of joining partially but not
- * completely.  We flatten such joins into the planner's top-level list of
+ * completely.	We flatten such joins into the planner's top-level list of
  * relations to join, but record information about each outer join in an
  * OuterJoinInfo struct.  These structs are kept in the PlannerInfo node's
  * oj_info_list.
@@ -925,57 +925,60 @@ typedef struct InClauseInfo
 typedef struct AppendRelInfo
 {
 	NodeTag		type;
+
 	/*
-	 * These fields uniquely identify this append relationship.  There
-	 * can be (in fact, always should be) multiple AppendRelInfos for the
-	 * same parent_relid, but never more than one per child_relid, since
-	 * a given RTE cannot be a child of more than one append parent.
+	 * These fields uniquely identify this append relationship.  There can be
+	 * (in fact, always should be) multiple AppendRelInfos for the same
+	 * parent_relid, but never more than one per child_relid, since a given
+	 * RTE cannot be a child of more than one append parent.
 	 */
 	Index		parent_relid;	/* RT index of append parent rel */
 	Index		child_relid;	/* RT index of append child rel */
+
 	/*
 	 * For an inheritance appendrel, the parent and child are both regular
 	 * relations, and we store their rowtype OIDs here for use in translating
-	 * whole-row Vars.  For a UNION-ALL appendrel, the parent and child are
+	 * whole-row Vars.	For a UNION-ALL appendrel, the parent and child are
 	 * both subqueries with no named rowtype, and we store InvalidOid here.
 	 */
-	Oid			parent_reltype;	/* OID of parent's composite type */
+	Oid			parent_reltype; /* OID of parent's composite type */
 	Oid			child_reltype;	/* OID of child's composite type */
 
 	/*
-	 * The N'th element of this list is the integer column number of
-	 * the child column corresponding to the N'th column of the parent.
-	 * A list element is zero if it corresponds to a dropped column of the
-	 * parent (this is only possible for inheritance cases, not UNION ALL).
+	 * The N'th element of this list is the integer column number of the child
+	 * column corresponding to the N'th column of the parent. A list element
+	 * is zero if it corresponds to a dropped column of the parent (this is
+	 * only possible for inheritance cases, not UNION ALL).
 	 */
 	List	   *col_mappings;	/* list of child attribute numbers */
 
 	/*
-	 * The N'th element of this list is a Var or expression representing
-	 * the child column corresponding to the N'th column of the parent.
-	 * This is used to translate Vars referencing the parent rel into
-	 * references to the child.  A list element is NULL if it corresponds
-	 * to a dropped column of the parent (this is only possible for
-	 * inheritance cases, not UNION ALL).
+	 * The N'th element of this list is a Var or expression representing the
+	 * child column corresponding to the N'th column of the parent. This is
+	 * used to translate Vars referencing the parent rel into references to
+	 * the child.  A list element is NULL if it corresponds to a dropped
+	 * column of the parent (this is only possible for inheritance cases, not
+	 * UNION ALL).
 	 *
 	 * This might seem redundant with the col_mappings data, but it is handy
-	 * because flattening of sub-SELECTs that are members of a UNION ALL
-	 * will cause changes in the expressions that need to be substituted
-	 * for a parent Var.  Adjusting this data structure lets us track what
-	 * really needs to be substituted.
+	 * because flattening of sub-SELECTs that are members of a UNION ALL will
+	 * cause changes in the expressions that need to be substituted for a
+	 * parent Var.	Adjusting this data structure lets us track what really
+	 * needs to be substituted.
 	 *
 	 * Notice we only store entries for user columns (attno > 0).  Whole-row
-	 * Vars are special-cased, and system columns (attno < 0) need no
-	 * special translation since their attnos are the same for all tables.
+	 * Vars are special-cased, and system columns (attno < 0) need no special
+	 * translation since their attnos are the same for all tables.
 	 *
-	 * Caution: the Vars have varlevelsup = 0.  Be careful to adjust
-	 * as needed when copying into a subquery.
+	 * Caution: the Vars have varlevelsup = 0.	Be careful to adjust as needed
+	 * when copying into a subquery.
 	 */
-	List	   *translated_vars; /* Expressions in the child's Vars */
+	List	   *translated_vars;	/* Expressions in the child's Vars */
+
 	/*
-	 * We store the parent table's OID here for inheritance, or InvalidOid
-	 * for UNION ALL.  This is only needed to help in generating error
-	 * messages if an attempt is made to reference a dropped parent column.
+	 * We store the parent table's OID here for inheritance, or InvalidOid for
+	 * UNION ALL.  This is only needed to help in generating error messages if
+	 * an attempt is made to reference a dropped parent column.
 	 */
 	Oid			parent_reloid;	/* OID of parent relation */
 } AppendRelInfo;
-- 
cgit v1.2.1