Phase 2 of pgindent updates.

Change pg_bsd_indent to follow upstream rules for placement of comments
to the right of code, and remove pgindent hack that caused comments
following #endif to not obey the general rule.

Commit e3860ffa4dd0dad0dd9eea4be9cc1412373a8c89 wasn't actually using
the published version of pg_bsd_indent, but a hacked-up version that
tried to minimize the amount of movement of comments to the right of
code.  The situation of interest is where such a comment has to be
moved to the right of its default placement at column 33 because there's
code there.  BSD indent has always moved right in units of tab stops
in such cases --- but in the previous incarnation, indent was working
in 8-space tab stops, while now it knows we use 4-space tabs.  So the
net result is that in about half the cases, such comments are placed
one tab stop left of before.  This is better all around: it leaves
more room on the line for comment text, and it means that in such
cases the comment uniformly starts at the next 4-space tab stop after
the code, rather than sometimes one and sometimes two tabs after.

Also, ensure that comments following #endif are indented the same
as comments following other preprocessor commands such as #else.
That inconsistency turns out to have been self-inflicted damage
from a poorly-thought-through post-indent "fixup" in pgindent.

This patch is much less interesting than the first round of indent
changes, but also bulkier, so I thought it best to separate the effects.

Discussion: https://postgr.es/m/E1dAmxK-0006EE-1r@gemulon.postgresql.org
Discussion: https://postgr.es/m/30527.1495162840@sss.pgh.pa.us

54 files changed, 89 insertions, 90 deletions

diff --git a/src/include/executor/execExpr.h b/src/include/executor/execExpr.h
index 86fdb33cd3f..7a65339f01a 100644
--- a/src/include/executor/execExpr.h
+++ b/src/include/executor/execExpr.h
@@ -261,7 +261,7 @@ typedef struct ExprEvalStep
 			bool		first;	/* first time through, need to initialize? */
 			bool		slow;	/* need runtime check for nulls? */
 			TupleDesc	tupdesc;	/* descriptor for resulting tuples */
-			JunkFilter *junkFilter;		/* JunkFilter to remove resjunk cols */
+			JunkFilter *junkFilter; /* JunkFilter to remove resjunk cols */
 		}			wholerow;
 
 		/* for EEOP_ASSIGN_*_VAR */
@@ -292,7 +292,7 @@ typedef struct ExprEvalStep
 		struct
 		{
 			FmgrInfo   *finfo;	/* function's lookup data */
-			FunctionCallInfo fcinfo_data;		/* arguments etc */
+			FunctionCallInfo fcinfo_data;	/* arguments etc */
 			/* faster to access without additional indirection: */
 			PGFunction	fn_addr;	/* actual call address */
 			int			nargs;	/* number of arguments */
@@ -302,19 +302,19 @@ typedef struct ExprEvalStep
 		struct
 		{
 			bool	   *anynull;	/* track if any input was NULL */
-			int			jumpdone;		/* jump here if result determined */
+			int			jumpdone;	/* jump here if result determined */
 		}			boolexpr;
 
 		/* for EEOP_QUAL */
 		struct
 		{
-			int			jumpdone;		/* jump here on false or null */
+			int			jumpdone;	/* jump here on false or null */
 		}			qualexpr;
 
 		/* for EEOP_JUMP[_CONDITION] */
 		struct
 		{
-			int			jumpdone;		/* target instruction's index */
+			int			jumpdone;	/* target instruction's index */
 		}			jump;
 
 		/* for EEOP_NULLTEST_ROWIS[NOT]NULL */
@@ -328,7 +328,7 @@ typedef struct ExprEvalStep
 		struct
 		{
 			int			paramid;	/* numeric ID for parameter */
-			Oid			paramtype;		/* OID of parameter's datatype */
+			Oid			paramtype;	/* OID of parameter's datatype */
 		}			param;
 
 		/* for EEOP_CASE_TESTVAL/DOMAIN_TESTVAL */
@@ -372,14 +372,14 @@ typedef struct ExprEvalStep
 		/* for EEOP_ARRAYEXPR */
 		struct
 		{
-			Datum	   *elemvalues;		/* element values get stored here */
+			Datum	   *elemvalues; /* element values get stored here */
 			bool	   *elemnulls;
 			int			nelems; /* length of the above arrays */
-			Oid			elemtype;		/* array element type */
-			int16		elemlength;		/* typlen of the array element type */
-			bool		elembyval;		/* is the element type pass-by-value? */
-			char		elemalign;		/* typalign of the element type */
-			bool		multidims;		/* is array expression multi-D? */
+			Oid			elemtype;	/* array element type */
+			int16		elemlength; /* typlen of the array element type */
+			bool		elembyval;	/* is the element type pass-by-value? */
+			char		elemalign;	/* typalign of the element type */
+			bool		multidims;	/* is array expression multi-D? */
 		}			arrayexpr;
 
 		/* for EEOP_ARRAYCOERCE */
@@ -387,9 +387,9 @@ typedef struct ExprEvalStep
 		{
 			ArrayCoerceExpr *coerceexpr;
 			Oid			resultelemtype; /* element type of result array */
-			FmgrInfo   *elemfunc;		/* lookup info for element coercion
-										 * function */
-			struct ArrayMapState *amstate;		/* workspace for array_map */
+			FmgrInfo   *elemfunc;	/* lookup info for element coercion
+									 * function */
+			struct ArrayMapState *amstate;	/* workspace for array_map */
 		}			arraycoerce;
 
 		/* for EEOP_ROW */
@@ -437,8 +437,8 @@ typedef struct ExprEvalStep
 		/* for EEOP_FIELDSELECT */
 		struct
 		{
-			AttrNumber	fieldnum;		/* field number to extract */
-			Oid			resulttype;		/* field's type */
+			AttrNumber	fieldnum;	/* field number to extract */
+			Oid			resulttype; /* field's type */
 			/* cached tupdesc pointer - filled at runtime */
 			TupleDesc	argdesc;
 		}			fieldselect;
@@ -466,7 +466,7 @@ typedef struct ExprEvalStep
 			struct ArrayRefState *state;
 			int			off;	/* 0-based index of this subscript */
 			bool		isupper;	/* is it upper or lower subscript? */
-			int			jumpdone;		/* jump here on null */
+			int			jumpdone;	/* jump here on null */
 		}			arrayref_subscript;
 
 		/* for EEOP_ARRAYREF_OLD / ASSIGN / FETCH */
