Merge branch 'master' into rel_future_beta

Author: funbringer

expected/pathman_utility_stmt.out

@@ -285,6 +285,58 @@ NOTICE:  drop cascades to 797 other objects
  * Test auto check constraint renaming
  */
 CREATE SCHEMA rename;
+/*
+ * Check that auto naming sequence is renamed
+ */
+CREATE TABLE rename.parent(id int not null);
+SELECT create_range_partitions('rename.parent', 'id', 1, 2, 2);
+ create_range_partitions 
+-------------------------
+                       2
+(1 row)
+
+SELECT 'rename.parent'::regclass;		/* parent is OK */
+   regclass    
+---------------
+ rename.parent
+(1 row)
+
+SELECT 'rename.parent_seq'::regclass;	/* sequence is OK */
+     regclass      
+-------------------
+ rename.parent_seq
+(1 row)
+
+ALTER TABLE rename.parent RENAME TO parent_renamed;
+SELECT 'rename.parent_renamed'::regclass;		/* parent is OK */
+       regclass        
+-----------------------
+ rename.parent_renamed
+(1 row)
+
+SELECT 'rename.parent_renamed_seq'::regclass;	/* sequence is OK */
+         regclass          
+---------------------------
+ rename.parent_renamed_seq
+(1 row)
+
+SELECT append_range_partition('rename.parent_renamed'); /* can append */
+ append_range_partition  
+-------------------------
+ rename.parent_renamed_3
+(1 row)
+
+DROP SEQUENCE rename.parent_renamed_seq;
+ALTER TABLE rename.parent_renamed RENAME TO parent;
+SELECT 'rename.parent'::regclass;		/* parent is OK */
+   regclass    
+---------------
+ rename.parent
+(1 row)
+
+/*
+ * Check that partitioning constraints are renamed
+ */
 CREATE TABLE rename.test(a serial, b int);
 SELECT create_hash_partitions('rename.test', 'a', 3);
  create_hash_partitions 
@@ -336,7 +388,9 @@ WHERE r.conrelid = 'rename.test_inh_one'::regclass AND r.contype = 'c';
  pathman_test_inh_1_check | CHECK (a < 100)
 (1 row)
 
-/* Check that plain tables are not affected too */
+/*
+ * 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');
@@ -365,7 +419,7 @@ WHERE r.conrelid = 'rename.plain_test'::regclass AND r.contype = 'c';
 (1 row)
 
 DROP SCHEMA rename CASCADE;
-NOTICE:  drop cascades to 7 other objects
+NOTICE:  drop cascades to 11 other objects
 /*
  * Test DROP INDEX CONCURRENTLY (test snapshots)
  */

sql/pathman_utility_stmt.sql

@@ -167,6 +167,25 @@ DROP SCHEMA copy_stmt_hooking CASCADE;
  */
 CREATE SCHEMA rename;
 
+
+/*
+ * Check that auto naming sequence is renamed
+ */
+CREATE TABLE rename.parent(id int not null);
+SELECT create_range_partitions('rename.parent', 'id', 1, 2, 2);
+SELECT 'rename.parent'::regclass;		/* parent is OK */
+SELECT 'rename.parent_seq'::regclass;	/* sequence is OK */
+ALTER TABLE rename.parent RENAME TO parent_renamed;
+SELECT 'rename.parent_renamed'::regclass;		/* parent is OK */
+SELECT 'rename.parent_renamed_seq'::regclass;	/* sequence is OK */
+SELECT append_range_partition('rename.parent_renamed'); /* can append */
+DROP SEQUENCE rename.parent_renamed_seq;
+ALTER TABLE rename.parent_renamed RENAME TO parent;
+SELECT 'rename.parent'::regclass;		/* parent is OK */
+
+/*
+ * Check that partitioning constraints are renamed
+ */
 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;
