Merge branch 'master' into rel_future_beta

Author: funbringer

expected/pathman_bgw.out

@@ -187,6 +187,7 @@ DECLARE
 	i			int4 := 0; -- protect from endless loop
 BEGIN
 	LOOP
+		-- get total number of processed rows
 		SELECT processed
 		FROM pathman_concurrent_part_tasks
 		WHERE relid = 'test_bgw.conc_part'::regclass
@@ -200,9 +201,12 @@ BEGIN
 
 			ASSERT rows IS NOT NULL;
 
-			-- rows should increase!
-			IF rows_old <= rows THEN
+			IF rows_old = rows THEN
 				i = i + 1;
+			ELSIF rows < rows_old THEN
+				RAISE EXCEPTION 'rows is decreasing: new %, old %', rows, rows_old;
+			ELSIF rows > 500 THEN
+				RAISE EXCEPTION 'processed % rows', rows;
 			END IF;
 		ELSE
 			EXIT; -- exit loop

sql/pathman_bgw.sql

@@ -101,6 +101,7 @@ DECLARE
 	i			int4 := 0; -- protect from endless loop
 BEGIN
 	LOOP
+		-- get total number of processed rows
 		SELECT processed
 		FROM pathman_concurrent_part_tasks
 		WHERE relid = 'test_bgw.conc_part'::regclass
@@ -114,9 +115,12 @@ BEGIN
 
 			ASSERT rows IS NOT NULL;
 
-			-- rows should increase!
-			IF rows_old <= rows THEN
+			IF rows_old = rows THEN
 				i = i + 1;
+			ELSIF rows < rows_old THEN
+				RAISE EXCEPTION 'rows is decreasing: new %, old %', rows, rows_old;
+			ELSIF rows > 500 THEN
+				RAISE EXCEPTION 'processed % rows', rows;
 			END IF;
 		ELSE
 			EXIT; -- exit loop

src/pathman_workers.c

@@ -763,7 +763,7 @@ partition_table_concurrently(PG_FUNCTION_ARGS)
 
 	/* Looks like we could not find an empty slot */
 	if (empty_slot_idx < 0)
-		ereport(ERROR, (ERRCODE_CONFIGURATION_LIMIT_EXCEEDED,
+		ereport(ERROR, (errcode(ERRCODE_CONFIGURATION_LIMIT_EXCEEDED),
 						errmsg("no empty worker slots found"),
 						errhint("consider increasing max_worker_processes")));
 	else