oracle-like DROP PARTITION command

zilder · zilder · commit a9e03f6dd8aa · 2017-01-25T16:34:48.000+03:00
diff --git a/src/backend/commands/partition.c b/src/backend/commands/partition.c
@@ -430,23 +430,17 @@ rename_partition(Oid parent, AlterTableCmd *cmd)
 void
 drop_partition(Oid parent, AlterTableCmd *cmd)
 {
-	DropStmt *n = makeNode(DropStmt);
 	RangeVar *partition;
 
-	/* TODO: Check that parent is an actual parent of partition */
-
 	Assert(list_length(cmd->partitions) == 1);
-
 	partition = (RangeVar *) linitial(cmd->partitions);
 
-	n->removeType = OBJECT_TABLE;
-	n->missing_ok = false;
-	n->objects = list_make1(makeNameListFromRangeVar(partition));
-	n->arguments = NIL;
-	n->behavior = DROP_RESTRICT;  // default behaviour
-	n->concurrent = false;
+	if (SPI_connect() != SPI_OK_CONNECT)
+		elog(ERROR, "could not connect using SPI");
+
+	pm_drop_range_partition_expand_next(RangeVarGetRelid(partition, NoLock, false));
 
-	RemoveRelations(n);
+	SPI_finish();
 }
 
 
diff --git a/src/backend/commands/pathman_wrapper.c b/src/backend/commands/pathman_wrapper.c
@@ -164,30 +164,6 @@ get_pathman_schema_name()
 	return get_namespace_name(schema_oid);
 }
 
-/* TODO: Probably remove this */
-Oid
-pm_get_attribute_type(Oid relid, const char *attname)
-{
-	FuncArgs		args;
-	bool			isnull;
-	Datum			atttype;
-	bool			ret;
-
-	InitFuncArgs(&args, 3);
-	PG_SETARG_DATUM(&args, 0, OIDOID, ObjectIdGetDatum(relid));
-	PG_SETARG_DATUM(&args, 1, TEXTOID, CStringGetTextDatum(attname));
-	ret = pathman_invoke_return_value("get_attribute_type($1, $2)",
-									  &args,
-									  &atttype,
-									  &isnull);
-
-	if (!ret)
-		elog(ERROR, "Cannot retrieve attribute type");
-
-	FreeFuncArgs(&args);
-
-	return !isnull ? DatumGetObjectId(atttype) : InvalidOid;
-}
 
 char *
 pm_get_partition_key(Oid relid)
@@ -515,10 +491,15 @@ pm_split_range_partition(Oid part_relid,
 		elog(ERROR, "Unable to split partition '%s'", get_rel_name(part_relid));
 }
 
-void pm_alter_partition(Oid relid,
-						const char *new_relname,
-						Oid new_namespace,
-						const char *new_tablespace)
+
+/*
+ * Change name, schema or tablespace
+ */
+void
+pm_alter_partition(Oid relid,
+				   const char *new_relname,
+				   Oid new_namespace,
+				   const char *new_tablespace)
 {
 	FuncArgs	args;
 	bool		ret;
@@ -550,3 +531,20 @@ void pm_alter_partition(Oid relid,
 	if (!ret)
 		elog(ERROR, "Unable to alter partition '%s'", get_rel_name(relid));
 }
+
+
+void
+pm_drop_range_partition_expand_next(Oid relid)
+{
+	FuncArgs	args;
+	bool		ret;
+
+	InitFuncArgs(&args, 1);
+	PG_SETARG_DATUM(&args, 0, OIDOID, relid);
+
+	ret = pathman_invoke("drop_range_partition_expand_next($1)", &args);
+	FreeFuncArgs(&args);
+
+	if (!ret)
+		elog(ERROR, "Unable to drop partition '%s'", get_rel_name(relid));
+}
diff --git a/src/include/commands/pathman_wrapper.h b/src/include/commands/pathman_wrapper.h
@@ -70,4 +70,5 @@ void pm_split_range_partition(Oid part_relid,
 						 Oid split_value_type,
 						 const char *relname,
 						 const char *tablespace);
-void pm_alter_partition(Oid relid, const char *new_relname, Oid new_namespace, const char *new_tablespace);
+void pm_alter_partition(Oid relid, const char *new_relname, Oid new_namespace, const char *new_tablespace);
+void pm_drop_range_partition_expand_next(Oid relid);
