Standard pgindent run for 8.1.

11 files changed, 71 insertions, 74 deletions

diff --git a/src/include/executor/execdebug.h b/src/include/executor/execdebug.h
index 9a6969ecefc..a4fc1c10162 100644
--- a/src/include/executor/execdebug.h
+++ b/src/include/executor/execdebug.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/executor/execdebug.h,v 1.27 2005/05/13 21:20:16 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/executor/execdebug.h,v 1.28 2005/10/15 02:49:44 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -266,7 +266,6 @@ extern int	NIndexTupleInserted;
 #define MJ_DEBUG_PROC_NODE(slot) \
   MJ2_printf("  %s = ExecProcNode(...) returns %s\n", \
 			 CppAsString(slot), NULL_OR_TUPLE(slot))
-
 #else
 
 #define MJ_nodeDisplay(l)
diff --git a/src/include/executor/executor.h b/src/include/executor/executor.h
index 6064ff2f4f2..31228e114ba 100644
--- a/src/include/executor/executor.h
+++ b/src/include/executor/executor.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/executor/executor.h,v 1.119 2005/08/20 00:40:13 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/executor/executor.h,v 1.120 2005/10/15 02:49:44 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -40,17 +40,17 @@ extern bool ExecMayReturnRawTuples(PlanState *node);
  * prototypes from functions in execGrouping.c
  */
 extern bool execTuplesMatch(TupleTableSlot *slot1,
-							TupleTableSlot *slot2,
-							int numCols,
-							AttrNumber *matchColIdx,
-							FmgrInfo *eqfunctions,
-							MemoryContext evalContext);
+				TupleTableSlot *slot2,
+				int numCols,
+				AttrNumber *matchColIdx,
+				FmgrInfo *eqfunctions,
+				MemoryContext evalContext);
 extern bool execTuplesUnequal(TupleTableSlot *slot1,
-							  TupleTableSlot *slot2,
-							  int numCols,
-							  AttrNumber *matchColIdx,
-							  FmgrInfo *eqfunctions,
-							  MemoryContext evalContext);
+				  TupleTableSlot *slot2,
+				  int numCols,
+				  AttrNumber *matchColIdx,
+				  FmgrInfo *eqfunctions,
+				  MemoryContext evalContext);
 extern FmgrInfo *execTuplesMatchPrepare(TupleDesc tupdesc,
 					   int numCols,
 					   AttrNumber *matchColIdx);
@@ -75,12 +75,12 @@ extern TupleHashEntry LookupTupleHashEntry(TupleHashTable hashtable,
 extern JunkFilter *ExecInitJunkFilter(List *targetList, bool hasoid,
 				   TupleTableSlot *slot);
 extern JunkFilter *ExecInitJunkFilterConversion(List *targetList,
-												TupleDesc cleanTupType,
-												TupleTableSlot *slot);
+							 TupleDesc cleanTupType,
+							 TupleTableSlot *slot);
 extern bool ExecGetJunkAttribute(JunkFilter *junkfilter, TupleTableSlot *slot,
 					 char *attrName, Datum *value, bool *isNull);
 extern TupleTableSlot *ExecFilterJunk(JunkFilter *junkfilter,
-									  TupleTableSlot *slot);
+			   TupleTableSlot *slot);
 extern HeapTuple ExecRemoveJunk(JunkFilter *junkfilter, TupleTableSlot *slot);
 
 
@@ -98,7 +98,7 @@ extern bool ExecContextForcesOids(PlanState *planstate, bool *hasoids);
 extern void ExecConstraints(ResultRelInfo *resultRelInfo,
 				TupleTableSlot *slot, EState *estate);
 extern TupleTableSlot *EvalPlanQual(EState *estate, Index rti,
-									ItemPointer tid, TransactionId priorXmax);
+			 ItemPointer tid, TransactionId priorXmax);
 
 /*
  * prototypes from functions in execProcnode.c
diff --git a/src/include/executor/functions.h b/src/include/executor/functions.h
index 88ca87fd86d..ab959b8a3ef 100644
--- a/src/include/executor/functions.h
+++ b/src/include/executor/functions.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/executor/functions.h,v 1.25 2005/03/31 22:46:22 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/executor/functions.h,v 1.26 2005/10/15 02:49:44 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -21,7 +21,7 @@
 extern Datum fmgr_sql(PG_FUNCTION_ARGS);
 
 extern bool check_sql_fn_retval(Oid func_id, Oid rettype,
-								List *queryTreeList,
-								JunkFilter **junkFilter);
+					List *queryTreeList,
+					JunkFilter **junkFilter);
 
 #endif   /* FUNCTIONS_H */
