Merge branch 'master' into picky_nodes

funbringer · funbringer · commit 1ee24560db4e · 2016-06-23T18:16:54.000+03:00
diff --git a/README.md b/README.md
@@ -120,7 +120,7 @@ Merge two adjacent RANGE partitions. Data from `partition2` is copied to `partit
 ```
 append_range_partition(p_relation TEXT)
 ```
-Appends new RANGE partition and returns 
+Appends new RANGE partition and returns
 ```
 prepend_range_partition(p_relation TEXT)
 ```
@@ -160,6 +160,13 @@ disable_partitioning(relation TEXT)
 Disables `pg_pathman` partitioning mechanism for the specified parent table and removes an insert trigger. Partitions itself remain unchanged.
 
 ## Examples
+
+### Common tips
+You can easily add **_partition_** column containing the names of the underlying partitions using the system attribute called **_tableoid_**:
+```
+SELECT tableoid::regclass, * AS partition FROM partitioned_table;
+```
+
 ### HASH
 Consider an example of HASH partitioning. First create a table with some integer column:
 ```
@@ -180,13 +187,13 @@ This will create new partitions and move the data from parent to partitions.
 Here is an example of the query with filtering by partitioning key and its plan:
 ```
 SELECT * FROM items WHERE id = 1234;
-  id  |               name               | code 
+  id  |               name               | code
 ------+----------------------------------+------
  1234 | 81dc9bdb52d04dc20036dbd8313ed055 | 1855
 (1 row)
 
 EXPLAIN SELECT * FROM items WHERE id = 1234;
-                                     QUERY PLAN                                     
+                                     QUERY PLAN
 ------------------------------------------------------------------------------------
  Append  (cost=0.28..8.29 rows=0 width=0)
    ->  Index Scan using items_34_pkey on items_34  (cost=0.28..8.29 rows=0 width=0)
@@ -195,7 +202,7 @@ EXPLAIN SELECT * FROM items WHERE id = 1234;
 Note that pg_pathman excludes parent table from the query plan. To access parent table use ONLY modifier:
 ```
 EXPLAIN SELECT * FROM ONLY items;
