Simplify the code

Author: ildus

src/pl_range_funcs.c

@@ -73,12 +73,10 @@ static void modify_range_constraint(Oid partition_relid,
 									const Bound *lower,
 									const Bound *upper);
 static char *get_qualified_rel_name(Oid relid);
-static void drop_table_by_oid(Oid relid, bool concurrent);
+static void drop_table_by_oid(Oid relid);
 static bool interval_is_trivial(Oid atttype,
 								Datum interval,
 								Oid interval_type);
-static void remove_inheritance(Oid parent_relid, Oid partition_relid);
-
 
 /*
  * -----------------------------
@@ -740,9 +738,6 @@ merge_range_partitions_internal(Oid parent_relid, Oid *parts, uint32 nparts)
 															 NULL,
 															 NULL);
 
-	/* should be invalidated */
-	//Assert(!prel->valid);
-
 	/* Make new relation visible */
 	CommandCounterIncrement();
 
@@ -767,22 +762,11 @@ merge_range_partitions_internal(Oid parent_relid, Oid *parts, uint32 nparts)
 
 	SPI_finish();
 
-	/*
-	 * Now detach these partitions.
-	 * this would get AccessExclusiveLock.
-	 */
-	for (i = 0; i < nparts; i++)
-		remove_inheritance(parent_relid, parts[i]);
-
 	/* Now we can drop the partitions */
 	for (i = 0; i < nparts; i++)
 	{
-		/*
-		 * we should get AccessExclusiveLock anyway, because logic of
-		 * ALTER TABLE .. NO INHERIT that we did before could change
-		 */
 		LockRelationOid(parts[i], AccessExclusiveLock);
-		drop_table_by_oid(parts[i], false);
+		drop_table_by_oid(parts[i]);
 	}
 }
 
@@ -844,7 +828,7 @@ drop_range_partition_expand_next(PG_FUNCTION_ARGS)
 	}
 
 	/* Finally drop this partition */
-	drop_table_by_oid(relid, false);
+	drop_table_by_oid(relid);
 
 	PG_RETURN_VOID();
 }
@@ -1263,7 +1247,7 @@ get_qualified_rel_name(Oid relid)
  * Drop table using it's Oid
  */
 static void
-drop_table_by_oid(Oid relid, bool concurrent)
+drop_table_by_oid(Oid relid)
 {
 	DropStmt	   *n = makeNode(DropStmt);
 	const char	   *relname = get_qualified_rel_name(relid);
@@ -1275,30 +1259,7 @@ drop_table_by_oid(Oid relid, bool concurrent)
 	n->arguments	= NIL;
 #endif
 	n->behavior		= DROP_RESTRICT;  /* default behavior */
-	n->concurrent	= concurrent;
+	n->concurrent	= false;
 
 	RemoveRelations(n);
 }
-
-/* Remove inheritance for partition */
-static void
-remove_inheritance(Oid parent_relid, Oid partition_relid)
-{
-	AlterTableStmt *stmt = makeNode(AlterTableStmt);
-	AlterTableCmd  *cmd = makeNode(AlterTableCmd);
-	LOCKMODE		lockmode;
-
-	stmt->relation = makeRangeVarFromNameList(
-			stringToQualifiedNameList(get_qualified_rel_name(partition_relid)));
-	stmt->relkind = OBJECT_TABLE;
-	stmt->cmds = list_make1(cmd);
-	stmt->missing_ok = false;
-
-	cmd->subtype = AT_DropInherit;
-	cmd->def = (Node *) makeRangeVarFromNameList(
-			stringToQualifiedNameList(get_qualified_rel_name(parent_relid)));
-
-	lockmode = AlterTableGetLockLevel(stmt->cmds);
-	LockRelationOid(partition_relid, lockmode);
-	AlterTable(partition_relid, lockmode, stmt);
-}