_partition_data_concurrent() should not be STRICT, fix ARGISNULL 'else if' checks in invoke_on_partition_created_callback()

funbringer · funbringer · commit 86d609a7dcc7 · 2016-09-29T19:32:58.000+03:00
diff --git a/init.sql b/init.sql
@@ -198,6 +198,7 @@ DECLARE
 	v_limit_clause	TEXT := '';
 	v_where_clause	TEXT := '';
 	ctids			TID[];
+
 BEGIN
 	SELECT attname INTO v_attr
 	FROM @extschema@.pathman_config WHERE partrel = p_relation;
@@ -244,7 +245,7 @@ BEGIN
 	RETURN;
 END
 $$
-LANGUAGE plpgsql STRICT
+LANGUAGE plpgsql
 SET pg_pathman.enable_partitionfilter = on; /* ensures that PartitionFilter is ON */
 
 /*
@@ -708,8 +709,9 @@ CREATE OR REPLACE FUNCTION @extschema@.validate_on_partition_created_callback(ca
 RETURNS VOID AS 'pg_pathman', 'validate_on_part_init_callback_pl'
 LANGUAGE C STRICT;
 
+
 /*
- * Builds JSONB object containing new partition parameters and invoke the callback.
+ * Invoke init_callback on RANGE partition.
  */
 CREATE OR REPLACE FUNCTION @extschema@.invoke_on_partition_created_callback(
 	parent_relid	REGCLASS,
@@ -720,6 +722,9 @@ CREATE OR REPLACE FUNCTION @extschema@.invoke_on_partition_created_callback(
 RETURNS VOID AS 'pg_pathman', 'invoke_on_partition_created_callback'
 LANGUAGE C;
 
+/*
+ * Invoke init_callback on HASH partition.
+ */
 CREATE OR REPLACE FUNCTION @extschema@.invoke_on_partition_created_callback(
 	parent_relid	REGCLASS,
 	partition		REGCLASS,
diff --git a/src/pl_funcs.c b/src/pl_funcs.c
@@ -844,7 +844,7 @@ invoke_on_partition_created_callback(PG_FUNCTION_ARGS)
 		part_type = PT_HASH;
 
 	/* Either RANGE_START or RANGE_END is missing */
-	if (PG_ARGISNULL(ARG_RANGE_START) || PG_ARGISNULL(ARG_RANGE_START))
+	else if (PG_ARGISNULL(ARG_RANGE_START) || PG_ARGISNULL(ARG_RANGE_START))
 		elog(ERROR, "both boundaries must be provided for RANGE partition");
 
 	/* Both RANGE_START & RANGE_END are provided */
