refactor(java_binding): extract java_binding to jni_core (#12108)

Co-authored-by: Eric Fu <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
risingwavelabs · Sep 15, 2023 · b78b02d · b78b02d
1 parent 415329c
commit b78b02d
Show file tree

Hide file tree

Showing 11 changed files with 973 additions and 838 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -15,6 +15,7 @@ members = [
   "src/frontend",
   "src/frontend/planner_test",
   "src/java_binding",
+  "src/jni_core",
   "src/meta",
   "src/object_store",
   "src/prost",
@@ -113,6 +114,8 @@ risingwave_stream = { path = "./src/stream" }
 risingwave_test_runner = { path = "./src/test_runner" }
 risingwave_udf = { path = "./src/udf" }
 risingwave_variables = { path = "./src/utils/variables" }
+risingwave_java_binding = { path = "./src/java_binding" }
+risingwave_jni_core = { path = "src/jni_core" }
 
 [profile.dev]
 lto = 'off'

diff --git a/java/com_risingwave_java_binding_Binding.h b/java/com_risingwave_java_binding_Binding.h
diff --git a/src/compute/src/lib.rs b/src/compute/src/lib.rs
@@ -32,6 +32,9 @@ pub mod rpc;
 pub mod server;
 pub mod telemetry;
 
+use std::future::Future;
+use std::pin::Pin;
+
 use clap::{Parser, ValueEnum};
 use risingwave_common::config::{AsyncStackTraceOption, OverrideConfig};
 use risingwave_common::util::resource_util::cpu::total_cpu_available;
@@ -186,9 +189,6 @@ fn validate_opts(opts: &ComputeNodeOpts) {
     }
 }
 
-use std::future::Future;
-use std::pin::Pin;
-
 use crate::server::compute_node_serve;
 
 /// Start compute node

diff --git a/src/java_binding/Cargo.toml b/src/java_binding/Cargo.toml
@@ -10,29 +10,12 @@ ignored = ["workspace-hack"]
 normal = ["workspace-hack"]
 
 [dependencies]
-bytes = "1"
-futures = { version = "0.3", default-features = false, features = ["alloc"] }
-itertools = "0.11"
-jni = "0.21.1"
 prost = "0.11"
 risingwave_common = { workspace = true }
-risingwave_hummock_sdk = { workspace = true }
-risingwave_object_store = { workspace = true }
+risingwave_jni_core = { workspace = true }
 risingwave_pb = { workspace = true }
-risingwave_storage = { workspace = true }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-thiserror = "1"
-tokio = { version = "0.2", package = "madsim-tokio", features = [
-    "fs",
-    "rt",
-    "rt-multi-thread",
-    "sync",
-    "macros",
-    "time",
-    "signal",
-] }
-tracing = "0.1"
 
 [dev-dependencies]
 risingwave_expr = { workspace = true }