pathman: drop hash partitions function updated

zilder · zilder · commit 66f10cdbef0e · 2016-02-17T12:06:00.000+03:00
diff --git a/contrib/pg_pathman/expected/pg_pathman.out b/contrib/pg_pathman/expected/pg_pathman.out
@@ -554,9 +554,41 @@ EXPLAIN (COSTS OFF) SELECT * FROM test.range_rel WHERE dt BETWEEN '2014-11-15' A
 SELECT pathman.drop_hash_partitions('test.hash_rel');
 NOTICE:  drop cascades to trigger test_hash_rel_insert_trigger on table test.hash_rel
 NOTICE:  function test.hash_rel_hash_update_trigger_func() does not exist, skipping
+NOTICE:  2 rows copied from test.hash_rel_2
+NOTICE:  3 rows copied from test.hash_rel_1
+NOTICE:  1 rows copied from test.hash_rel_0
  drop_hash_partitions 
 ----------------------
- 
+                    3
+(1 row)
+
+SELECT COUNT(*) FROM ONLY test.hash_rel;
+ count 
+-------
+     6
+(1 row)
+
+SELECT pathman.create_hash_partitions('test.hash_rel', 'value', 3);
+NOTICE:  function test.hash_rel_hash_insert_trigger_func() does not exist, skipping
+NOTICE:  function test.hash_rel_hash_update_trigger_func() does not exist, skipping
+NOTICE:  Copying data to partitions...
+ create_hash_partitions 
+------------------------
+                      3
+(1 row)
+
+SELECT pathman.drop_hash_partitions('test.hash_rel', TRUE);
+NOTICE:  drop cascades to trigger test_hash_rel_insert_trigger on table test.hash_rel
+NOTICE:  function test.hash_rel_hash_update_trigger_func() does not exist, skipping
+ drop_hash_partitions 
+----------------------
+                    3
+(1 row)
+
+SELECT COUNT(*) FROM ONLY test.hash_rel;
+ count 
+-------
+     0
 (1 row)
 
 DROP TABLE test.hash_rel CASCADE;
diff --git a/contrib/pg_pathman/hash.sql b/contrib/pg_pathman/hash.sql
@@ -111,28 +111,41 @@ $$ LANGUAGE plpgsql;
 /*
  * Drops all partitions for specified relation
  */
-CREATE OR REPLACE FUNCTION @extschema@.drop_hash_partitions(IN relation TEXT)
-RETURNS VOID AS
+CREATE OR REPLACE FUNCTION @extschema@.drop_hash_partitions(
+    IN relation TEXT
+    , delete_data BOOLEAN DEFAULT FALSE)
+RETURNS INTEGER AS
 $$
 DECLARE
-    relid INTEGER;
-    partitions_count INTEGER;
-    rec RECORD;
-    num INTEGER := 0;
+    v_rec RECORD;
+    v_rows INTEGER;
+    v_part_count INTEGER := 0;
 BEGIN
     relation := @extschema@.validate_relname(relation);
 
     /* Drop trigger first */
     PERFORM @extschema@.drop_hash_triggers(relation);
     DELETE FROM @extschema@.pathman_config WHERE relname = relation;
 
-    FOR rec in (SELECT * FROM pg_inherits WHERE inhparent = relation::regclass::oid)
+    FOR v_rec in (SELECT inhrelid::regclass::text AS tbl
+                FROM pg_inherits WHERE inhparent = relation::regclass::oid)
     LOOP
-        EXECUTE format('DROP TABLE %s', rec.inhrelid::regclass::text);
+        IF NOT delete_data THEN
+            EXECUTE format('WITH part_data AS (DELETE FROM %s RETURNING *)
+                            INSERT INTO %s SELECT * FROM part_data'
+                           , v_rec.tbl
+                           , relation);
+            GET DIAGNOSTICS v_rows = ROW_COUNT;
+            RAISE NOTICE '% rows copied from %', v_rows, v_rec.tbl;
+        END IF;
+        EXECUTE format('DROP TABLE %s', v_rec.tbl);
+        v_part_count := v_part_count + 1;
     END LOOP;
 
     /* Notify backend about changes */
     PERFORM @extschema@.on_remove_partitions(relation::regclass::oid);
+
+    RETURN v_part_count;
 END
 $$ LANGUAGE plpgsql;
 
diff --git a/contrib/pg_pathman/range.sql b/contrib/pg_pathman/range.sql
@@ -949,7 +949,7 @@ BEGIN
 
     /* Invalidate cache */
     PERFORM @extschema@.on_update_partitions(v_parent::regclass::oid);
-    
+
     /* Release lock */
     PERFORM @extschema@.release_partitions_lock();
     RETURN p_partition;
@@ -1082,13 +1082,12 @@ $$ LANGUAGE plpgsql;
  * If delete_data set to TRUE then partitions will be dropped with all the data
  */
 CREATE OR REPLACE FUNCTION @extschema@.drop_range_partitions(
-    relation TEXT,
-    delete_data BOOLEAN DEFAULT FALSE)
+    relation TEXT
+    , delete_data BOOLEAN DEFAULT FALSE)
 RETURNS INTEGER AS
 $$
 DECLARE
     v_rec   RECORD;
-    -- v_total_rows INTEGER;
     v_rows INTEGER;
     v_part_count INTEGER := 0;
 BEGIN
diff --git a/contrib/pg_pathman/sql/pg_pathman.sql b/contrib/pg_pathman/sql/pg_pathman.sql
@@ -126,6 +126,10 @@ EXPLAIN (COSTS OFF) SELECT * FROM test.range_rel WHERE dt BETWEEN '2014-11-15' A
  * Clean up
  */
 SELECT pathman.drop_hash_partitions('test.hash_rel');
+SELECT COUNT(*) FROM ONLY test.hash_rel;
+SELECT pathman.create_hash_partitions('test.hash_rel', 'value', 3);
+SELECT pathman.drop_hash_partitions('test.hash_rel', TRUE);
+SELECT COUNT(*) FROM ONLY test.hash_rel;
 DROP TABLE test.hash_rel CASCADE;
 
 SELECT pathman.drop_range_partitions('test.num_range_rel');
