Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(java_binding): extract java_binding to jni_core #12108

Merged
merged 25 commits into from
Sep 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ members = [
"src/frontend",
"src/frontend/planner_test",
"src/java_binding",
"src/jni_core",
"src/meta",
"src/object_store",
"src/prost",
Expand Down Expand Up @@ -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'
Expand Down
72 changes: 72 additions & 0 deletions java/com_risingwave_java_binding_Binding.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions src/compute/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand Down
19 changes: 1 addition & 18 deletions src/java_binding/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
chenzl25 marked this conversation as resolved.
Show resolved Hide resolved
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 }
Expand Down
Loading
Loading