Merge pull request #147 from postgres/master

Sync Fork from Upstream Repo

Author: sthagen

contrib/amcheck/expected/check_btree.out

@@ -97,8 +97,8 @@ SELECT bt_index_parent_check('bttest_b_idx');
 SELECT * FROM pg_locks
 WHERE relation = ANY(ARRAY['bttest_a', 'bttest_a_idx', 'bttest_b', 'bttest_b_idx']::regclass[])
     AND pid = pg_backend_pid();
- locktype | database | relation | page | tuple | virtualxid | transactionid | classid | objid | objsubid | virtualtransaction | pid | mode | granted | fastpath 
-----------+----------+----------+------+-------+------------+---------------+---------+-------+----------+--------------------+-----+------+---------+----------
+ locktype | database | relation | page | tuple | virtualxid | transactionid | classid | objid | objsubid | virtualtransaction | pid | mode | granted | fastpath | waitstart 
+----------+----------+----------+------+-------+------------+---------------+---------+-------+----------+--------------------+-----+------+---------+----------+-----------
 (0 rows)
 
 COMMIT;

contrib/amcheck/verify_nbtree.c

@@ -535,7 +535,7 @@ bt_check_every_level(Relation rel, Relation heaprel, bool heapkeyspace,
 	if (metad->btm_fastroot != metad->btm_root)
 		ereport(DEBUG1,
 				(errcode(ERRCODE_NO_DATA),
-				 errmsg("harmless fast root mismatch in index %s",
+				 errmsg_internal("harmless fast root mismatch in index %s",
 						RelationGetRelationName(rel)),
 				 errdetail_internal("Fast root block %u (level %u) differs from true root block %u (level %u).",
 									metad->btm_fastroot, metad->btm_fastlevel,
@@ -721,7 +721,7 @@ bt_check_level_from_leftmost(BtreeCheckState *state, BtreeLevel level)
 			else
 				ereport(DEBUG1,
 						(errcode(ERRCODE_NO_DATA),
-						 errmsg("block %u of index \"%s\" ignored",
+						 errmsg_internal("block %u of index \"%s\" ignored",
 								current, RelationGetRelationName(state->rel))));
 			goto nextpage;
 		}
@@ -979,7 +979,7 @@ bt_recheck_sibling_links(BtreeCheckState *state,
 			/* Report split in left sibling, not target (or new target) */
 			ereport(DEBUG1,
 					(errcode(ERRCODE_INTERNAL_ERROR),
-					 errmsg("harmless concurrent page split detected in index \"%s\"",
+					 errmsg_internal("harmless concurrent page split detected in index \"%s\"",
 							RelationGetRelationName(state->rel)),
 					 errdetail_internal("Block=%u new right sibling=%u original right sibling=%u.",
 										leftcurrent, newtargetblock,
@@ -1605,7 +1605,7 @@ bt_right_page_check_scankey(BtreeCheckState *state)
 		targetnext = opaque->btpo_next;
 		ereport(DEBUG1,
 				(errcode(ERRCODE_NO_DATA),
-				 errmsg("level %u leftmost page of index \"%s\" was found deleted or half dead",
+				 errmsg_internal("level %u leftmost page of index \"%s\" was found deleted or half dead",
 						opaque->btpo.level, RelationGetRelationName(state->rel)),
 				 errdetail_internal("Deleted page found when building scankey from right sibling.")));
 
@@ -1733,7 +1733,7 @@ bt_right_page_check_scankey(BtreeCheckState *state)
 		 */
 		ereport(DEBUG1,
 				(errcode(ERRCODE_NO_DATA),
-				 errmsg("%s block %u of index \"%s\" has no first data item",
+				 errmsg_internal("%s block %u of index \"%s\" has no first data item",
 						P_ISLEAF(opaque) ? "leaf" : "internal", targetnext,
 						RelationGetRelationName(state->rel))));
 		return NULL;
@@ -2287,7 +2287,7 @@ bt_downlink_missing_check(BtreeCheckState *state, bool rightsplit,
 	{
 		ereport(DEBUG1,
 				(errcode(ERRCODE_NO_DATA),
-				 errmsg("harmless interrupted page split detected in index %s",
+				 errmsg_internal("harmless interrupted page split detected in index %s",
 						RelationGetRelationName(state->rel)),
 				 errdetail_internal("Block=%u level=%u left sibling=%u page lsn=%X/%X.",
 									blkno, opaque->btpo.level,

contrib/pageinspect/expected/gist.out

@@ -31,25 +31,25 @@ SELECT * FROM gist_page_opaque_info(get_raw_page('test_gist_idx', 2));
 
 COMMIT;
 SELECT * FROM gist_page_items(get_raw_page('test_gist_idx', 0), 'test_gist_idx');
- itemoffset |   ctid    | itemlen |       keys        
-------------+-----------+---------+-------------------
-          1 | (1,65535) |      40 | (p)=((166,166))
-          2 | (2,65535) |      40 | (p)=((332,332))
-          3 | (3,65535) |      40 | (p)=((498,498))
-          4 | (4,65535) |      40 | (p)=((664,664))
-          5 | (5,65535) |      40 | (p)=((830,830))
-          6 | (6,65535) |      40 | (p)=((996,996))
-          7 | (7,65535) |      40 | (p)=((1000,1000))
+ itemoffset |   ctid    | itemlen | dead |       keys        
+------------+-----------+---------+------+-------------------
+          1 | (1,65535) |      40 | f    | (p)=((166,166))
+          2 | (2,65535) |      40 | f    | (p)=((332,332))
+          3 | (3,65535) |      40 | f    | (p)=((498,498))
+          4 | (4,65535) |      40 | f    | (p)=((664,664))
+          5 | (5,65535) |      40 | f    | (p)=((830,830))
+          6 | (6,65535) |      40 | f    | (p)=((996,996))
+          7 | (7,65535) |      40 | f    | (p)=((1000,1000))
 (7 rows)
 
 SELECT * FROM gist_page_items(get_raw_page('test_gist_idx', 1), 'test_gist_idx') LIMIT 5;
- itemoffset | ctid  | itemlen |    keys     
-------------+-------+---------+-------------
-          1 | (0,1) |      40 | (p)=((1,1))
-          2 | (0,2) |      40 | (p)=((2,2))
-          3 | (0,3) |      40 | (p)=((3,3))
-          4 | (0,4) |      40 | (p)=((4,4))
-          5 | (0,5) |      40 | (p)=((5,5))
+ itemoffset | ctid  | itemlen | dead |    keys     
+------------+-------+---------+------+-------------
+          1 | (0,1) |      40 | f    | (p)=((1,1))
+          2 | (0,2) |      40 | f    | (p)=((2,2))
+          3 | (0,3) |      40 | f    | (p)=((3,3))
+          4 | (0,4) |      40 | f    | (p)=((4,4))
+          5 | (0,5) |      40 | f    | (p)=((5,5))
 (5 rows)
 
 -- gist_page_items_bytea prints the raw key data as a bytea. The output of that is

contrib/pageinspect/gistfuncs.c

@@ -103,6 +103,7 @@ gist_page_items_bytea(PG_FUNCTION_ARGS)
 	MemoryContext oldcontext;
 	Page		page;
 	OffsetNumber offset;
+	OffsetNumber maxoff = InvalidOffsetNumber;
 
 	if (!superuser())
 		ereport(ERROR,
@@ -135,15 +136,18 @@ gist_page_items_bytea(PG_FUNCTION_ARGS)
 
 	page = get_page_from_raw(raw_page);
 
+	/* Avoid bogus PageGetMaxOffsetNumber() call with deleted pages */
 	if (GistPageIsDeleted(page))
 		elog(NOTICE, "page is deleted");
+	else
+		maxoff = PageGetMaxOffsetNumber(page);
 
 	for (offset = FirstOffsetNumber;
-		 offset <= PageGetMaxOffsetNumber(page);
+		 offset <= maxoff;
 		 offset++)
 	{
-		Datum		values[4];
-		bool		nulls[4];
+		Datum		values[5];
+		bool		nulls[5];
 		ItemId		id;
 		IndexTuple	itup;
 		bytea	   *tuple_bytea;
@@ -166,7 +170,8 @@ gist_page_items_bytea(PG_FUNCTION_ARGS)
 		tuple_bytea = (bytea *) palloc(tuple_len + VARHDRSZ);
 		SET_VARSIZE(tuple_bytea, tuple_len + VARHDRSZ);
 		memcpy(VARDATA(tuple_bytea), itup, tuple_len);
-		values[3] = PointerGetDatum(tuple_bytea);
+		values[3] = BoolGetDatum(ItemIdIsDead(id));
+		values[4] = PointerGetDatum(tuple_bytea);
 
 		tuplestore_putvalues(tupstore, tupdesc, values, nulls);
 	}
@@ -187,6 +192,7 @@ gist_page_items(PG_FUNCTION_ARGS)
 	MemoryContext oldcontext;
 	Page		page;
 	OffsetNumber offset;
+	OffsetNumber maxoff = InvalidOffsetNumber;
 
 	if (!superuser())
 		ereport(ERROR,
@@ -222,15 +228,18 @@ gist_page_items(PG_FUNCTION_ARGS)
 
 	page = get_page_from_raw(raw_page);
 
+	/* Avoid bogus PageGetMaxOffsetNumber() call with deleted pages */
 	if (GistPageIsDeleted(page))
 		elog(NOTICE, "page is deleted");
+	else
+		maxoff = PageGetMaxOffsetNumber(page);
 
 	for (offset = FirstOffsetNumber;
-		 offset <= PageGetMaxOffsetNumber(page);
+		 offset <= maxoff;
 		 offset++)
 	{
-		Datum		values[4];
-		bool		nulls[4];
+		Datum		values[5];
+		bool		nulls[5];
 		ItemId		id;
 		IndexTuple	itup;
 		Datum		itup_values[INDEX_MAX_KEYS];
@@ -252,14 +261,15 @@ gist_page_items(PG_FUNCTION_ARGS)
 		values[0] = DatumGetInt16(offset);
 		values[1] = ItemPointerGetDatum(&itup->t_tid);
 		values[2] = Int32GetDatum((int) IndexTupleSize(itup));
+		values[3] = BoolGetDatum(ItemIdIsDead(id));
 
 		key_desc = BuildIndexValueDescription(indexRel, itup_values, itup_isnull);
 		if (key_desc)
-			values[3] = CStringGetTextDatum(key_desc);
+			values[4] = CStringGetTextDatum(key_desc);
 		else
 		{
-			values[3] = (Datum) 0;
-			nulls[3] = true;
+			values[4] = (Datum) 0;
+			nulls[4] = true;
 		}
 
 		tuplestore_putvalues(tupstore, tupdesc, values, nulls);

contrib/pageinspect/pageinspect--1.8--1.9.sql

@@ -22,6 +22,7 @@ CREATE FUNCTION gist_page_items_bytea(IN page bytea,
     OUT itemoffset smallint,
     OUT ctid tid,
     OUT itemlen smallint,
+    OUT dead boolean,
     OUT key_data bytea)
 RETURNS SETOF record
 AS 'MODULE_PATHNAME', 'gist_page_items_bytea'
@@ -35,6 +36,7 @@ CREATE FUNCTION gist_page_items(IN page bytea,
     OUT itemoffset smallint,
     OUT ctid tid,
     OUT itemlen smallint,
+    OUT dead boolean,
     OUT keys text)
 RETURNS SETOF record
 AS 'MODULE_PATHNAME', 'gist_page_items'

contrib/pg_prewarm/autoprewarm.c

@@ -697,7 +697,7 @@ apw_dump_now(bool is_bgworker, bool dump_unlogged)
 	apw_state->pid_using_dumpfile = InvalidPid;
 
 	ereport(DEBUG1,
-			(errmsg("wrote block details for %d blocks", num_blocks)));
+			(errmsg_internal("wrote block details for %d blocks", num_blocks)));
 	return num_blocks;
 }
 

contrib/pgcrypto/internal-sha2.c

@@ -118,7 +118,7 @@ int_sha2_finish(PX_MD *h, uint8 *dst)
 {
 	pg_cryptohash_ctx *ctx = (pg_cryptohash_ctx *) h->p.ptr;
 
-	if (pg_cryptohash_final(ctx, dst) < 0)
+	if (pg_cryptohash_final(ctx, dst, h->result_size(h)) < 0)
 		elog(ERROR, "could not finalize %s context", "SHA2");
 }
 

contrib/pgcrypto/internal.c

@@ -106,7 +106,7 @@ int_md5_finish(PX_MD *h, uint8 *dst)
 {
 	pg_cryptohash_ctx *ctx = (pg_cryptohash_ctx *) h->p.ptr;
 
-	if (pg_cryptohash_final(ctx, dst) < 0)
+	if (pg_cryptohash_final(ctx, dst, h->result_size(h)) < 0)
 		elog(ERROR, "could not finalize %s context", "MD5");
 }
 
@@ -156,7 +156,7 @@ int_sha1_finish(PX_MD *h, uint8 *dst)
 {
 	pg_cryptohash_ctx *ctx = (pg_cryptohash_ctx *) h->p.ptr;
 
-	if (pg_cryptohash_final(ctx, dst) < 0)
+	if (pg_cryptohash_final(ctx, dst, h->result_size(h)) < 0)
 		elog(ERROR, "could not finalize %s context", "SHA1");
 }
 

contrib/pgstattuple/pgstattuple.c

@@ -430,7 +430,7 @@ pgstat_btree_page(pgstattuple_type *stat, Relation rel, BlockNumber blkno,
 		opaque = (BTPageOpaque) PageGetSpecialPointer(page);
 		if (P_IGNORE(opaque))
 		{
-			/* recyclable page */
+			/* deleted or half-dead page */
 			stat->free_space += BLCKSZ;
 		}
 		else if (P_ISLEAF(opaque))
@@ -440,7 +440,7 @@ pgstat_btree_page(pgstattuple_type *stat, Relation rel, BlockNumber blkno,
 		}
 		else
 		{
-			/* root or node */
+			/* internal page */
 		}
 	}
 

contrib/postgres_fdw/expected/postgres_fdw.out

@@ -613,6 +613,24 @@ SELECT t1."C 1", t2.c1, t3.c1 FROM "S 1"."T 1" t1 full join ft1 t2 full join ft2
 
 RESET enable_hashjoin;
 RESET enable_nestloop;
+-- Test executing assertion in estimate_path_cost_size() that makes sure that
+-- retrieved_rows for foreign rel re-used to cost pre-sorted foreign paths is
+-- a sensible value even when the rel has tuples=0
+CREATE TABLE loct_empty (c1 int NOT NULL, c2 text);
+CREATE FOREIGN TABLE ft_empty (c1 int NOT NULL, c2 text)
+  SERVER loopback OPTIONS (table_name 'loct_empty');
+INSERT INTO loct_empty
+  SELECT id, 'AAA' || to_char(id, 'FM000') FROM generate_series(1, 100) id;
+DELETE FROM loct_empty;
+ANALYZE ft_empty;
+EXPLAIN (VERBOSE, COSTS OFF) SELECT * FROM ft_empty ORDER BY c1;
+                                  QUERY PLAN                                   
+-------------------------------------------------------------------------------
+ Foreign Scan on public.ft_empty
+   Output: c1, c2
+   Remote SQL: SELECT c1, c2 FROM public.loct_empty ORDER BY c1 ASC NULLS LAST
+(3 rows)
+
 -- ===================================================================
 -- WHERE with remotely-executable conditions
 -- ===================================================================
@@ -8928,7 +8946,7 @@ DO $d$
     END;
 $d$;
 ERROR:  invalid option "password"
-HINT:  Valid options in this context are: service, passfile, channel_binding, connect_timeout, dbname, host, hostaddr, port, options, application_name, keepalives, keepalives_idle, keepalives_interval, keepalives_count, tcp_user_timeout, sslmode, sslcompression, sslcert, sslkey, sslrootcert, sslcrl, requirepeer, ssl_min_protocol_version, ssl_max_protocol_version, gssencmode, krbsrvname, gsslib, target_session_attrs, use_remote_estimate, fdw_startup_cost, fdw_tuple_cost, extensions, updatable, fetch_size, batch_size
+HINT:  Valid options in this context are: service, passfile, channel_binding, connect_timeout, dbname, host, hostaddr, port, options, application_name, keepalives, keepalives_idle, keepalives_interval, keepalives_count, tcp_user_timeout, sslmode, sslcompression, sslcert, sslkey, sslrootcert, sslcrl, sslcrldir, requirepeer, ssl_min_protocol_version, ssl_max_protocol_version, gssencmode, krbsrvname, gsslib, target_session_attrs, use_remote_estimate, fdw_startup_cost, fdw_tuple_cost, extensions, updatable, fetch_size, batch_size
 CONTEXT:  SQL statement "ALTER SERVER loopback_nopw OPTIONS (ADD password 'dummypw')"
 PL/pgSQL function inline_code_block line 3 at EXECUTE
 -- If we add a password for our user mapping instead, we should get a different
@@ -9396,5 +9414,26 @@ SELECT COUNT(*) FROM batch_table;
     66
 (1 row)
 
+-- Check that enabling batched inserts doesn't interfere with cross-partition
+-- updates
+CREATE TABLE batch_cp_upd_test (a int) PARTITION BY LIST (a);
+CREATE TABLE batch_cp_upd_test1 (LIKE batch_cp_upd_test);
+CREATE FOREIGN TABLE batch_cp_upd_test1_f
+	PARTITION OF batch_cp_upd_test
+	FOR VALUES IN (1)
+	SERVER loopback
+	OPTIONS (table_name 'batch_cp_upd_test1', batch_size '10');
+CREATE TABLE batch_cp_up_test1 PARTITION OF batch_cp_upd_test
+	FOR VALUES IN (2);
+INSERT INTO batch_cp_upd_test VALUES (1), (2);
+-- The following moves a row from the local partition to the foreign one
+UPDATE batch_cp_upd_test t SET a = 1 FROM (VALUES (1), (2)) s(a) WHERE t.a = s.a;
+SELECT tableoid::regclass, * FROM batch_cp_upd_test;
+       tableoid       | a 
+----------------------+---
+ batch_cp_upd_test1_f | 1
+ batch_cp_upd_test1_f | 1
+(2 rows)
+
 -- Clean up
-DROP TABLE batch_table CASCADE;
+DROP TABLE batch_table, batch_cp_upd_test CASCADE;