Merge PG10 master branch into xl10devel

This commit merges PG10 branch upto commit
2710ccd782d0308a3fa1ab193531183148e9b626. Regression tests show no noteworthy
additional failures. This merge includes major pgindent work done with the
newer version of pgindent

18 files changed, 30 insertions, 29 deletions

diff --git a/src/include/common/base64.h b/src/include/common/base64.h
index 09b69b1656..7fe19bb432 100644
--- a/src/include/common/base64.h
+++ b/src/include/common/base64.h
@@ -16,4 +16,4 @@ extern int	pg_b64_decode(const char *src, int len, char *dst);
 extern int	pg_b64_enc_len(int srclen);
 extern int	pg_b64_dec_len(int srclen);
 
-#endif   /* BASE64_H */
+#endif							/* BASE64_H */
diff --git a/src/include/common/config_info.h b/src/include/common/config_info.h
index 656e26fdb0..f775327861 100644
--- a/src/include/common/config_info.h
+++ b/src/include/common/config_info.h
@@ -18,4 +18,4 @@ typedef struct ConfigData
 extern ConfigData *get_configdata(const char *my_exec_path,
 			   size_t *configdata_len);
 
-#endif   /* COMMON_CONFIG_INFO_H */
+#endif							/* COMMON_CONFIG_INFO_H */
diff --git a/src/include/common/controldata_utils.h b/src/include/common/controldata_utils.h
index 82ea426afe..e97abe6a51 100644
--- a/src/include/common/controldata_utils.h
+++ b/src/include/common/controldata_utils.h
@@ -14,4 +14,4 @@
 
 extern ControlFileData *get_controlfile(const char *DataDir, const char *progname, bool *crc_ok_p);
 
-#endif   /* COMMON_CONTROLDATA_UTILS_H */
+#endif							/* COMMON_CONTROLDATA_UTILS_H */
diff --git a/src/include/common/fe_memutils.h b/src/include/common/fe_memutils.h
index cb381bd9f5..6708670b96 100644
--- a/src/include/common/fe_memutils.h
+++ b/src/include/common/fe_memutils.h
@@ -41,4 +41,4 @@ extern void pfree(void *pointer);
 extern char *psprintf(const char *fmt,...) pg_attribute_printf(1, 2);
 extern size_t pvsnprintf(char *buf, size_t len, const char *fmt, va_list args) pg_attribute_printf(3, 0);
 
-#endif   /* FE_MEMUTILS_H */
+#endif							/* FE_MEMUTILS_H */
diff --git a/src/include/common/file_utils.h b/src/include/common/file_utils.h
index 95c001905d..52af7f0baa 100644
--- a/src/include/common/file_utils.h
+++ b/src/include/common/file_utils.h
@@ -24,4 +24,4 @@ extern int durable_rename(const char *oldfile, const char *newfile,
 			   const char *progname);
 extern int	fsync_parent_path(const char *fname, const char *progname);
 
-#endif   /* FILE_UTILS_H */
+#endif							/* FILE_UTILS_H */
diff --git a/src/include/common/int128.h b/src/include/common/int128.h
index 4c46e26f40..af2c93da46 100644
--- a/src/include/common/int128.h
+++ b/src/include/common/int128.h
@@ -61,7 +61,7 @@ int128_add_int64(INT128 *i128, int64 v)
 static inline void
 int128_add_int64_mul_int64(INT128 *i128, int64 x, int64 y)
 {
-	*i128 += (int128) x *(int128) y;
+	*i128 += (int128) x * (int128) y;
 }
 
 /*
@@ -271,6 +271,6 @@ int128_to_int64(INT128 val)
 	return (int64) val.lo;
 }
 
-#endif   /* USE_NATIVE_INT128 */
+#endif							/* USE_NATIVE_INT128 */
 
-#endif   /* INT128_H */
+#endif							/* INT128_H */
diff --git a/src/include/common/ip.h b/src/include/common/ip.h
index 815e6ccad3..f530139876 100644
--- a/src/include/common/ip.h
+++ b/src/include/common/ip.h
@@ -25,13 +25,13 @@
 #endif
 
 extern int pg_getaddrinfo_all(const char *hostname, const char *servname,
-				   const struct addrinfo * hintp,
-				   struct addrinfo ** result);
-extern void pg_freeaddrinfo_all(int hint_ai_family, struct addrinfo * ai);
+				   const struct addrinfo *hintp,
+				   struct addrinfo **result);
+extern void pg_freeaddrinfo_all(int hint_ai_family, struct addrinfo *ai);
 