@@ -201,7 +220,9 @@ SELECT r.conname, pg_get_constraintdef(r.oid, true)
 FROM pg_constraint r
 WHERE r.conrelid = 'rename.test_inh_one'::regclass AND r.contype = 'c';
 
-/* Check that plain tables are not affected too */
+/*
+ * 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');
@@ -216,6 +237,7 @@ SELECT r.conname, pg_get_constraintdef(r.oid, true)
 FROM pg_constraint r
 WHERE r.conrelid = 'rename.plain_test'::regclass AND r.contype = 'c';
 
+
 DROP SCHEMA rename CASCADE;
 
 

src/hooks.c

@@ -882,6 +882,7 @@ pathman_process_utility_hook(Node *first_arg,
 		Oid			relation_oid;
 		PartType	part_type;
 		AttrNumber	attr_number;
+		bool		is_parent;
 
 		/* Override standard COPY statement if needed */
 		if (is_pathman_related_copy(parsetree))
@@ -900,10 +901,15 @@ pathman_process_utility_hook(Node *first_arg,
 
 		/* Override standard RENAME statement if needed */
 		else if (is_pathman_related_table_rename(parsetree,
-												 &relation_oid))
+												 &relation_oid,
+												 &is_parent))
 		{
-			PathmanRenameConstraint(relation_oid,
-									(const RenameStmt *) parsetree);
+			const RenameStmt *rename_stmt = (const RenameStmt *) parsetree;
+
+			if (is_parent)
+				PathmanRenameSequence(relation_oid, rename_stmt);
+			else
+				PathmanRenameConstraint(relation_oid, rename_stmt);
 		}
 
 		/* Override standard ALTER COLUMN TYPE statement if needed */

src/include/init.h

