From 7b87cbbac16bcf26244b9a198f3a0a74530ff3fe Mon Sep 17 00:00:00 2001 From: alissa-tung Date: Fri, 30 Dec 2022 16:52:48 +0800 Subject: [PATCH 1/5] rm unused mut --- src/hstreamdb/src/flow_controller.rs | 2 +- src/hstreamdb/tests/consumer_test.rs | 2 +- src/hstreamdb/tests/producer_test.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/hstreamdb/src/flow_controller.rs b/src/hstreamdb/src/flow_controller.rs index 0297169..5e01dd1 100644 --- a/src/hstreamdb/src/flow_controller.rs +++ b/src/hstreamdb/src/flow_controller.rs @@ -148,7 +148,7 @@ mod tests { .unwrap(); tokio::spawn(async move { - let mut appender = appender; + let appender = appender; for _ in 0..5000 { appender .append(Record { diff --git a/src/hstreamdb/tests/consumer_test.rs b/src/hstreamdb/tests/consumer_test.rs index 0f7c7af..1c3832e 100644 --- a/src/hstreamdb/tests/consumer_test.rs +++ b/src/hstreamdb/tests/consumer_test.rs @@ -65,7 +65,7 @@ async fn test_consumer() { for _ in 0..10 { let appender = appender.clone(); let join_handle = tokio::spawn(async move { - let mut appender = appender; + let appender = appender; let mut results = Vec::new(); for _ in 0..100 { diff --git a/src/hstreamdb/tests/producer_test.rs b/src/hstreamdb/tests/producer_test.rs index acfa750..cb2b7c8 100644 --- a/src/hstreamdb/tests/producer_test.rs +++ b/src/hstreamdb/tests/producer_test.rs @@ -53,7 +53,7 @@ async fn test_producer() { for _ in 0..10 { let appender = appender.clone(); let join_handle = tokio::spawn(async move { - let mut appender = appender; + let appender = appender; let mut results = Vec::new(); for _ in 0..100 { From f5753514c9dab1e1d1b26c008f3b35d86173f3f7 Mon Sep 17 00:00:00 2001 From: alissa-tung Date: Fri, 30 Dec 2022 17:05:47 +0800 Subject: [PATCH 2/5] rm unused atom --- src/x/hstreamdb-erl-nifs/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/x/hstreamdb-erl-nifs/src/lib.rs b/src/x/hstreamdb-erl-nifs/src/lib.rs index 50c7508..ac07af2 100644 --- a/src/x/hstreamdb-erl-nifs/src/lib.rs +++ b/src/x/hstreamdb-erl-nifs/src/lib.rs @@ -33,7 +33,7 @@ rustler::atoms! { create_stream_reply, create_subscription_reply, earliest, latest, - start_producer_reply, stop_producer_reply, + start_producer_reply, append_reply, await_append_result_reply, start_streaming_fetch_reply, streaming_fetch, ack_reply, From e95050fab302feaabcc9e3770182a6d8d65d09df Mon Sep 17 00:00:00 2001 From: alissa-tung Date: Tue, 3 Jan 2023 16:48:46 +0800 Subject: [PATCH 3/5] bump ver --- src/hstreamdb-pb/Cargo.toml | 8 ++++---- src/hstreamdb/Cargo.toml | 22 +++++++++++----------- src/utils/hstreamdb-test-utils/Cargo.toml | 4 ++-- src/x/hstreamdb-erl-nifs/Cargo.toml | 10 +++++----- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/hstreamdb-pb/Cargo.toml b/src/hstreamdb-pb/Cargo.toml index eca7dcc..47dd464 100644 --- a/src/hstreamdb-pb/Cargo.toml +++ b/src/hstreamdb-pb/Cargo.toml @@ -11,10 +11,10 @@ readme = "README.md" keywords = ["hstreamdb", "streaming-database", "database-client"] [dependencies] -prost = "0.11.0" -prost-types = "0.11.1" -tonic = "0.8.2" +prost = "0.11.5" +prost-types = "0.11.5" +tonic = "0.8.3" workspace-hack = { version = "0.1", path = "../utils/workspace-hack" } [build-dependencies] -tonic-build = "0.8.0" +tonic-build = "0.8.4" diff --git a/src/hstreamdb/Cargo.toml b/src/hstreamdb/Cargo.toml index 220c53f..1fbd243 100644 --- a/src/hstreamdb/Cargo.toml +++ b/src/hstreamdb/Cargo.toml @@ -11,29 +11,29 @@ readme = "README.md" keywords = ["hstreamdb", "streaming-database", "database-client"] [dependencies] -thiserror = "1.0.34" +thiserror = "1.0.38" log = "0.4.17" -flate2 = "1.0.24" +flate2 = "1.0.25" zstd = "0.11.2" num-bigint = "0.4.3" num-traits = "0.2.15" -md-5 = "0.10.1" +md-5 = "0.10.5" hstreamdb-pb = { version = "0.2.0", path = "../hstreamdb-pb/" } -prost-types = "0.11.1" +prost-types = "0.11.5" -prost = "0.11.0" -tokio = { version = "1.21.0", features = ["rt-multi-thread", "parking_lot"] } -tokio-stream = "0.1.9" -tonic = { version = "0.8.2", features = ["tls"] } -url = "2.2.2" +prost = "0.11.5" +tokio = { version = "1.23.0", features = ["rt-multi-thread", "parking_lot"] } +tokio-stream = "0.1.11" +tonic = { version = "0.8.3", features = ["tls"] } +url = "2.3.1" workspace-hack = { version = "0.1", path = "../utils/workspace-hack" } [dev-dependencies] hstreamdb-test-utils = { path = "../utils/hstreamdb-test-utils" } -anyhow = "1.0.62" -env_logger = "0.9.0" +anyhow = "1.0.68" +env_logger = "0.9.3" rand = "0.8.5" diff --git a/src/utils/hstreamdb-test-utils/Cargo.toml b/src/utils/hstreamdb-test-utils/Cargo.toml index 93ea93b..ab7e0a9 100644 --- a/src/utils/hstreamdb-test-utils/Cargo.toml +++ b/src/utils/hstreamdb-test-utils/Cargo.toml @@ -5,8 +5,8 @@ edition = "2021" [dependencies] log = "0.4.17" -env_logger = "0.9.0" +env_logger = "0.9.3" -anyhow = "1.0.62" +anyhow = "1.0.68" rand = "0.8.5" workspace-hack = { version = "0.1", path = "../workspace-hack" } diff --git a/src/x/hstreamdb-erl-nifs/Cargo.toml b/src/x/hstreamdb-erl-nifs/Cargo.toml index 1ea9cb8..a1e8923 100644 --- a/src/x/hstreamdb-erl-nifs/Cargo.toml +++ b/src/x/hstreamdb-erl-nifs/Cargo.toml @@ -11,12 +11,12 @@ workspace-hack = { version = "0.1", path = "../../utils/workspace-hack" } hstreamdb = { path = "../../hstreamdb" } log = "0.4.17" -env_logger = "0.9.0" +env_logger = "0.9.3" -once_cell = "1.14.0" +once_cell = "1.17.0" rustler = "0.26.0" -tokio = { version = "1.21.0", features = ["rt-multi-thread", "parking_lot"] } +tokio = { version = "1.23.0", features = ["rt-multi-thread", "parking_lot"] } tokio-stream = "0.1.11" -prost = "0.11.0" -tonic = "0.8.2" +prost = "0.11.5" +tonic = "0.8.3" From 73d21f615c4cc60dd611e15a3bcd1c24a9c52004 Mon Sep 17 00:00:00 2001 From: alissa-tung Date: Tue, 3 Jan 2023 17:00:39 +0800 Subject: [PATCH 4/5] bump ver --- Cargo.lock | 10 +++------- src/utils/workspace-hack/Cargo.toml | 3 +-- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 956430c..b53b5e8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -310,10 +310,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" dependencies = [ "cfg-if", - "js-sys", "libc", "wasi", - "wasm-bindgen", ] [[package]] @@ -1133,9 +1131,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.21.1" +version = "1.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0020c875007ad96677dcc890298f4b942882c5d4eb7cc8f439fc3bf813dc9c95" +checksum = "eab6d665857cc6ca78d6e80303a02cea7a7851e85dfbd77cbdc09bd129f1ef46" dependencies = [ "autocfg", "bytes", @@ -1143,12 +1141,11 @@ dependencies = [ "memchr", "mio", "num_cpus", - "once_cell", "parking_lot", "pin-project-lite", "socket2", "tokio-macros", - "winapi", + "windows-sys", ] [[package]] @@ -1616,7 +1613,6 @@ dependencies = [ "bytes", "cc", "either", - "getrandom", "indexmap", "log", "prost", diff --git a/src/utils/workspace-hack/Cargo.toml b/src/utils/workspace-hack/Cargo.toml index 8f1e412..7c6c7eb 100644 --- a/src/utils/workspace-hack/Cargo.toml +++ b/src/utils/workspace-hack/Cargo.toml @@ -15,7 +15,6 @@ publish = false ### BEGIN HAKARI SECTION [dependencies] bytes = { version = "1", features = ["std"] } -getrandom = { version = "0.2", default-features = false, features = ["js", "js-sys", "rdrand", "std", "wasm-bindgen"] } indexmap = { version = "1", default-features = false, features = ["std"] } log = { version = "0.4", default-features = false, features = ["std"] } prost = { version = "0.11", features = ["prost-derive", "std"] } @@ -23,7 +22,7 @@ prost-types = { version = "0.11", features = ["std"] } rand = { version = "0.8", features = ["alloc", "getrandom", "libc", "rand_chacha", "small_rng", "std", "std_rng"] } regex = { version = "1", features = ["aho-corasick", "memchr", "perf", "perf-cache", "perf-dfa", "perf-inline", "perf-literal", "std", "unicode", "unicode-age", "unicode-bool", "unicode-case", "unicode-gencat", "unicode-perl", "unicode-script", "unicode-segment"] } regex-syntax = { version = "0.6", features = ["unicode", "unicode-age", "unicode-bool", "unicode-case", "unicode-gencat", "unicode-perl", "unicode-script", "unicode-segment"] } -tokio = { version = "1", features = ["bytes", "io-std", "io-util", "libc", "macros", "memchr", "mio", "net", "num_cpus", "once_cell", "parking_lot", "rt", "rt-multi-thread", "socket2", "sync", "time", "tokio-macros"] } +tokio = { version = "1", features = ["bytes", "io-std", "io-util", "libc", "macros", "memchr", "mio", "net", "num_cpus", "parking_lot", "rt", "rt-multi-thread", "socket2", "sync", "time", "tokio-macros"] } tonic = { version = "0.8", features = ["async-trait", "axum", "channel", "codegen", "h2", "hyper", "hyper-timeout", "prost", "prost-derive", "prost1", "rustls-pemfile", "tls", "tokio", "tokio-rustls", "tower", "tracing-futures", "transport"] } [build-dependencies] From 48804e2066d0c4773946774195432698eaaf0909 Mon Sep 17 00:00:00 2001 From: alissa-tung Date: Tue, 3 Jan 2023 17:02:46 +0800 Subject: [PATCH 5/5] fix pb ver --- src/hstreamdb/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hstreamdb/Cargo.toml b/src/hstreamdb/Cargo.toml index 1fbd243..c838e54 100644 --- a/src/hstreamdb/Cargo.toml +++ b/src/hstreamdb/Cargo.toml @@ -21,7 +21,7 @@ num-bigint = "0.4.3" num-traits = "0.2.15" md-5 = "0.10.5" -hstreamdb-pb = { version = "0.2.0", path = "../hstreamdb-pb/" } +hstreamdb-pb = { version = "0.2.1", path = "../hstreamdb-pb/" } prost-types = "0.11.5" prost = "0.11.5"