constraint renaming and tests

Author: zilder

Makefile

@@ -4,7 +4,7 @@ MODULE_big = pg_pathman
 OBJS = src/init.o src/relation_info.o src/utils.o src/partition_filter.o \
 	src/runtimeappend.o src/runtime_merge_append.o src/pg_pathman.o src/rangeset.o \
 	src/pl_funcs.o src/pl_range_funcs.o src/pl_hash_funcs.o src/pathman_workers.o \
-	src/hooks.o src/nodes_common.o src/xact_handling.o src/copy_stmt_hooking.o \
+	src/hooks.o src/nodes_common.o src/xact_handling.o src/utility_stmt_hooking.o \
 	src/planner_tree_modification.o src/debug_print.o src/pg_compat.o $(WIN32RES)
 
 EXTENSION = pg_pathman
@@ -20,7 +20,7 @@ REGRESS = pathman_basic \
 		  pathman_foreign_keys \
 		  pathman_permissions \
 		  pathman_rowmarks \
-		  pathman_copy_stmt_hooking \
+		  pathman_utility_stmt_hooking \
 		  pathman_calamity
 EXTRA_REGRESS_OPTS=--temp-config=$(top_srcdir)/$(subdir)/conf.add
 EXTRA_CLEAN = pg_pathman--$(EXTVERSION).sql ./isolation_output

expected/pathman_copy_stmt_hooking.out renamed to expected/pathman_utility_stmt_hooking.out

@@ -1,5 +1,8 @@
 \set VERBOSITY terse
 CREATE EXTENSION pg_pathman;