-extern int pg_getnameinfo_all(const struct sockaddr_storage * addr, int salen,
+extern int pg_getnameinfo_all(const struct sockaddr_storage *addr, int salen,
 				   char *node, int nodelen,
 				   char *service, int servicelen,
 				   int flags);
 
-#endif   /* IP_H */
+#endif							/* IP_H */
diff --git a/src/include/common/keywords.h b/src/include/common/keywords.h
index 34e066be6b..60522715a8 100644
--- a/src/include/common/keywords.h
+++ b/src/include/common/keywords.h
@@ -41,4 +41,4 @@ extern const ScanKeyword *ScanKeywordLookup(const char *text,
 				  const ScanKeyword *keywords,
 				  int num_keywords);
 
-#endif   /* KEYWORDS_H */
+#endif							/* KEYWORDS_H */
diff --git a/src/include/common/pg_lzcompress.h b/src/include/common/pg_lzcompress.h
index dbd51d58ef..d4b2e8a53c 100644
--- a/src/include/common/pg_lzcompress.h
+++ b/src/include/common/pg_lzcompress.h
@@ -88,4 +88,4 @@ extern int32 pglz_compress(const char *source, int32 slen, char *dest,
 extern int32 pglz_decompress(const char *source, int32 slen, char *dest,
 				int32 rawsize);
 
-#endif   /* _PG_LZCOMPRESS_H_ */
+#endif							/* _PG_LZCOMPRESS_H_ */
diff --git a/src/include/common/relpath.h b/src/include/common/relpath.h
index 8468c0c6f6..fb9ca3e785 100644
--- a/src/include/common/relpath.h
+++ b/src/include/common/relpath.h
@@ -92,4 +92,4 @@ extern char *GetRelationPath_client(Oid dbNode, Oid spcNode, Oid relNode,
 #define relpath(rnode, forknum) \
 	relpathbackend((rnode).node, (rnode).backend, forknum)
 #endif
-#endif   /* RELPATH_H */
+#endif							/* RELPATH_H */
diff --git a/src/include/common/restricted_token.h b/src/include/common/restricted_token.h
index 7441a55119..51be5a760c 100644
--- a/src/include/common/restricted_token.h
+++ b/src/include/common/restricted_token.h
@@ -21,4 +21,4 @@ void		get_restricted_token(const char *progname);
 HANDLE		CreateRestrictedProcess(char *cmd, PROCESS_INFORMATION *processInfo, const char *progname);
 #endif
 
-#endif   /* COMMON_RESTRICTED_TOKEN_H */
+#endif							/* COMMON_RESTRICTED_TOKEN_H */
diff --git a/src/include/common/saslprep.h b/src/include/common/saslprep.h
index ec5c8ce361..c7b620cf19 100644
--- a/src/include/common/saslprep.h
+++ b/src/include/common/saslprep.h
@@ -27,4 +27,4 @@ typedef enum
 
 extern pg_saslprep_rc pg_saslprep(const char *input, char **output);
 
-#endif   /* SASLPREP_H */
+#endif							/* SASLPREP_H */
diff --git a/src/include/common/scram-common.h b/src/include/common/scram-common.h
index 2ee51fbaec..ebb733df4b 100644
--- a/src/include/common/scram-common.h
+++ b/src/include/common/scram-common.h
@@ -56,4 +56,4 @@ extern void scram_ServerKey(const uint8 *salted_password, uint8 *result);
 extern char *scram_build_verifier(const char *salt, int saltlen, int iterations,
 					 const char *password);
 
-#endif   /* SCRAM_COMMON_H */
+#endif							/* SCRAM_COMMON_H */
diff --git a/src/include/common/sha2.h b/src/include/common/sha2.h
index 09107cfc3b..6358ca3c56 100644
--- a/src/include/common/sha2.h
+++ b/src/include/common/sha2.h
@@ -89,7 +89,7 @@ typedef struct pg_sha512_ctx
 } pg_sha512_ctx;
 typedef struct pg_sha256_ctx pg_sha224_ctx;
 typedef struct pg_sha512_ctx pg_sha384_ctx;
-#endif   /* USE_SSL */
+#endif							/* USE_SSL */
 
 /* Interface routines for SHA224/256/384/512 */
 extern void pg_sha224_init(pg_sha224_ctx *ctx);
@@ -112,4 +112,4 @@ extern void pg_sha512_update(pg_sha512_ctx *ctx, const uint8 *input0,
 				 size_t len);
 extern void pg_sha512_final(pg_sha512_ctx *ctx, uint8 *dest);
 
-#endif   /* _PG_SHA2_H_ */
+#endif							/* _PG_SHA2_H_ */
diff --git a/src/include/common/string.h b/src/include/common/string.h
index ec9ee9a740..5f3ea71d61 100644
--- a/src/include/common/string.h
+++ b/src/include/common/string.h
@@ -12,4 +12,4 @@
 
 extern bool pg_str_endswith(const char *str, const char *end);
 
-#endif   /* COMMON_STRING_H */
+#endif							/* COMMON_STRING_H */
diff --git a/src/include/common/unicode_norm.h b/src/include/common/unicode_norm.h
index 488f964d2c..8741209751 100644
--- a/src/include/common/unicode_norm.h
+++ b/src/include/common/unicode_norm.h
@@ -18,4 +18,4 @@
 
 extern pg_wchar *unicode_normalize_kc(const pg_wchar *input);
 
-#endif   /* UNICODE_NORM_H */
+#endif							/* UNICODE_NORM_H */
diff --git a/src/include/common/unicode_norm_table.h b/src/include/common/unicode_norm_table.h
index 3bcf05e5ee..da08e487e3 100644
--- a/src/include/common/unicode_norm_table.h
+++ b/src/include/common/unicode_norm_table.h
@@ -26,7 +26,8 @@ typedef struct
 } pg_unicode_decomposition;
 
 #define DECOMP_NO_COMPOSE	0x80	/* don't use for re-composition */
-#define DECOMP_INLINE		0x40	/* decomposition is stored inline in dec_index */
+#define DECOMP_INLINE		0x40	/* decomposition is stored inline in
+									 * dec_index */
 
 #define DECOMPOSITION_SIZE(x) ((x)->dec_size_flags & 0x3F)
 #define DECOMPOSITION_NO_COMPOSE(x) (((x)->dec_size_flags & DECOMP_NO_COMPOSE) != 0)
@@ -36,14 +37,14 @@ typedef struct
 static const pg_unicode_decomposition UnicodeDecompMain[6532] =
 {
 	{0x00A0, 0, 1 | DECOMP_INLINE, 0x0020},
-	{0x00A8, 0, 2 | DECOMP_NO_COMPOSE, 0},		/* compatibility mapping */
+	{0x00A8, 0, 2 | DECOMP_NO_COMPOSE, 0},	/* compatibility mapping */
 	{0x00AA, 0, 1 | DECOMP_INLINE, 0x0061},
-	{0x00AF, 0, 2 | DECOMP_NO_COMPOSE, 2},		/* compatibility mapping */
+	{0x00AF, 0, 2 | DECOMP_NO_COMPOSE, 2},	/* compatibility mapping */
 	{0x00B2, 0, 1 | DECOMP_INLINE, 0x0032},
 	{0x00B3, 0, 1 | DECOMP_INLINE, 0x0033},
-	{0x00B4, 0, 2 | DECOMP_NO_COMPOSE, 4},		/* compatibility mapping */
+	{0x00B4, 0, 2 | DECOMP_NO_COMPOSE, 4},	/* compatibility mapping */
 	{0x00B5, 0, 1 | DECOMP_INLINE, 0x03BC},
-	{0x00B8, 0, 2 | DECOMP_NO_COMPOSE, 6},		/* compatibility mapping */
+	{0x00B8, 0, 2 | DECOMP_NO_COMPOSE, 6},	/* compatibility mapping */
 	{0x00B9, 0, 1 | DECOMP_INLINE, 0x0031},
 	{0x00BA, 0, 1 | DECOMP_INLINE, 0x006F},
 	{0x00BC, 0, 3, 8},
diff --git a/src/include/common/username.h b/src/include/common/username.h
index 114304f9e1..735572d382 100644
--- a/src/include/common/username.h
+++ b/src/include/common/username.h
@@ -12,4 +12,4 @@
 extern const char *get_user_name(char **errstr);
 extern const char *get_user_name_or_exit(const char *progname);
 
-#endif   /* USERNAME_H */
+#endif							/* USERNAME_H */