diff --git a/src/include/executor/hashjoin.h b/src/include/executor/hashjoin.h
index f5200831d7e..abe0e5914d7 100644
--- a/src/include/executor/hashjoin.h
+++ b/src/include/executor/hashjoin.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/executor/hashjoin.h,v 1.36 2005/04/16 20:07:35 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/executor/hashjoin.h,v 1.37 2005/10/15 02:49:44 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -41,7 +41,7 @@
  * If nbatch > 1 then tuples that don't belong in first batch get saved
  * into inner-batch temp files. The same statements apply for the
  * first scan of the outer relation, except we write tuples to outer-batch
- * temp files.  After finishing the first scan, we do the following for
+ * temp files.	After finishing the first scan, we do the following for
  * each remaining batch:
  *	1. Read tuples from inner batch file, load into hash buckets.
  *	2. Read tuples from outer batch file, match to hash buckets and output.
@@ -63,7 +63,7 @@
 
 typedef struct HashJoinTupleData
 {
-	struct HashJoinTupleData *next;	/* link to next tuple in same bucket */
+	struct HashJoinTupleData *next;		/* link to next tuple in same bucket */
 	uint32		hashvalue;		/* tuple's hash code */
 	HeapTupleData htup;			/* tuple header */
 } HashJoinTupleData;
@@ -86,21 +86,20 @@ typedef struct HashJoinTableData
 	double		totalTuples;	/* # tuples obtained from inner plan */
 
 	/*
-	 * These arrays are allocated for the life of the hash join, but
-	 * only if nbatch > 1.  A file is opened only when we first write
-	 * a tuple into it (otherwise its pointer remains NULL).  Note that
-	 * the zero'th array elements never get used, since we will process
-	 * rather than dump out any tuples of batch zero.
+	 * These arrays are allocated for the life of the hash join, but only if
+	 * nbatch > 1.	A file is opened only when we first write a tuple into it
+	 * (otherwise its pointer remains NULL).  Note that the zero'th array
+	 * elements never get used, since we will process rather than dump out any
+	 * tuples of batch zero.
 	 */
 	BufFile   **innerBatchFile; /* buffered virtual temp file per batch */
 	BufFile   **outerBatchFile; /* buffered virtual temp file per batch */
 
 	/*
-	 * Info about the datatype-specific hash functions for the datatypes
-	 * being hashed.  We assume that the inner and outer sides of each
-	 * hashclause are the same type, or at least share the same hash
-	 * function. This is an array of the same length as the number of hash
-	 * keys.
+	 * Info about the datatype-specific hash functions for the datatypes being
+	 * hashed.	We assume that the inner and outer sides of each hashclause
+	 * are the same type, or at least share the same hash function. This is an
+	 * array of the same length as the number of hash keys.
 	 */
 	FmgrInfo   *hashfunctions;	/* lookup data for hash functions */
 
diff --git a/src/include/executor/instrument.h b/src/include/executor/instrument.h
index 47899fbcc26..3dad75e3526 100644
--- a/src/include/executor/instrument.h
+++ b/src/include/executor/instrument.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 2001-2005, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/include/executor/instrument.h,v 1.11 2005/04/16 20:07:35 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/executor/instrument.h,v 1.12 2005/10/15 02:49:44 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -20,7 +20,7 @@
  * gettimeofday() does not have sufficient resolution on Windows,
  * so we must use QueryPerformanceCounter() instead.  These macros
  * also give some breathing room to use other high-precision-timing APIs
- * on yet other platforms.  (The macro-ization is not complete, however;
+ * on yet other platforms.	(The macro-ization is not complete, however;
  * see subtraction code in instrument.c and explain.c.)
  */
 #ifndef WIN32
@@ -32,8 +32,7 @@ typedef struct timeval instr_time;
 #define INSTR_TIME_SET_CURRENT(t)	gettimeofday(&(t), NULL)
 #define INSTR_TIME_GET_DOUBLE(t) \
 	(((double) (t).tv_sec) + ((double) (t).tv_usec) / 1000000.0)
-
-#else  /* WIN32 */
+#else							/* WIN32 */
 
 typedef LARGE_INTEGER instr_time;
 
@@ -51,8 +50,7 @@ GetTimerFrequency(void)
 	QueryPerformanceFrequency(&f);
 	return (double) f.QuadPart;
 }
-
-#endif /* WIN32 */
+#endif   /* WIN32 */
 
 
 typedef struct Instrumentation