@@ -201,7 +201,8 @@ find_children_status find_inheritance_children_array(Oid parentrelId,
 char *build_check_constraint_name_relid_internal(Oid relid);
 char *build_check_constraint_name_relname_internal(const char *relname);
 
-char *build_sequence_name_internal(Oid relid);
+char *build_sequence_name_relid_internal(Oid relid);
+char *build_sequence_name_relname_internal(const char *relname);
 
 char *build_update_trigger_name_internal(Oid relid);
 char *build_update_trigger_func_name_internal(Oid relid);

src/include/utility_stmt_hooking.h

@@ -23,7 +23,8 @@
 /* Various traits */
 bool is_pathman_related_copy(Node *parsetree);
 bool is_pathman_related_table_rename(Node *parsetree,
-									 Oid *partition_relid_out);
+									 Oid *relation_oid_out,
+									 bool *is_parent_out);
 bool is_pathman_related_alter_column_type(Node *parsetree,
 										  Oid *parent_relid_out,
 										  AttrNumber *attr_number,
@@ -32,8 +33,9 @@ bool is_pathman_related_alter_column_type(Node *parsetree,
 /* Statement handlers */
 void PathmanDoCopy(const CopyStmt *stmt, const char *queryString,
 				   int stmt_location, int stmt_len, uint64 *processed);
-void PathmanRenameConstraint(Oid partition_relid,
-							 const RenameStmt *partition_rename_stmt);
+
+void PathmanRenameConstraint(Oid partition_relid, const RenameStmt *rename_stmt);
+void PathmanRenameSequence(Oid parent_relid, const RenameStmt *rename_stmt);
 
 
 #endif /* COPY_STMT_HOOKING_H */

src/init.c

@@ -569,6 +569,7 @@ build_check_constraint_name_relid_internal(Oid relid)
 char *
 build_check_constraint_name_relname_internal(const char *relname)
 {
+	AssertArg(relname != NULL);
 	return psprintf("pathman_%s_check", relname);
 }
 
@@ -577,10 +578,21 @@ build_check_constraint_name_relname_internal(const char *relname)
  * NOTE: this function does not perform sanity checks at all.
  */
 char *
-build_sequence_name_internal(Oid relid)
+build_sequence_name_relid_internal(Oid relid)
 {
 	AssertArg(OidIsValid(relid));
-	return psprintf("%s_seq", get_rel_name(relid));
+	return build_sequence_name_relname_internal(get_rel_name(relid));
+}
+
+/*
+ * Generate part sequence name for a parent.
+ * NOTE: this function does not perform sanity checks at all.
+ */
+char *
+build_sequence_name_relname_internal(const char *relname)
+{
+	AssertArg(relname != NULL);
+	return psprintf("%s_seq", relname);
 }
 
 /*

src/partition_creation.c

@@ -594,22 +594,31 @@ spawn_partitions_val(Oid parent_relid,				/* parent's Oid */
 static char *
 choose_range_partition_name(Oid parent_relid, Oid parent_nsp)
 {
-	Datum	part_num;
-	Oid		part_seq_relid;
-	char   *part_seq_relname;
-	Oid		save_userid;
-	int		save_sec_context;
-	bool	need_priv_escalation = !superuser(); /* we might be a SU */
-	char   *relname;
-	int		attempts_cnt = 1000;
-
-	part_seq_relname = build_sequence_name_internal(parent_relid);
-	part_seq_relid = get_relname_relid(part_seq_relname, parent_nsp);
+	Datum		part_num;
+	Oid			part_seq_relid;
+	char	   *part_seq_nspname,
+			   *part_seq_relname;
+	RangeVar   *part_seq_rv;
+	Oid			save_userid;
+	int			save_sec_context;
+	bool		need_priv_escalation = !superuser(); /* we might be a SU */
+	char	   *relname;
+	int			attempts_cnt = 1000;
+
+	/* Dispatch sequence and lock it using AccessShareLock */
+	part_seq_nspname	= get_namespace_name(get_rel_namespace(parent_relid));
+	part_seq_relname	= build_sequence_name_relid_internal(parent_relid);
+	part_seq_rv			= makeRangeVar(part_seq_nspname, part_seq_relname, -1);
+	part_seq_relid		= RangeVarGetRelid(part_seq_rv, AccessShareLock, true);
 
 	/* Could not find part number generating sequence */
 	if (!OidIsValid(part_seq_relid))
 		elog(ERROR, "auto naming sequence \"%s\" does not exist", part_seq_relname);
 
+	pfree(part_seq_nspname);
+	pfree(part_seq_relname);
+	pfree(part_seq_rv);
+
 	/* Do we have to escalate privileges? */
 	if (need_priv_escalation)
 	{

src/pl_funcs.c

@@ -886,7 +886,7 @@ add_to_pathman_config(PG_FUNCTION_ARGS)
 		Oid			naming_seq;
 
 		naming_seq_rv = makeRangeVar(get_namespace_name(get_rel_namespace(relid)),
-									 build_sequence_name_internal(relid),
+									 build_sequence_name_relid_internal(relid),
 									 -1);
 
 		naming_seq = RangeVarGetRelid(naming_seq_rv, AccessShareLock, true);

src/pl_range_funcs.c

@@ -589,16 +589,18 @@ build_sequence_name(PG_FUNCTION_ARGS)
 {
 	Oid		parent_relid = PG_GETARG_OID(0);
 	Oid		parent_nsp;
+	char   *seq_name;
 	char   *result;
 
 	if (!SearchSysCacheExists1(RELOID, ObjectIdGetDatum(parent_relid)))
 		ereport(ERROR, (errmsg("relation \"%u\" does not exist", parent_relid)));
 
 	parent_nsp = get_rel_namespace(parent_relid);
+	seq_name = build_sequence_name_relid_internal(parent_relid);
 
 	result = psprintf("%s.%s",
 					  quote_identifier(get_namespace_name(parent_nsp)),
-					  quote_identifier(build_sequence_name_internal(parent_relid)));
+					  quote_identifier(seq_name));
 
 	PG_RETURN_TEXT_P(cstring_to_text(result));
 }