allow drop subscription in recovery

risingwavelabs · Oct 31, 2024 · 3b8becc · 3b8becc
1 parent 5c0aab6
commit 3b8becc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/meta/src/controller/catalog.rs b/src/meta/src/controller/catalog.rs
@@ -2910,6 +2910,7 @@ impl CatalogController {
         let inner = self.inner.read().await;
         let subscription_objs: Vec<(SubscriptionId, ObjectId, i64, DatabaseId)> =
             Subscription::find()
+                .select_only()
                 .select_column(subscription::Column::SubscriptionId)
                 .select_column(subscription::Column::DependentTableId)
                 .select_column(subscription::Column::RetentionSeconds)

diff --git a/src/meta/src/rpc/ddl_controller.rs b/src/meta/src/rpc/ddl_controller.rs
@@ -172,6 +172,7 @@ impl DdlCommand {
             | DdlCommand::DropStreamingJob(_, _, _)
             | DdlCommand::DropConnection(_)
             | DdlCommand::DropSecret(_)
+            | DdlCommand::DropSubscription(_, _)
             | DdlCommand::AlterName(_, _)
             | DdlCommand::AlterObjectOwner(_, _)
             | DdlCommand::AlterSetSchema(_, _)
@@ -186,8 +187,7 @@ impl DdlCommand {
             | DdlCommand::CreateSourceWithoutStreamingJob(_)
             | DdlCommand::ReplaceTable(_)
             | DdlCommand::AlterSourceColumn(_)
-            | DdlCommand::CreateSubscription(_)
-            | DdlCommand::DropSubscription(_, _) => false,
+            | DdlCommand::CreateSubscription(_) => false,
         }
     }
 }