pgindent run for 9.6

Author: robertmhaas

contrib/auto_explain/auto_explain.c

@@ -165,16 +165,16 @@ _PG_init(void)
 
 	DefineCustomRealVariable("auto_explain.sample_rate",
 							 "Fraction of queries to process.",
-							NULL,
-							&auto_explain_sample_rate,
-							1.0,
-							0.0,
-							1.0,
-							PGC_SUSET,
-							0,
-							NULL,
-							NULL,
-							NULL);
+							 NULL,
+							 &auto_explain_sample_rate,
+							 1.0,
+							 0.0,
+							 1.0,
+							 PGC_SUSET,
+							 0,
+							 NULL,
+							 NULL,
+							 NULL);
 
 	EmitWarningsOnPlaceholders("auto_explain");
 
@@ -209,12 +209,12 @@ static void
 explain_ExecutorStart(QueryDesc *queryDesc, int eflags)
 {
 	/*
-	 * For rate sampling, randomly choose top-level statement. Either
-	 * all nested statements will be explained or none will.
+	 * For rate sampling, randomly choose top-level statement. Either all
+	 * nested statements will be explained or none will.
 	 */
 	if (auto_explain_log_min_duration >= 0 && nesting_level == 0)
 		current_query_sampled = (random() < auto_explain_sample_rate *
-				MAX_RANDOM_VALUE);
+								 MAX_RANDOM_VALUE);
 
 	if (auto_explain_enabled() && current_query_sampled)
 	{

contrib/bloom/blinsert.c

@@ -33,11 +33,11 @@ PG_MODULE_MAGIC;
 typedef struct
 {
 	BloomState	blstate;		/* bloom index state */
-	MemoryContext tmpCtx;		/* temporary memory context reset after
-								 * each tuple */
+	MemoryContext tmpCtx;		/* temporary memory context reset after each
+								 * tuple */
 	char		data[BLCKSZ];	/* cached page */
 	int64		count;			/* number of tuples in cached page */
-}	BloomBuildState;
+} BloomBuildState;
 
 /*
  * Flush page cached in BloomBuildState.
@@ -140,8 +140,8 @@ blbuild(Relation heap, Relation index, IndexInfo *indexInfo)
 								   bloomBuildCallback, (void *) &buildstate);
 
 	/*
-	 * There are could be some items in cached page.  Flush this page
-	 * if needed.
+	 * There are could be some items in cached page.  Flush this page if
+	 * needed.
 	 */
 	if (buildstate.count > 0)
 		flushCachedPage(index, &buildstate);

contrib/bloom/bloom.h

@@ -31,14 +31,13 @@
 /* Opaque for bloom pages */
 typedef struct BloomPageOpaqueData
 {
-	OffsetNumber	maxoff;			/* number of index tuples on page */
-	uint16			flags;			/* see bit definitions below */
-	uint16			unused;			/* placeholder to force maxaligning of size
-									 * of BloomPageOpaqueData and to place
-									 * bloom_page_id exactly at the end of page
-									 */
-	uint16			bloom_page_id;	/* for identification of BLOOM indexes */
-}	BloomPageOpaqueData;
+	OffsetNumber maxoff;		/* number of index tuples on page */
+	uint16		flags;			/* see bit definitions below */
+	uint16		unused;			/* placeholder to force maxaligning of size of
+								 * BloomPageOpaqueData and to place
+								 * bloom_page_id exactly at the end of page */
+	uint16		bloom_page_id;	/* for identification of BLOOM indexes */
+} BloomPageOpaqueData;
 
 typedef BloomPageOpaqueData *BloomPageOpaque;
 
@@ -102,9 +101,9 @@ typedef struct BloomOptions
 {
 	int32		vl_len_;		/* varlena header (do not touch directly!) */
 	int			bloomLength;	/* length of signature in words (not bits!) */
-	int			bitSize[INDEX_MAX_KEYS];	/* # of bits generated for each
-											 * index key */
-}	BloomOptions;
+	int			bitSize[INDEX_MAX_KEYS];		/* # of bits generated for
+												 * each index key */
+} BloomOptions;
 
 /*
  * FreeBlockNumberArray - array of block numbers sized so that metadata fill
@@ -125,7 +124,7 @@ typedef struct BloomMetaPageData
 	uint16		nEnd;
 	BloomOptions opts;
 	FreeBlockNumberArray notFullPage;
-}	BloomMetaPageData;
+} BloomMetaPageData;
 
 /* Magic number to distinguish bloom pages among anothers */
 #define BLOOM_MAGICK_NUMBER (0xDBAC0DED)
