merge connector_common and connector

risingwavelabs · Oct 23, 2023 · fc2a51f · fc2a51f
1 parent 0028edc
commit fc2a51f
Show file tree

Hide file tree

Showing 94 changed files with 219 additions and 570 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -10,7 +10,6 @@ members = [
   "src/common/heap_profiling",
   "src/compute",
   "src/connector",
-  "src/connector/connector_common",
   "src/connector/sink_impl",
   "src/ctl",
   "src/expr/core",
@@ -137,7 +136,6 @@ risingwave_compactor = { path = "./src/storage/compactor" }
 risingwave_compute = { path = "./src/compute" }
 risingwave_ctl = { path = "./src/ctl" }
 risingwave_connector = { path = "./src/connector" }
-risingwave_connector_common = { path = "./src/connector/connector_common" }
 risingwave_expr = { path = "./src/expr/core" }
 risingwave_expr_impl = { path = "./src/expr/impl" }
 risingwave_frontend = { path = "./src/frontend" }

diff --git a/src/connector/Cargo.toml b/src/connector/Cargo.toml
@@ -100,7 +100,6 @@ redis = { version = "0.23.3", features = ["aio","tokio-comp","async-std-comp"] }
 regex = "1.4"
 reqwest = { version = "0.11", features = ["json"] }
 risingwave_common = { workspace = true }
-risingwave_connector_common = { workspace = true }
 risingwave_jni_core = { workspace = true }
 risingwave_pb = { workspace = true }
 risingwave_rpc_client = { workspace = true }

diff --git a/src/connector/build.rs b/src/connector/build.rs
@@ -23,7 +23,7 @@ fn main() {
         .map(|f| format!("{}/{}.proto", proto_dir, f))
         .collect();
     prost_build::Config::new()
-        .out_dir("./connector_common/src/parser/protobuf")
+        .out_dir("./src/parser/protobuf")
         .compile_protos(&protos, &Vec::<String>::new())
         .unwrap();
 }
diff --git a/src/connector/connector_common/Cargo.toml b/src/connector/connector_common/Cargo.toml
diff --git a/src/connector/connector_common/src/kafka/mod.rs b/src/connector/connector_common/src/kafka/mod.rs