Merge commit 'ac5a2bb086937740fce7ecee791cf329d9fafbd2' into PGPRO9_5

dmpgpro · dmpgpro · commit bd91f261da31 · 2016-10-05T16:41:53.000+03:00
diff --git a/contrib/pg_pathman/init.sql b/contrib/pg_pathman/init.sql
@@ -530,36 +530,37 @@ BEGIN
 	DELETE FROM @extschema@.pathman_config_params WHERE partrel = parent_relid;
 
 	IF conf_num_del = 0 THEN
-		RAISE EXCEPTION 'relation "%" has no partitions', parent_relid::text;
+		RAISE EXCEPTION 'relation "%" has no partitions', parent_relid::TEXT;
 	END IF;
 
-	FOR v_rec IN (SELECT inhrelid::regclass::text AS tbl
+	FOR v_rec IN (SELECT inhrelid::REGCLASS AS tbl
 				  FROM pg_catalog.pg_inherits
 				  WHERE inhparent::regclass = parent_relid)
 	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,
+							v_rec.tbl::TEXT,
 							parent_relid::text);
 			GET DIAGNOSTICS v_rows = ROW_COUNT;
 
 			/* Show number of copied rows */
-			RAISE NOTICE '% rows copied from %', v_rows, v_rec.tbl;
+			RAISE NOTICE '% rows copied from %', v_rows, v_rec.tbl::TEXT;
 		END IF;
 
+		SELECT relkind FROM pg_catalog.pg_class
+		WHERE oid = v_rec.tbl
+		INTO v_relkind;
+
 		/*
 		 * Determine the kind of child relation. It can be either regular
 		 * table (r) or foreign table (f). Depending on relkind we use
-		 * DROP TABLE or DROP FOREIGN TABLE
+		 * DROP TABLE or DROP FOREIGN TABLE.
 		 */
-		EXECUTE format('SELECT relkind FROM pg_class WHERE oid = ''%s''::regclass', v_rec.tbl)
-		INTO v_relkind;
-
 		IF v_relkind = 'f' THEN
-			EXECUTE format('DROP FOREIGN TABLE %s', v_rec.tbl);
+			EXECUTE format('DROP FOREIGN TABLE %s', v_rec.tbl::TEXT);
 		ELSE
-			EXECUTE format('DROP TABLE %s', v_rec.tbl);
+			EXECUTE format('DROP TABLE %s', v_rec.tbl::TEXT);
 		END IF;
 
 		v_part_count := v_part_count + 1;
diff --git a/contrib/pg_pathman/range.sql b/contrib/pg_pathman/range.sql
@@ -1066,6 +1066,7 @@ $$
 DECLARE
 	v_attname			TEXT;
 	rel_persistence		CHAR;
+	v_init_callback		REGPROCEDURE;
 
 BEGIN
 	/* Acquire lock on parent */
@@ -1105,6 +1106,20 @@ BEGIN
 													 p_start_value,
 													 p_end_value));
 
+	/* Fetch init_callback from 'params' table */
+	WITH stub_callback(stub) as (values (0))
+	SELECT coalesce(init_callback, 0::REGPROCEDURE)
+	FROM stub_callback
+	LEFT JOIN @extschema@.pathman_config_params AS params
+	ON params.partrel = parent_relid
+	INTO v_init_callback;
+
+	PERFORM @extschema@.invoke_on_partition_created_callback(parent_relid,
+															 p_partition,
+															 v_init_callback,
+															 p_start_value,
+															 p_end_value);
+
 	/* Invalidate cache */
 	PERFORM @extschema@.on_update_partitions(parent_relid);
 
diff --git a/contrib/pg_pathman/src/copy_stmt_hooking.c b/contrib/pg_pathman/src/copy_stmt_hooking.c
@@ -54,6 +54,8 @@ is_pathman_related_copy(Node *parsetree)
 	CopyStmt   *copy_stmt = (CopyStmt *) parsetree;
 	Oid			partitioned_table;
 
+	Assert(IsPathmanReady());
+
 	if (!IsOverrideCopyEnabled())
 	{
 		elog(DEBUG1, "COPY statement hooking is disabled");
diff --git a/contrib/pg_pathman/src/hooks.c b/contrib/pg_pathman/src/hooks.c
@@ -611,9 +611,9 @@ pathman_process_utility_hook(Node *parsetree,
 								  dest, completionTag);
 
 	/* Override standard COPY statement if needed */
-	if (is_pathman_related_copy(parsetree))
+	if (IsPathmanReady() && is_pathman_related_copy(parsetree))
 	{
-		uint64		processed;
+		uint64	processed;
 
 		PathmanDoCopy((CopyStmt *) parsetree, queryString, &processed);
 		if (completionTag)

Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,8 @@ is_pathman_related_copy(Node *parsetree)`
`54`	`54`	`CopyStmt copy_stmt = (CopyStmt ) parsetree;`
`55`	`55`	`Oid partitioned_table;`
`56`	`56`
	`57`	`+ Assert(IsPathmanReady());`
	`58`	`+`
`57`	`59`	`if (!IsOverrideCopyEnabled())`
`58`	`60`	`{`
`59`	`61`	`elog(DEBUG1, "COPY statement hooking is disabled");`