Review/test: Add wait events for server logging destination writes (v4-0001)

config/c-compiler.m4

@@ -267,25 +267,6 @@ fi])# PGAC_CXX_TYPEOF_UNQUAL
 
 
 
-# PGAC_C_TYPES_COMPATIBLE
-# -----------------------
-# Check if the C compiler understands __builtin_types_compatible_p,
-# and define HAVE__BUILTIN_TYPES_COMPATIBLE_P if so.
-#
-# We check usage with __typeof__, though it's unlikely any compiler would
-# have the former and not the latter.
-AC_DEFUN([PGAC_C_TYPES_COMPATIBLE],
-[AC_CACHE_CHECK(for __builtin_types_compatible_p, pgac_cv__types_compatible,
-[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],
-[[ int x; static int y[__builtin_types_compatible_p(__typeof__(x), int)]; ]])],
-[pgac_cv__types_compatible=yes],
-[pgac_cv__types_compatible=no])])
-if test x"$pgac_cv__types_compatible" = xyes ; then
-AC_DEFINE(HAVE__BUILTIN_TYPES_COMPATIBLE_P, 1,
-          [Define to 1 if your compiler understands __builtin_types_compatible_p.])
-fi])# PGAC_C_TYPES_COMPATIBLE
-
-
 # PGAC_C_BUILTIN_CONSTANT_P
 # -------------------------
 # Check if the C compiler understands __builtin_constant_p(),

configure

@@ -15181,36 +15181,6 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
   fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_types_compatible_p" >&5
-$as_echo_n "checking for __builtin_types_compatible_p... " >&6; }
-if ${pgac_cv__types_compatible+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
- int x; static int y[__builtin_types_compatible_p(__typeof__(x), int)];
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  pgac_cv__types_compatible=yes
-else
-  pgac_cv__types_compatible=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv__types_compatible" >&5
-$as_echo "$pgac_cv__types_compatible" >&6; }
-if test x"$pgac_cv__types_compatible" = xyes ; then
-
-$as_echo "#define HAVE__BUILTIN_TYPES_COMPATIBLE_P 1" >>confdefs.h
-
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_constant_p" >&5
 $as_echo_n "checking for __builtin_constant_p... " >&6; }

configure.ac

@@ -1727,7 +1727,6 @@ PGAC_C_TYPEOF
 PGAC_CXX_TYPEOF
 PGAC_C_TYPEOF_UNQUAL
 PGAC_CXX_TYPEOF_UNQUAL
-PGAC_C_TYPES_COMPATIBLE
 PGAC_C_BUILTIN_CONSTANT_P
 PGAC_C_BUILTIN_OP_OVERFLOW
 PGAC_C_BUILTIN_UNREACHABLE

contrib/basic_archive/basic_archive.c

