Remove lowering for expression, add additional checks for expression before any actions

Author: ildus

expected/pathman_basic.out

@@ -129,11 +129,11 @@ CREATE TABLE test.range_rel (
 CREATE INDEX ON test.range_rel (dt);
 INSERT INTO test.range_rel (dt, txt)
 SELECT g, md5(g::TEXT) FROM generate_series('2015-01-01', '2015-04-30', '1 day'::interval) as g;
-SELECT pathman.create_range_partitions('test.range_rel', 'dt', '2015-01-01'::DATE, '1 month'::INTERVAL, 2);
-ERROR:  not enough partitions to fit all values of "dt"
 SELECT pathman.create_range_partitions('test.range_rel', 'dt', '2015-01-01'::DATE, '1 month'::INTERVAL);
 ERROR:  partitioning key "dt" must be marked NOT NULL
 ALTER TABLE test.range_rel ALTER COLUMN dt SET NOT NULL;
+SELECT pathman.create_range_partitions('test.range_rel', 'dt', '2015-01-01'::DATE, '1 month'::INTERVAL, 2);
+ERROR:  not enough partitions to fit all values of "dt"
 SELECT pathman.create_range_partitions('test.range_rel', 'DT', '2015-01-01'::DATE, '1 month'::INTERVAL);
  create_range_partitions 
 -------------------------

expected/pathman_calamity.out

@@ -296,6 +296,21 @@ SELECT validate_relname(1::REGCLASS);
 ERROR:  relation "1" does not exist
 SELECT validate_relname(NULL);
 ERROR:  relation should not be NULL
+/* check function validate_expression() */
+SELECT validate_expression('calamity.part_test');
+ERROR:  function validate_expression(unknown) does not exist at character 51
+SELECT validate_expression('calamity.part_test', NULL);
+ERROR:  'expression' should not be NULL
+SELECT validate_expression('calamity.part_test', 'valval');
+ERROR:  cannot find type name for attribute "valval" of relation "part_test"
+SELECT validate_expression('calamity.part_test', 'random()');
+ERROR:  functions in partitioning expression must be marked IMMUTABLE
+SELECT validate_expression('calamity.part_test', 'val');
+ validate_expression 
+---------------------
+ 
+(1 row)
+
 /* check function get_number_of_partitions() */
 SELECT get_number_of_partitions('calamity.part_test');
  get_number_of_partitions 

expected/pathman_expressions.out

@@ -16,18 +16,28 @@ SELECT COUNT(*) FROM test_exprs.hash_rel;
      5
 (1 row)
 
+SELECT create_hash_partitions('test_exprs.hash_rel', 'random()', 4);
+ERROR:  functions in partitioning expression must be marked IMMUTABLE
 \set VERBOSITY default
 SELECT create_hash_partitions('test_exprs.hash_rel', 'value * value2))', 4);
 ERROR:  partitioning expression parse error
 DETAIL:  syntax error at or near ")"
-QUERY:  SELECT public.add_to_pathman_config(parent_relid, expression)
-CONTEXT:  PL/pgSQL function create_hash_partitions(regclass,text,integer,boolean,text[],text[]) line 9 at PERFORM
+QUERY:  SELECT public.validate_expression(parent_relid, expression)
+CONTEXT:  PL/pgSQL function prepare_for_partitioning(regclass,text,boolean) line 9 at PERFORM
+SQL statement "SELECT public.prepare_for_partitioning(parent_relid,
+												 expression,
+												 partition_data)"
+PL/pgSQL function create_hash_partitions(regclass,text,integer,boolean,text[],text[]) line 4 at PERFORM
 SELECT create_hash_partitions('test_exprs.hash_rel', 'value * value3', 4);
 ERROR:  partitioning expression analyze error
 DETAIL:  column "value3" does not exist
 HINT:  Perhaps you meant to reference the column "hash_rel.value" or the column "hash_rel.value2".
