pathman: some RANGE partitioning fixes

zilder · zilder · commit 685dafcca459 · 2016-01-15T16:04:24.000+03:00
diff --git a/contrib/pathman/pathman.c b/contrib/pathman/pathman.c
@@ -319,8 +319,10 @@ append_child_relation(PlannerInfo *root, RelOptInfo *rel, Index rti, RangeTblEnt
 
 		/* replace old relids with new ones */
 		change_varnos(new_rinfo->clause, rel->relid, childrel->relid);
-		change_varnos(new_rinfo->left_em->em_expr, rel->relid, childrel->relid);
-		change_varnos(new_rinfo->right_em->em_expr, rel->relid, childrel->relid);
+		if (new_rinfo->left_em)
+			change_varnos(new_rinfo->left_em->em_expr, rel->relid, childrel->relid);
+		if (new_rinfo->right_em)
+			change_varnos(new_rinfo->right_em->em_expr, rel->relid, childrel->relid);
 
 		/* TODO: find some elegant way to do this */
 		if (bms_is_member(rel->relid, new_rinfo->clause_relids))
@@ -800,8 +802,11 @@ on_partitions_updated(PG_FUNCTION_ARGS) {
 	relid = DatumGetInt32(PG_GETARG_DATUM(0));
 	prel = (PartRelationInfo *)
 		hash_search(relations, (const void *) &relid, HASH_FIND, 0);
-	prel->children_count = 0;
-	load_part_relations_hashtable();
+	if (prel != NULL)
+	{
+		prel->children_count = 0;
+		load_part_relations_hashtable();
+	}
 	LWLockRelease(AddinShmemInitLock);
 
 	PG_RETURN_NULL();
diff --git a/contrib/pathman/sql/range.sql b/contrib/pathman/sql/range.sql
@@ -5,7 +5,7 @@ CREATE OR REPLACE FUNCTION create_range_partitions(
     v_relation TEXT
     , v_attribute TEXT
     , v_start_timestamp TIMESTAMP
-    , v_interval INTERVAL
+    , v_interval TEXT
     , v_premake INTEGER)
 RETURNS VOID AS
 $$
@@ -26,10 +26,14 @@ BEGIN
         SELECT current_date INTO v_dt;
     END IF;
 
+    /* create first partition */
     PERFORM create_single_range_partition(v_relation
                                           , v_dt
                                           , v_interval);
 
+    /* premake further partitions */
+    PERFORM append_range_partitions(v_relation, v_interval, v_premake);
+
     INSERT INTO pg_pathman_rels (
         relname
         , attname
@@ -76,7 +80,7 @@ BEGIN
         LOOP
             PERFORM create_single_range_partition(v_relation
                                                   , v_part_timestamp
-                                                  , v_interval::INTERVAL);
+                                                  , v_interval);
             v_part_timestamp := v_part_timestamp + v_interval::INTERVAL;
         END LOOP;
     ELSIF NOT v_part_num IS NULL THEN
@@ -85,7 +89,7 @@ BEGIN
         LOOP
             PERFORM create_single_range_partition(v_relation
                                                   , v_part_timestamp
-                                                  , v_interval::INTEGER);
+                                                  , v_interval);
             v_part_timestamp := v_part_timestamp + v_interval;
         END LOOP;
     END IF;
@@ -99,8 +103,8 @@ $$ LANGUAGE plpgsql;
  */
 CREATE OR REPLACE FUNCTION create_single_range_partition(
     v_parent_relname TEXT
-    , v_start_timestamp TIMESTAMPTZ
-    , v_interval INTERVAL)
+    , v_start_timestamp TIMESTAMP
+    , v_interval TEXT)
 RETURNS VOID AS
 $$
 DECLARE
@@ -127,7 +131,7 @@ BEGIN
     INSERT INTO pg_pathman_range_rels (parent, min_dt, max_dt, child)
     VALUES (v_parent_relname
             , v_start_timestamp
-            , v_start_timestamp + v_interval
+            , v_start_timestamp + v_interval::INTERVAL
             , v_child_relname);
 END
 $$ LANGUAGE plpgsql;