@@ -146,7 +145,7 @@ typedef struct BloomState
 	 * precompute it
 	 */
 	Size		sizeOfBloomTuple;
-}	BloomState;
+} BloomState;
 
 #define BloomPageGetFreeSpace(state, page) \
 	(BLCKSZ - MAXALIGN(SizeOfPageHeaderData) \
@@ -160,30 +159,30 @@ typedef struct BloomTuple
 {
 	ItemPointerData heapPtr;
 	BloomSignatureWord sign[FLEXIBLE_ARRAY_MEMBER];
-}	BloomTuple;
+} BloomTuple;
 
 #define BLOOMTUPLEHDRSZ offsetof(BloomTuple, sign)
 
 /* Opaque data structure for bloom index scan */
 typedef struct BloomScanOpaqueData
 {
-	BloomSignatureWord *sign;			/* Scan signature */
+	BloomSignatureWord *sign;	/* Scan signature */
 	BloomState	state;
-}	BloomScanOpaqueData;
+} BloomScanOpaqueData;
 
 typedef BloomScanOpaqueData *BloomScanOpaque;
 
 /* blutils.c */
 extern void _PG_init(void);
 extern Datum blhandler(PG_FUNCTION_ARGS);
-extern void initBloomState(BloomState * state, Relation index);
+extern void initBloomState(BloomState *state, Relation index);
 extern void BloomFillMetapage(Relation index, Page metaPage);
 extern void BloomInitMetapage(Relation index);
 extern void BloomInitPage(Page page, uint16 flags);
 extern Buffer BloomNewBuffer(Relation index);
-extern void signValue(BloomState * state, BloomSignatureWord * sign, Datum value, int attno);
-extern BloomTuple *BloomFormTuple(BloomState * state, ItemPointer iptr, Datum *values, bool *isnull);
-extern bool BloomPageAddItem(BloomState * state, Page page, BloomTuple * tuple);
+extern void signValue(BloomState *state, BloomSignatureWord *sign, Datum value, int attno);
+extern BloomTuple *BloomFormTuple(BloomState *state, ItemPointer iptr, Datum *values, bool *isnull);
+extern bool BloomPageAddItem(BloomState *state, Page page, BloomTuple *tuple);
 
 /* blvalidate.c */
 extern bool blvalidate(Oid opclassoid);

contrib/bloom/blutils.c

@@ -37,6 +37,7 @@ PG_FUNCTION_INFO_V1(blhandler);
 
 /* Kind of relation options for bloom index */
 static relopt_kind bl_relopt_kind;
+
 /* parse table for fillRelOptions */
 static relopt_parse_elt bl_relopt_tab[INDEX_MAX_KEYS + 1];
 
@@ -215,7 +216,9 @@ myRand(void)
 	 * October 1988, p. 1195.
 	 *----------
 	 */
-	int32 hi, lo, x;
+	int32		hi,
+				lo,
+				x;
 
 	/* Must be in [1, 0x7ffffffe] range at this point. */
 	hi = next / 127773;

contrib/bloom/blvacuum.c

