resolve conflicts caused by merge of 'rel_future_beta'

Author: funbringer

Makefile

@@ -10,7 +10,7 @@ OBJS = src/init.o src/relation_info.o src/utils.o src/partition_filter.o \
 	src/compat/pg_compat.o src/compat/relation_tags.o src/compat/expand_rte_hook.o \
 	src/compat/rowmarks_fix.o $(WIN32RES)
 
-PG_CPPFLAGS = -I$(CURDIR)/src/include
+override PG_CPPFLAGS += -I$(CURDIR)/src/include
 
 EXTENSION = pg_pathman
 

expected/pathman_basic.out

@@ -9,8 +9,17 @@ CREATE TABLE test.hash_rel (
 INSERT INTO test.hash_rel VALUES (1, 1);
 INSERT INTO test.hash_rel VALUES (2, 2);
 INSERT INTO test.hash_rel VALUES (3, 3);
+\set VERBOSITY default
 SELECT pathman.create_hash_partitions('test.hash_rel', 'value', 3);
-ERROR:  partitioning key "value" must be marked NOT NULL
+ERROR:  failed to analyze partitioning expression "value"
+DETAIL:  column "value" should be marked NOT NULL
+CONTEXT:  SQL statement "SELECT pathman.validate_expression(parent_relid, expression)"
+PL/pgSQL function pathman.prepare_for_partitioning(regclass,text,boolean) line 9 at PERFORM
+SQL statement "SELECT pathman.prepare_for_partitioning(parent_relid,
+												 expression,
+												 partition_data)"
+PL/pgSQL function pathman.create_hash_partitions(regclass,text,integer,boolean,text[],text[]) line 4 at PERFORM
+\set VERBOSITY terse
 ALTER TABLE test.hash_rel ALTER COLUMN value SET NOT NULL;
 SELECT pathman.create_hash_partitions('test.hash_rel', 'value', 3, partition_data:=false);
  create_hash_partitions 
@@ -129,8 +138,17 @@ 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;
+\set VERBOSITY default
 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
+ERROR:  failed to analyze partitioning expression "dt"
+DETAIL:  column "dt" should be marked NOT NULL
+CONTEXT:  SQL statement "SELECT pathman.validate_expression(parent_relid, expression)"
+PL/pgSQL function pathman.prepare_for_partitioning(regclass,text,boolean) line 9 at PERFORM
+SQL statement "SELECT pathman.prepare_for_partitioning(parent_relid,
+												 expression,
+												 partition_data)"
+PL/pgSQL function pathman.create_range_partitions(regclass,text,anyelement,interval,integer,boolean) line 12 at PERFORM
+\set VERBOSITY terse
 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"

expected/pathman_calamity.out

@@ -280,11 +280,11 @@ ERROR:  'parttype' should not be NULL
 SELECT validate_interval_value('pg_class', 'oid', 1, 'HASH', NULL);					/* not ok */
 ERROR:  interval should be NULL for HASH partitioned table
 SELECT validate_interval_value('pg_class', 'expr', 2, '1 mon', NULL);				/* not ok */
-ERROR:  cannot find type name for attribute "expr" of relation "pg_class"
+ERROR:  failed to analyze partitioning expression "expr"
 SELECT validate_interval_value('pg_class', 'expr', 2, NULL, 'cooked_expr');			/* not ok */
 ERROR:  unrecognized token: "cooked_expr"
 SELECT validate_interval_value('pg_class', 'EXPR', 1, 'HASH', NULL);				/* not ok */
-ERROR:  cannot find type name for attribute "expr" of relation "pg_class"
+ERROR:  failed to analyze partitioning expression "EXPR"
 /* check function validate_relname() */
 SELECT validate_relname('calamity.part_test');
  validate_relname 
@@ -304,7 +304,7 @@ ERROR:  'relid' should not be NULL
 SELECT validate_expression('calamity.part_test', NULL);			/* not ok */
 ERROR:  'expression' should not be NULL
 SELECT validate_expression('calamity.part_test', 'valval');		/* not ok */
-ERROR:  cannot find type name for attribute "valval" of relation "part_test"
+ERROR:  failed to analyze partitioning expression "valval"
 SELECT validate_expression('calamity.part_test', 'random()');	/* not ok */
 ERROR:  failed to analyze partitioning expression "random()"
 SELECT validate_expression('calamity.part_test', 'val');		/* OK */
@@ -580,7 +580,7 @@ ERROR:  relation "0" does not exist
 SELECT add_to_pathman_config('calamity.part_test', NULL);		/* no expr */
 ERROR:  'expression' should not be NULL
 SELECT add_to_pathman_config('calamity.part_test', 'V_A_L');	/* wrong expr */
-ERROR:  cannot find type name for attribute "v_a_l" of relation "part_test"
+ERROR:  failed to analyze partitioning expression "V_A_L"
 SELECT add_to_pathman_config('calamity.part_test', 'val');		/* OK */
  add_to_pathman_config 
 -----------------------
