pathman: plpgsql functions return values

zilder · zilder · commit c758c4b4b5bc · 2016-01-28T01:17:17.000+03:00
diff --git a/contrib/pg_pathman/expected/pg_pathman.out b/contrib/pg_pathman/expected/pg_pathman.out
@@ -34,7 +34,7 @@ NOTICE:  Copying data to test.range_rel_2 (condition: ((dt >= 'Sun Feb 01 00:00:
 NOTICE:  Copying data to test.range_rel_1 (condition: ((dt >= 'Thu Jan 01 00:00:00 2015'::timestamp without time zone) AND (dt < 'Sun Feb 01 00:00:00 2015'::timestamp without time zone)))
  partition_data 
 ----------------
-              0
+            120
 (1 row)
 
 CREATE TABLE test.num_range_rel (
@@ -81,9 +81,9 @@ SELECT * FROM test.hash_rel WHERE value = 7;
 (1 row)
 
 SELECT pathman.create_range_update_trigger('test.num_range_rel');
- create_range_update_trigger 
------------------------------
- 
+       create_range_update_trigger        
+------------------------------------------
+ test.num_range_rel_update_trigger_func()
 (1 row)
 
 UPDATE test.num_range_rel SET id = 3001 WHERE id = 1;
@@ -518,7 +518,7 @@ NOTICE:  Copying data to hash_rel_1 (condition: ((value % 3) = 1))
 NOTICE:  Copying data to hash_rel_2 (condition: ((value % 3) = 2))
  partition_data 
 ----------------
-              0
+          10000
 (1 row)
 
 EXPLAIN (COSTS OFF) SELECT * FROM hash_rel WHERE id = 1234;
@@ -562,7 +562,7 @@ NOTICE:  Copying data to range_rel_11 (condition: ((dt >= 'Mon Nov 01 00:00:00 2
 NOTICE:  Copying data to range_rel_12 (condition: ((dt >= 'Wed Dec 01 00:00:00 2010'::timestamp without time zone) AND (dt < 'Sat Jan 01 00:00:00 2011'::timestamp without time zone)))
  partition_data 
 ----------------
-              0
+            365
 (1 row)
 
 SELECT merge_range_partitions('range_rel_1', 'range_rel_2');
diff --git a/contrib/pg_pathman/sql/init.sql b/contrib/pg_pathman/sql/init.sql
@@ -41,13 +41,16 @@ RETURNS ANYARRAY AS 'pg_pathman', 'get_range_by_idx' LANGUAGE C STRICT;
 /*
  * Copy rows to partitions
  */
-CREATE OR REPLACE FUNCTION @extschema@.partition_data(p_parent text)
-RETURNS bigint AS
+CREATE OR REPLACE FUNCTION @extschema@.partition_data(p_parent text, OUT p_total BIGINT)
+AS
 $$
 DECLARE
     rec RECORD;
+    cnt BIGINT := 0;
 BEGIN
     p_parent := @extschema@.validate_relname(p_parent);
+
+    p_total := 0;
     FOR rec IN  (SELECT inhrelid as child_id, pg_constraint.consrc
                  FROM @extschema@.pathman_config as cfg
                  JOIN pg_class AS parent ON parent.relfilenode = cfg.relname::regclass::oid
@@ -62,8 +65,9 @@ BEGIN
                         , p_parent
                         , rec.consrc
                         , rec.child_id::regclass::text);
+        GET DIAGNOSTICS cnt = ROW_COUNT;
+        p_total := p_total + cnt;
     END LOOP;
-    RETURN 0;
 END
 $$
 LANGUAGE plpgsql;
diff --git a/contrib/pg_pathman/sql/range.sql b/contrib/pg_pathman/sql/range.sql
@@ -262,7 +262,6 @@ BEGIN
 END
 $$ LANGUAGE plpgsql;
 
-
 /*
  * Split RANGE partition
  */
@@ -596,7 +595,7 @@ $$ LANGUAGE plpgsql;
  */
 CREATE OR REPLACE FUNCTION @extschema@.create_range_update_trigger(
     IN relation TEXT)
-RETURNS VOID AS
+RETURNS TEXT AS
 $$
 DECLARE
     func TEXT := '
@@ -630,6 +629,7 @@ DECLARE
     num         INTEGER := 0;
     attr        TEXT;
 BEGIN
+    relation := @extschema@.validate_relname(relation);
     relid := relation::regclass::oid;
     SELECT string_agg(attname, ', '),
            string_agg('OLD.' || attname, ', '),
@@ -656,6 +656,8 @@ BEGIN
                        , relation);
         num := num + 1;
     END LOOP;
+
+    RETURN format('%s_update_trigger_func()', relation);
 END
 $$ LANGUAGE plpgsql;
 
