Merge branch 'picky_nodes' into merge_concurrent

Author: zilder

expected/pg_pathman.out

@@ -1273,7 +1273,7 @@ SELECT pathman.enable_auto('test.range_rel');
 INSERT INTO test.range_rel (dt) VALUES ('2015-06-01');
 DROP TABLE test.range_rel CASCADE;
 NOTICE:  drop cascades to 20 other objects
-SELECT partrel, attname, parttype, range_interval FROM pathman.pathman_config;
+SELECT * FROM pathman.pathman_config;
  partrel | attname | parttype | range_interval 
 ---------+---------+----------+----------------
 (0 rows)
@@ -1457,7 +1457,7 @@ SELECT pathman.create_partitions_from_range('test."RangeRel"', 'dt', '2015-01-01
 
 DROP TABLE test."RangeRel" CASCADE;
 NOTICE:  drop cascades to 5 other objects
-SELECT partrel, attname, parttype, range_interval FROM pathman.pathman_config;
+SELECT * FROM pathman.pathman_config;
       partrel       | attname | parttype | range_interval 
 --------------------+---------+----------+----------------
  test.num_range_rel | id      |        2 | 1000

hash.sql

@@ -75,6 +75,9 @@ BEGIN
 	END IF;
 
 	RETURN partitions_count;
+
+EXCEPTION WHEN others THEN
+	RAISE EXCEPTION '%', SQLERRM;
 END
 $$ LANGUAGE plpgsql
 SET client_min_messages = WARNING;

init.sql

@@ -18,8 +18,7 @@
  *		range_interval - base interval for RANGE partitioning as string
  */
 CREATE TABLE IF NOT EXISTS @extschema@.pathman_config (
-	id				SERIAL PRIMARY KEY,
-	partrel			REGCLASS NOT NULL,
+	partrel			REGCLASS NOT NULL PRIMARY KEY,
 	attname			TEXT NOT NULL,
 	parttype		INTEGER NOT NULL,
 	range_interval	TEXT,
@@ -309,8 +308,18 @@ $$
 DECLARE
 	v_rec			RECORD;
 	is_referenced	BOOLEAN;
+	rel_persistence	CHAR;
 
 BEGIN
+	/* Ignore temporary tables */
+	SELECT relpersistence FROM pg_catalog.pg_class
+	WHERE oid = p_relation INTO rel_persistence;
+
+	IF rel_persistence = 't'::CHAR THEN
+		RAISE EXCEPTION 'Temporary table "%" cannot be partitioned',
+			quote_ident(p_relation::TEXT);
+	END IF;
+
 	IF EXISTS (SELECT * FROM @extschema@.pathman_config
 			   WHERE partrel = p_relation) THEN
 		RAISE EXCEPTION 'Relation "%" has already been partitioned', p_relation;
@@ -320,7 +329,7 @@ BEGIN
 		RAISE EXCEPTION 'Partitioning key ''%'' must be NOT NULL', p_attribute;
 	END IF;
 
-	/* Check if there are foreign keys reference to the relation */
+	/* Check if there are foreign keys that reference the relation */
 	FOR v_rec IN (SELECT *
 				  FROM pg_constraint WHERE confrelid = p_relation::regclass::oid)
 	LOOP
@@ -469,12 +478,9 @@ CREATE OR REPLACE FUNCTION @extschema@.drop_triggers(
 	parent_relid	REGCLASS)
 RETURNS VOID AS
 $$
-DECLARE
-	funcname	TEXT;
-
 BEGIN
-	funcname := @extschema@.build_update_trigger_func_name(parent_relid);
-	EXECUTE format('DROP FUNCTION IF EXISTS %s() CASCADE', funcname);
+	EXECUTE format('DROP FUNCTION IF EXISTS %s() CASCADE',
+				   @extschema@.build_update_trigger_func_name(parent_relid));
 END
 $$ LANGUAGE plpgsql;
 
@@ -545,12 +551,14 @@ EXECUTE PROCEDURE @extschema@.pathman_ddl_trigger_func();
 
 
 /*
- * Check if regclass is date or timestamp
+ * Attach partitioned table
  */
-CREATE OR REPLACE FUNCTION @extschema@.is_date_type(
-	typid	REGTYPE)
-RETURNS BOOLEAN AS 'pg_pathman', 'is_date_type'
-LANGUAGE C STRICT;
+CREATE OR REPLACE FUNCTION @extschema@.add_to_pathman_config(
+	parent_relid	REGCLASS,
+	attname			TEXT,
+	range_interval	TEXT DEFAULT NULL)
+RETURNS BOOLEAN AS 'pg_pathman', 'add_to_pathman_config'
+LANGUAGE C;
 
 
 CREATE OR REPLACE FUNCTION @extschema@.on_create_partitions(
@@ -569,6 +577,21 @@ RETURNS VOID AS 'pg_pathman', 'on_partitions_removed'
 LANGUAGE C STRICT;
 
 
+/*
+ * Get parent of pg_pathman's partition.
+ */
+CREATE OR REPLACE FUNCTION @extschema@.get_parent_of_partition(REGCLASS)
+RETURNS REGCLASS AS 'pg_pathman', 'get_parent_of_partition_pl'
+LANGUAGE C STRICT;
+
+/*
+ * Check if regclass is date or timestamp
+ */
+CREATE OR REPLACE FUNCTION @extschema@.is_date_type(
+	typid	REGTYPE)
+RETURNS BOOLEAN AS 'pg_pathman', 'is_date_type'
+LANGUAGE C STRICT;
+
 /*
  * Checks if attribute is nullable
  */
@@ -617,10 +640,3 @@ LANGUAGE C STRICT;
 CREATE OR REPLACE FUNCTION @extschema@.debug_capture()
 RETURNS VOID AS 'pg_pathman', 'debug_capture'
 LANGUAGE C STRICT;
-
-/*
- * Get parent of pg_pathman's partition.
- */
-CREATE OR REPLACE FUNCTION @extschema@.get_parent_of_partition(REGCLASS)
-RETURNS REGCLASS AS 'pg_pathman', 'get_parent_of_partition_pl'
-LANGUAGE C STRICT;

range.sql

@@ -971,7 +971,7 @@ BEGIN
 	WHERE oid = p_partition INTO rel_persistence;
 
 	IF rel_persistence = 't'::CHAR THEN
-		RAISE EXCEPTION 'Temporary table \"%\" cannot be used as a partition',
+		RAISE EXCEPTION 'Temporary table "%" cannot be used as a partition',
 			quote_ident(p_partition::TEXT);
 	END IF;
 

src/hooks.c

@@ -227,7 +227,7 @@ pathman_rel_pathlist_hook(PlannerInfo *root, RelOptInfo *rel, Index rti, RangeTb
 		rte->inh = true; /* we must restore 'inh' flag! */
 
 		children = PrelGetChildrenArray(prel);
-		ranges = list_make1_irange(make_irange(0, PrelChildrenCount(prel) - 1, false));
+		ranges = list_make1_irange(make_irange(0, PrelLastChild(prel), false));
 
 		/* Make wrappers over restrictions and collect final rangeset */
 		InitWalkerContext(&context, prel, NULL, false);
@@ -361,15 +361,8 @@ pg_pathman_enable_assign_hook(bool newval, void *extra)
 	elog(DEBUG2, "pg_pathman_enable_assign_hook() [newval = %s] triggered",
 		  newval ? "true" : "false");
 
-	if (initialization_needed)
-	{
-		elog(DEBUG2, "pg_pathman is not yet initialized, "
-					 "pg_pathman.enable is set to false");
-		return;
-	}
-
 	/* Return quickly if nothing has changed */
-	if (newval == (pg_pathman_enable &&
+	if (newval == (pg_pathman_init_state.pg_pathman_enable &&
 				   pg_pathman_enable_runtimeappend &&
 				   pg_pathman_enable_runtime_merge_append &&
 				   pg_pathman_enable_partition_filter))
@@ -465,23 +458,9 @@ pathman_post_parse_analysis_hook(ParseState *pstate, Query *query)
 	if (IsPathmanReady())
 		finish_delayed_invalidation();
 
-	elog(DEBUG2, "post_parse: %d %d %u [%u]",
-		 IsPathmanEnabled(),
-		 initialization_needed,
-		 get_pathman_schema(),
-		 MyProcPid);
-
-	/* DEBUG!!!! */
-	// static int parse_sleep = 10;
-	// if (IsPathmanEnabled() &&
-	// 	initialization_needed &&
-	// 	get_pathman_schema() == InvalidOid)
-	// 	sleep(parse_sleep);
-	/* -------------------- */
-
 	/* Load config if pg_pathman exists & it's still necessary */
 	if (IsPathmanEnabled() &&
-		initialization_needed &&
+		!IsPathmanInitialized() &&
 		/* Now evaluate the most expensive clause */
 		get_pathman_schema() != InvalidOid)
 	{