pathman: pl functions fixes

zilder · zilder · commit 2ca82a86d908 · 2016-01-15T16:06:00.000+03:00
diff --git a/contrib/pathman/init.c b/contrib/pathman/init.c
@@ -97,7 +97,7 @@ create_part_relations_hashtable()
 		hash_destroy(relations);
 
 	relations = ShmemInitHash("Partitioning relation info",
-							  128, 128,
+							  16, 16,
 							  &ctl, HASH_ELEM | HASH_BLOBS);
 }
 
@@ -175,7 +175,7 @@ create_hash_restrictions_hashtable()
 		hash_destroy(hash_restrictions);
 
 	hash_restrictions = ShmemInitHash("pg_pathman hash restrictions",
-									  1024, 1024,
+									  128, 128,
 									  &ctl, HASH_ELEM | HASH_BLOBS);
 }
 
@@ -312,8 +312,7 @@ create_range_restrictions_hashtable()
 	memset(&ctl, 0, sizeof(ctl));
 	ctl.keysize = sizeof(int);
 	ctl.entrysize = sizeof(RangeRelation);
-
 	range_restrictions = ShmemInitHash("pg_pathman range restrictions",
-									   16, 16,
+									   512, 512,
 									   &ctl, HASH_ELEM | HASH_BLOBS);
 }
diff --git a/contrib/pathman/pathman.c b/contrib/pathman/pathman.c
@@ -827,6 +827,9 @@ on_partitions_removed(PG_FUNCTION_ARGS) {
 	prel = (PartRelationInfo *)
 		hash_search(relations, (const void *) &relid, HASH_FIND, 0);
 
+	if (!prel)
+		PG_RETURN_NULL();
+
 	/* remove children relations */
 	switch (prel->parttype)
 	{
diff --git a/contrib/pathman/sql/range.sql b/contrib/pathman/sql/range.sql
@@ -159,7 +159,14 @@ RETURNS VOID AS
 $$
 DECLARE
     v_child_relname TEXT;
+    v_check TEXT;
+    v_min_value TEXT;
+    v_max_value TEXT;
+    v_attname TEXT;
 BEGIN
+    v_attname := attname FROM pg_pathman_rels
+                 WHERE relname = v_parent_relname;
+
     IF v_type = 'time' THEN
         v_child_relname := format('%s_%s'
                                  , v_parent_relname
@@ -190,13 +197,24 @@ BEGIN
                 , v_start_value::TIMESTAMP
                 , v_start_value::TIMESTAMP + v_interval::INTERVAL
                 , v_child_relname);
+        v_min_value := to_char(v_start_value::TIMESTAMP, 'YYYY-MM-DD HH:MI:SS');
+        v_max_value := to_char(v_start_value::TIMESTAMP + v_interval::INTERVAL, 'YYYY-MM-DD HH:MI:SS');
     ELSIF v_type = 'num' THEN
         INSERT INTO pg_pathman_range_rels (parent, min_num, max_num, child)
         VALUES (v_parent_relname
                 , v_start_value::DOUBLE PRECISION
                 , v_start_value::DOUBLE PRECISION + v_interval::DOUBLE PRECISION
                 , v_child_relname);
+        v_min_value := v_start_value::DOUBLE PRECISION;
+        v_max_value := v_start_value::DOUBLE PRECISION + v_interval::DOUBLE PRECISION;
     END IF;
+
+    EXECUTE format('ALTER TABLE %s ADD CHECK (%s >= ''%s'' AND %s < ''%s'')'
+                   , v_child_relname
+                   , v_attname
+                   , v_min_value
+                   , v_attname
+                   , v_max_value);
 END
 $$ LANGUAGE plpgsql;
 
@@ -298,6 +316,24 @@ BEGIN
 END
 $$ LANGUAGE plpgsql;
 
+/*
+ *
+ */
+CREATE OR REPLACE FUNCTION disable_range_partitions(IN relation TEXT)
+RETURNS VOID AS
+$$
+DECLARE
+    v_relid INTEGER;
+    v_rec   RECORD;
+BEGIN
+    DELETE FROM pg_pathman_rels WHERE relname = relation;
+    DELETE FROM pg_pathman_range_rels WHERE parent = relation;
+
+    /* Notify backend about changes */
+    PERFORM pg_pathman_on_remove_partitions(v_relid);
+END
+$$ LANGUAGE plpgsql;
+
 /*
  * Drop trigger
  */

Original file line number	Diff line number	Diff line change
`@@ -827,6 +827,9 @@ on_partitions_removed(PG_FUNCTION_ARGS) {`
`827`	`827`	`prel = (PartRelationInfo *)`
`828`	`828`	`hash_search(relations, (const void *) &relid, HASH_FIND, 0);`
`829`	`829`
	`830`	`+ if (!prel)`
	`831`	`+ PG_RETURN_NULL();`
	`832`	`+`
`830`	`833`	`/* remove children relations */`
`831`	`834`	`switch (prel->parttype)`
`832`	`835`	`{`