pathman:

zilder · zilder · commit c36721e0e7e4 · 2016-01-15T16:25:10.000+03:00
* fix ONLY statement
* partition_data PL-function
diff --git a/contrib/pathman/pathman.c b/contrib/pathman/pathman.c
@@ -52,6 +52,7 @@ static void append_child_relation(PlannerInfo *root, RelOptInfo *rel, Index rti,
 static Node *wrapper_make_expression(WrapperNode *wrap, int index, bool *alwaysTrue);
 static void set_pathkeys(PlannerInfo *root, RelOptInfo *childrel, Path *path);
 static void disable_inheritance(Query *parse);
+bool inheritance_disabled;
 
 static WrapperNode *walk_expr_tree(Expr *expr, const PartRelationInfo *prel);
 static int make_hash(const PartRelationInfo *prel, int value);
@@ -127,6 +128,7 @@ my_planner_hook(Query *parse, int cursorOptions, ParamListInfo boundParams)
 	if (initialization_needed)
 		init();
 
+	inheritance_disabled = false;
 	disable_inheritance(parse);
 	result = standard_planner(parse, cursorOptions, boundParams);
 	return result;
@@ -157,7 +159,16 @@ disable_inheritance(Query *parse)
 					prel = (PartRelationInfo *)
 						hash_search(relations, (const void *) &rte->relid, HASH_FIND, 0);
 					if (prel != NULL)
+					{
 						rte->inh = false;
+						/*
+						 * Sometimes user uses the ONLY statement and in this case
+						 * rte->inh is also false. We should differ the case
+						 * when user uses ONLY statement from case when we
+						 * make rte->inh false intentionally.
+						 */
+						inheritance_disabled = true;
+					}
 				}
 				break;
 			case RTE_SUBQUERY:
@@ -198,7 +209,7 @@ my_hook(PlannerInfo *root, RelOptInfo *rel, Index rti, RangeTblEntry *rte)
 	PartRelationInfo *prel = NULL;
 
 	/* This works on for SELECT queries */
-	if (root->parse->commandType != CMD_SELECT)
+	if (root->parse->commandType != CMD_SELECT || !inheritance_disabled)
 		return;
 
 	/* Lookup partitioning information for parent relation */
diff --git a/contrib/pathman/sql/init.sql b/contrib/pathman/sql/init.sql
@@ -5,7 +5,7 @@ CREATE TABLE IF NOT EXISTS @extschema@.pg_pathman_rels (
     id         SERIAL PRIMARY KEY,
     relname    VARCHAR(127),
     attname    VARCHAR(127),
-    atttype    INTEGER,
+    -- atttype    INTEGER,
     parttype   INTEGER
 );
 
@@ -169,6 +169,34 @@ RETURNS VOID AS 'pathman', 'on_partitions_removed' LANGUAGE C STRICT;
 CREATE OR REPLACE FUNCTION find_range_partition(relid OID, value ANYELEMENT)
 RETURNS OID AS 'pathman', 'find_range_partition' LANGUAGE C STRICT;
 
+CREATE OR REPLACE FUNCTION partition_data(p_parent text)
+RETURNS bigint AS
+$$
+DECLARE
+    rec RECORD;
+BEGIN
+    FOR rec IN  (SELECT child.relname, pg_constraint.consrc
+                   FROM pg_pathman_rels
+                   JOIN pg_class AS parent ON parent.relname = pg_pathman_rels.relname
+                   JOIN pg_inherits ON inhparent = parent.relfilenode
+                   JOIN pg_constraint ON conrelid = inhrelid AND contype='c'
+                   JOIN pg_class AS child ON child.relfilenode = inhrelid
+                   WHERE pg_pathman_rels.relname = p_parent)
+    LOOP
+        RAISE NOTICE 'child %, condition %', rec.relname, rec.consrc;
+
+        EXECUTE format('WITH part_data AS (
+                            DELETE FROM ONLY %s WHERE %s RETURNING *)
+                        INSERT INTO %s SELECT * FROM part_data'
+                        , p_parent
+                        , rec.consrc
+                        , rec.relname);
+    END LOOP;
+    RETURN 0;
+END
+$$ LANGUAGE plpgsql;
+
+
 -- CREATE OR REPLACE FUNCTION sample_rel_trigger_func()
 -- RETURNS TRIGGER AS $$
 -- DECLARE
