chore: resolve conflict

Signed-off-by: discord9 <discord9@163.com>

Cargo.lock

@@ -5804,7 +5804,7 @@ dependencies = [
 [[package]]
 name = "greptime-proto"
 version = "0.1.0"
-source = "git+https://github.com/GreptimeTeam/greptime-proto.git?rev=b8c9a206930fc4d88f8e2d5ec9a1265a7dd26a4d#b8c9a206930fc4d88f8e2d5ec9a1265a7dd26a4d"
+source = "git+https://github.com/GreptimeTeam/greptime-proto.git?rev=4cbc54accdd975ddbf84a473d254851f93a23431#4cbc54accdd975ddbf84a473d254851f93a23431"
 dependencies = [
  "prost 0.14.1",
  "prost-types 0.14.1",
@@ -6323,7 +6323,7 @@ dependencies = [
  "libc",
  "percent-encoding",
  "pin-project-lite",
- "socket2 0.5.10",
+ "socket2 0.6.0",
  "tokio",
  "tower-service",
  "tracing",
@@ -10807,7 +10807,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ac6c3320f9abac597dcbc668774ef006702672474aad53c6d596b62e487b40b1"
 dependencies = [
  "heck 0.5.0",
- "itertools 0.10.5",
+ "itertools 0.11.0",
  "log",
  "multimap",
  "once_cell",
@@ -10855,7 +10855,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a56d757972c98b346a9b766e3f02746cde6dd1cd1d1d563472929fdd74bec4d"
 dependencies = [
  "anyhow",
- "itertools 0.10.5",
+ "itertools 0.11.0",
  "proc-macro2",
  "quote",
  "syn 2.0.117",
@@ -10868,7 +10868,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9120690fafc389a67ba3803df527d0ec9cbbc9cc45e4cc20b332996dfb672425"
 dependencies = [
  "anyhow",
- "itertools 0.10.5",
+ "itertools 0.11.0",
  "proc-macro2",
  "quote",
  "syn 2.0.117",

Cargo.toml

@@ -159,7 +159,7 @@ fs2 = "0.4"
 fst = "0.4.7"
 futures = "0.3"
 futures-util = "0.3"
-greptime-proto = { git = "https://github.com/GreptimeTeam/greptime-proto.git", rev = "b8c9a206930fc4d88f8e2d5ec9a1265a7dd26a4d" }
+greptime-proto = { git = "https://github.com/GreptimeTeam/greptime-proto.git", rev = "4cbc54accdd975ddbf84a473d254851f93a23431" }
 hex = "0.4"
 http = "1"
 humantime = "2.1"

src/common/meta/src/ddl/drop_table/executor.rs

@@ -245,6 +245,7 @@ impl DropTableExecutor {
                         fast_path,
                         force,
                         partial_drop,
+                        soft_drop: false,
                     })),
                 };
                 let datanode = datanode.clone();