@@ -491,7 +491,7 @@ typedef struct ExprEvalStep
 		/* for EEOP_CONVERT_ROWTYPE */
 		struct
 		{
-			ConvertRowtypeExpr *convert;		/* original expression */
+			ConvertRowtypeExpr *convert;	/* original expression */
 			/* these three fields are filled at runtime: */
 			TupleDesc	indesc; /* tupdesc for input type */
 			TupleDesc	outdesc;	/* tupdesc for output type */
@@ -509,7 +509,7 @@ typedef struct ExprEvalStep
 			bool		typbyval;
 			char		typalign;
 			FmgrInfo   *finfo;	/* function's lookup data */
-			FunctionCallInfo fcinfo_data;		/* arguments etc */
+			FunctionCallInfo fcinfo_data;	/* arguments etc */
 			/* faster to access without additional indirection: */
 			PGFunction	fn_addr;	/* actual call address */
 		}			scalararrayop;
@@ -647,4 +647,4 @@ extern void ExecEvalAlternativeSubPlan(ExprState *state, ExprEvalStep *op,
 extern void ExecEvalWholeRowVar(ExprState *state, ExprEvalStep *op,
 					ExprContext *econtext);
 
-#endif   /* EXEC_EXPR_H */
+#endif							/* EXEC_EXPR_H */
diff --git a/src/include/executor/execParallel.h b/src/include/executor/execParallel.h
index 0b7ca59dca5..bd0a87fa041 100644
--- a/src/include/executor/execParallel.h
+++ b/src/include/executor/execParallel.h
@@ -40,4 +40,4 @@ extern void ExecParallelReinitialize(ParallelExecutorInfo *pei);
 
 extern void ParallelQueryMain(dsm_segment *seg, shm_toc *toc);
 
-#endif   /* EXECPARALLEL_H */
+#endif							/* EXECPARALLEL_H */
diff --git a/src/include/executor/execdebug.h b/src/include/executor/execdebug.h
index 8b61520e189..cd04b601762 100644
--- a/src/include/executor/execdebug.h
+++ b/src/include/executor/execdebug.h
@@ -76,7 +76,7 @@
 #define NL_printf(s)
 #define NL1_printf(s, a)
 #define ENL1_printf(message)
-#endif   /* EXEC_NESTLOOPDEBUG */
+#endif							/* EXEC_NESTLOOPDEBUG */
 
 /* ----------------
  *		sort node debugging defines
@@ -90,7 +90,7 @@
 #define SO_nodeDisplay(l)
 #define SO_printf(s)
 #define SO1_printf(s, p)
-#endif   /* EXEC_SORTDEBUG */
+#endif							/* EXEC_SORTDEBUG */
 
 /* ----------------
  *		merge join debugging defines
@@ -123,6 +123,6 @@
 #define MJ_DEBUG_COMPARE(res)
 #define MJ_DEBUG_QUAL(clause, res)
 #define MJ_DEBUG_PROC_NODE(slot)
-#endif   /* EXEC_MERGEJOINDEBUG */
+#endif							/* EXEC_MERGEJOINDEBUG */
 
-#endif   /* EXECDEBUG_H */
+#endif							/* EXECDEBUG_H */
diff --git a/src/include/executor/execdesc.h b/src/include/executor/execdesc.h
index 37de6f20113..8c09961e281 100644
--- a/src/include/executor/execdesc.h
+++ b/src/include/executor/execdesc.h
@@ -41,7 +41,7 @@ typedef struct QueryDesc
 	DestReceiver *dest;			/* the destination for tuple output */
 	ParamListInfo params;		/* param values being passed in */
 	QueryEnvironment *queryEnv; /* query environment passed in */
-	int			instrument_options;		/* OR of InstrumentOption flags */
+	int			instrument_options; /* OR of InstrumentOption flags */
 
 	/* These fields are set by ExecutorStart */
 	TupleDesc	tupDesc;		/* descriptor for result tuples */
@@ -49,7 +49,7 @@ typedef struct QueryDesc
 	PlanState  *planstate;		/* tree of per-plan-node state */
 
 	/* This field is set by ExecutorRun */
-	bool		already_executed;		/* true if previously executed */
+	bool		already_executed;	/* true if previously executed */
 
 	/* This is always set NULL by the core system, but plugins can change it */
 	struct Instrumentation *totaltime;	/* total time spent in ExecutorRun */
@@ -67,4 +67,4 @@ extern QueryDesc *CreateQueryDesc(PlannedStmt *plannedstmt,
 
 extern void FreeQueryDesc(QueryDesc *qdesc);
 
-#endif   /* EXECDESC_H  */
+#endif							/* EXECDESC_H  */
diff --git a/src/include/executor/executor.h b/src/include/executor/executor.h
index 6544be96028..3c4abd1098d 100644
--- a/src/include/executor/executor.h
+++ b/src/include/executor/executor.h
@@ -538,4 +538,4 @@ extern void CheckCmdReplicaIdentity(Relation rel, CmdType cmd);
 extern void CheckSubscriptionRelkind(char relkind, const char *nspname,
 						 const char *relname);
 
-#endif   /* EXECUTOR_H  */
+#endif							/* EXECUTOR_H  */
diff --git a/src/include/executor/functions.h b/src/include/executor/functions.h
index 7821a634f1b..718d8947a3c 100644
--- a/src/include/executor/functions.h
+++ b/src/include/executor/functions.h
@@ -36,4 +36,4 @@ extern bool check_sql_fn_retval(Oid func_id, Oid rettype,
 
 extern DestReceiver *CreateSQLFunctionDestReceiver(void);
 
-#endif   /* FUNCTIONS_H */
+#endif							/* FUNCTIONS_H */
diff --git a/src/include/executor/hashjoin.h b/src/include/executor/hashjoin.h
index addcd09049d..82acadf85ba 100644
--- a/src/include/executor/hashjoin.h
+++ b/src/include/executor/hashjoin.h
@@ -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 */
 	/* Tuple data, in MinimalTuple format, follows on a MAXALIGN boundary */
 }			HashJoinTupleData;
@@ -128,9 +128,8 @@ typedef struct HashJoinTableData
 	int			nbuckets;		/* # buckets in the in-memory hash table */
 	int			log2_nbuckets;	/* its log2 (nbuckets must be a power of 2) */
 
-	int			nbuckets_original;		/* # buckets when starting the first
-										 * hash */
-	int			nbuckets_optimal;		/* optimal # buckets (per batch) */
+	int			nbuckets_original;	/* # buckets when starting the first hash */
+	int			nbuckets_optimal;	/* optimal # buckets (per batch) */
 	int			log2_nbuckets_optimal;	/* log2(nbuckets_optimal) */
 
 	/* buckets[i] is head of list of tuples in i'th in-memory bucket */
@@ -179,7 +178,7 @@ typedef struct HashJoinTableData
 	Size		spaceAllowed;	/* upper limit for space used */
 	Size		spacePeak;		/* peak space used */
 	Size		spaceUsedSkew;	/* skew hash table's current space usage */
-	Size		spaceAllowedSkew;		/* upper limit for skew hashtable */
+	Size		spaceAllowedSkew;	/* upper limit for skew hashtable */
 
 	MemoryContext hashCxt;		/* context for whole-hash-join storage */
 	MemoryContext batchCxt;		/* context for this-batch-only storage */
@@ -188,4 +187,4 @@ typedef struct HashJoinTableData
 	HashMemoryChunk chunks;		/* one list for the whole batch */
 }			HashJoinTableData;
 
-#endif   /* HASHJOIN_H */
+#endif							/* HASHJOIN_H */
diff --git a/src/include/executor/instrument.h b/src/include/executor/instrument.h
index c9e169c45ca..31573145a9f 100644
--- a/src/include/executor/instrument.h
+++ b/src/include/executor/instrument.h
@@ -19,15 +19,15 @@
 typedef struct BufferUsage
 {
 	long		shared_blks_hit;	/* # of shared buffer hits */
-	long		shared_blks_read;		/* # of shared disk blocks read */
+	long		shared_blks_read;	/* # of shared disk blocks read */
 	long		shared_blks_dirtied;	/* # of shared blocks dirtied */
 	long		shared_blks_written;	/* # of shared disk blocks written */
 	long		local_blks_hit; /* # of local buffer hits */
 	long		local_blks_read;	/* # of local disk blocks read */
-	long		local_blks_dirtied;		/* # of shared blocks dirtied */
-	long		local_blks_written;		/* # of local disk blocks written */
+	long		local_blks_dirtied; /* # of shared blocks dirtied */
+	long		local_blks_written; /* # of local disk blocks written */
 	long		temp_blks_read; /* # of temp blocks read */
-	long		temp_blks_written;		/* # of temp blocks written */
+	long		temp_blks_written;	/* # of temp blocks written */
 	instr_time	blk_read_time;	/* time spent reading */
 	instr_time	blk_write_time; /* time spent writing */
 } BufferUsage;
@@ -81,4 +81,4 @@ extern void InstrStartParallelQuery(void);
 extern void InstrEndParallelQuery(BufferUsage *result);
 extern void InstrAccumParallelQuery(BufferUsage *result);
 
-#endif   /* INSTRUMENT_H */
+#endif							/* INSTRUMENT_H */
diff --git a/src/include/executor/nodeAgg.h b/src/include/executor/nodeAgg.h
index d2fee52e123..fa11ba93a6b 100644
--- a/src/include/executor/nodeAgg.h
+++ b/src/include/executor/nodeAgg.h
@@ -25,4 +25,4 @@ extern Size hash_agg_entry_size(int numAggs);
 
 extern Datum aggregate_dummy(PG_FUNCTION_ARGS);
 
-#endif   /* NODEAGG_H */
+#endif							/* NODEAGG_H */
diff --git a/src/include/executor/nodeAppend.h b/src/include/executor/nodeAppend.h
index 6fb4662c880..ee0b6ad23dd 100644
--- a/src/include/executor/nodeAppend.h
+++ b/src/include/executor/nodeAppend.h
@@ -21,4 +21,4 @@ extern TupleTableSlot *ExecAppend(AppendState *node);
 extern void ExecEndAppend(AppendState *node);
 extern void ExecReScanAppend(AppendState *node);
 
-#endif   /* NODEAPPEND_H */
+#endif							/* NODEAPPEND_H */
diff --git a/src/include/executor/nodeBitmapAnd.h b/src/include/executor/nodeBitmapAnd.h
index 1cb3470bcb3..5d848b61afc 100644
--- a/src/include/executor/nodeBitmapAnd.h
+++ b/src/include/executor/nodeBitmapAnd.h
@@ -21,4 +21,4 @@ extern Node *MultiExecBitmapAnd(BitmapAndState *node);
 extern void ExecEndBitmapAnd(BitmapAndState *node);
 extern void ExecReScanBitmapAnd(BitmapAndState *node);
 
-#endif   /* NODEBITMAPAND_H */
+#endif							/* NODEBITMAPAND_H */
diff --git a/src/include/executor/nodeBitmapHeapscan.h b/src/include/executor/nodeBitmapHeapscan.h
index 465c58e6ee5..f477d1c7720 100644
--- a/src/include/executor/nodeBitmapHeapscan.h
+++ b/src/include/executor/nodeBitmapHeapscan.h
@@ -28,4 +28,4 @@ extern void ExecBitmapHeapInitializeDSM(BitmapHeapScanState *node,
 extern void ExecBitmapHeapInitializeWorker(BitmapHeapScanState *node,
 							   shm_toc *toc);
 
-#endif   /* NODEBITMAPHEAPSCAN_H */
+#endif							/* NODEBITMAPHEAPSCAN_H */
diff --git a/src/include/executor/nodeBitmapIndexscan.h b/src/include/executor/nodeBitmapIndexscan.h
index 1fb8da01cb0..842193f4df6 100644
--- a/src/include/executor/nodeBitmapIndexscan.h
+++ b/src/include/executor/nodeBitmapIndexscan.h
@@ -21,4 +21,4 @@ extern Node *MultiExecBitmapIndexScan(BitmapIndexScanState *node);
 extern void ExecEndBitmapIndexScan(BitmapIndexScanState *node);
 extern void ExecReScanBitmapIndexScan(BitmapIndexScanState *node);
 
-#endif   /* NODEBITMAPINDEXSCAN_H */
+#endif							/* NODEBITMAPINDEXSCAN_H */
diff --git a/src/include/executor/nodeBitmapOr.h b/src/include/executor/nodeBitmapOr.h
index a23bf77ff77..526904eb4dc 100644
--- a/src/include/executor/nodeBitmapOr.h
+++ b/src/include/executor/nodeBitmapOr.h
@@ -21,4 +21,4 @@ extern Node *MultiExecBitmapOr(BitmapOrState *node);
 extern void ExecEndBitmapOr(BitmapOrState *node);
 extern void ExecReScanBitmapOr(BitmapOrState *node);
 
-#endif   /* NODEBITMAPOR_H */
+#endif							/* NODEBITMAPOR_H */
diff --git a/src/include/executor/nodeCtescan.h b/src/include/executor/nodeCtescan.h
index e8bcb88b351..397bdfdd1ce 100644
--- a/src/include/executor/nodeCtescan.h
+++ b/src/include/executor/nodeCtescan.h
@@ -21,4 +21,4 @@ extern TupleTableSlot *ExecCteScan(CteScanState *node);
 extern void ExecEndCteScan(CteScanState *node);
 extern void ExecReScanCteScan(CteScanState *node);
 
-#endif   /* NODECTESCAN_H */
+#endif							/* NODECTESCAN_H */
diff --git a/src/include/executor/nodeCustom.h b/src/include/executor/nodeCustom.h
index c2f2ca1eede..e81bcf7f21c 100644
--- a/src/include/executor/nodeCustom.h
+++ b/src/include/executor/nodeCustom.h
@@ -39,4 +39,4 @@ extern void ExecCustomScanInitializeWorker(CustomScanState *node,
 							   shm_toc *toc);
 extern void ExecShutdownCustomScan(CustomScanState *node);
 
-#endif   /* NODECUSTOM_H */
+#endif							/* NODECUSTOM_H */
diff --git a/src/include/executor/nodeForeignscan.h b/src/include/executor/nodeForeignscan.h
index 1b167b8143a..3ff4ecd8c93 100644
--- a/src/include/executor/nodeForeignscan.h
+++ b/src/include/executor/nodeForeignscan.h
@@ -30,4 +30,4 @@ extern void ExecForeignScanInitializeWorker(ForeignScanState *node,
 								shm_toc *toc);
 extern void ExecShutdownForeignScan(ForeignScanState *node);
 
-#endif   /* NODEFOREIGNSCAN_H */
+#endif							/* NODEFOREIGNSCAN_H */
diff --git a/src/include/executor/nodeFunctionscan.h b/src/include/executor/nodeFunctionscan.h
index efff0deaee6..5e830ebdeae 100644
--- a/src/include/executor/nodeFunctionscan.h
+++ b/src/include/executor/nodeFunctionscan.h
@@ -21,4 +21,4 @@ extern TupleTableSlot *ExecFunctionScan(FunctionScanState *node);
 extern void ExecEndFunctionScan(FunctionScanState *node);
 extern void ExecReScanFunctionScan(FunctionScanState *node);
 
-#endif   /* NODEFUNCTIONSCAN_H */
+#endif							/* NODEFUNCTIONSCAN_H */
diff --git a/src/include/executor/nodeGather.h b/src/include/executor/nodeGather.h
index e19bc9b20dd..b0006934d4d 100644
--- a/src/include/executor/nodeGather.h
+++ b/src/include/executor/nodeGather.h
@@ -22,4 +22,4 @@ extern void ExecEndGather(GatherState *node);
 extern void ExecShutdownGather(GatherState *node);
 extern void ExecReScanGather(GatherState *node);
 
-#endif   /* NODEGATHER_H */
+#endif							/* NODEGATHER_H */
diff --git a/src/include/executor/nodeGatherMerge.h b/src/include/executor/nodeGatherMerge.h
index f5ba353762a..14b31a086c3 100644
--- a/src/include/executor/nodeGatherMerge.h
+++ b/src/include/executor/nodeGatherMerge.h
@@ -24,4 +24,4 @@ extern void ExecEndGatherMerge(GatherMergeState *node);
 extern void ExecReScanGatherMerge(GatherMergeState *node);
 extern void ExecShutdownGatherMerge(GatherMergeState *node);
 
-#endif   /* NODEGATHERMERGE_H */
+#endif							/* NODEGATHERMERGE_H */
diff --git a/src/include/executor/nodeGroup.h b/src/include/executor/nodeGroup.h
index a9536a3c6f7..7358b61707c 100644
--- a/src/include/executor/nodeGroup.h
+++ b/src/include/executor/nodeGroup.h
@@ -21,4 +21,4 @@ extern TupleTableSlot *ExecGroup(GroupState *node);
 extern void ExecEndGroup(GroupState *node);
 extern void ExecReScanGroup(GroupState *node);
 
-#endif   /* NODEGROUP_H */
+#endif							/* NODEGROUP_H */
diff --git a/src/include/executor/nodeHash.h b/src/include/executor/nodeHash.h
index fe5c2642d74..8052f27d0b1 100644
--- a/src/include/executor/nodeHash.h
+++ b/src/include/executor/nodeHash.h
@@ -50,4 +50,4 @@ extern void ExecChooseHashTableSize(double ntuples, int tupwidth, bool useskew,
 						int *num_skew_mcvs);
 extern int	ExecHashGetSkewBucket(HashJoinTable hashtable, uint32 hashvalue);
 
-#endif   /* NODEHASH_H */
+#endif							/* NODEHASH_H */
diff --git a/src/include/executor/nodeHashjoin.h b/src/include/executor/nodeHashjoin.h
index ddc32b1de3a..541c81edc71 100644
--- a/src/include/executor/nodeHashjoin.h
+++ b/src/include/executor/nodeHashjoin.h
@@ -25,4 +25,4 @@ extern void ExecReScanHashJoin(HashJoinState *node);
 extern void ExecHashJoinSaveTuple(MinimalTuple tuple, uint32 hashvalue,
 					  BufFile **fileptr);
 
-#endif   /* NODEHASHJOIN_H */
+#endif							/* NODEHASHJOIN_H */
diff --git a/src/include/executor/nodeIndexonlyscan.h b/src/include/executor/nodeIndexonlyscan.h
index 5d3c6bbc0de..cf227daae04 100644
--- a/src/include/executor/nodeIndexonlyscan.h
+++ b/src/include/executor/nodeIndexonlyscan.h
@@ -32,4 +32,4 @@ extern void ExecIndexOnlyScanInitializeDSM(IndexOnlyScanState *node,
 extern void ExecIndexOnlyScanInitializeWorker(IndexOnlyScanState *node,
 								  shm_toc *toc);
 
-#endif   /* NODEINDEXONLYSCAN_H */
+#endif							/* NODEINDEXONLYSCAN_H */
diff --git a/src/include/executor/nodeIndexscan.h b/src/include/executor/nodeIndexscan.h
index ea3f3a5cc4d..a3518e03a4d 100644
--- a/src/include/executor/nodeIndexscan.h
+++ b/src/include/executor/nodeIndexscan.h
@@ -42,4 +42,4 @@ extern bool ExecIndexEvalArrayKeys(ExprContext *econtext,
 					   IndexArrayKeyInfo *arrayKeys, int numArrayKeys);
 extern bool ExecIndexAdvanceArrayKeys(IndexArrayKeyInfo *arrayKeys, int numArrayKeys);
 
-#endif   /* NODEINDEXSCAN_H */
+#endif							/* NODEINDEXSCAN_H */
diff --git a/src/include/executor/nodeLimit.h b/src/include/executor/nodeLimit.h
index 6e4084b46d6..7bb20d99786 100644
--- a/src/include/executor/nodeLimit.h
+++ b/src/include/executor/nodeLimit.h
@@ -21,4 +21,4 @@ extern TupleTableSlot *ExecLimit(LimitState *node);
 extern void ExecEndLimit(LimitState *node);
 extern void ExecReScanLimit(LimitState *node);
 
-#endif   /* NODELIMIT_H */
+#endif							/* NODELIMIT_H */
diff --git a/src/include/executor/nodeLockRows.h b/src/include/executor/nodeLockRows.h
index c23954131b8..6b90756e4c0 100644
--- a/src/include/executor/nodeLockRows.h
+++ b/src/include/executor/nodeLockRows.h
@@ -21,4 +21,4 @@ extern TupleTableSlot *ExecLockRows(LockRowsState *node);
 extern void ExecEndLockRows(LockRowsState *node);
 extern void ExecReScanLockRows(LockRowsState *node);
 
-#endif   /* NODELOCKROWS_H */
+#endif							/* NODELOCKROWS_H */
diff --git a/src/include/executor/nodeMaterial.h b/src/include/executor/nodeMaterial.h
index f6a7241ee7b..f69abbca82b 100644
--- a/src/include/executor/nodeMaterial.h
+++ b/src/include/executor/nodeMaterial.h
@@ -23,4 +23,4 @@ extern void ExecMaterialMarkPos(MaterialState *node);
 extern void ExecMaterialRestrPos(MaterialState *node);
 extern void ExecReScanMaterial(MaterialState *node);
 
-#endif   /* NODEMATERIAL_H */
+#endif							/* NODEMATERIAL_H */
diff --git a/src/include/executor/nodeMergeAppend.h b/src/include/executor/nodeMergeAppend.h
index eafa15445cf..3cc6ef549b3 100644
--- a/src/include/executor/nodeMergeAppend.h
+++ b/src/include/executor/nodeMergeAppend.h
@@ -21,4 +21,4 @@ extern TupleTableSlot *ExecMergeAppend(MergeAppendState *node);
 extern void ExecEndMergeAppend(MergeAppendState *node);
 extern void ExecReScanMergeAppend(MergeAppendState *node);
 
-#endif   /* NODEMERGEAPPEND_H */
+#endif							/* NODEMERGEAPPEND_H */
diff --git a/src/include/executor/nodeMergejoin.h b/src/include/executor/nodeMergejoin.h
index ffaa3af9080..32df25ae8b3 100644
--- a/src/include/executor/nodeMergejoin.h
+++ b/src/include/executor/nodeMergejoin.h
@@ -21,4 +21,4 @@ extern TupleTableSlot *ExecMergeJoin(MergeJoinState *node);
 extern void ExecEndMergeJoin(MergeJoinState *node);
 extern void ExecReScanMergeJoin(MergeJoinState *node);
 
-#endif   /* NODEMERGEJOIN_H */
+#endif							/* NODEMERGEJOIN_H */
diff --git a/src/include/executor/nodeModifyTable.h b/src/include/executor/nodeModifyTable.h
index 0c327768e19..5a406f236d4 100644
--- a/src/include/executor/nodeModifyTable.h
+++ b/src/include/executor/nodeModifyTable.h
@@ -20,4 +20,4 @@ extern TupleTableSlot *ExecModifyTable(ModifyTableState *node);
 extern void ExecEndModifyTable(ModifyTableState *node);
 extern void ExecReScanModifyTable(ModifyTableState *node);
 
-#endif   /* NODEMODIFYTABLE_H */
+#endif							/* NODEMODIFYTABLE_H */
diff --git a/src/include/executor/nodeNamedtuplestorescan.h b/src/include/executor/nodeNamedtuplestorescan.h
index 9ef477e7ff2..7f72fbe98af 100644
--- a/src/include/executor/nodeNamedtuplestorescan.h
+++ b/src/include/executor/nodeNamedtuplestorescan.h
@@ -21,4 +21,4 @@ extern TupleTableSlot *ExecNamedTuplestoreScan(NamedTuplestoreScanState *node);
 extern void ExecEndNamedTuplestoreScan(NamedTuplestoreScanState *node);
 extern void ExecReScanNamedTuplestoreScan(NamedTuplestoreScanState *node);
 
-#endif   /* NODENAMEDTUPLESTORESCAN_H */
+#endif							/* NODENAMEDTUPLESTORESCAN_H */
diff --git a/src/include/executor/nodeNestloop.h b/src/include/executor/nodeNestloop.h
index 4b2bf590500..8e0fcc1922c 100644
--- a/src/include/executor/nodeNestloop.h
+++ b/src/include/executor/nodeNestloop.h
@@ -21,4 +21,4 @@ extern TupleTableSlot *ExecNestLoop(NestLoopState *node);
 extern void ExecEndNestLoop(NestLoopState *node);
 extern void ExecReScanNestLoop(NestLoopState *node);
 
-#endif   /* NODENESTLOOP_H */
+#endif							/* NODENESTLOOP_H */
diff --git a/src/include/executor/nodeProjectSet.h b/src/include/executor/nodeProjectSet.h
index 30b2b7cec9f..2f6999e8db3 100644
--- a/src/include/executor/nodeProjectSet.h
+++ b/src/include/executor/nodeProjectSet.h
@@ -21,4 +21,4 @@ extern TupleTableSlot *ExecProjectSet(ProjectSetState *node);
 extern void ExecEndProjectSet(ProjectSetState *node);
 extern void ExecReScanProjectSet(ProjectSetState *node);
 
-#endif   /* NODEPROJECTSET_H */
+#endif							/* NODEPROJECTSET_H */
diff --git a/src/include/executor/nodeRecursiveunion.h b/src/include/executor/nodeRecursiveunion.h
index 066596f773b..f0eba05bee9 100644
--- a/src/include/executor/nodeRecursiveunion.h
+++ b/src/include/executor/nodeRecursiveunion.h
@@ -21,4 +21,4 @@ extern TupleTableSlot *ExecRecursiveUnion(RecursiveUnionState *node);
 extern void ExecEndRecursiveUnion(RecursiveUnionState *node);
 extern void ExecReScanRecursiveUnion(RecursiveUnionState *node);
 
-#endif   /* NODERECURSIVEUNION_H */
+#endif							/* NODERECURSIVEUNION_H */
diff --git a/src/include/executor/nodeResult.h b/src/include/executor/nodeResult.h
index 8e547b77e9b..61d3cb2cc2e 100644
--- a/src/include/executor/nodeResult.h
+++ b/src/include/executor/nodeResult.h
@@ -23,4 +23,4 @@ extern void ExecResultMarkPos(ResultState *node);
 extern void ExecResultRestrPos(ResultState *node);
 extern void ExecReScanResult(ResultState *node);
 
-#endif   /* NODERESULT_H */
+#endif							/* NODERESULT_H */
diff --git a/src/include/executor/nodeSamplescan.h b/src/include/executor/nodeSamplescan.h
index 8baf3a355c5..ed06e77e4ee 100644
--- a/src/include/executor/nodeSamplescan.h
+++ b/src/include/executor/nodeSamplescan.h
@@ -21,4 +21,4 @@ extern TupleTableSlot *ExecSampleScan(SampleScanState *node);
 extern void ExecEndSampleScan(SampleScanState *node);
 extern void ExecReScanSampleScan(SampleScanState *node);
 
-#endif   /* NODESAMPLESCAN_H */
+#endif							/* NODESAMPLESCAN_H */
diff --git a/src/include/executor/nodeSeqscan.h b/src/include/executor/nodeSeqscan.h
index 92b305e1384..06e0686b0b7 100644
--- a/src/include/executor/nodeSeqscan.h
+++ b/src/include/executor/nodeSeqscan.h
@@ -27,4 +27,4 @@ extern void ExecSeqScanEstimate(SeqScanState *node, ParallelContext *pcxt);
 extern void ExecSeqScanInitializeDSM(SeqScanState *node, ParallelContext *pcxt);
 extern void ExecSeqScanInitializeWorker(SeqScanState *node, shm_toc *toc);
 
-#endif   /* NODESEQSCAN_H */
+#endif							/* NODESEQSCAN_H */
diff --git a/src/include/executor/nodeSetOp.h b/src/include/executor/nodeSetOp.h
index 887bdc1a428..af859771838 100644
--- a/src/include/executor/nodeSetOp.h
+++ b/src/include/executor/nodeSetOp.h
@@ -21,4 +21,4 @@ extern TupleTableSlot *ExecSetOp(SetOpState *node);
 extern void ExecEndSetOp(SetOpState *node);
 extern void ExecReScanSetOp(SetOpState *node);
 
-#endif   /* NODESETOP_H */
+#endif							/* NODESETOP_H */
diff --git a/src/include/executor/nodeSort.h b/src/include/executor/nodeSort.h
index 10d16b47b1d..1d2b7130b32 100644
--- a/src/include/executor/nodeSort.h
+++ b/src/include/executor/nodeSort.h
@@ -23,4 +23,4 @@ extern void ExecSortMarkPos(SortState *node);
 extern void ExecSortRestrPos(SortState *node);
 extern void ExecReScanSort(SortState *node);
 
-#endif   /* NODESORT_H */
+#endif							/* NODESORT_H */
diff --git a/src/include/executor/nodeSubplan.h b/src/include/executor/nodeSubplan.h
index 0d3f52118b2..5dbaeeb29a3 100644
--- a/src/include/executor/nodeSubplan.h
+++ b/src/include/executor/nodeSubplan.h
@@ -28,4 +28,4 @@ extern void ExecReScanSetParamPlan(SubPlanState *node, PlanState *parent);
 
 extern void ExecSetParamPlan(SubPlanState *node, ExprContext *econtext);
 
-#endif   /* NODESUBPLAN_H */
+#endif							/* NODESUBPLAN_H */
diff --git a/src/include/executor/nodeSubqueryscan.h b/src/include/executor/nodeSubqueryscan.h
index c2a0f707a66..c852e2947f9 100644
--- a/src/include/executor/nodeSubqueryscan.h
+++ b/src/include/executor/nodeSubqueryscan.h
@@ -21,4 +21,4 @@ extern TupleTableSlot *ExecSubqueryScan(SubqueryScanState *node);
 extern void ExecEndSubqueryScan(SubqueryScanState *node);
 extern void ExecReScanSubqueryScan(SubqueryScanState *node);
 
-#endif   /* NODESUBQUERYSCAN_H */
+#endif							/* NODESUBQUERYSCAN_H */
diff --git a/src/include/executor/nodeTableFuncscan.h b/src/include/executor/nodeTableFuncscan.h
index 529c9299931..c58156e99c2 100644
--- a/src/include/executor/nodeTableFuncscan.h
+++ b/src/include/executor/nodeTableFuncscan.h
@@ -21,4 +21,4 @@ extern TupleTableSlot *ExecTableFuncScan(TableFuncScanState *node);
 extern void ExecEndTableFuncScan(TableFuncScanState *node);
 extern void ExecReScanTableFuncScan(TableFuncScanState *node);
 
-#endif   /* NODETABLEFUNCSCAN_H */
+#endif							/* NODETABLEFUNCSCAN_H */
diff --git a/src/include/executor/nodeTidscan.h b/src/include/executor/nodeTidscan.h
index 3186ca8cff2..d07ed7c8641 100644
--- a/src/include/executor/nodeTidscan.h
+++ b/src/include/executor/nodeTidscan.h
@@ -21,4 +21,4 @@ extern TupleTableSlot *ExecTidScan(TidScanState *node);
 extern void ExecEndTidScan(TidScanState *node);
 extern void ExecReScanTidScan(TidScanState *node);
 
-#endif   /* NODETIDSCAN_H */
+#endif							/* NODETIDSCAN_H */
diff --git a/src/include/executor/nodeUnique.h b/src/include/executor/nodeUnique.h
index 66ad8983971..3d0ac9dde16 100644
--- a/src/include/executor/nodeUnique.h
+++ b/src/include/executor/nodeUnique.h
@@ -21,4 +21,4 @@ extern TupleTableSlot *ExecUnique(UniqueState *node);
 extern void ExecEndUnique(UniqueState *node);
 extern void ExecReScanUnique(UniqueState *node);
 
-#endif   /* NODEUNIQUE_H */
+#endif							/* NODEUNIQUE_H */
diff --git a/src/include/executor/nodeValuesscan.h b/src/include/executor/nodeValuesscan.h
index 6c2af73b1f0..c28bb1acce6 100644
--- a/src/include/executor/nodeValuesscan.h
+++ b/src/include/executor/nodeValuesscan.h
@@ -21,4 +21,4 @@ extern TupleTableSlot *ExecValuesScan(ValuesScanState *node);
 extern void ExecEndValuesScan(ValuesScanState *node);
 extern void ExecReScanValuesScan(ValuesScanState *node);
 
-#endif   /* NODEVALUESSCAN_H */
+#endif							/* NODEVALUESSCAN_H */
diff --git a/src/include/executor/nodeWindowAgg.h b/src/include/executor/nodeWindowAgg.h
index 11d2dba2c56..db1ad60677a 100644
--- a/src/include/executor/nodeWindowAgg.h
+++ b/src/include/executor/nodeWindowAgg.h
@@ -21,4 +21,4 @@ extern TupleTableSlot *ExecWindowAgg(WindowAggState *node);
 extern void ExecEndWindowAgg(WindowAggState *node);
 extern void ExecReScanWindowAgg(WindowAggState *node);
 
-#endif   /* NODEWINDOWAGG_H */
+#endif							/* NODEWINDOWAGG_H */
diff --git a/src/include/executor/nodeWorktablescan.h b/src/include/executor/nodeWorktablescan.h
index 7790ca2e1b5..c222d9f6b4d 100644
--- a/src/include/executor/nodeWorktablescan.h
+++ b/src/include/executor/nodeWorktablescan.h
@@ -21,4 +21,4 @@ extern TupleTableSlot *ExecWorkTableScan(WorkTableScanState *node);
 extern void ExecEndWorkTableScan(WorkTableScanState *node);
 extern void ExecReScanWorkTableScan(WorkTableScanState *node);
 
-#endif   /* NODEWORKTABLESCAN_H */
+#endif							/* NODEWORKTABLESCAN_H */
diff --git a/src/include/executor/spi.h b/src/include/executor/spi.h
index ffb4c28ad1a..acade7e92e3 100644
--- a/src/include/executor/spi.h
+++ b/src/include/executor/spi.h
@@ -159,4 +159,4 @@ extern int	SPI_register_trigger_data(TriggerData *tdata);
 extern void AtEOXact_SPI(bool isCommit);
 extern void AtEOSubXact_SPI(bool isCommit, SubTransactionId mySubid);
 
-#endif   /* SPI_H */
+#endif							/* SPI_H */
diff --git a/src/include/executor/spi_priv.h b/src/include/executor/spi_priv.h
index 49aa7c94e79..ba7fb988754 100644
--- a/src/include/executor/spi_priv.h
+++ b/src/include/executor/spi_priv.h
@@ -31,7 +31,7 @@ typedef struct
 	MemoryContext procCxt;		/* procedure context */
 	MemoryContext execCxt;		/* executor context */
 	MemoryContext savedcxt;		/* context of SPI_connect's caller */
-	SubTransactionId connectSubid;		/* ID of connecting subtransaction */
+	SubTransactionId connectSubid;	/* ID of connecting subtransaction */
 	QueryEnvironment *queryEnv; /* query environment setup for SPI level */
 } _SPI_connection;
 
@@ -88,4 +88,4 @@ typedef struct _SPI_plan
 	void	   *parserSetupArg;
 } _SPI_plan;
 
-#endif   /* SPI_PRIV_H */
+#endif							/* SPI_PRIV_H */
diff --git a/src/include/executor/tablefunc.h b/src/include/executor/tablefunc.h
index 9c7b4808a8e..a24a555b757 100644
--- a/src/include/executor/tablefunc.h
+++ b/src/include/executor/tablefunc.h
@@ -64,4 +64,4 @@ typedef struct TableFuncRoutine
 	void		(*DestroyOpaque) (struct TableFuncScanState *state);
 } TableFuncRoutine;
 