@@ -245,9 +245,9 @@ compare_files(const char *file1, const char *file2)
 
 	for (;;)
 	{
-		int			nbytes = 0;
-		int			buf1_len = 0;
-		int			buf2_len = 0;
+		ssize_t		nbytes = 0;
+		size_t		buf1_len = 0;
+		size_t		buf2_len = 0;
 
 		while (buf1_len < CMP_BUF_SIZE)
 		{

contrib/dblink/dblink.c

@@ -3151,9 +3151,8 @@ applyRemoteGucs(PGconn *conn)
 	};
 
 	int			nestlevel = -1;
-	int			i;
 
-	for (i = 0; i < lengthof(GUCsAffectingIO); i++)
+	for (size_t i = 0; i < lengthof(GUCsAffectingIO); i++)
 	{
 		const char *gucName = GUCsAffectingIO[i];
 		const char *remoteVal = PQparameterStatus(conn, gucName);

contrib/hstore/expected/hstore.out

@@ -1509,7 +1509,7 @@ select count(*) from (select h from (select * from testhstore union all select *
 (1 row)
 
 set enable_hashagg = true;
-set enable_sort = false;
+set enable_groupagg = false;
 select count(*) from (select h from (select * from testhstore union all select * from testhstore) hs group by h) hs2;
  count 
 -------
@@ -1522,7 +1522,7 @@ select distinct * from (values (hstore '' || ''),('')) v(h);
 
 (1 row)
 
-set enable_sort = true;
+set enable_groupagg = true;
 -- btree
 drop index hidx;
 create index hidx on testhstore using btree (h);

contrib/hstore/sql/hstore.sql

@@ -345,10 +345,10 @@ select count(distinct h) from testhstore;
 set enable_hashagg = false;
 select count(*) from (select h from (select * from testhstore union all select * from testhstore) hs group by h) hs2;
 set enable_hashagg = true;
-set enable_sort = false;
+set enable_groupagg = false;
 select count(*) from (select h from (select * from testhstore union all select * from testhstore) hs group by h) hs2;
 select distinct * from (values (hstore '' || ''),('')) v(h);
-set enable_sort = true;
+set enable_groupagg = true;
 
 -- btree
 drop index hidx;

contrib/ltree/expected/ltree.out

@@ -7891,7 +7891,7 @@ reset enable_seqscan;
 reset enable_bitmapscan;
 -- test hash aggregate
 set enable_hashagg=on;
-set enable_sort=off;
+set enable_groupagg=off;
 EXPLAIN (COSTS OFF)
 SELECT count(*) FROM (
 SELECT t FROM (SELECT * FROM ltreetest UNION ALL SELECT * FROM ltreetest) t1 GROUP BY t
@@ -7915,7 +7915,7 @@ SELECT t FROM (SELECT * FROM ltreetest UNION ALL SELECT * FROM ltreetest) t1 GRO
 (1 row)
 
 reset enable_hashagg;
-reset enable_sort;
+reset enable_groupagg;
 drop index tstidx;
 -- test gist index
 create index tstidx on ltreetest using gist (t gist_ltree_ops(siglen=0));

contrib/ltree/sql/ltree.sql

@@ -372,7 +372,7 @@ reset enable_bitmapscan;
 -- test hash aggregate
 
 set enable_hashagg=on;
-set enable_sort=off;
+set enable_groupagg=off;
 
 EXPLAIN (COSTS OFF)
 SELECT count(*) FROM (
@@ -384,7 +384,7 @@ SELECT t FROM (SELECT * FROM ltreetest UNION ALL SELECT * FROM ltreetest) t1 GRO
 ) t2;
 
 reset enable_hashagg;
-reset enable_sort;
+reset enable_groupagg;
 
 drop index tstidx;
 

contrib/pageinspect/fsmfuncs.c

@@ -38,7 +38,6 @@ fsm_page_contents(PG_FUNCTION_ARGS)
 	StringInfoData sinfo;
 	Page		page;
 	FSMPage		fsmpage;
-	int			i;
 
 	if (!superuser())
 		ereport(ERROR,
@@ -54,10 +53,10 @@ fsm_page_contents(PG_FUNCTION_ARGS)
 
 	initStringInfo(&sinfo);
 
-	for (i = 0; i < NodesPerPage; i++)
+	for (size_t i = 0; i < NodesPerPage; i++)
 	{
 		if (fsmpage->fp_nodes[i] != 0)
-			appendStringInfo(&sinfo, "%d: %d\n", i, fsmpage->fp_nodes[i]);
+			appendStringInfo(&sinfo, "%zu: %d\n", i, fsmpage->fp_nodes[i]);
 	}
 	appendStringInfo(&sinfo, "fp_next_slot: %d\n", fsmpage->fp_next_slot);
 

contrib/pageinspect/hashfuncs.c

@@ -404,8 +404,7 @@ hash_bitmap_info(PG_FUNCTION_ARGS)
 	int32		bitmappage,
 				bitmapbit;
 	HeapTuple	tuple;
-	int			i,
-				j;
+	int			j;
 	Datum		values[3];
 	bool		nulls[3] = {0};
 	uint32	   *freep;
@@ -456,7 +455,7 @@ hash_bitmap_info(PG_FUNCTION_ARGS)
 				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
 				 errmsg("invalid overflow block number %u",
 						(BlockNumber) ovflblkno)));
-	for (i = 0; i < metap->hashm_nmaps; i++)
+	for (uint32 i = 0; i < metap->hashm_nmaps; i++)
 		if (metap->hashm_mapp[i] == ovflblkno)
 			ereport(ERROR,
 					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),

contrib/pg_logicalinspect/pg_logicalinspect.c

@@ -170,7 +170,7 @@ pg_get_logical_snapshot_info(PG_FUNCTION_ARGS)
 
 		arrayelems = (Datum *) palloc(ondisk.builder.committed.xcnt * sizeof(Datum));
 
-		for (int j = 0; j < ondisk.builder.committed.xcnt; j++)
+		for (size_t j = 0; j < ondisk.builder.committed.xcnt; j++)
 			arrayelems[j] = TransactionIdGetDatum(ondisk.builder.committed.xip[j]);
 
 		values[i++] = PointerGetDatum(construct_array_builtin(arrayelems,
@@ -187,7 +187,7 @@ pg_get_logical_snapshot_info(PG_FUNCTION_ARGS)
 
 		arrayelems = (Datum *) palloc(ondisk.builder.catchange.xcnt * sizeof(Datum));
 
-		for (int j = 0; j < ondisk.builder.catchange.xcnt; j++)
+		for (size_t j = 0; j < ondisk.builder.catchange.xcnt; j++)
 			arrayelems[j] = TransactionIdGetDatum(ondisk.builder.catchange.xip[j]);
 
 		values[i++] = PointerGetDatum(construct_array_builtin(arrayelems,

contrib/pg_plan_advice/pgpa_identifier.c

@@ -355,7 +355,7 @@ pgpa_compute_rti_from_identifier(int rtable_length,
 {
 	Index		result = 0;
 
-	for (Index rti = 1; rti <= rtable_length; ++rti)
+	for (int rti = 1; rti <= rtable_length; ++rti)
 	{
 		pgpa_identifier *rti_rid = &rt_identifiers[rti - 1];
 

contrib/pg_plan_advice/pgpa_join.c

@@ -231,7 +231,6 @@ pgpa_build_unrolled_join(pgpa_plan_walker_context *walker,
 						 pgpa_join_unroller *join_unroller)
 {
 	pgpa_unrolled_join *ujoin;
-	int			i;
 
 	/*
 	 * We shouldn't have gone even so far as to create a join unroller unless
@@ -260,7 +259,7 @@ pgpa_build_unrolled_join(pgpa_plan_walker_context *walker,
 	 * the reverse of that order, so we need to flip the order of the arrays
 	 * when constructing the final result.
 	 */
-	for (i = 0; i < join_unroller->nused; ++i)
+	for (unsigned i = 0; i < join_unroller->nused; ++i)
 	{
 		int			k = join_unroller->nused - i - 1;
 

contrib/pg_plan_advice/pgpa_output.c

@@ -95,7 +95,7 @@ pgpa_output_advice(StringInfo buf, pgpa_plan_walker_context *walker,
 	 * portion of the query didn't make it into the final plan.
 	 */
 	context.rid_strings = palloc0_array(const char *, rtable_length);
-	for (int i = 0; i < rtable_length; ++i)
+	for (Index i = 0; i < rtable_length; ++i)
 		if (rt_identifiers[i].alias_name != NULL)
 			context.rid_strings[i] = pgpa_identifier_string(&rt_identifiers[i]);
 
@@ -173,7 +173,7 @@ pgpa_output_unrolled_join(pgpa_output_context *context,
 {
 	pgpa_output_join_member(context, &join->outer);
 
-	for (int k = 0; k < join->ninner; ++k)
+	for (unsigned k = 0; k < join->ninner; ++k)
 	{
 		pgpa_join_member *member = &join->inner[k];
 

contrib/pg_plan_advice/pgpa_walker.c

@@ -502,7 +502,7 @@ pgpa_process_unrolled_join(pgpa_plan_walker_context *walker,
 	/* If this fails, we didn't unroll properly. */
 	Assert(ujoin->outer.unrolled_join == NULL);
 
-	for (int k = 0; k < ujoin->ninner; ++k)
+	for (unsigned k = 0; k < ujoin->ninner; ++k)
 	{
 		pgpa_join_member *member = &ujoin->inner[k];
 		Bitmapset  *relids;

contrib/pg_trgm/trgm_gist.c

@@ -535,10 +535,9 @@ gtrgm_distance(PG_FUNCTION_ARGS)
 static int32
 unionkey(BITVECP sbase, TRGM *add, int siglen)
 {
-	int32		i;
-
 	if (ISSIGNKEY(add))
 	{
+		int32		i;
 		BITVECP		sadd = GETSIGN(add);
 
 		if (ISALLTRUE(add))
@@ -552,7 +551,7 @@ unionkey(BITVECP sbase, TRGM *add, int siglen)
 		trgm	   *ptr = GETARR(add);
 		int32		tmp = 0;
 
-		for (i = 0; i < ARRNELEM(add); i++)
+		for (unsigned i = 0; i < ARRNELEM(add); i++)
 		{
 			CPTRGM(&tmp, ptr + i);
 			HASH(sbase, tmp, siglen);

contrib/postgres_fdw/deparse.c

@@ -707,6 +707,26 @@ foreign_expr_walker(Node *node,
 			{
 				ArrayCoerceExpr *e = (ArrayCoerceExpr *) node;
 
+				/*
+				 * Push down only when the per-element coercion is a plain
+				 * relabeling, that is, elemexpr is a RelabelType or a bare
+				 * CaseTestExpr.  Any other element coercion -- a cast
+				 * function, an I/O conversion (CoerceViaIO), or a domain
+				 * coercion -- is kept local.  We ship only a bare
+				 * "arg::resulttype" cast (nothing at all for an
+				 * implicit-format coercion), so a non-relabeling conversion
+				 * would be re-resolved against the remote server's catalogs
+				 * and session state and could silently change the result.
+				 * This matches the handling of the scalar coercions for the
+				 * I/O and domain cases (never shipped); an element cast
+				 * function is kept local too, which is more conservative than
+				 * the scalar case (a scalar cast function is shipped when it
+				 * is shippable).
+				 */
+				if (!IsA(e->elemexpr, RelabelType) &&
+					!IsA(e->elemexpr, CaseTestExpr))
+					return false;
+
 				/*
 				 * Recurse to input subexpression.
 				 */