pathman: option allowing to drop data with partitions

zilder · zilder · commit a400a914ac28 · 2016-02-12T13:34:36.000+03:00
diff --git a/contrib/pg_pathman/expected/pg_pathman.out b/contrib/pg_pathman/expected/pg_pathman.out
@@ -688,17 +688,7 @@ NOTICE:  Copying data to partitions...
                            10
 (1 row)
 
-SELECT drop_range_partitions('range_rel');
-NOTICE:  0 rows copied from range_rel_10
-NOTICE:  0 rows copied from range_rel_9
-NOTICE:  0 rows copied from range_rel_8
-NOTICE:  0 rows copied from range_rel_7
-NOTICE:  0 rows copied from range_rel_6
-NOTICE:  0 rows copied from range_rel_5
-NOTICE:  65 rows copied from range_rel_4
-NOTICE:  100 rows copied from range_rel_3
-NOTICE:  100 rows copied from range_rel_2
-NOTICE:  100 rows copied from range_rel_1
+SELECT drop_range_partitions('range_rel', TRUE);
  drop_range_partitions 
 -----------------------
                     10
diff --git a/contrib/pg_pathman/range.sql b/contrib/pg_pathman/range.sql
@@ -886,8 +886,11 @@ $$ LANGUAGE plpgsql;
 
 /*
  * Drop partitions
+ * If delete_data set to TRUE then partitions will be dropped with all the data
  */
-CREATE OR REPLACE FUNCTION @extschema@.drop_range_partitions(IN relation TEXT)
+CREATE OR REPLACE FUNCTION @extschema@.drop_range_partitions(
+    relation TEXT,
+    delete_data BOOLEAN DEFAULT FALSE)
 RETURNS INTEGER AS
 $$
 DECLARE
@@ -904,13 +907,15 @@ BEGIN
     FOR v_rec IN (SELECT inhrelid::regclass::text AS tbl
                   FROM pg_inherits WHERE inhparent = relation::regclass::oid)
     LOOP
-        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;
+        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);
-        RAISE NOTICE '% rows copied from %', v_rows, v_rec.tbl;
         v_part_count := v_part_count + 1;
     END LOOP;
 
diff --git a/contrib/pg_pathman/sql/pg_pathman.sql b/contrib/pg_pathman/sql/pg_pathman.sql
@@ -175,7 +175,7 @@ EXPLAIN (COSTS OFF) SELECT * FROM range_rel WHERE dt < '2010-03-01';
 /* Create range partitions from whole range */
 SELECT drop_range_partitions('range_rel');
 SELECT create_partitions_from_range('range_rel', 'id', 1, 1000, 100);
-SELECT drop_range_partitions('range_rel');
+SELECT drop_range_partitions('range_rel', TRUE);
 SELECT create_partitions_from_range('range_rel', 'dt', '2015-01-01'::date, '2015-12-01'::date, '1 month'::interval);
 EXPLAIN (COSTS OFF) SELECT * FROM range_rel WHERE dt = '2015-12-15';
 
