Merge branch 'rel_future_beta' into rel_future_update_node

Author: funbringer

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.1",
+   "version": "1.4.2",
    "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.1",
+           "version": "1.4.2",
            "abstract": "Partitioning tool"
       }
    },

README.md

@@ -102,6 +102,13 @@ SET pg_pathman.enable = t;
 
 ## Available functions
 
+### Module's version
+
+```plpgsql
+pathman_version()
+```
+Although it's possible to get major and minor version numbers using `\dx pg_pathman`, it doesn't show the actual [patch number](http://semver.org/). This function returns a complete version number of the loaded pg_pathman module in `MAJOR.MINOR.PATCH` format.
+
 ### Partition creation
 ```plpgsql
 create_hash_partitions(relation         REGCLASS,
@@ -282,7 +289,7 @@ Update RANGE partitioned table interval. Note that interval must not be negative
 ```plpgsql
 set_enable_parent(relation REGCLASS, value BOOLEAN)
 ```
-Include/exclude parent table into/from query plan. In original PostgreSQL planner parent table is always included into query plan even if it's empty which can lead to additional overhead. You can use `disable_parent()` if you are never going to use parent table as a storage. Default value depends on the `partition_data` parameter that was specified during initial partitioning in `create_range_partitions()` or `create_partitions_from_range()` functions. If the `partition_data` parameter was `true` then all data have already been migrated to partitions and parent table disabled. Otherwise it is enabled.
+Include/exclude parent table into/from query plan. In original PostgreSQL planner parent table is always included into query plan even if it's empty which can lead to additional overhead. You can use `disable_parent()` if you are never going to use parent table as a storage. Default value depends on the `partition_data` parameter that was specified during initial partitioning in `create_range_partitions()` function. If the `partition_data` parameter was `true` then all data have already been migrated to partitions and parent table disabled. Otherwise it is enabled.
 
 ```plpgsql
 set_auto(relation REGCLASS, value BOOLEAN)

expected/pathman_calamity.out

@@ -9,10 +9,10 @@ SELECT debug_capture();
 
 (1 row)
 
-SELECT get_pathman_lib_version();
- get_pathman_lib_version 
--------------------------
- 10500
+SELECT pathman_version();
+ pathman_version 
+-----------------
+ 1.5.0
 (1 row)
 
 set client_min_messages = NOTICE;

init.sql

@@ -870,6 +870,6 @@ CREATE OR REPLACE FUNCTION @extschema@.debug_capture()
 RETURNS VOID AS 'pg_pathman', 'debug_capture'
 LANGUAGE C STRICT;
 
-CREATE OR REPLACE FUNCTION @extschema@.get_pathman_lib_version()
-RETURNS CSTRING AS 'pg_pathman', 'get_pathman_lib_version'
+CREATE OR REPLACE FUNCTION @extschema@.pathman_version()
+RETURNS CSTRING AS 'pg_pathman', 'pathman_version'
 LANGUAGE C STRICT;

sql/pathman_calamity.sql

@@ -7,7 +7,7 @@ CREATE SCHEMA calamity;
 /* call for coverage test */
 set client_min_messages = ERROR;
 SELECT debug_capture();
-SELECT get_pathman_lib_version();
+SELECT pathman_version();
 set client_min_messages = NOTICE;
 
 

src/include/compat/pg_compat.h

@@ -209,7 +209,7 @@
 /*
  * create_nestloop_path()
  */
-#if PG_VERSION_NUM >= 100000
+#if PG_VERSION_NUM >= 100000 || (defined(PGPRO_VERSION) && PG_VERSION_NUM >= 90603)
 #define create_nestloop_path_compat(root, joinrel, jointype, workspace, extra, \
 									outer, inner, filtered_joinclauses, pathkeys, \
 									required_outer) \

src/include/init.h

@@ -153,11 +153,11 @@ simpify_mcxt_name(MemoryContext mcxt)
 #define DEFAULT_PATHMAN_OVERRIDE_COPY		true
 
 
-/* Lowest version of Pl/PgSQL frontend compatible with internals (0xAA_BB_CC) */
-#define LOWEST_COMPATIBLE_FRONT		0x010500
+/* Lowest version of Pl/PgSQL frontend compatible with internals */
+#define LOWEST_COMPATIBLE_FRONT		"1.5.0"
 
