clean code, take lock in PathmanRenameConstraint()

funbringer · funbringer · commit fa6f4c159499 · 2016-11-22T18:06:19.000+03:00
diff --git a/src/hooks.c b/src/hooks.c
@@ -653,7 +653,7 @@ pathman_process_utility_hook(Node *parsetree,
 			 * Rename check constraint of a table if it is a partition managed
 			 * by pg_pathman
 			 */
-			PathmanDoRenameConstraint((RenameStmt *) parsetree);
+			PathmanRenameConstraint((RenameStmt *) parsetree);
 		}
 	}
 
diff --git a/src/init.c b/src/init.c
@@ -593,12 +593,18 @@ find_inheritance_children_array(Oid parentrelId,
 /*
  * Generate check constraint name for a partition.
  *
- * This function does not perform sanity checks at all.
+ * These functions does not perform sanity checks at all.
  */
 char *
-build_check_constraint_name_internal(Oid relid, AttrNumber attno)
+build_check_constraint_name_relid_internal(Oid relid, AttrNumber attno)
 {
-	return build_check_constraint_name_by_relname(get_rel_name(relid), attno);
+	return build_check_constraint_name_relname_internal(get_rel_name(relid), attno);
+}
+
+char *
+build_check_constraint_name_relname_internal(char *relname, AttrNumber attno)
+{
+	return psprintf("pathman_%s_%u_check", relname, attno);
 }
 
 /*
@@ -807,7 +813,7 @@ get_partition_constraint_expr(Oid partition, AttrNumber part_attno)
 	bool		conbin_isnull;
 	Expr	   *expr;			/* expression tree for constraint */
 
-	conname = build_check_constraint_name_internal(partition, part_attno);
+	conname = build_check_constraint_name_relid_internal(partition, part_attno);
 	conid = get_relation_constraint_oid(partition, conname, true);
 	if (conid == InvalidOid)
 	{
diff --git a/src/init.h b/src/init.h
@@ -86,15 +86,6 @@ 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.
@@ -132,8 +123,11 @@ find_children_status find_inheritance_children_array(Oid parentrelId,
 													 uint32 *children_size,
 													 Oid **children);
 
-char *build_check_constraint_name_internal(Oid relid,
-										   AttrNumber attno);
+char *build_check_constraint_name_relid_internal(Oid relid,
+												 AttrNumber attno);
+
+char *build_check_constraint_name_relname_internal(char *relname,
+												   AttrNumber attno);
 
 bool pathman_config_contains_relation(Oid relid,
 									  Datum *values,
diff --git a/src/pl_funcs.c b/src/pl_funcs.c
@@ -521,7 +521,7 @@ build_check_constraint_name_attnum(PG_FUNCTION_ARGS)
 		elog(ERROR, "Cannot build check constraint name: "
 					"invalid attribute number %i", attnum);
 
-	result = build_check_constraint_name_internal(relid, attnum);
+	result = build_check_constraint_name_relid_internal(relid, attnum);
 
 	PG_RETURN_TEXT_P(cstring_to_text(quote_identifier(result)));
 }
@@ -541,7 +541,7 @@ build_check_constraint_name_attname(PG_FUNCTION_ARGS)
 		elog(ERROR, "relation \"%s\" has no column \"%s\"",
 			 get_rel_name_or_relid(relid), text_to_cstring(attname));
 
-	result = build_check_constraint_name_internal(relid, attnum);
+	result = build_check_constraint_name_relid_internal(relid, attnum);
 
 	PG_RETURN_TEXT_P(cstring_to_text(quote_identifier(result)));
 }
diff --git a/src/utility_stmt_hooking.c b/src/utility_stmt_hooking.c
@@ -626,44 +626,45 @@ prepare_rri_fdw_for_copy(EState *estate,
 }
 
 /*
- * Rename check constraint of table if it is a partition 
+ * Rename check constraint of table if it's a partition
  */
 void
-PathmanDoRenameConstraint(const RenameStmt *stmt)
+PathmanRenameConstraint(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);
-		}
-	}
+	Oid						partition_relid,
+							parent_relid;
+	char				   *old_constraint_name,
+						   *new_constraint_name;
+	RenameStmt			   *rename_stmt;
+	const PartRelationInfo *prel;
+
+	partition_relid = RangeVarGetRelid(stmt->relation, AccessShareLock, false);
+	parent_relid = get_rel_parent(partition_relid);
+
+	/* Skip if there's no parent */
+	if (!OidIsValid(parent_relid)) return;
+
+	/* Fetch partitioning data */
+	prel = get_pathman_relation_info(parent_relid);
+
+	/* Skip if this table is not partitioned */
+	if (!prel) return;
+
+	/* Generate old constraint name */
+	old_constraint_name = build_check_constraint_name_relid_internal(partition_relid,
+																	 prel->attnum);
+
+	/* Generate new constraint name */
+	new_constraint_name = build_check_constraint_name_relname_internal(stmt->newname,
+																	   prel->attnum);
+
+	/* Build check constraint RENAME statement */
+	rename_stmt = makeNode(RenameStmt);
+	rename_stmt->renameType = OBJECT_TABCONSTRAINT;
+	rename_stmt->relation = stmt->relation;
+	rename_stmt->subname = old_constraint_name;
+	rename_stmt->newname = new_constraint_name;
+	rename_stmt->missing_ok = false;
+
+	RenameConstraint(rename_stmt);
 }