@@ -851,9 +851,7 @@ DROP EXTENSION pg_pathman;
  */
 CREATE SCHEMA calamity;
 CREATE EXTENSION pg_pathman;
-/* Change this setting for code coverage */
-SET pg_pathman.enable_bounds_cache = false;
-/* check view pathman_cache_stats */
+/* check that cache loading is lazy */
 CREATE TABLE calamity.test_pathman_cache_stats(val NUMERIC NOT NULL);
 SELECT create_range_partitions('calamity.test_pathman_cache_stats', 'val', 1, 10, 10);
  create_range_partitions 
@@ -870,22 +868,54 @@ SELECT context, entries FROM pathman_cache_stats ORDER BY context;	/* OK */
  partition parents cache  |       0
 (4 rows)
 
-SELECT drop_partitions('calamity.test_pathman_cache_stats');
-NOTICE:  0 rows copied from calamity.test_pathman_cache_stats_1
-NOTICE:  0 rows copied from calamity.test_pathman_cache_stats_2
-NOTICE:  0 rows copied from calamity.test_pathman_cache_stats_3
-NOTICE:  0 rows copied from calamity.test_pathman_cache_stats_4
-NOTICE:  0 rows copied from calamity.test_pathman_cache_stats_5
-NOTICE:  0 rows copied from calamity.test_pathman_cache_stats_6
-NOTICE:  0 rows copied from calamity.test_pathman_cache_stats_7
-NOTICE:  0 rows copied from calamity.test_pathman_cache_stats_8
-NOTICE:  0 rows copied from calamity.test_pathman_cache_stats_9
-NOTICE:  0 rows copied from calamity.test_pathman_cache_stats_10
- drop_partitions 
------------------
-              10
+DROP TABLE calamity.test_pathman_cache_stats CASCADE;
+NOTICE:  drop cascades to 11 other objects
+SELECT context, entries FROM pathman_cache_stats ORDER BY context;	/* OK */
+         context          | entries 
+--------------------------+---------
+ maintenance              |       0
+ partition bounds cache   |       0
+ partition dispatch cache |       0
+ partition parents cache  |       0
+(4 rows)
+
+/* Change this setting for code coverage */
+SET pg_pathman.enable_bounds_cache = false;
+/* check view pathman_cache_stats (bounds cache disabled) */
+CREATE TABLE calamity.test_pathman_cache_stats(val NUMERIC NOT NULL);
+SELECT create_range_partitions('calamity.test_pathman_cache_stats', 'val', 1, 10, 10);
+ create_range_partitions 
+-------------------------
+                      10
 (1 row)
 
+EXPLAIN (COSTS OFF) SELECT * FROM calamity.test_pathman_cache_stats;
+                  QUERY PLAN                   
+-----------------------------------------------
+ Append
+   ->  Seq Scan on test_pathman_cache_stats_1
+   ->  Seq Scan on test_pathman_cache_stats_2
+   ->  Seq Scan on test_pathman_cache_stats_3
+   ->  Seq Scan on test_pathman_cache_stats_4
+   ->  Seq Scan on test_pathman_cache_stats_5
+   ->  Seq Scan on test_pathman_cache_stats_6
+   ->  Seq Scan on test_pathman_cache_stats_7
+   ->  Seq Scan on test_pathman_cache_stats_8
+   ->  Seq Scan on test_pathman_cache_stats_9
+   ->  Seq Scan on test_pathman_cache_stats_10
+(11 rows)
+
+SELECT context, entries FROM pathman_cache_stats ORDER BY context;	/* OK */
+         context          | entries 
+--------------------------+---------
+ maintenance              |       0
+ partition bounds cache   |       0
+ partition dispatch cache |       1
+ partition parents cache  |      10
+(4 rows)
+
+DROP TABLE calamity.test_pathman_cache_stats CASCADE;
+NOTICE:  drop cascades to 11 other objects
 SELECT context, entries FROM pathman_cache_stats ORDER BY context;	/* OK */
          context          | entries 
 --------------------------+---------
@@ -895,42 +925,102 @@ SELECT context, entries FROM pathman_cache_stats ORDER BY context;	/* OK */
  partition parents cache  |       0
 (4 rows)
 
-DROP TABLE calamity.test_pathman_cache_stats;
 /* Restore this GUC */
 SET pg_pathman.enable_bounds_cache = true;
-/* check view pathman_cache_stats (one more time) */
+/* check view pathman_cache_stats (bounds cache enabled) */
 CREATE TABLE calamity.test_pathman_cache_stats(val NUMERIC NOT NULL);
 SELECT create_range_partitions('calamity.test_pathman_cache_stats', 'val', 1, 10, 10);
  create_range_partitions 
 -------------------------
                       10
 (1 row)
 