-                      QUERY PLAN                      
+                      QUERY PLAN
 ------------------------------------------------------
  Seq Scan on items  (cost=0.00..0.00 rows=1 width=45)
 ```
diff --git a/hash.sql b/hash.sql
@@ -122,12 +122,10 @@ DECLARE
 	atttype       TEXT;
 	hashfunc      TEXT;
 BEGIN
-	relation := @extschema@.validate_relname(relation);
-
 	SELECT * INTO plain_schema, plain_relname
 	FROM @extschema@.get_plain_schema_and_relname(relation);
 
-	relid := relation::regclass::oid;
+	relid := relation::oid;
 	SELECT string_agg(attname, ', '),
 		   string_agg('OLD.' || attname, ', '),
 		   string_agg('NEW.' || attname, ', '),
@@ -143,6 +141,11 @@ BEGIN
 		   att_fmt;
 
 	attr := attname FROM @extschema@.pathman_config WHERE relname::regclass = relation;
+
+	IF attr IS NULL THEN
+		RAISE EXCEPTION 'Table % is not partitioned', quote_ident(relation::TEXT);
+	END IF;
+
 	partitions_count := COUNT(*) FROM pg_inherits WHERE inhparent = relation::oid;
 
 	/* Function name, trigger name and child relname template */
diff --git a/range.sql b/range.sql
@@ -417,6 +417,10 @@ BEGIN
     v_attname := attname FROM @extschema@.pathman_config
                  WHERE relname::regclass = p_parent;
 
+	IF v_attname IS NULL THEN
+		RAISE EXCEPTION 'Table % is not partitioned', quote_ident(p_parent::TEXT);
+	END IF;
+
 	SELECT * INTO v_plain_schema, v_plain_relname
 	FROM @extschema@.get_plain_schema_and_relname(p_parent);
 
@@ -488,9 +492,15 @@ BEGIN
 					  FROM pg_inherits
 					  WHERE inhrelid = v_child_relid;
 
-	SELECT attname, parttype INTO v_attname, v_part_type
+	SELECT attname, parttype
 	FROM @extschema@.pathman_config
-	WHERE relname::regclass = v_parent_relid::regclass;
+	WHERE relname::regclass = v_parent_relid::regclass
+	INTO v_attname, v_part_type;
+
+	IF v_attname IS NULL THEN
+		RAISE EXCEPTION 'Table % is not partitioned',
+						quote_ident(v_parent_relid::regclass::text);
+	END IF;
 
 	SELECT * INTO v_plain_schema, v_plain_relname
 	FROM @extschema@.get_plain_schema_and_relname(p_partition);
@@ -585,9 +595,15 @@ BEGIN
 		RAISE EXCEPTION 'Cannot merge partitions having different parents';
 	END IF;
 
-	SELECT attname, parttype INTO v_attname, v_part_type
+	SELECT attname, parttype
 	FROM @extschema@.pathman_config
-	WHERE relname::regclass = v_parent_relid1::regclass;
+	WHERE relname::regclass = v_parent_relid1::regclass
+	INTO v_attname, v_part_type;
+
+	IF v_attname IS NULL THEN
+		RAISE EXCEPTION 'Table % is not partitioned',
+						quote_ident(v_parent_relid1::regclass::text);
+	END IF;
 
 	/* Check if this is RANGE partition */
 	IF v_part_type != 2 THEN
@@ -631,8 +647,14 @@ DECLARE
 	v_child_relname TEXT;
 	v_check_name    TEXT;
 BEGIN
-	SELECT attname INTO v_attname FROM @extschema@.pathman_config
-	WHERE relname::regclass = p_parent_relid::regclass;
+	SELECT attname FROM @extschema@.pathman_config
+	WHERE relname::regclass = p_parent_relid::regclass
+	INTO v_attname;
+
+	IF v_attname IS NULL THEN
+		RAISE EXCEPTION 'Table % is not partitioned',
+						quote_ident(p_parent_relid::regclass::text);
+	END IF;
 
 	SELECT * INTO v_plain_schema, v_plain_relname
 	FROM @extschema@.get_plain_schema_and_relname(p_part1);
@@ -688,16 +710,22 @@ CREATE OR REPLACE FUNCTION @extschema@.append_range_partition(
 RETURNS TEXT AS
 $$
 DECLARE
-	v_attname TEXT;
-	v_atttype TEXT;
-	v_part_name TEXT;
-	v_interval TEXT;
+	v_attname	TEXT;
+	v_atttype	TEXT;
+	v_part_name	TEXT;
+	v_interval	TEXT;
 BEGIN
 	/* Prevent concurrent partition creation */
 	PERFORM @extschema@.acquire_partitions_lock();
 
-	SELECT attname, range_interval INTO v_attname, v_interval
-	FROM @extschema@.pathman_config WHERE relname::regclass = p_relation;
+	SELECT attname, range_interval
+	FROM @extschema@.pathman_config
+	WHERE relname::regclass = p_relation
+	INTO v_attname, v_interval;
+
+	IF v_attname IS NULL THEN
+		RAISE EXCEPTION 'Table % is not partitioned', quote_ident(p_relation::TEXT);
+	END IF;
 
 	v_atttype := @extschema@.get_attribute_type_name(p_relation, v_attname);
 
@@ -764,8 +792,15 @@ BEGIN
 	/* Prevent concurrent partition creation */
 	PERFORM @extschema@.acquire_partitions_lock();
 
-	SELECT attname, range_interval INTO v_attname, v_interval
-	FROM @extschema@.pathman_config WHERE relname::regclass = p_relation;
+	SELECT attname, range_interval
+	FROM @extschema@.pathman_config
+	WHERE relname::regclass = p_relation
+	INTO v_attname, v_interval;
+
+	IF v_attname IS NULL THEN
+		RAISE EXCEPTION 'Table % is not partitioned', quote_ident(p_relation::TEXT);
+	END IF;
+
 	v_atttype := @extschema@.get_attribute_type_name(p_relation, v_attname);
 
 	EXECUTE format('SELECT @extschema@.prepend_partition_internal($1, $2, $3, ARRAY[]::%s[])', v_atttype)
@@ -940,7 +975,14 @@ BEGIN
 				   , p_relation);
 
 	/* Set check constraint */
-	v_attname := attname FROM @extschema@.pathman_config WHERE relname::regclass = p_relation;
+	v_attname := attname
+	FROM @extschema@.pathman_config
+	WHERE relname::regclass = p_relation;
+
+	IF v_attname IS NULL THEN
+		RAISE EXCEPTION 'Table % is not partitioned', quote_ident(p_relation::TEXT);
+	END IF;
+
 	v_cond := @extschema@.get_range_condition(v_attname, p_start_value, p_end_value);
 
 	/* Plain partition name and schema */
@@ -1010,7 +1052,7 @@ LANGUAGE plpgsql;
  * Creates an update trigger
  */
 CREATE OR REPLACE FUNCTION @extschema@.create_range_update_trigger(
-	IN relation TEXT)
+	IN relation REGCLASS)
 RETURNS TEXT AS
 $$
 DECLARE
@@ -1045,8 +1087,7 @@ DECLARE
 	num         INTEGER := 0;
 	attr        TEXT;
 BEGIN
-	relation := @extschema@.validate_relname(relation);
-	relid := relation::regclass::oid;
+	relid := relation::oid;
 	SELECT string_agg(attname, ', '),
 		   string_agg('OLD.' || attname, ', '),
 		   string_agg('NEW.' || attname, ', '),
@@ -1061,7 +1102,14 @@ BEGIN
 		   att_val_fmt,
 		   att_fmt;
 
-	attr := attname FROM @extschema@.pathman_config WHERE relname = relation;
+	attr := attname
+	FROM @extschema@.pathman_config
+	WHERE relname::regclass = relation;
+
+	IF attr IS NULL THEN
+		RAISE EXCEPTION 'Table % is not partitioned', quote_ident(relation::TEXT);
+	END IF;
+
 	EXECUTE format(func, relation, attr, 0, att_val_fmt,
 				   old_fields, att_fmt, new_fields);
 	FOR rec in (SELECT * FROM pg_inherits WHERE inhparent = relation::regclass::oid)
@@ -1087,7 +1135,6 @@ CREATE OR REPLACE FUNCTION @extschema@.append_partitions_on_demand_internal(
 RETURNS OID AS
 $$
 DECLARE
-	v_relation TEXT;
 	v_cnt INTEGER := 0;
 	i INTEGER := 0;
 	v_part TEXT;
@@ -1099,11 +1146,16 @@ DECLARE
 	v_next_value p_new_value%TYPE;
 	v_is_date BOOLEAN;
 BEGIN
-	v_relation := @extschema@.validate_relname(p_relid::regclass::text);
-
 	/* get attribute name and interval */
-	SELECT attname, range_interval INTO v_attname, v_interval
-	FROM @extschema@.pathman_config WHERE relname = v_relation;
+	SELECT attname, range_interval
+	FROM @extschema@.pathman_config
+	WHERE relname::regclass = p_relid::regclass
+	INTO v_attname, v_interval;
+
+	IF v_attname IS NULL THEN
+		RAISE EXCEPTION 'Table % is not partitioned',
+						quote_ident(p_relid::regclass::text);
+	END IF;
 
 	v_min := @extschema@.get_min_range_value(p_relid::regclass::oid, p_new_value);
 	v_max := @extschema@.get_max_range_value(p_relid::regclass::oid, p_new_value);
