Merge branch 'PGPRO9_6' of git.postgrespro.ru:pgpro-dev/postgrespro into PGPRO9_6

Author: vbwagner

configure

@@ -14746,7 +14746,7 @@ fi
 LIBS_including_readline="$LIBS"
 LIBS=`echo "$LIBS" | sed -e 's/-ledit//g' -e 's/-lreadline//g'`
 
-for ac_func in cbrt dlopen fdatasync getifaddrs getpeerucred getrlimit mbstowcs_l memmove poll pstat pthread_is_threaded_np readlink setproctitle setsid shm_open symlink sync_file_range towlower utime utimes wcstombs wcstombs_l
+for ac_func in cbrt dlopen fdatasync getifaddrs getpeerucred getrlimit mbstowcs_l memmove poll posix_fallocate pstat pthread_is_threaded_np readlink setproctitle setsid shm_open symlink sync_file_range towlower utime utimes wcstombs wcstombs_l
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"

configure.in

@@ -1562,7 +1562,7 @@ PGAC_FUNC_WCSTOMBS_L
 LIBS_including_readline="$LIBS"
 LIBS=`echo "$LIBS" | sed -e 's/-ledit//g' -e 's/-lreadline//g'`
 
-AC_CHECK_FUNCS([cbrt dlopen fdatasync getifaddrs getpeerucred getrlimit mbstowcs_l memmove poll pstat pthread_is_threaded_np readlink setproctitle setsid shm_open symlink sync_file_range towlower utime utimes wcstombs wcstombs_l])
+AC_CHECK_FUNCS([cbrt dlopen fdatasync getifaddrs getpeerucred getrlimit mbstowcs_l memmove poll posix_fallocate pstat pthread_is_threaded_np readlink setproctitle setsid shm_open symlink sync_file_range towlower utime utimes wcstombs wcstombs_l])
 
 AC_REPLACE_FUNCS(fseeko)
 case $host_os in

contrib/online_analyze/online_analyze.c

@@ -557,6 +557,9 @@ makeAnalyze(Oid relOid, CmdKind operation, int64 naffected)
 			&vacstmt, NULL, true, GetAccessStrategy(BAS_VACUUM)
 #endif
 		);
+		
+		/* Make changes visible to subsequent calls */
+		CommandCounterIncrement();
 
 		if (online_analyze_verbose)
 		{

contrib/pg_pathman/META.json

@@ -2,7 +2,7 @@
    "name": "pg_pathman",
    "abstract": "Partitioning tool",
    "description": "The `pg_pathman` module provides optimized partitioning mechanism and functions to manage partitions.",
-   "version": "1.4.6",
+   "version": "1.4.7",
    "maintainer": [
       "Ildar Musin <i.musin@postgrespro.ru>",
       "Dmitry Ivanov <d.ivanov@postgrespro.ru>",
@@ -24,7 +24,7 @@
        "pg_pathman": {
            "file": "pg_pathman--1.4.sql",
            "docfile": "README.md",
-           "version": "1.4.6",
+           "version": "1.4.7",
            "abstract": "Partitioning tool"
       }
    },

contrib/pg_pathman/expected/pathman_bgw.out

@@ -181,19 +181,39 @@ ROLLBACK;
 /* Wait until it finises */
 DO $$
 DECLARE
-	ops int8;
+	ops			int8;
+	rows		int8;
+	rows_old	int8 := 0;
+	i			int4 := 0; -- protect from endless loop
 BEGIN
 	LOOP
-		SELECT count(*)
+		SELECT processed
 		FROM pathman_concurrent_part_tasks
-		WHERE processed < 500 -- protect from endless loops
-		INTO ops;
+		WHERE relid = 'test_bgw.conc_part'::regclass
+		INTO rows;
+
+		-- get number of partitioning tasks
+		GET DIAGNOSTICS ops = ROW_COUNT;
 
 		IF ops > 0 THEN
 			PERFORM pg_sleep(0.2);
+
+			ASSERT rows IS NOT NULL;
+
+			-- rows should increase!
+			IF rows_old <= rows THEN
+				i = i + 1;
+			END IF;
 		ELSE
-			EXIT;
+			EXIT; -- exit loop
 		END IF;
+
+		IF i > 50 THEN
+			RAISE WARNING 'looks like partitioning bgw is stuck!';
+			EXIT; -- exit loop
+		END IF;
+
+		rows_old = rows;
 	END LOOP;
 END
 $$ LANGUAGE plpgsql;

contrib/pg_pathman/expected/pathman_calamity.out

@@ -12,7 +12,7 @@ SELECT debug_capture();
 SELECT get_pathman_lib_version();
  get_pathman_lib_version 
 -------------------------
- 10406
+ 10407
 (1 row)
 
 set client_min_messages = NOTICE;

contrib/pg_pathman/sql/pathman_bgw.sql

@@ -95,19 +95,39 @@ ROLLBACK;
 /* Wait until it finises */
 DO $$
 DECLARE
-	ops int8;
+	ops			int8;
+	rows		int8;
+	rows_old	int8 := 0;
+	i			int4 := 0; -- protect from endless loop
 BEGIN
 	LOOP
-		SELECT count(*)
+		SELECT processed
 		FROM pathman_concurrent_part_tasks
-		WHERE processed < 500 -- protect from endless loops
-		INTO ops;
+		WHERE relid = 'test_bgw.conc_part'::regclass
+		INTO rows;
+
+		-- get number of partitioning tasks
+		GET DIAGNOSTICS ops = ROW_COUNT;
 
 		IF ops > 0 THEN
 			PERFORM pg_sleep(0.2);
+
+			ASSERT rows IS NOT NULL;
+
+			-- rows should increase!
+			IF rows_old <= rows THEN
+				i = i + 1;
+			END IF;
 		ELSE
-			EXIT;
+			EXIT; -- exit loop
 		END IF;
+
+		IF i > 50 THEN
+			RAISE WARNING 'looks like partitioning bgw is stuck!';
+			EXIT; -- exit loop
+		END IF;
+
+		rows_old = rows;
 	END LOOP;
 END
 $$ LANGUAGE plpgsql;

contrib/pg_pathman/src/include/init.h

@@ -157,7 +157,7 @@ simpify_mcxt_name(MemoryContext mcxt)
 #define LOWEST_COMPATIBLE_FRONT		0x010400
 
 /* Current version of native C library (0xAA_BB_CC) */
-#define CURRENT_LIB_VERSION			0x010406
+#define CURRENT_LIB_VERSION			0x010407
 
 
 void *pathman_cache_search_relid(HTAB *cache_table,

contrib/pg_pathman/src/include/pathman_workers.h

@@ -74,7 +74,7 @@ typedef struct
 	pid_t	pid;			/* worker's PID */
 	Oid		dbid;			/* database which contains the relation */
 	Oid		relid;			/* table to be partitioned concurrently */
-	uint64	total_rows;		/* total amount of rows processed */
+	int64	total_rows;		/* total amount of rows processed */
 
 	int32	batch_size;		/* number of rows in a batch */
 	float8	sleep_time;		/* how long should we sleep in case of error? */