diff --git a/src/include/executor/nodeHash.h b/src/include/executor/nodeHash.h
index 678b2bd7622..55715c8a60c 100644
--- a/src/include/executor/nodeHash.h
+++ b/src/include/executor/nodeHash.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/executor/nodeHash.h,v 1.37 2005/04/16 20:07:35 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/executor/nodeHash.h,v 1.38 2005/10/15 02:49:44 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -26,17 +26,17 @@ extern void ExecReScanHash(HashState *node, ExprContext *exprCtxt);
 extern HashJoinTable ExecHashTableCreate(Hash *node, List *hashOperators);
 extern void ExecHashTableDestroy(HashJoinTable hashtable);
 extern void ExecHashTableInsert(HashJoinTable hashtable,
-								HeapTuple tuple,
-								uint32 hashvalue);
+					HeapTuple tuple,
+					uint32 hashvalue);
 extern uint32 ExecHashGetHashValue(HashJoinTable hashtable,
-								   ExprContext *econtext,
-								   List *hashkeys);
+					 ExprContext *econtext,
+					 List *hashkeys);
 extern void ExecHashGetBucketAndBatch(HashJoinTable hashtable,
-									  uint32 hashvalue,
-									  int *bucketno,
-									  int *batchno);
+						  uint32 hashvalue,
+						  int *bucketno,
+						  int *batchno);
 extern HeapTuple ExecScanHashBucket(HashJoinState *hjstate,
-									ExprContext *econtext);
+				   ExprContext *econtext);
 extern void ExecHashTableReset(HashJoinTable hashtable);
 extern void ExecChooseHashTableSize(double ntuples, int tupwidth,
 						int *numbuckets,
diff --git a/src/include/executor/nodeHashjoin.h b/src/include/executor/nodeHashjoin.h
index 44e942317dc..8590d6b1898 100644
--- a/src/include/executor/nodeHashjoin.h
+++ b/src/include/executor/nodeHashjoin.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/executor/nodeHashjoin.h,v 1.29 2005/03/06 22:15:05 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/executor/nodeHashjoin.h,v 1.30 2005/10/15 02:49:44 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -24,6 +24,6 @@ extern void ExecEndHashJoin(HashJoinState *node);
 extern void ExecReScanHashJoin(HashJoinState *node, ExprContext *exprCtxt);
 
 extern void ExecHashJoinSaveTuple(HeapTuple heapTuple, uint32 hashvalue,
-								  BufFile **fileptr);
+					  BufFile **fileptr);
 
 #endif   /* NODEHASHJOIN_H */
diff --git a/src/include/executor/nodeIndexscan.h b/src/include/executor/nodeIndexscan.h
index 69e7ea6ba9b..7f280c892e1 100644
--- a/src/include/executor/nodeIndexscan.h
+++ b/src/include/executor/nodeIndexscan.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/executor/nodeIndexscan.h,v 1.23 2005/04/25 01:30:14 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/executor/nodeIndexscan.h,v 1.24 2005/10/15 02:49:44 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -30,8 +30,8 @@ extern bool ExecIndexBuildScanKeys(PlanState *planstate, List *quals,
 					   ExprState ***runtimeKeyInfo,
 					   ScanKey *scanKeys, int *numScanKeys);
 extern void ExecIndexEvalRuntimeKeys(ExprContext *econtext,
-									 ExprState **run_keys,
-									 ScanKey scan_keys,
-									 int n_keys);
+						 ExprState **run_keys,
+						 ScanKey scan_keys,
+						 int n_keys);
 
 #endif   /* NODEINDEXSCAN_H */
diff --git a/src/include/executor/spi.h b/src/include/executor/spi.h
index 23562c75e55..9f5e9316401 100644
--- a/src/include/executor/spi.h
+++ b/src/include/executor/spi.h
@@ -2,7 +2,7 @@
  *
  * spi.h
  *
- * $PostgreSQL: pgsql/src/include/executor/spi.h,v 1.52 2005/05/02 00:37:06 neilc Exp $
+ * $PostgreSQL: pgsql/src/include/executor/spi.h,v 1.53 2005/10/15 02:49:44 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -83,16 +83,16 @@ extern void SPI_push(void);
 extern void SPI_pop(void);
 extern void SPI_restore_connection(void);
 extern int	SPI_execute(const char *src, bool read_only, long tcount);
-extern int	SPI_execute_plan(void *plan, Datum *Values, const char *Nulls,
-							 bool read_only, long tcount);
+extern int SPI_execute_plan(void *plan, Datum *Values, const char *Nulls,
+				 bool read_only, long tcount);
 extern int	SPI_exec(const char *src, long tcount);
