Merge branch 'rel_future_expressions' into rel_future_beta

Author: ildus

.gitignore

@@ -10,6 +10,5 @@ regression.out
 *.gcno
 *.gcov
 pg_pathman--*.sql
-
-/cscope*
-/tags
+tags
+cscope*

Makefile

@@ -42,7 +42,8 @@ REGRESS = pathman_basic \
 		  pathman_runtime_nodes \
 		  pathman_update_trigger \
 		  pathman_updates \
-		  pathman_utility_stmt
+		  pathman_utility_stmt \
+		  pathman_expressions
 
 
 EXTRA_REGRESS_OPTS=--temp-config=$(top_srcdir)/$(subdir)/conf.add

expected/pathman_basic.out

@@ -130,10 +130,10 @@ 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);
 NOTICE:  sequence "range_rel_seq" does not exist, skipping
  create_range_partitions 
@@ -1328,7 +1328,7 @@ Indexes:
 Indexes:
     "hash_rel_extern_pkey" PRIMARY KEY, btree (id)
 Check constraints:
-    "pathman_hash_rel_extern_2_check" CHECK (pathman.get_hash_part_idx(hashint4(value), 3) = 0)
+    "pathman_hash_rel_extern_check" CHECK (pathman.get_hash_part_idx(hashint4(value), 3) = 0)
 Inherits: test.hash_rel
 
 INSERT INTO test.hash_rel SELECT * FROM test.hash_rel_0;
@@ -1461,16 +1461,16 @@ INSERT INTO test.range_rel (dt) VALUES ('2015-06-01');
  */
 ALTER TABLE test.range_rel DROP COLUMN data;
 SELECT * FROM pathman.pathman_config;
-    partrel     | attname | parttype | range_interval 
-----------------+---------+----------+----------------
- test.range_rel | dt      |        2 | @ 10 days
+    partrel     | attname | parttype | range_interval |                                                      expression_p                                                       | atttype 
+----------------+---------+----------+----------------+-------------------------------------------------------------------------------------------------------------------------+---------
+ test.range_rel | dt      |        2 | @ 10 days      | {VAR :varno 1 :varattno 2 :vartype 1114 :vartypmod -1 :varcollid 0 :varlevelsup 0 :varnoold 1 :varoattno 2 :location 8} |    1114
 (1 row)
 
 DROP TABLE test.range_rel CASCADE;
 NOTICE:  drop cascades to 20 other objects
 SELECT * FROM pathman.pathman_config;
- partrel | attname | parttype | range_interval 
----------+---------+----------+----------------
+ partrel | attname | parttype | range_interval | expression_p | atttype 
+---------+---------+----------+----------------+--------------+---------
 (0 rows)
 
 /* Check overlaps */