@@ -78,7 +78,7 @@ blbulkdelete(IndexVacuumInfo *info, IndexBulkDeleteResult *stats,
 		/* Iterate over the tuples */
 		itup = itupPtr = BloomPageGetTuple(&state, page, FirstOffsetNumber);
 		itupEnd = BloomPageGetTuple(&state, page,
-								OffsetNumberNext(BloomPageGetMaxOffset(page)));
+							  OffsetNumberNext(BloomPageGetMaxOffset(page)));
 		while (itup < itupEnd)
 		{
 			/* Do we have to delete this tuple? */
@@ -106,11 +106,11 @@ blbulkdelete(IndexVacuumInfo *info, IndexBulkDeleteResult *stats,
 		}
 
 		Assert(itupPtr == BloomPageGetTuple(&state, page,
-								OffsetNumberNext(BloomPageGetMaxOffset(page))));
+							 OffsetNumberNext(BloomPageGetMaxOffset(page))));
 
 		/*
-		 * Add page to notFullPage list if we will not mark page as deleted and
-		 * there is a free space on it
+		 * Add page to notFullPage list if we will not mark page as deleted
+		 * and there is a free space on it
 		 */
 		if (BloomPageGetMaxOffset(page) != 0 &&
 			BloomPageGetFreeSpace(&state, page) > state.sizeOfBloomTuple &&

contrib/file_fdw/file_fdw.c

@@ -132,7 +132,7 @@ static bool fileAnalyzeForeignTable(Relation relation,
 						AcquireSampleRowsFunc *func,
 						BlockNumber *totalpages);
 static bool fileIsForeignScanParallelSafe(PlannerInfo *root, RelOptInfo *rel,
-										  RangeTblEntry *rte);
+							  RangeTblEntry *rte);
 
 /*
  * Helper functions
@@ -767,12 +767,12 @@ fileAnalyzeForeignTable(Relation relation,
 
 /*
  * fileIsForeignScanParallelSafe
- * 		Reading a file in a parallel worker should work just the same as
- * 		reading it in the leader, so mark scans safe.
+ *		Reading a file in a parallel worker should work just the same as
+ *		reading it in the leader, so mark scans safe.
  */
 static bool
 fileIsForeignScanParallelSafe(PlannerInfo *root, RelOptInfo *rel,
-								  RangeTblEntry *rte)
+							  RangeTblEntry *rte)
 {
 	return true;
 }

contrib/isn/isn.c

@@ -444,9 +444,9 @@ ean2ISBN(char *isn)
 	unsigned	check;
 
 	/*
-	 * The number should come in this format: 978-0-000-00000-0
-	 * or may be an ISBN-13 number, 979-..., which does not have a short
-	 * representation. Do the short output version if possible.
+	 * The number should come in this format: 978-0-000-00000-0 or may be an
+	 * ISBN-13 number, 979-..., which does not have a short representation. Do
+	 * the short output version if possible.
 	 */
 	if (strncmp("978-", isn, 4) == 0)
 	{

contrib/pageinspect/heapfuncs.c

@@ -82,7 +82,7 @@ text_to_bits(char *str, int len)
 		else
 			ereport(ERROR,
 					(errcode(ERRCODE_DATA_CORRUPTED),
-					 errmsg("illegal character '%c' in t_bits string", str[off])));
+			   errmsg("illegal character '%c' in t_bits string", str[off])));
 
 		if (off % 8 == 7)
 			bits[off / 8] = byte;
