introduce fixed function drop_partitions()

funbringer · funbringer · commit 92e46ac299da · 2016-06-08T14:12:25.000+03:00
diff --git a/hash.sql b/hash.sql
@@ -66,48 +66,6 @@ BEGIN
 END
 $$ LANGUAGE plpgsql;
 
-/*
- * Drops all partitions for specified relation
- */
-CREATE OR REPLACE FUNCTION @extschema@.drop_hash_partitions(
-	IN relation REGCLASS
-	, delete_data BOOLEAN DEFAULT FALSE)
-RETURNS INTEGER AS
-$$
-DECLARE
-	v_relname    TEXT;
-	v_rec        RECORD;
-	v_rows       INTEGER;
-	v_part_count INTEGER := 0;
-BEGIN
-	v_relname := @extschema@.validate_relname(relation);
-
-	/* Drop trigger first */
-	PERFORM @extschema@.drop_triggers(relation);
-	DELETE FROM @extschema@.pathman_config WHERE relname::regclass = relation;
-
-	FOR v_rec in (SELECT inhrelid::regclass::text AS tbl
-				FROM pg_inherits WHERE inhparent = relation::oid)
-	LOOP
-		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::text);
-			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::oid);
-
-	RETURN v_part_count;
-END
-$$ LANGUAGE plpgsql;
-
 /*
  * Creates an update trigger
  */
diff --git a/init.sql b/init.sql
@@ -352,3 +352,57 @@ BEGIN
 	EXECUTE format('DROP FUNCTION IF EXISTS %s() CASCADE', funcname);
 END
 $$ 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_partitions(
+	relation REGCLASS
+	, delete_data BOOLEAN DEFAULT FALSE)
+RETURNS INTEGER AS
+$$
+DECLARE
+	v_rec        RECORD;
+	v_rows       INTEGER;
+	v_part_count INTEGER := 0;
+	v_relname    TEXT;
+	conf_num_del INTEGER;
+BEGIN
+	v_relname := @extschema@.validate_relname(relation);
+
+	/* Drop trigger first */
+	PERFORM @extschema@.drop_triggers(relation);
+
+	WITH config_num_deleted AS (DELETE FROM @extschema@.pathman_config
+								WHERE relname::regclass = relation
+								RETURNING *)
+	SELECT count(*) from config_num_deleted INTO conf_num_del;
+
+	IF conf_num_del = 0 THEN
+		RAISE EXCEPTION 'table % has no partitions', relation::text;
+	END IF;
+
+	FOR v_rec IN (SELECT inhrelid::regclass::text AS tbl
+				  FROM pg_inherits WHERE inhparent::regclass = relation)
+	LOOP
+		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::text);
+			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::oid);
+
+	RETURN v_part_count;
+END
+$$ LANGUAGE plpgsql
+SET pg_pathman.enable_partitionfilter = off;
+
diff --git a/range.sql b/range.sql
@@ -1075,51 +1075,6 @@ BEGIN
 END
 $$ 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(
-	relation REGCLASS
-	, delete_data BOOLEAN DEFAULT FALSE)
-RETURNS INTEGER AS
-$$
-DECLARE
-	v_rec        RECORD;
-	v_rows       INTEGER;
-	v_part_count INTEGER := 0;
-	v_relname    TEXT;
-BEGIN
-	v_relname := @extschema@.validate_relname(relation);
-
-	/* Drop trigger first */
-	PERFORM @extschema@.drop_triggers(relation);
-
-	FOR v_rec IN (SELECT inhrelid::regclass::text AS tbl
-				  FROM pg_inherits WHERE inhparent::regclass = relation)
-	LOOP
-		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::text);
-			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;
-
-	DELETE FROM @extschema@.pathman_config WHERE relname::regclass = relation;
-
-	/* Notify backend about changes */
-	PERFORM @extschema@.on_remove_partitions(relation::oid);
-
-	RETURN v_part_count;
-END
-$$ LANGUAGE plpgsql;
-
 /*
  * Internal function used to create new partitions on insert or update trigger.
  * Invoked from C-function find_or_create_range_partition().
diff --git a/sql/pg_pathman.sql b/sql/pg_pathman.sql
@@ -396,14 +396,14 @@ SELECT * FROM test.hash_rel WHERE id = 123;
 /*
  * Clean up
  */
-SELECT pathman.drop_hash_partitions('test.hash_rel');
+SELECT pathman.drop_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 pathman.drop_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');
+SELECT pathman.drop_partitions('test.num_range_rel');
 DROP TABLE test.num_range_rel CASCADE;
 
 DROP TABLE test.range_rel CASCADE;
@@ -453,7 +453,7 @@ UPDATE test."TeSt" SET a = 1;
 SELECT * FROM test."TeSt";
 SELECT * FROM test."TeSt" WHERE a = 1;
 EXPLAIN (COSTS OFF) SELECT * FROM test."TeSt" WHERE a = 1;
-SELECT pathman.drop_hash_partitions('test."TeSt"');
+SELECT pathman.drop_partitions('test."TeSt"');
 SELECT * FROM test."TeSt";
 
 CREATE TABLE test."RangeRel" (
@@ -467,7 +467,7 @@ SELECT pathman.append_range_partition('test."RangeRel"');
 SELECT pathman.prepend_range_partition('test."RangeRel"');
 SELECT pathman.merge_range_partitions('test."RangeRel_1"', 'test."RangeRel_' || currval('test."RangeRel_seq"') || '"');
 SELECT pathman.split_range_partition('test."RangeRel_1"', '2015-01-01'::DATE);
-SELECT pathman.drop_range_partitions('test."RangeRel"');
+SELECT pathman.drop_partitions('test."RangeRel"');
 SELECT pathman.create_partitions_from_range('test."RangeRel"', 'dt', '2015-01-01'::DATE, '2015-01-05'::DATE, '1 day'::INTERVAL);
 DROP TABLE test."RangeRel" CASCADE;
 SELECT * FROM pathman.pathman_config;
@@ -476,7 +476,7 @@ CREATE TABLE test."RangeRel" (
 	dt	TIMESTAMP NOT NULL,
 	txt	TEXT);
 SELECT pathman.create_range_partitions('test."RangeRel"', 'id', 1, 100, 3);
-SELECT pathman.drop_range_partitions('test."RangeRel"');
+SELECT pathman.drop_partitions('test."RangeRel"');
 SELECT pathman.create_partitions_from_range('test."RangeRel"', 'id', 1, 300, 100);
 DROP TABLE test."RangeRel" CASCADE;
 
@@ -524,9 +524,9 @@ EXPLAIN (COSTS OFF) DELETE FROM range_rel r USING tmp t WHERE r.dt = '2010-01-02
 DELETE FROM range_rel r USING tmp t WHERE r.dt = '2010-01-02' AND r.id = t.id;
 
 /* Create range partitions from whole range */
-SELECT drop_range_partitions('range_rel');
+SELECT drop_partitions('range_rel');
 SELECT create_partitions_from_range('range_rel', 'id', 1, 1000, 100);
-SELECT drop_range_partitions('range_rel', TRUE);
+SELECT drop_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';
 
