Merge commit 'c44d6d5f85ea77b3fda7f23d253cc53f92b25405' into PGPRO9_6

vbwagner · vbwagner · commit a035fd511071 · 2017-10-13T14:56:33.000+03:00
diff --git a/contrib/pg_pathman/META.json b/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"
       }
    },
diff --git a/contrib/pg_pathman/expected/pathman_bgw.out b/contrib/pg_pathman/expected/pathman_bgw.out
@@ -200,7 +200,8 @@ BEGIN
 
 			ASSERT rows IS NOT NULL;
 
-			IF rows_old = rows THEN
+			-- rows should increase!
+			IF rows_old <= rows THEN
 				i = i + 1;
 			END IF;
 		ELSE
diff --git a/contrib/pg_pathman/expected/pathman_calamity.out b/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;
diff --git a/contrib/pg_pathman/sql/pathman_bgw.sql b/contrib/pg_pathman/sql/pathman_bgw.sql
@@ -114,7 +114,8 @@ BEGIN
 
 			ASSERT rows IS NOT NULL;
 
-			IF rows_old = rows THEN
+			-- rows should increase!
+			IF rows_old <= rows THEN
 				i = i + 1;
 			END IF;
 		ELSE
diff --git a/contrib/pg_pathman/src/include/init.h b/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,
diff --git a/contrib/pg_pathman/src/pathman_workers.c b/contrib/pg_pathman/src/pathman_workers.c
@@ -569,6 +569,7 @@ bgw_main_concurrent_part(Datum main_arg)
 
 				/* Extract number of processed rows */
 				rows = DatumGetInt64(SPI_getbinval(tuple, tupdesc, 1, &isnull));
+				Assert(tupdesc->attrs[0]->atttypid == INT8OID); /* check type */
 				Assert(!isnull); /* ... and ofc it must not be NULL */
 			}
 			/* Else raise generic error */

Original file line number	Diff line number	Diff line change
`@@ -569,6 +569,7 @@ bgw_main_concurrent_part(Datum main_arg)`
`569`	`569`
`570`	`570`	`/* Extract number of processed rows */`
`571`	`571`	`rows = DatumGetInt64(SPI_getbinval(tuple, tupdesc, 1, &isnull));`
	`572`	`+ Assert(tupdesc->attrs[0]->atttypid == INT8OID); /* check type */`
`572`	`573`	`Assert(!isnull); /* ... and ofc it must not be NULL */`
`573`	`574`	`}`
`574`	`575`	`/* Else raise generic error */`