+EXPLAIN (COSTS OFF) SELECT * FROM calamity.test_pathman_cache_stats;
+                  QUERY PLAN                   
+-----------------------------------------------
+ Append
+   ->  Seq Scan on test_pathman_cache_stats_1
+   ->  Seq Scan on test_pathman_cache_stats_2
+   ->  Seq Scan on test_pathman_cache_stats_3
+   ->  Seq Scan on test_pathman_cache_stats_4
+   ->  Seq Scan on test_pathman_cache_stats_5
+   ->  Seq Scan on test_pathman_cache_stats_6
+   ->  Seq Scan on test_pathman_cache_stats_7
+   ->  Seq Scan on test_pathman_cache_stats_8
+   ->  Seq Scan on test_pathman_cache_stats_9
+   ->  Seq Scan on test_pathman_cache_stats_10
+(11 rows)
+
 SELECT context, entries FROM pathman_cache_stats ORDER BY context;	/* OK */
          context          | entries 
 --------------------------+---------
  maintenance              |       0
- partition bounds cache   |       0
+ partition bounds cache   |      10
  partition dispatch cache |       1
+ partition parents cache  |      10
+(4 rows)
+
+DROP TABLE calamity.test_pathman_cache_stats CASCADE;
+NOTICE:  drop cascades to 11 other objects
+SELECT context, entries FROM pathman_cache_stats ORDER BY context;	/* OK */
+         context          | entries 
+--------------------------+---------
+ maintenance              |       0
+ partition bounds cache   |       0
+ partition dispatch cache |       0
  partition parents cache  |       0
 (4 rows)
 
-SELECT drop_partitions('calamity.test_pathman_cache_stats');
-NOTICE:  0 rows copied from calamity.test_pathman_cache_stats_1
-NOTICE:  0 rows copied from calamity.test_pathman_cache_stats_2
-NOTICE:  0 rows copied from calamity.test_pathman_cache_stats_3
-NOTICE:  0 rows copied from calamity.test_pathman_cache_stats_4
-NOTICE:  0 rows copied from calamity.test_pathman_cache_stats_5
-NOTICE:  0 rows copied from calamity.test_pathman_cache_stats_6
-NOTICE:  0 rows copied from calamity.test_pathman_cache_stats_7
-NOTICE:  0 rows copied from calamity.test_pathman_cache_stats_8
-NOTICE:  0 rows copied from calamity.test_pathman_cache_stats_9
-NOTICE:  0 rows copied from calamity.test_pathman_cache_stats_10
- drop_partitions 
------------------
-              10
+/* check that parents cache has been flushed after partition was dropped */
+CREATE TABLE calamity.test_pathman_cache_stats(val NUMERIC NOT NULL);
+SELECT create_range_partitions('calamity.test_pathman_cache_stats', 'val', 1, 10, 10);
+ create_range_partitions 
+-------------------------
+                      10
 (1 row)
 
+EXPLAIN (COSTS OFF) SELECT * FROM calamity.test_pathman_cache_stats;
+                  QUERY PLAN                   
+-----------------------------------------------
+ Append
+   ->  Seq Scan on test_pathman_cache_stats_1
+   ->  Seq Scan on test_pathman_cache_stats_2
+   ->  Seq Scan on test_pathman_cache_stats_3
+   ->  Seq Scan on test_pathman_cache_stats_4
+   ->  Seq Scan on test_pathman_cache_stats_5
+   ->  Seq Scan on test_pathman_cache_stats_6
+   ->  Seq Scan on test_pathman_cache_stats_7
+   ->  Seq Scan on test_pathman_cache_stats_8
+   ->  Seq Scan on test_pathman_cache_stats_9
+   ->  Seq Scan on test_pathman_cache_stats_10
+(11 rows)
+
+SELECT context, entries FROM pathman_cache_stats ORDER BY context;	/* OK */
+         context          | entries 
+--------------------------+---------
+ maintenance              |       0
+ partition bounds cache   |      10
+ partition dispatch cache |       1
+ partition parents cache  |      10
+(4 rows)
+
+SELECT drop_range_partition('calamity.test_pathman_cache_stats_1');
+        drop_range_partition         
+-------------------------------------
+ calamity.test_pathman_cache_stats_1
+(1 row)
+
+SELECT context, entries FROM pathman_cache_stats ORDER BY context;	/* OK */
+         context          | entries 
+--------------------------+---------
+ maintenance              |       0
+ partition bounds cache   |       9
+ partition dispatch cache |       1
+ partition parents cache  |       0
+(4 rows)
+
+DROP TABLE calamity.test_pathman_cache_stats CASCADE;
+NOTICE:  drop cascades to 10 other objects
 SELECT context, entries FROM pathman_cache_stats ORDER BY context;	/* OK */
          context          | entries 
 --------------------------+---------
@@ -940,7 +1030,6 @@ SELECT context, entries FROM pathman_cache_stats ORDER BY context;	/* OK */
  partition parents cache  |       0
 (4 rows)
 
-DROP TABLE calamity.test_pathman_cache_stats;
 DROP SCHEMA calamity CASCADE;
 DROP EXTENSION pg_pathman;
 /*