@@ -1632,9 +1632,9 @@ SELECT pathman.create_partitions_from_range('test."RangeRel"', 'dt', '2015-01-01
 DROP TABLE test."RangeRel" CASCADE;
 NOTICE:  drop cascades to 5 other objects
 SELECT * FROM pathman.pathman_config;
-      partrel       | attname | parttype | range_interval 
---------------------+---------+----------+----------------
- test.num_range_rel | id      |        2 | 1000
+      partrel       | attname | parttype | range_interval |                                                      expression_p                                                      | atttype 
+--------------------+---------+----------+----------------+------------------------------------------------------------------------------------------------------------------------+---------
+ test.num_range_rel | id      |        2 | 1000           | {VAR :varno 1 :varattno 1 :vartype 23 :vartypmod -1 :varcollid 0 :varlevelsup 0 :varnoold 1 :varoattno 1 :location -1} |      23
 (1 row)
 
 CREATE TABLE test."RangeRel" (

expected/pathman_calamity.out

@@ -250,7 +250,7 @@ ERROR:  no hash function for type calamity.part_test
 SELECT build_range_condition(NULL, 'val', 10, 20);						/* not ok */
 ERROR:  'partition_relid' should not be NULL
 SELECT build_range_condition('calamity.part_test', NULL, 10, 20);		/* not ok */
-ERROR:  'attribute' should not be NULL
+ERROR:  'expression' should not be NULL
 SELECT build_range_condition('calamity.part_test', 'val', 10, 20);		/* OK */
     build_range_condition     
 ------------------------------
@@ -270,17 +270,15 @@ SELECT build_range_condition('calamity.part_test', 'val', NULL, 10);	/* OK */
 (1 row)
 
 /* check function validate_interval_value() */
-SELECT validate_interval_value(NULL, 'val', 2, '1 mon');					/* not ok */
-ERROR:  'partrel' should not be NULL
-SELECT validate_interval_value('calamity.part_test', NULL, 2, '1 mon');		/* not ok */
-ERROR:  'attname' should not be NULL
-SELECT validate_interval_value('calamity.part_test', 'val', NULL, '1 mon');	/* not ok */
+SELECT validate_interval_value(NULL, 2, '1 mon');					/* not ok */
+ERROR:  'atttype' should not be NULL
+SELECT validate_interval_value('interval'::regtype, NULL, '1 mon');	/* not ok */
 ERROR:  'parttype' should not be NULL
-SELECT validate_interval_value('calamity.part_test', 'val', 2, '1 mon');	/* not ok */
+SELECT validate_interval_value('int4'::regtype, 2, '1 mon');		/* not ok */
 ERROR:  invalid input syntax for integer: "1 mon"
-SELECT validate_interval_value('calamity.part_test', 'val', 1, '1 mon');	/* not ok */
+SELECT validate_interval_value('interval'::regtype, 1, '1 mon');	/* not ok */
 ERROR:  interval should be NULL for HASH partitioned table
-SELECT validate_interval_value('calamity.part_test', 'val', 2, NULL);		/* OK */
+SELECT validate_interval_value('interval'::regtype, 2, NULL);		/* OK */
  validate_interval_value 
 -------------------------
  t
@@ -350,59 +348,16 @@ SELECT get_partition_key_type(NULL) IS NULL;
  t
 (1 row)
 
-/* check function build_check_constraint_name_attnum() */
-SELECT build_check_constraint_name('calamity.part_test', 1::int2);	/* OK */
+/* check function build_check_constraint_name() */
+SELECT build_check_constraint_name('calamity.part_test');		/* OK */
  build_check_constraint_name 
 -----------------------------
- pathman_part_test_1_check
+ pathman_part_test_check
 (1 row)
 
-SELECT build_check_constraint_name(0::REGCLASS, 1::int2);			/* not ok */
+SELECT build_check_constraint_name(0::REGCLASS);				/* not ok */
 ERROR:  relation "0" does not exist
-SELECT build_check_constraint_name('calamity.part_test', -1::int2);	/* not ok */
-ERROR:  invalid attribute number -1
-SELECT build_check_constraint_name('calamity.part_test', NULL::int2) IS NULL;
- ?column? 
-----------
- t
-(1 row)
-
-SELECT build_check_constraint_name(NULL, 1::int2) IS NULL;
- ?column? 
-----------
- t
-(1 row)
-
-SELECT build_check_constraint_name(NULL, NULL::int2) IS NULL;
- ?column? 
-----------
- t
-(1 row)
-
-/* check function build_check_constraint_name_attname() */
-SELECT build_check_constraint_name('calamity.part_test', 'val');	/* OK */
- build_check_constraint_name 
------------------------------
- pathman_part_test_1_check
-(1 row)
-
-SELECT build_check_constraint_name(0::REGCLASS, 'val');				/* not ok */
-ERROR:  relation "0" does not exist
-SELECT build_check_constraint_name('calamity.part_test', 'nocol');	/* not ok */
-ERROR:  relation "part_test" has no column "nocol"
-SELECT build_check_constraint_name('calamity.part_test', NULL::text) IS NULL;
- ?column? 
-----------
- t
-(1 row)
-
-SELECT build_check_constraint_name(NULL, 'val') IS NULL;
- ?column? 
-----------
- t
-(1 row)
-
-SELECT build_check_constraint_name(NULL, NULL::text) IS NULL;
+SELECT build_check_constraint_name(NULL) IS NULL;
  ?column? 
 ----------
  t
@@ -599,9 +554,9 @@ ERROR:  'parent_relid' should not be NULL
 SELECT add_to_pathman_config(0::REGCLASS, 'val');				/* no table (oid) */
 ERROR:  relation "0" does not exist
 SELECT add_to_pathman_config('calamity.part_test', NULL);		/* no column */
-ERROR:  'attname' should not be NULL
+ERROR:  'expression' should not be NULL
 SELECT add_to_pathman_config('calamity.part_test', 'V_A_L');	/* wrong column */
-ERROR:  relation "part_test" has no column "V_A_L"
+ERROR:  cannot find type name for attribute "v_a_l" of relation "part_test"
 SELECT add_to_pathman_config('calamity.part_test', 'val');		/* OK */
  add_to_pathman_config 
 -----------------------
@@ -638,7 +593,7 @@ SELECT create_hash_partitions('calamity.part_ok', 'val', 4);
 CREATE TABLE calamity.wrong_partition (LIKE calamity.part_test) INHERITS (calamity.part_test); /* wrong partition w\o constraints */
 NOTICE:  merging column "val" with inherited definition
 SELECT add_to_pathman_config('calamity.part_test', 'val');
-ERROR:  constraint "pathman_wrong_partition_1_check" of partition "wrong_partition" does not exist
+ERROR:  constraint "pathman_wrong_partition_check" of partition "wrong_partition" does not exist
 EXPLAIN (COSTS OFF) SELECT * FROM calamity.part_ok; /* check that pathman is enabled */
          QUERY PLAN          
 -----------------------------
@@ -650,7 +605,7 @@ EXPLAIN (COSTS OFF) SELECT * FROM calamity.part_ok; /* check that pathman is ena
 (5 rows)
 
 SELECT add_to_pathman_config('calamity.part_test', 'val', '10');
-ERROR:  constraint "pathman_wrong_partition_1_check" of partition "wrong_partition" does not exist
+ERROR:  constraint "pathman_wrong_partition_check" of partition "wrong_partition" does not exist
 EXPLAIN (COSTS OFF) SELECT * FROM calamity.part_ok; /* check that pathman is enabled */
          QUERY PLAN          
 -----------------------------
@@ -662,7 +617,7 @@ EXPLAIN (COSTS OFF) SELECT * FROM calamity.part_ok; /* check that pathman is ena
 (5 rows)
 
 ALTER TABLE calamity.wrong_partition
-ADD CONSTRAINT pathman_wrong_partition_1_check
+ADD CONSTRAINT pathman_wrong_partition_check
 CHECK (val = 1 OR val = 2); /* wrong constraint */
 SELECT add_to_pathman_config('calamity.part_test', 'val', '10');
 ERROR:  wrong constraint format for RANGE partition "wrong_partition"
@@ -676,9 +631,9 @@ EXPLAIN (COSTS OFF) SELECT * FROM calamity.part_ok; /* check that pathman is ena
    ->  Seq Scan on part_ok_3
 (5 rows)
 
-ALTER TABLE calamity.wrong_partition DROP CONSTRAINT pathman_wrong_partition_1_check;
+ALTER TABLE calamity.wrong_partition DROP CONSTRAINT pathman_wrong_partition_check;
 ALTER TABLE calamity.wrong_partition
-ADD CONSTRAINT pathman_wrong_partition_1_check
+ADD CONSTRAINT pathman_wrong_partition_check
 CHECK (val >= 10 AND val = 2); /* wrong constraint */
 SELECT add_to_pathman_config('calamity.part_test', 'val', '10');
 ERROR:  wrong constraint format for RANGE partition "wrong_partition"
@@ -692,7 +647,7 @@ EXPLAIN (COSTS OFF) SELECT * FROM calamity.part_ok; /* check that pathman is ena
    ->  Seq Scan on part_ok_3
 (5 rows)
 
-ALTER TABLE calamity.wrong_partition DROP CONSTRAINT pathman_wrong_partition_1_check;
+ALTER TABLE calamity.wrong_partition DROP CONSTRAINT pathman_wrong_partition_check;
 /* check GUC variable */
 SHOW pg_pathman.enable;
  pg_pathman.enable 

expected/pathman_column_type.out

@@ -31,12 +31,26 @@ SELECT context, entries FROM pathman_cache_stats ORDER BY context;
 
 /* change column's type (should flush caches) */
 ALTER TABLE test_column_type.test ALTER val TYPE NUMERIC;
+/* check that parsed expression was cleared */
+SELECT * FROM pathman_config;
+        partrel        | attname | parttype | range_interval | expression_p | atttype 
+-----------------------+---------+----------+----------------+--------------+---------
+ test_column_type.test | val     |        2 | 10             |              |        
+(1 row)
+
 /* make sure that everything works properly */
 SELECT * FROM test_column_type.test;
  val 
 -----
 (0 rows)
 
+/* check that expression, atttype is changed */
+SELECT * FROM pathman_config;
+        partrel        | attname | parttype | range_interval |                                                      expression_p                                                       | atttype 
+-----------------------+---------+----------+----------------+-------------------------------------------------------------------------------------------------------------------------+---------
+ test_column_type.test | val     |        2 | 10             | {VAR :varno 1 :varattno 1 :vartype 1700 :vartypmod -1 :varcollid 0 :varlevelsup 0 :varnoold 1 :varoattno 1 :location 8} |    1700
+(1 row)
+
 SELECT context, entries FROM pathman_cache_stats ORDER BY context;
          context          | entries 
 --------------------------+---------