summaryrefslogtreecommitdiff
path: root/src/include/nodes
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>1998-09-01 04:40:42 +0000
committerBruce Momjian <bruce@momjian.us>1998-09-01 04:40:42 +0000
commitfa1a8d6a97068295fe30ac646aec7493a6305bc2 (patch)
tree645f7cef3c78fbab4d6d7bbc7c9a61ad2893d273 /src/include/nodes
parentaf74855a608da4cd7ef88ceb2241ec1c75537f39 (diff)
downloadpostgresql-fa1a8d6a97068295fe30ac646aec7493a6305bc2.tar.gz
OK, folks, here is the pgindent output.
Diffstat (limited to 'src/include/nodes')
-rw-r--r--src/include/nodes/execnodes.h32
-rw-r--r--src/include/nodes/makefuncs.h18
-rw-r--r--src/include/nodes/memnodes.h4
-rw-r--r--src/include/nodes/nodeFuncs.h4
-rw-r--r--src/include/nodes/nodes.h12
-rw-r--r--src/include/nodes/params.h4
-rw-r--r--src/include/nodes/parsenodes.h15
-rw-r--r--src/include/nodes/pg_list.h4
-rw-r--r--src/include/nodes/plannodes.h16
-rw-r--r--src/include/nodes/primnodes.h4
-rw-r--r--src/include/nodes/print.h7
-rw-r--r--src/include/nodes/readfuncs.h4
-rw-r--r--src/include/nodes/relation.h14
13 files changed, 63 insertions, 75 deletions
diff --git a/src/include/nodes/execnodes.h b/src/include/nodes/execnodes.h
index c582cdd799..a062456c68 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.17 1998/08/03 19:41:31 momjian Exp $
+ * $Id: execnodes.h,v 1.18 1998/09/01 04:36:35 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -194,20 +194,20 @@ typedef struct JunkFilter
*/
typedef struct EState
{
- NodeTag type;
- ScanDirection es_direction;
- Snapshot es_snapshot;
- List *es_range_table;
- RelationInfo *es_result_relation_info;
- 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) */
+ NodeTag type;
+ ScanDirection es_direction;
+ Snapshot es_snapshot;
+ List *es_range_table;
+ RelationInfo *es_result_relation_info;
+ 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) */
} EState;
/* ----------------
@@ -704,4 +704,4 @@ typedef struct TeeState
HeapScanDesc tee_rightScanDesc;
} TeeState;
-#endif /* EXECNODES_H */
+#endif /* EXECNODES_H */
diff --git a/src/include/nodes/makefuncs.h b/src/include/nodes/makefuncs.h
index 58848328a6..43c8d08886 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.13 1998/07/20 20:48:52 momjian Exp $
+ * $Id: makefuncs.h,v 1.14 1998/09/01 04:36:37 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -17,15 +17,13 @@
#include <nodes/parsenodes.h>
#include <utils/fcache.h>
-extern Oper *
-makeOper(Oid opno,
+extern Oper *makeOper(Oid opno,
Oid opid,
Oid opresulttype,
int opsize,
FunctionCachePtr op_fcache);
-extern Var *
-makeVar(Index varno,
+extern Var *makeVar(Index varno,
AttrNumber varattno,
Oid vartype,
int32 vartypmod,
@@ -34,10 +32,9 @@ makeVar(Index varno,
AttrNumber varoattno);
extern TargetEntry *
-makeTargetEntry(Resdom *resdom, Node *expr);
+ makeTargetEntry(Resdom *resdom, Node *expr);
-extern Resdom *
-makeResdom(AttrNumber resno,
+extern Resdom *makeResdom(AttrNumber resno,
Oid restype,
int32 restypmod,
char *resname,
@@ -45,8 +42,7 @@ makeResdom(AttrNumber resno,
Oid reskeyop,
int resjunk);
-extern Const *
-makeConst(Oid consttype,
+extern Const *makeConst(Oid consttype,
int constlen,
Datum constvalue,
bool constisnull,
@@ -54,4 +50,4 @@ makeConst(Oid consttype,
bool constisset,
bool constiscast);
-#endif /* MAKEFUNC_H */
+#endif /* MAKEFUNC_H */
diff --git a/src/include/nodes/memnodes.h b/src/include/nodes/memnodes.h
index e3104996d4..accf6ed131 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.7 1997/09/08 21:52:44 momjian Exp $
+ * $Id: memnodes.h,v 1.8 1998/09/01 04:36:39 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.
@@ -98,4 +98,4 @@ typedef struct PortalHeapMemory
(IsA(context,MemoryContext) || IsA(context,GlobalMemory) || \
IsA(context,PortalVariableMemory) || IsA(context,PortalHeapMemory))
-#endif /* MEMNODES_H */
+#endif /* MEMNODES_H */
diff --git a/src/include/nodes/nodeFuncs.h b/src/include/nodes/nodeFuncs.h
index 696f5f7fa6..d7c1b2f696 100644
--- a/src/include/nodes/nodeFuncs.h
+++ b/src/include/nodes/nodeFuncs.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: nodeFuncs.h,v 1.6 1997/11/25 22:06:30 momjian Exp $
+ * $Id: nodeFuncs.h,v 1.7 1998/09/01 04:36:40 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -22,4 +22,4 @@ extern bool var_is_rel(Var *var);
extern Oper *replace_opid(Oper *oper);
extern bool non_null(Expr *c);
-#endif /* NODEFUNCS_H */
+#endif /* NODEFUNCS_H */
diff --git a/src/include/nodes/nodes.h b/src/include/nodes/nodes.h
index b7fc3ede87..29124a839c 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.29 1998/09/01 03:28:14 momjian Exp $
+ * $Id: nodes.h,v 1.30 1998/09/01 04:36:41 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -306,13 +306,11 @@ typedef enum CmdType
CMD_INSERT, /* insert stmt (formerly append) */
CMD_DELETE,
CMD_NOTIFY,
- CMD_UTILITY, /* cmds like create, destroy, copy,
+ CMD_UTILITY, /* cmds like create, destroy, copy,
* vacuum, etc. */
- CMD_NOTHING /* dummy command for
- * instead nothing
- * rules with qual
- */
+ CMD_NOTHING /* dummy command for instead nothing rules
+ * with qual */
} CmdType;
-#endif /* NODES_H */
+#endif /* NODES_H */
diff --git a/src/include/nodes/params.h b/src/include/nodes/params.h
index aaa5657208..7d88313530 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.8 1998/02/26 04:41:58 momjian Exp $
+ * $Id: params.h,v 1.9 1998/09/01 04:36:42 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -99,4 +99,4 @@ typedef struct ParamExecData
bool isnull;
} ParamExecData;
-#endif /* PARAMS_H */
+#endif /* PARAMS_H */
diff --git a/src/include/nodes/parsenodes.h b/src/include/nodes/parsenodes.h
index 3555ac49be..26bdc420dd 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.58 1998/08/26 05:22:55 momjian Exp $
+ * $Id: parsenodes.h,v 1.59 1998/09/01 04:36:43 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -448,7 +448,7 @@ typedef struct UnlistenStmt
{
NodeTag type;
char *relname; /* relation to unlisten on */
-} UnlistenStmt;
+} UnlistenStmt;
/* ----------------------
* {Begin|Abort|End} Transaction Statement
@@ -490,8 +490,7 @@ typedef struct CreatedbStmt
NodeTag type;
char *dbname; /* database to create */
char *dbpath; /* location of database */
- int encoding; /* default encoding
- (see regex/pg_wchar.h) */
+ int encoding; /* default encoding (see regex/pg_wchar.h) */
} CreatedbStmt;
/* ----------------------
@@ -799,7 +798,7 @@ typedef struct SortGroupBy
{
NodeTag type;
char *useOp; /* operator to use */
- Node *node; /* Expression */
+ Node *node; /* Expression */
} SortGroupBy;
/*
@@ -811,7 +810,7 @@ typedef struct JoinUsing
int resno; /* target number */
char *range;
char *name; /* name of column to sort on */
-} JoinUsing;
+} JoinUsing;
/*
* RangeVar - range variable, used in from clauses
@@ -832,7 +831,7 @@ typedef struct IndexElem
char *name; /* name of index */
List *args; /* if not NULL, function index */
char *class;
- TypeName *typename; /* type of index's keys (optional) */
+ TypeName *typename; /* type of index's keys (optional) */
} IndexElem;
/*
@@ -912,4 +911,4 @@ typedef struct GroupClause
Oid grpOpoid; /* the sort operator to use */
} GroupClause;
-#endif /* PARSENODES_H */
+#endif /* PARSENODES_H */
diff --git a/src/include/nodes/pg_list.h b/src/include/nodes/pg_list.h
index e3e3574193..96e721bbf4 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.8 1997/09/08 21:52:51 momjian Exp $
+ * $Id: pg_list.h,v 1.9 1998/09/01 04:36:44 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -117,4 +117,4 @@ extern bool same(List *foo, List *bar);
/* in copyfuncs.c */
extern List *listCopy(List *);
-#endif /* PG_LIST_H */
+#endif /* PG_LIST_H */
diff --git a/src/include/nodes/plannodes.h b/src/include/nodes/plannodes.h
index 5de80471b3..1731b1a2f5 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.17 1998/08/04 16:44:24 momjian Exp $
+ * $Id: plannodes.h,v 1.18 1998/09/01 04:36:46 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -139,14 +139,10 @@ typedef struct Append
{
Plan plan;
List *appendplans;
- List *unionrtables; /*
- * List of range tables, one for each
- * union query.
- */
- Index inheritrelid; /*
- * The range table has to be changed for
- * inheritance.
- */
+ List *unionrtables; /* List of range tables, one for each
+ * union query. */
+ Index inheritrelid; /* The range table has to be changed for
+ * inheritance. */
List *inheritrtable;
AppendState *appendstate;
} Append;
@@ -382,4 +378,4 @@ typedef struct SubPlan
bool shutdown; /* shutdown plan if TRUE */
} SubPlan;
-#endif /* PLANNODES_H */
+#endif /* PLANNODES_H */
diff --git a/src/include/nodes/primnodes.h b/src/include/nodes/primnodes.h
index 1a62b38879..32701e075e 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.22 1998/07/12 21:29:33 momjian Exp $
+ * $Id: primnodes.h,v 1.23 1998/09/01 04:36:47 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -351,4 +351,4 @@ typedef struct ArrayRef
Node *refassgnexpr;
} ArrayRef;
-#endif /* PRIMNODES_H */
+#endif /* PRIMNODES_H */
diff --git a/src/include/nodes/print.h b/src/include/nodes/print.h
index 308c2d9363..0df89e2e15 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.7 1998/02/26 04:42:03 momjian Exp $
+ * $Id: print.h,v 1.8 1998/09/01 04:36:48 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -26,9 +26,8 @@ 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,
+extern void print_plan_recursive(Plan *p, Query *parsetree,
int indentLevel, char *label);
extern void print_plan(Plan *p, Query *parsetree);
-#endif /* PRINT_H */
+#endif /* PRINT_H */
diff --git a/src/include/nodes/readfuncs.h b/src/include/nodes/readfuncs.h
index f2b24e18ed..abb1b57eb2 100644
--- a/src/include/nodes/readfuncs.h
+++ b/src/include/nodes/readfuncs.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: readfuncs.h,v 1.5 1997/11/26 01:13:09 momjian Exp $
+ * $Id: readfuncs.h,v 1.6 1998/09/01 04:36:49 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -26,4 +26,4 @@ extern void *nodeRead(bool read_car_only);
*/
extern Node *parsePlanString(void);
-#endif /* READFUNCS_H */
+#endif /* READFUNCS_H */
diff --git a/src/include/nodes/relation.h b/src/include/nodes/relation.h
index 69fb911921..0f350e0f11 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.10 1998/09/01 03:28:16 momjian Exp $
+ * $Id: relation.h,v 1.11 1998/09/01 04:36:51 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -106,7 +106,7 @@ typedef struct RelOptInfo
List *joininfo; /* join clauses */
List *innerjoin;
List *superrels;
-} RelOptInfo;
+} RelOptInfo;
extern Var *get_expr(TargetEntry *foo);
@@ -139,7 +139,7 @@ typedef struct Path
{
NodeTag type;
- RelOptInfo *parent;
+ RelOptInfo *parent;
Cost path_cost;
NodeTag pathtype;
@@ -221,7 +221,7 @@ typedef struct ClauseInfo
/* hashjoin only */
Oid hashjoinoperator;
Relid cinfojoinid;
-} ClauseInfo;
+} ClauseInfo;
typedef struct JoinMethod
{
@@ -250,7 +250,7 @@ typedef struct JoinInfo
bool mergejoinable;
bool hashjoinable;
bool inactive;
-} JoinInfo;
+} JoinInfo;
typedef struct Iter
{
@@ -285,7 +285,7 @@ typedef struct Stream
{
NodeTag type;
Path *pathptr;
- ClauseInfo *cinfo;
+ ClauseInfo *cinfo;
int *clausetype;
struct Stream *upstream;
struct Stream *downstream;
@@ -294,4 +294,4 @@ typedef struct Stream
Cost groupsel;
} Stream;
-#endif /* RELATION_H */
+#endif /* RELATION_H */