+/*
+ * Test COPY
+ */
 CREATE SCHEMA copy_stmt_hooking;
 CREATE TABLE copy_stmt_hooking.test(
 	val int not null,
@@ -190,4 +193,92 @@ SELECT * FROM copy_stmt_hooking.test ORDER BY val;
 
 DROP SCHEMA copy_stmt_hooking CASCADE;
 NOTICE:  drop cascades to 7 other objects
+/*
+ * Test auto check constraint renaming
+ */
+CREATE SCHEMA rename;
+CREATE TABLE rename.test(a serial, b int);
+SELECT create_hash_partitions('rename.test', 'a', 3);
+ create_hash_partitions 
+------------------------
+                      3
+(1 row)
+
+ALTER TABLE rename.test_0 RENAME TO test_one;
+/* We expect to find check constraint renamed as well */
+\d+ rename.test_one
+                                              Table "rename.test_one"
+ Column |  Type   |                        Modifiers                        | Storage | Stats target | Description 
+--------+---------+---------------------------------------------------------+---------+--------------+-------------
+ a      | integer | not null default nextval('rename.test_a_seq'::regclass) | plain   |              | 
+ b      | integer |                                                         | plain   |              | 
+Check constraints:
+    "pathman_test_one_1_check" CHECK (get_hash_part_idx(hashint4(a), 3) = 0)
+Inherits: rename.test
+
+/* Generates check constraint for relation */
+CREATE OR REPLACE FUNCTION add_constraint(rel regclass, att text)
+RETURNS VOID AS $$
+declare
+    constraint_name text := build_check_constraint_name(rel, 'a');
+BEGIN
+    EXECUTE format('ALTER TABLE %s ADD CONSTRAINT %s CHECK (a < 100);',
+                   rel, constraint_name);
+END
+$$
+LANGUAGE plpgsql;
+/*
+ * Check that it doesn't affect regular inherited tables that aren't managed
+ * by pg_pathman
+ */
+CREATE TABLE rename.test_inh (LIKE rename.test INCLUDING ALL);
+CREATE TABLE rename.test_inh_1 (LIKE rename.test INCLUDING ALL);
+ALTER TABLE rename.test_inh_1 INHERIT rename.test_inh;
+SELECT add_constraint('rename.test_inh_1', 'a');
+ add_constraint 
+----------------
+ 
+(1 row)
+
+ALTER TABLE rename.test_inh_1 RENAME TO test_inh_one;
+\d+ rename.test_inh_one
+                                            Table "rename.test_inh_one"
+ Column |  Type   |                        Modifiers                        | Storage | Stats target | Description 
+--------+---------+---------------------------------------------------------+---------+--------------+-------------
+ a      | integer | not null default nextval('rename.test_a_seq'::regclass) | plain   |              | 
+ b      | integer |                                                         | plain   |              | 
+Check constraints:
+    "pathman_test_inh_1_1_check" CHECK (a < 100)
+Inherits: rename.test_inh
+
+/* Check that plain tables are not affected too */
+CREATE TABLE rename.plain_test(a serial, b int);
+ALTER TABLE rename.plain_test RENAME TO plain_test_renamed;
+SELECT add_constraint('rename.plain_test_renamed', 'a');
+ add_constraint 
+----------------
+ 
+(1 row)
+
+\d+ rename.plain_test_renamed
+                                            Table "rename.plain_test_renamed"
+ Column |  Type   |                           Modifiers                           | Storage | Stats target | Description 
+--------+---------+---------------------------------------------------------------+---------+--------------+-------------
+ a      | integer | not null default nextval('rename.plain_test_a_seq'::regclass) | plain   |              | 
+ b      | integer |                                                               | plain   |              | 
+Check constraints:
+    "pathman_plain_test_renamed_1_check" CHECK (a < 100)
+
+ALTER TABLE rename.plain_test_renamed RENAME TO plain_test;
+\d+ rename.plain_test
+                                                Table "rename.plain_test"
+ Column |  Type   |                           Modifiers                           | Storage | Stats target | Description 
+--------+---------+---------------------------------------------------------------+---------+--------------+-------------
+ a      | integer | not null default nextval('rename.plain_test_a_seq'::regclass) | plain   |              | 
+ b      | integer |                                                               | plain   |              | 
+Check constraints:
+    "pathman_plain_test_renamed_1_check" CHECK (a < 100)
+
+DROP SCHEMA rename CASCADE;
+NOTICE:  drop cascades to 7 other objects
 DROP EXTENSION pg_pathman;

sql/pathman_copy_stmt_hooking.sql renamed to sql/pathman_utility_stmt_hooking.sql

@@ -1,9 +1,11 @@
 \set VERBOSITY terse
 
 CREATE EXTENSION pg_pathman;
-CREATE SCHEMA copy_stmt_hooking;
-
 
+/*
+ * Test COPY
+ */
+CREATE SCHEMA copy_stmt_hooking;
 CREATE TABLE copy_stmt_hooking.test(
 	val int not null,
 	comment text,
@@ -89,6 +91,50 @@ COPY copy_stmt_hooking.test FROM stdin;
 SELECT count(*) FROM ONLY copy_stmt_hooking.test;
 SELECT * FROM copy_stmt_hooking.test ORDER BY val;
 
-
 DROP SCHEMA copy_stmt_hooking CASCADE;
+
+/*
+ * Test auto check constraint renaming
+ */
+CREATE SCHEMA rename;
+
+CREATE TABLE rename.test(a serial, b int);
+SELECT create_hash_partitions('rename.test', 'a', 3);
+ALTER TABLE rename.test_0 RENAME TO test_one;
+/* We expect to find check constraint renamed as well */
+\d+ rename.test_one
+
+/* Generates check constraint for relation */
+CREATE OR REPLACE FUNCTION add_constraint(rel regclass, att text)
+RETURNS VOID AS $$
+declare
+    constraint_name text := build_check_constraint_name(rel, 'a');
+BEGIN
+    EXECUTE format('ALTER TABLE %s ADD CONSTRAINT %s CHECK (a < 100);',
+                   rel, constraint_name);
+END
+$$
+LANGUAGE plpgsql;
+
+/*
+ * Check that it doesn't affect regular inherited tables that aren't managed
+ * by pg_pathman
+ */
+CREATE TABLE rename.test_inh (LIKE rename.test INCLUDING ALL);
+CREATE TABLE rename.test_inh_1 (LIKE rename.test INCLUDING ALL);
+ALTER TABLE rename.test_inh_1 INHERIT rename.test_inh;
+SELECT add_constraint('rename.test_inh_1', 'a');
+ALTER TABLE rename.test_inh_1 RENAME TO test_inh_one;
+\d+ rename.test_inh_one
+
+/* Check that plain tables are not affected too */
+CREATE TABLE rename.plain_test(a serial, b int);
+ALTER TABLE rename.plain_test RENAME TO plain_test_renamed;
+SELECT add_constraint('rename.plain_test_renamed', 'a');
+\d+ rename.plain_test_renamed
+ALTER TABLE rename.plain_test_renamed RENAME TO plain_test;
+\d+ rename.plain_test
+
+DROP SCHEMA rename CASCADE;
+
 DROP EXTENSION pg_pathman;

src/hooks.c

@@ -8,7 +8,7 @@
  * ------------------------------------------------------------------------
  */
 
-#include "copy_stmt_hooking.h"
+#include "utility_stmt_hooking.h"
 #include "hooks.h"
 #include "init.h"
 #include "partition_filter.h"
@@ -24,6 +24,7 @@
 #include "optimizer/cost.h"
 #include "optimizer/restrictinfo.h"
 #include "utils/typcache.h"
+#include "utils/lsyscache.h"
 
 
 set_join_pathlist_hook_type		set_join_pathlist_next = NULL;
@@ -34,6 +35,10 @@ shmem_startup_hook_type			shmem_startup_hook_next = NULL;
 ProcessUtility_hook_type		process_utility_hook_next = NULL;
 
 
+#define is_table_rename_statement(s) \
+			IsA((s), RenameStmt) && ((RenameStmt *)(s))->renameType == OBJECT_TABLE
+
+
 /* Take care of joins */
 void
 pathman_join_pathlist_hook(PlannerInfo *root,
@@ -627,17 +632,29 @@ pathman_process_utility_hook(Node *parsetree,
 							 char *completionTag)
 {
 	/* Override standard COPY statement if needed */
-	if (IsPathmanReady() && is_pathman_related_copy(parsetree))
+	if (IsPathmanReady())
 	{
-		uint64	processed;
+		if (is_pathman_related_copy(parsetree))
+		{
+			uint64	processed;
+
+			/* Handle our COPY case (and show a special cmd name) */
+			PathmanDoCopy((CopyStmt *) parsetree, queryString, &processed);
+			if (completionTag)
+				snprintf(completionTag, COMPLETION_TAG_BUFSIZE,
+						 "PATHMAN COPY " UINT64_FORMAT, processed);
 
-		/* Handle our COPY case (and show a special cmd name) */
-		PathmanDoCopy((CopyStmt *) parsetree, queryString, &processed);
-		if (completionTag)
-			snprintf(completionTag, COMPLETION_TAG_BUFSIZE,
-					 "PATHMAN COPY " UINT64_FORMAT, processed);
+			return; /* don't call standard_ProcessUtility() or hooks */
+		}
 
-		return; /* don't call standard_ProcessUtility() or hooks */
+		if (is_table_rename_statement(parsetree))
+		{
+			/*
+			 * Rename check constraint of a table if it is a partition managed
+			 * by pg_pathman
+			 */
+			PathmanDoRenameConstraint((RenameStmt *) parsetree);
+		}
 	}
 
 	/* Call hooks set by other extensions if needed */

src/init.c

@@ -598,7 +598,7 @@ find_inheritance_children_array(Oid parentrelId,
 char *
 build_check_constraint_name_internal(Oid relid, AttrNumber attno)
 {
-	return psprintf("pathman_%s_%u_check", get_rel_name(relid), attno);
+	return build_check_constraint_name_by_relname(get_rel_name(relid), attno);
 }
 
 /*

src/init.h

@@ -86,6 +86,15 @@ extern PathmanInitState 	pg_pathman_init_state;
 		pg_pathman_init_state.initialization_needed = true; \
 	} while (0)
 
+/*
+ * Generate check constraint name for given relname
+ */
+static inline char *
+build_check_constraint_name_by_relname(char *relname, AttrNumber attno)
+{
+	return psprintf("pathman_%s_%u_check", relname, attno);
+}
+
 
 /*
  * Save and restore PathmanInitState.

src/copy_stmt_hooking.c renamed to src/utility_stmt_hooking.c

@@ -1,7 +1,8 @@
 /* ------------------------------------------------------------------------
  *
- * copy_stmt_hooking.c
- *		Override COPY TO/FROM statement for partitioned tables
+ * utility_stmt_hooking.c
+ *		Override COPY TO/FROM and ALTER TABLE ... RENAME statements
+ *		for partitioned tables
  *
  * Copyright (c) 2016, Postgres Professional
  * Portions Copyright (c) 1996-2015, PostgreSQL Global Development Group
@@ -10,7 +11,7 @@
  * ------------------------------------------------------------------------
  */
 
-#include "copy_stmt_hooking.h"
+#include "utility_stmt_hooking.h"
 #include "init.h"
 #include "partition_filter.h"
 #include "relation_info.h"
@@ -22,6 +23,7 @@
 #include "catalog/pg_attribute.h"
 #include "commands/copy.h"
 #include "commands/trigger.h"
+#include "commands/tablecmds.h"
 #include "executor/executor.h"
 #include "foreign/fdwapi.h"
 #include "miscadmin.h"
@@ -622,3 +624,46 @@ prepare_rri_fdw_for_copy(EState *estate,
 		elog(ERROR, "cannot copy to foreign partition \"%s\"",
 			 get_rel_name(RelationGetRelid(rri->ri_RelationDesc)));
 }
+
+/*
+ * Rename check constraint of table if it is a partition 
+ */
+void
+PathmanDoRenameConstraint(const RenameStmt *stmt)
+{
+	Oid		partition = RangeVarGetRelid(stmt->relation, NoLock, true);
+	Oid		parent = get_rel_parent(partition);
+
+	if (partition != InvalidOid && parent != InvalidOid)
+	{
+		char   *old_constraint_name,
+			   *new_constraint_name;
+		const PartRelationInfo *prel = get_pathman_relation_info(parent);
+
+		if (prel)
+		{
+			RangeVar	   *rngVar;
+			RenameStmt	   *s;
+
+			/* Generate old constraint name */
+			old_constraint_name = build_check_constraint_name_by_relname(
+				get_rel_name(partition),
+				prel->attnum);
+
+			/* Generate new constraint name */
+			new_constraint_name = build_check_constraint_name_by_relname(
+				stmt->newname,
+				prel->attnum);
+
+			/* Build check constraint RENAME statement */
+			s = makeNode(RenameStmt);
+			s->renameType = OBJECT_TABCONSTRAINT;
+			s->relation = stmt->relation;
+			s->subname = old_constraint_name;
+			s->newname = new_constraint_name;
+			s->missing_ok = false;
+
+			RenameConstraint(s);
+		}
+	}
+}

src/copy_stmt_hooking.h renamed to src/utility_stmt_hooking.h

@@ -1,6 +1,6 @@
 /* ------------------------------------------------------------------------
  *
- * copy_stmt_hooking.h
+ * utility_stmt_hooking.h
  *		Transaction-specific locks and other functions
  *
  * Copyright (c) 2016, Postgres Professional
@@ -19,5 +19,6 @@
 
 bool is_pathman_related_copy(Node *parsetree);
 void PathmanDoCopy(const CopyStmt *stmt, const char *queryString, uint64 *processed);
+void PathmanDoRenameConstraint(const RenameStmt *stmt);
 
 #endif