-extern int	SPI_execp(void *plan, Datum *Values, const char *Nulls,
-					  long tcount);
-extern int	SPI_execute_snapshot(void *plan,
-								 Datum *Values, const char *Nulls,
-								 Snapshot snapshot,
-								 Snapshot crosscheck_snapshot,
-								 bool read_only, long tcount);
+extern int SPI_execp(void *plan, Datum *Values, const char *Nulls,
+		  long tcount);
+extern int SPI_execute_snapshot(void *plan,
+					 Datum *Values, const char *Nulls,
+					 Snapshot snapshot,
+					 Snapshot crosscheck_snapshot,
+					 bool read_only, long tcount);
 extern void *SPI_prepare(const char *src, int nargs, Oid *argtypes);
 extern void *SPI_saveplan(void *plan);
 extern int	SPI_freeplan(void *plan);
diff --git a/src/include/executor/spi_priv.h b/src/include/executor/spi_priv.h
index a21bbc5e7c0..267b3c5bd47 100644
--- a/src/include/executor/spi_priv.h
+++ b/src/include/executor/spi_priv.h
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/executor/spi_priv.h,v 1.23 2005/10/01 18:43:19 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/executor/spi_priv.h,v 1.24 2005/10/15 02:49:44 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -26,7 +26,7 @@ typedef struct
 	MemoryContext procCxt;		/* procedure context */
 	MemoryContext execCxt;		/* executor context */
 	MemoryContext savedcxt;
-	SubTransactionId connectSubid;	/* ID of connecting subtransaction */
+	SubTransactionId connectSubid;		/* ID of connecting subtransaction */
 } _SPI_connection;
 
 typedef struct
diff --git a/src/include/executor/tuptable.h b/src/include/executor/tuptable.h
index a5193683a28..882d377ed51 100644
--- a/src/include/executor/tuptable.h
+++ b/src/include/executor/tuptable.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/executor/tuptable.h,v 1.28 2005/03/16 21:38:10 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/executor/tuptable.h,v 1.29 2005/10/15 02:49:44 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -37,17 +37,17 @@
  * a lower plan node's output TupleTableSlot, or to a function result
  * constructed in a plan node's per-tuple econtext.  It is the responsibility
  * of the generating plan node to be sure these resources are not released
- * for as long as the virtual tuple needs to be valid.  We only use virtual
+ * for as long as the virtual tuple needs to be valid.	We only use virtual
  * tuples in the result slots of plan nodes --- tuples to be copied anywhere
  * else need to be "materialized" into physical tuples.  Note also that a
  * virtual tuple does not have any "system columns".
  *
  * The Datum/isnull arrays of a TupleTableSlot serve double duty.  When the
- * slot contains a virtual tuple, they are the authoritative data.  When the
+ * slot contains a virtual tuple, they are the authoritative data.	When the
  * slot contains a physical tuple, the arrays contain data extracted from
  * the tuple.  (In this state, any pass-by-reference Datums point into
  * the physical tuple.)  The extracted information is built "lazily",
- * ie, only as needed.  This serves to avoid repeated extraction of data
+ * ie, only as needed.	This serves to avoid repeated extraction of data
  * from the physical tuple.
  *
  * A TupleTableSlot can also be "empty", holding no valid data.  This is
@@ -70,7 +70,7 @@
  * buffer page.)
  *
  * tts_nvalid indicates the number of valid columns in the tts_values/isnull
- * arrays.  When the slot is holding a "virtual" tuple this must be equal
+ * arrays.	When the slot is holding a "virtual" tuple this must be equal
  * to the descriptor's natts.  When the slot is holding a physical tuple
  * this is equal to the number of columns we have extracted (we always
  * extract columns from left to right, so there are no holes).
@@ -85,8 +85,8 @@
 typedef struct TupleTableSlot
 {
 	NodeTag		type;			/* vestigial ... allows IsA tests */
-	bool		tts_isempty;			/* true = slot is empty */
-	bool		tts_shouldFree;			/* should pfree tuple? */
+	bool		tts_isempty;	/* true = slot is empty */
+	bool		tts_shouldFree; /* should pfree tuple? */
 	bool		tts_shouldFreeDesc;		/* should pfree descriptor? */
 	bool		tts_slow;		/* saved state for slot_deform_tuple */
 	HeapTuple	tts_tuple;		/* physical tuple, or NULL if none */
@@ -137,7 +137,8 @@ extern HeapTuple ExecCopySlotTuple(TupleTableSlot *slot);
 extern HeapTuple ExecFetchSlotTuple(TupleTableSlot *slot);
 extern HeapTuple ExecMaterializeSlot(TupleTableSlot *slot);
 extern TupleTableSlot *ExecCopySlot(TupleTableSlot *dstslot,
-									TupleTableSlot *srcslot);
+			 TupleTableSlot *srcslot);
+
 /* in access/common/heaptuple.c */
 extern Datum slot_getattr(TupleTableSlot *slot, int attnum, bool *isnull);
 extern void slot_getallattrs(TupleTableSlot *slot);