-/* Current version of native C library (0xAA_BB_CC) */
-#define CURRENT_LIB_VERSION			0x010500
+/* Current version of native C library */
+#define CURRENT_LIB_VERSION			"1.5.0"
 
 
 void *pathman_cache_search_relid(HTAB *cache_table,

src/init.c

@@ -38,6 +38,8 @@
 #include "utils/syscache.h"
 #include "utils/typcache.h"
 
+#include <stdlib.h>
+
 
 /* Various memory contexts for caches */
 MemoryContext		TopPathmanContext				= NULL;
@@ -92,9 +94,10 @@ static bool read_opexpr_const(const OpExpr *opexpr,
 
 
 /* Validate SQL facade */
-static uint32 build_sql_facade_version(char *version_cstr);
-static uint32 get_sql_facade_version(void);
-static void validate_sql_facade_version(uint32 ver);
+static uint32 build_semver_uint32(char *version_cstr);
+static uint32 get_plpgsql_frontend_version(void);
+static void validate_plpgsql_frontend_version(uint32 current_ver,
+											  uint32 compatible_ver);
 
 
 /*
@@ -206,7 +209,8 @@ load_config(void)
 		return false; /* remain 'uninitialized', exit before creating main caches */
 
 	/* Validate pg_pathman's Pl/PgSQL facade (might be outdated) */
-	validate_sql_facade_version(get_sql_facade_version());
+	validate_plpgsql_frontend_version(get_plpgsql_frontend_version(),
+									  build_semver_uint32(LOWEST_COMPATIBLE_FRONT));
 
 	/* Create various hash tables (caches) */
 	init_local_cache();
@@ -1196,27 +1200,66 @@ validate_hash_constraint(const Expr *expr,
 
 /* Parse cstring and build uint32 representing the version */
 static uint32
-build_sql_facade_version(char *version_cstr)
+build_semver_uint32(char *version_cstr)
 {
-	uint32	version;
+	uint32	version = 0;
+	bool	expect_num_token = false;
+	long	max_dots = 2;
+	char   *pos = version_cstr;
+
+	while (*pos)
+	{
+		/* Invert expected token type */
+		expect_num_token = !expect_num_token;
+
+		if (expect_num_token)
+		{
+			char   *end_pos;
+			long	num;
+			long	i;
+
+			/* Parse number */
+			num = strtol(pos, &end_pos, 10);
 
-	/* expect to see x+.y+.z+ */
-	version = strtol(version_cstr, &version_cstr, 10) & 0xFF;
+			if (pos == end_pos || num > 99 || num < 0)
+				goto version_error;
 
-	version <<= 8;
-	if (strlen(version_cstr) > 1)
-		version |= (strtol(version_cstr + 1, &version_cstr, 10) & 0xFF);
+			for (i = 0; i < max_dots; i++)
+				num *= 100;
 
-	version <<= 8;
-	if (strlen(version_cstr) > 1)
-		version |= (strtol(version_cstr + 1, &version_cstr, 10) & 0xFF);
+			version += num;
+
+			/* Move position */
+			pos = end_pos;
+		}
+		else
+		{
+			/* Expect to see less dots */
+			max_dots--;
+
+			if (*pos != '.' || max_dots < 0)
+				goto version_error;
+
+			/* Move position */
+			pos++;
+		}
+	}
+
+	if (!expect_num_token)
+		goto version_error;
 
 	return version;
+
+version_error:
+	DisablePathman(); /* disable pg_pathman since config is broken */
+	ereport(ERROR, (errmsg("wrong version: \"%s\"", version_cstr),
+					errhint(INIT_ERROR_HINT)));
+	return 0; /* keep compiler happy */
 }
 
 /* Get version of pg_pathman's facade written in Pl/PgSQL */
 static uint32
-get_sql_facade_version(void)
+get_plpgsql_frontend_version(void)
 {
 	Relation		pg_extension_rel;
 	ScanKeyData		skey;
@@ -1255,20 +1298,21 @@ get_sql_facade_version(void)
 	systable_endscan(scan);
 	heap_close(pg_extension_rel, AccessShareLock);
 
-	return build_sql_facade_version(version_cstr);
+	return build_semver_uint32(version_cstr);
 }
 
 /* Check that current Pl/PgSQL facade is compatible with internals */
 static void
-validate_sql_facade_version(uint32 ver)
+validate_plpgsql_frontend_version(uint32 current_ver, uint32 compatible_ver)
 {
-	Assert(ver > 0);
+	Assert(current_ver > 0);
+	Assert(compatible_ver > 0);
 
 	/* Compare ver to 'lowest compatible frontend' version */
-	if (ver < LOWEST_COMPATIBLE_FRONT)
+	if (current_ver < compatible_ver)
 	{
 		elog(DEBUG1, "current version: %x, lowest compatible: %x",
-					 ver, LOWEST_COMPATIBLE_FRONT);
+					 current_ver, compatible_ver);
 
 		DisablePathman(); /* disable pg_pathman since config is broken */
 		ereport(ERROR,

src/pl_funcs.c

@@ -70,7 +70,7 @@ PG_FUNCTION_INFO_V1( invoke_on_partition_created_callback );
 PG_FUNCTION_INFO_V1( check_security_policy );
 
 PG_FUNCTION_INFO_V1( debug_capture );
-PG_FUNCTION_INFO_V1( get_pathman_lib_version );
+PG_FUNCTION_INFO_V1( pathman_version );
 
 
 /* User context for function show_partition_list_internal() */
@@ -1120,7 +1120,7 @@ debug_capture(PG_FUNCTION_ARGS)
 
 /* NOTE: just in case */
 Datum
-get_pathman_lib_version(PG_FUNCTION_ARGS)
+pathman_version(PG_FUNCTION_ARGS)
 {
-	PG_RETURN_CSTRING(psprintf("%x", CURRENT_LIB_VERSION));
+	PG_RETURN_CSTRING(CURRENT_LIB_VERSION);
 }