@@ -192,9 +192,9 @@ heap_page_items(PG_FUNCTION_ARGS)
 			lp_offset == MAXALIGN(lp_offset) &&
 			lp_offset + lp_len <= raw_page_size)
 		{
-			HeapTupleHeader		tuphdr;
-			bytea			   *tuple_data_bytea;
-			int					tuple_data_len;
+			HeapTupleHeader tuphdr;
+			bytea	   *tuple_data_bytea;
+			int			tuple_data_len;
 
 			/* Extract information from the tuple header */
 
@@ -214,7 +214,7 @@ heap_page_items(PG_FUNCTION_ARGS)
 			tuple_data_bytea = (bytea *) palloc(tuple_data_len + VARHDRSZ);
 			SET_VARSIZE(tuple_data_bytea, tuple_data_len + VARHDRSZ);
 			memcpy(VARDATA(tuple_data_bytea), (char *) tuphdr + tuphdr->t_hoff,
-					 tuple_data_len);
+				   tuple_data_len);
 			values[13] = PointerGetDatum(tuple_data_bytea);
 
 			/*
@@ -284,16 +284,16 @@ heap_page_items(PG_FUNCTION_ARGS)
  */
 static Datum
 tuple_data_split_internal(Oid relid, char *tupdata,
-				 uint16 tupdata_len, uint16 t_infomask,
-				 uint16 t_infomask2, bits8 *t_bits,
-				 bool do_detoast)
+						  uint16 tupdata_len, uint16 t_infomask,
+						  uint16 t_infomask2, bits8 *t_bits,
+						  bool do_detoast)
 {
-	ArrayBuildState	   *raw_attrs;
-	int 				nattrs;
-	int					i;
-	int					off = 0;
-	Relation			rel;
-	TupleDesc			tupdesc;
+	ArrayBuildState *raw_attrs;
+	int			nattrs;
+	int			i;
+	int			off = 0;
+	Relation	rel;
+	TupleDesc	tupdesc;
 
 	/* Get tuple descriptor from relation OID */
 	rel = relation_open(relid, NoLock);
@@ -310,30 +310,31 @@ tuple_data_split_internal(Oid relid, char *tupdata,
 
 	for (i = 0; i < nattrs; i++)
 	{
-		Form_pg_attribute	attr;
-		bool				is_null;
-		bytea			   *attr_data = NULL;
+		Form_pg_attribute attr;
+		bool		is_null;
+		bytea	   *attr_data = NULL;
 
 		attr = tupdesc->attrs[i];
 		is_null = (t_infomask & HEAP_HASNULL) && att_isnull(i, t_bits);
 
 		/*
-		 * Tuple header can specify less attributes than tuple descriptor
-		 * as ALTER TABLE ADD COLUMN without DEFAULT keyword does not
-		 * actually change tuples in pages, so attributes with numbers greater
-		 * than (t_infomask2 & HEAP_NATTS_MASK) should be treated as NULL.
+		 * Tuple header can specify less attributes than tuple descriptor as
+		 * ALTER TABLE ADD COLUMN without DEFAULT keyword does not actually
+		 * change tuples in pages, so attributes with numbers greater than
+		 * (t_infomask2 & HEAP_NATTS_MASK) should be treated as NULL.
 		 */
 		if (i >= (t_infomask2 & HEAP_NATTS_MASK))
 			is_null = true;
 
 		if (!is_null)
 		{
-			int		len;
+			int			len;
 
 			if (attr->attlen == -1)
 			{
 				off = att_align_pointer(off, tupdesc->attrs[i]->attalign, -1,
 										tupdata + off);
+
 				/*
 				 * As VARSIZE_ANY throws an exception if it can't properly
 				 * detect the type of external storage in macros VARTAG_SIZE,
@@ -343,8 +344,8 @@ tuple_data_split_internal(Oid relid, char *tupdata,
 					!VARATT_IS_EXTERNAL_ONDISK(tupdata + off) &&
 					!VARATT_IS_EXTERNAL_INDIRECT(tupdata + off))
 					ereport(ERROR,
-						(errcode(ERRCODE_DATA_CORRUPTED),
-						 errmsg("first byte of varlena attribute is incorrect for attribute %d", i)));
+							(errcode(ERRCODE_DATA_CORRUPTED),
+							 errmsg("first byte of varlena attribute is incorrect for attribute %d", i)));
 
 				len = VARSIZE_ANY(tupdata + off);
 			}
@@ -381,7 +382,7 @@ tuple_data_split_internal(Oid relid, char *tupdata,
 	if (tupdata_len != off)
 		ereport(ERROR,
 				(errcode(ERRCODE_DATA_CORRUPTED),
-				 errmsg("end of tuple reached without looking at all its data")));
+			errmsg("end of tuple reached without looking at all its data")));
 
 	return makeArrayResult(raw_attrs, CurrentMemoryContext);
 }
@@ -397,14 +398,14 @@ PG_FUNCTION_INFO_V1(tuple_data_split);
 Datum
 tuple_data_split(PG_FUNCTION_ARGS)
 {
-	Oid				relid;
-	bytea		   *raw_data;
-	uint16			t_infomask;
-	uint16			t_infomask2;
-	char		   *t_bits_str;
-	bool			do_detoast = false;
-	bits8		   *t_bits = NULL;
-	Datum			res;
+	Oid			relid;
+	bytea	   *raw_data;
+	uint16		t_infomask;
+	uint16		t_infomask2;
+	char	   *t_bits_str;
+	bool		do_detoast = false;
+	bits8	   *t_bits = NULL;
+	Datum		res;
 
 	relid = PG_GETARG_OID(0);
 	raw_data = PG_ARGISNULL(1) ? NULL : PG_GETARG_BYTEA_P(1);
@@ -430,8 +431,8 @@ tuple_data_split(PG_FUNCTION_ARGS)
 	 */
 	if (t_infomask & HEAP_HASNULL)
 	{
-		int		bits_str_len;
-		int		bits_len;
+		int			bits_str_len;
+		int			bits_len;
 
 		bits_len = (t_infomask2 & HEAP_NATTS_MASK) / 8 + 1;
 		if (!t_bits_str)