diff --git a/src/utility_stmt_hooking.h b/src/utility_stmt_hooking.h
@@ -19,6 +19,6 @@
 
 bool is_pathman_related_copy(Node *parsetree);
 void PathmanDoCopy(const CopyStmt *stmt, const char *queryString, uint64 *processed);
-void PathmanDoRenameConstraint(const RenameStmt *stmt);
+void PathmanRenameConstraint(const RenameStmt *stmt);
 
 #endif

Original file line number	Diff line number	Diff line change
`@@ -653,7 +653,7 @@ pathman_process_utility_hook(Node *parsetree,`
`653`	`653`	`* Rename check constraint of a table if it is a partition managed`
`654`	`654`	`* by pg_pathman`
`655`	`655`	`*/`
`656`		`- PathmanDoRenameConstraint((RenameStmt *) parsetree);`
	`656`	`+ PathmanRenameConstraint((RenameStmt *) parsetree);`
`657`	`657`	`}`
`658`	`658`	`}`
`659`	`659`
Original file line number	Diff line number	Diff line change
`@@ -521,7 +521,7 @@ build_check_constraint_name_attnum(PG_FUNCTION_ARGS)`
`521`	`521`	`elog(ERROR, "Cannot build check constraint name: "`
`522`	`522`	`"invalid attribute number %i", attnum);`
`523`	`523`
`524`		`- result = build_check_constraint_name_internal(relid, attnum);`
	`524`	`+ result = build_check_constraint_name_relid_internal(relid, attnum);`
`525`	`525`
`526`	`526`	`PG_RETURN_TEXT_P(cstring_to_text(quote_identifier(result)));`
`527`	`527`	`}`
`@@ -541,7 +541,7 @@ build_check_constraint_name_attname(PG_FUNCTION_ARGS)`
`541`	`541`	`elog(ERROR, "relation \"%s\" has no column \"%s\"",`
`542`	`542`	`get_rel_name_or_relid(relid), text_to_cstring(attname));`
`543`	`543`
`544`		`- result = build_check_constraint_name_internal(relid, attnum);`
	`544`	`+ result = build_check_constraint_name_relid_internal(relid, attnum);`
`545`	`545`
`546`	`546`	`PG_RETURN_TEXT_P(cstring_to_text(quote_identifier(result)));`
`547`	`547`	`}`