Merge branch 'PGPROEE10' into PGPROEE10_libpq

Author: dmpgpro

configure.in

@@ -1984,11 +1984,11 @@ if test x"$USE_SSE42_CRC32C" = x"1"; then
   AC_MSG_RESULT(SSE 4.2)
 else
   if test x"$USE_SSE42_CRC32C_WITH_RUNTIME_CHECK" = x"1"; then
-    AC_DEFINE(USE_SSE42_CRC32C_WITH_RUNTIME_CHECK, 1, [Define to 1 to use Intel SSSE 4.2 CRC instructions with a runtime check.])
+    AC_DEFINE(USE_SSE42_CRC32C_WITH_RUNTIME_CHECK, 1, [Define to 1 to use Intel SSE 4.2 CRC instructions with a runtime check.])
     PG_CRC32C_OBJS="pg_crc32c_sse42.o pg_crc32c_sb8.o pg_crc32c_choose.o"
     AC_MSG_RESULT(SSE 4.2 with runtime check)
   else
-    AC_DEFINE(USE_SLICING_BY_8_CRC32C, 1, [Define to 1 to use Intel SSE 4.2 CRC instructions with a runtime check.])
+    AC_DEFINE(USE_SLICING_BY_8_CRC32C, 1, [Define to 1 to use software CRC-32C implementation (slicing-by-8).])
     PG_CRC32C_OBJS="pg_crc32c_sb8.o"
     AC_MSG_RESULT(slicing-by-8)
   fi

contrib/adminpack/adminpack.c

@@ -173,7 +173,7 @@ pg_file_rename(PG_FUNCTION_ARGS)
 	fn1 = convert_and_check_filename(PG_GETARG_TEXT_PP(0), false);
 	fn2 = convert_and_check_filename(PG_GETARG_TEXT_PP(1), false);
 	if (PG_ARGISNULL(2))
-		fn3 = 0;
+		fn3 = NULL;
 	else
 		fn3 = convert_and_check_filename(PG_GETARG_TEXT_PP(2), false);
 
@@ -195,7 +195,7 @@ pg_file_rename(PG_FUNCTION_ARGS)
 		PG_RETURN_BOOL(false);
 	}
 
-	rc = access(fn3 ? fn3 : fn2, 2);
+	rc = access(fn3 ? fn3 : fn2, W_OK);
 	if (rc >= 0 || errno != ENOENT)
 	{
 		ereport(ERROR,

contrib/bloom/blinsert.c

@@ -33,10 +33,11 @@ PG_MODULE_MAGIC;
 typedef struct
 {
 	BloomState	blstate;		/* bloom index state */
+	int64		indtuples;		/* total number of tuples indexed */
 	MemoryContext tmpCtx;		/* temporary memory context reset after each
 								 * tuple */
 	char		data[BLCKSZ];	/* cached page */
-	int64		count;			/* number of tuples in cached page */
+	int			count;			/* number of tuples in cached page */
 } BloomBuildState;
 
 /*
@@ -102,8 +103,14 @@ bloomBuildCallback(Relation index, HeapTuple htup, Datum *values,
 			/* We shouldn't be here since we're inserting to the empty page */
 			elog(ERROR, "could not add new bloom tuple to empty page");
 		}
+
+		/* Next item was added successfully */
+		buildstate->count++;
 	}
 
+	/* Update total tuple count */
+	buildstate->indtuples += 1;
+
 	MemoryContextSwitchTo(oldCtx);
 	MemoryContextReset(buildstate->tmpCtx);
 }
@@ -137,17 +144,15 @@ blbuild(Relation heap, Relation index, IndexInfo *indexInfo)
 	reltuples = IndexBuildHeapScan(heap, index, indexInfo, true,
 								   bloomBuildCallback, (void *) &buildstate);
 
-	/*
-	 * There are could be some items in cached page.  Flush this page if
-	 * needed.
-	 */
+	/* Flush last page if needed (it will be, unless heap was empty) */
 	if (buildstate.count > 0)
 		flushCachedPage(index, &buildstate);
 
 	MemoryContextDelete(buildstate.tmpCtx);
 
 	result = (IndexBuildResult *) palloc(sizeof(IndexBuildResult));
-	result->heap_tuples = result->index_tuples = reltuples;
+	result->heap_tuples = reltuples;
+	result->index_tuples = buildstate.indtuples;
 
 	return result;
 }

contrib/btree_gist/btree_inet.c