-QUERY:  SELECT public.add_to_pathman_config(parent_relid, expression)
-CONTEXT:  PL/pgSQL function create_hash_partitions(regclass,text,integer,boolean,text[],text[]) line 9 at PERFORM
+QUERY:  SELECT public.validate_expression(parent_relid, expression)
+CONTEXT:  PL/pgSQL function prepare_for_partitioning(regclass,text,boolean) line 9 at PERFORM
+SQL statement "SELECT public.prepare_for_partitioning(parent_relid,
+												 expression,
+												 partition_data)"
+PL/pgSQL function create_hash_partitions(regclass,text,integer,boolean,text[],text[]) line 4 at PERFORM
 \set VERBOSITY terse
 SELECT create_hash_partitions('test_exprs.hash_rel', 'value * value2', 4);
  create_hash_partitions 
@@ -88,7 +98,7 @@ CREATE TABLE test_exprs.range_rel (id SERIAL PRIMARY KEY, dt TIMESTAMP, txt TEXT
 INSERT INTO test_exprs.range_rel (dt, txt)
 SELECT g, md5(g::TEXT) FROM generate_series('2015-01-01', '2020-04-30', '1 month'::interval) as g;
 SELECT create_range_partitions('test_exprs.range_rel', 'RANDOM()', '15 years'::INTERVAL, '1 year'::INTERVAL, 10);
-ERROR:  start value is less than min value of "random()"
+ERROR:  functions in partitioning expression must be marked IMMUTABLE
 SELECT create_range_partitions('test_exprs.range_rel', 'AGE(dt, ''2000-01-01''::DATE)',
 		'15 years'::INTERVAL, '1 year'::INTERVAL, 10);
  create_range_partitions 

init.sql

@@ -434,6 +434,7 @@ DECLARE
 
 BEGIN
 	PERFORM @extschema@.validate_relname(parent_relid);
+	PERFORM @extschema@.validate_expression(parent_relid, expression);
 
 	IF partition_data = true THEN
 		/* Acquire data modification lock */
@@ -830,6 +831,15 @@ CREATE OR REPLACE FUNCTION @extschema@.validate_relname(
 RETURNS VOID AS 'pg_pathman', 'validate_relname'
 LANGUAGE C;
 
+/*
+ * Check that expression is valid
+ */
+CREATE OR REPLACE FUNCTION @extschema@.validate_expression(
+	relid	REGCLASS,
+	expression TEXT)
+RETURNS VOID AS 'pg_pathman', 'validate_expression'
+LANGUAGE C;
+
 /*
  * Check if regclass is date or timestamp.
  */

range.sql

@@ -67,7 +67,6 @@ DECLARE
 	i				INTEGER;
 
 BEGIN
-	expression := lower(expression);
 	PERFORM @extschema@.prepare_for_partitioning(parent_relid,
 												 expression,
 												 partition_data);
@@ -167,7 +166,6 @@ DECLARE
 	i				INTEGER;
 
 BEGIN
-	expression := lower(expression);
 	PERFORM @extschema@.prepare_for_partitioning(parent_relid,
 												 expression,
 												 partition_data);
@@ -268,7 +266,6 @@ BEGIN
 		RAISE EXCEPTION 'Bounds array must have at least two values';
 	END IF;
 
-	expression := lower(expression);
 	PERFORM @extschema@.prepare_for_partitioning(parent_relid,
 												 expression,
 												 partition_data);
@@ -319,7 +316,6 @@ DECLARE
 	part_count		INTEGER := 0;
 
 BEGIN
-	expression := lower(expression);
 	PERFORM @extschema@.prepare_for_partitioning(parent_relid,
 												 expression,
 												 partition_data);
@@ -376,7 +372,6 @@ DECLARE
 	part_count		INTEGER := 0;
 
 BEGIN
-	expression := lower(expression);
 	PERFORM @extschema@.prepare_for_partitioning(parent_relid,
 												 expression,
 												 partition_data);

sql/pathman_basic.sql

@@ -39,9 +39,9 @@ CREATE TABLE test.range_rel (
 CREATE INDEX ON test.range_rel (dt);
 INSERT INTO test.range_rel (dt, txt)
 SELECT g, md5(g::TEXT) FROM generate_series('2015-01-01', '2015-04-30', '1 day'::interval) as g;
-SELECT pathman.create_range_partitions('test.range_rel', 'dt', '2015-01-01'::DATE, '1 month'::INTERVAL, 2);
 SELECT pathman.create_range_partitions('test.range_rel', 'dt', '2015-01-01'::DATE, '1 month'::INTERVAL);
 ALTER TABLE test.range_rel ALTER COLUMN dt SET NOT NULL;
+SELECT pathman.create_range_partitions('test.range_rel', 'dt', '2015-01-01'::DATE, '1 month'::INTERVAL, 2);
 SELECT pathman.create_range_partitions('test.range_rel', 'DT', '2015-01-01'::DATE, '1 month'::INTERVAL);
 SELECT COUNT(*) FROM test.range_rel;
 SELECT COUNT(*) FROM ONLY test.range_rel;

sql/pathman_calamity.sql

@@ -140,6 +140,13 @@ SELECT validate_relname('calamity.part_test');
 SELECT validate_relname(1::REGCLASS);
 SELECT validate_relname(NULL);
 
+/* check function validate_expression() */
+SELECT validate_expression('calamity.part_test');
+SELECT validate_expression('calamity.part_test', NULL);
+SELECT validate_expression('calamity.part_test', 'valval');
+SELECT validate_expression('calamity.part_test', 'random()');
+SELECT validate_expression('calamity.part_test', 'val');
+
 /* check function get_number_of_partitions() */
 SELECT get_number_of_partitions('calamity.part_test');
 SELECT get_number_of_partitions(NULL) IS NULL;

sql/pathman_expressions.sql

@@ -15,6 +15,7 @@ INSERT INTO test_exprs.hash_rel (value, value2)
 	SELECT val, val * 2 FROM generate_series(1, 5) val;
 
 SELECT COUNT(*) FROM test_exprs.hash_rel;
+SELECT create_hash_partitions('test_exprs.hash_rel', 'random()', 4);
 \set VERBOSITY default
 SELECT create_hash_partitions('test_exprs.hash_rel', 'value * value2))', 4);
 SELECT create_hash_partitions('test_exprs.hash_rel', 'value * value3', 4);

src/pl_funcs.c

@@ -57,6 +57,7 @@ PG_FUNCTION_INFO_V1( build_update_trigger_func_name );
 PG_FUNCTION_INFO_V1( build_check_constraint_name );
 
 PG_FUNCTION_INFO_V1( validate_relname );
+PG_FUNCTION_INFO_V1( validate_expression );
 PG_FUNCTION_INFO_V1( is_date_type );
 PG_FUNCTION_INFO_V1( is_operator_supported );
 PG_FUNCTION_INFO_V1( is_tuple_convertible );
@@ -595,6 +596,37 @@ validate_relname(PG_FUNCTION_ARGS)
 	PG_RETURN_VOID();
 }
 
+/*
+ * Validate a partitioning expression
+ * We need this in range functions because we do many things
+ * before actual partitioning.
+ */
+Datum
+validate_expression(PG_FUNCTION_ARGS)
+{
+	Oid			relid;
+	char	   *expression;
+
+	/* Fetch relation's Oid */
+	relid = PG_GETARG_OID(0);
+
+	if (!SearchSysCacheExists1(RELOID, ObjectIdGetDatum(relid)))
+		ereport(ERROR, (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+						errmsg("relation \"%u\" does not exist", relid),
+						errdetail("triggered in function "
+								  CppAsString(validate_expression))));
+
+	if (!PG_ARGISNULL(1))
+	{
+		expression = TextDatumGetCString(PG_GETARG_TEXT_P(1));
+	}
+	else ereport(ERROR, (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+						 errmsg("'expression' should not be NULL")));
+
+	cook_partitioning_expression(relid, expression, NULL);
+	PG_RETURN_VOID();
+}
+
 Datum
 is_date_type(PG_FUNCTION_ARGS)
 {