-#endif   /* _TABLEFUNC_H */
+#endif							/* _TABLEFUNC_H */
diff --git a/src/include/executor/tqueue.h b/src/include/executor/tqueue.h
index 892eec812ec..a717ac61849 100644
--- a/src/include/executor/tqueue.h
+++ b/src/include/executor/tqueue.h
@@ -30,4 +30,4 @@ extern void DestroyTupleQueueReader(TupleQueueReader *reader);
 extern HeapTuple TupleQueueReaderNext(TupleQueueReader *reader,
 					 bool nowait, bool *done);
 
-#endif   /* TQUEUE_H */
+#endif							/* TQUEUE_H */
diff --git a/src/include/executor/tstoreReceiver.h b/src/include/executor/tstoreReceiver.h
index cd15e278210..ac4de3a6632 100644
--- a/src/include/executor/tstoreReceiver.h
+++ b/src/include/executor/tstoreReceiver.h
@@ -26,4 +26,4 @@ extern void SetTuplestoreDestReceiverParams(DestReceiver *self,
 								MemoryContext tContext,
 								bool detoast);
 
-#endif   /* TSTORE_RECEIVER_H */
+#endif							/* TSTORE_RECEIVER_H */
diff --git a/src/include/executor/tuptable.h b/src/include/executor/tuptable.h
index 32489ef9bde..55f4cce4ee1 100644
--- a/src/include/executor/tuptable.h
+++ b/src/include/executor/tuptable.h
@@ -115,7 +115,7 @@ typedef struct TupleTableSlot
 	NodeTag		type;
 	bool		tts_isempty;	/* true = slot is empty */
 	bool		tts_shouldFree; /* should pfree tts_tuple? */
-	bool		tts_shouldFreeMin;		/* should pfree tts_mintuple? */
+	bool		tts_shouldFreeMin;	/* should pfree tts_mintuple? */
 	bool		tts_slow;		/* saved state for slot_deform_tuple */
 	HeapTuple	tts_tuple;		/* physical tuple, or NULL if virtual */
 	TupleDesc	tts_tupleDescriptor;	/* slot's tuple descriptor */
@@ -170,4 +170,4 @@ extern void slot_getallattrs(TupleTableSlot *slot);
 extern void slot_getsomeattrs(TupleTableSlot *slot, int attnum);
 extern bool slot_attisnull(TupleTableSlot *slot, int attnum);
 
-#endif   /* TUPTABLE_H */
+#endif							/* TUPTABLE_H */