@@ -99,9 +99,11 @@ gbt_inet_compress(PG_FUNCTION_ARGS)
 	if (entry->leafkey)
 	{
 		inetKEY    *r = (inetKEY *) palloc(sizeof(inetKEY));
+		bool		failure = false;
 
 		retval = palloc(sizeof(GISTENTRY));
-		r->lower = convert_network_to_scalar(entry->key, INETOID);
+		r->lower = convert_network_to_scalar(entry->key, INETOID, &failure);
+		Assert(!failure);
 		r->upper = r->lower;
 		gistentryinit(*retval, PointerGetDatum(r),
 					  entry->rel, entry->page,
@@ -118,13 +120,18 @@ Datum
 gbt_inet_consistent(PG_FUNCTION_ARGS)
 {
 	GISTENTRY  *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
-	double		query = convert_network_to_scalar(PG_GETARG_DATUM(1), INETOID);
+	Datum		dquery = PG_GETARG_DATUM(1);
 	StrategyNumber strategy = (StrategyNumber) PG_GETARG_UINT16(2);
 
 	/* Oid		subtype = PG_GETARG_OID(3); */
 	bool	   *recheck = (bool *) PG_GETARG_POINTER(4);
 	inetKEY    *kkk = (inetKEY *) DatumGetPointer(entry->key);
 	GBT_NUMKEY_R key;
+	double		query;
+	bool		failure = false;
+
+	query = convert_network_to_scalar(dquery, INETOID, &failure);
+	Assert(!failure);
 
 	/* All cases served by this function are inexact */
 	*recheck = true;

contrib/btree_gist/expected/inet.out

@@ -64,3 +64,42 @@ SELECT count(*) FROM inettmp WHERE a >  '89.225.196.191'::inet;
    386
 (1 row)
 
+VACUUM inettmp;
+-- gist_inet_ops lacks a fetch function, so this should not be index-only scan
+EXPLAIN (COSTS OFF)
+SELECT count(*) FROM inettmp WHERE a  = '89.225.196.191'::inet;
+                       QUERY PLAN                       
+--------------------------------------------------------
+ Aggregate
+   ->  Bitmap Heap Scan on inettmp
+         Recheck Cond: (a = '89.225.196.191'::inet)
+         ->  Bitmap Index Scan on inetidx
+               Index Cond: (a = '89.225.196.191'::inet)
+(5 rows)
+
+SELECT count(*) FROM inettmp WHERE a  = '89.225.196.191'::inet;
+ count 
+-------
+     1
+(1 row)
+
+DROP INDEX inetidx;
+CREATE INDEX ON inettmp USING gist (a gist_inet_ops, a inet_ops);
+-- likewise here (checks for core planner bug)
+EXPLAIN (COSTS OFF)
+SELECT count(*) FROM inettmp WHERE a  = '89.225.196.191'::inet;
+                       QUERY PLAN                       
+--------------------------------------------------------
+ Aggregate
+   ->  Bitmap Heap Scan on inettmp
+         Recheck Cond: (a = '89.225.196.191'::inet)
+         ->  Bitmap Index Scan on inettmp_a_a1_idx
+               Index Cond: (a = '89.225.196.191'::inet)
+(5 rows)
+
+SELECT count(*) FROM inettmp WHERE a  = '89.225.196.191'::inet;
+ count 
+-------
+     1
+(1 row)
+

contrib/btree_gist/sql/inet.sql

@@ -29,3 +29,21 @@ SELECT count(*) FROM inettmp WHERE a  = '89.225.196.191'::inet;
 SELECT count(*) FROM inettmp WHERE a >= '89.225.196.191'::inet;
 
 SELECT count(*) FROM inettmp WHERE a >  '89.225.196.191'::inet;
+
+VACUUM inettmp;
+
+-- gist_inet_ops lacks a fetch function, so this should not be index-only scan
+EXPLAIN (COSTS OFF)
+SELECT count(*) FROM inettmp WHERE a  = '89.225.196.191'::inet;
+
+SELECT count(*) FROM inettmp WHERE a  = '89.225.196.191'::inet;
+
+DROP INDEX inetidx;
+
+CREATE INDEX ON inettmp USING gist (a gist_inet_ops, a inet_ops);
+
+-- likewise here (checks for core planner bug)
+EXPLAIN (COSTS OFF)
+SELECT count(*) FROM inettmp WHERE a  = '89.225.196.191'::inet;
+
+SELECT count(*) FROM inettmp WHERE a  = '89.225.196.191'::inet;

contrib/cube/cube.c

@@ -1555,7 +1555,6 @@ cube_coord_llur(PG_FUNCTION_ARGS)
 {
 	NDBOX	   *cube = PG_GETARG_NDBOX(0);
 	int			coord = PG_GETARG_INT32(1);
-	bool		inverse = false;
 	float8		result;
 
 	/* 0 is the only unsupported coordinate value */
@@ -1593,10 +1592,6 @@ cube_coord_llur(PG_FUNCTION_ARGS)
 		result = 0.0;
 	}
 
-	/* Inverse value if needed */
-	if (inverse)
-		result = -result;
-
 	PG_RETURN_FLOAT8(result);
 }
 

contrib/in_memory/Makefile

@@ -41,7 +41,7 @@ submake-isolation:
 submake-in_memory:
 	$(MAKE) -C $(top_builddir)/contrib/in_memory
 
-REGRESSCHECKS = in_memory tuple_limit subtrans ddl_forbid non_coercible
+REGRESSCHECKS = in_memory tuple_limit subtrans ddl_forbid non_coercible collation
 
 regresscheck: | submake-regress submake-in_memory temp-install
 	$(pg_regress_check) \
@@ -60,5 +60,5 @@ isolationcheck: | submake-isolation submake-in_memory temp-install
 
 temp-install: EXTRA_INSTALL=contrib/in_memory
 
-standby-check: submake-in_memory temp-install
+prove-check: submake-in_memory temp-install
 	$(prove_check)