Skip to content

Commit 5b37f9b

Browse files
drmingdrmerdrmingdrmer
committed
fix: upgrade databend-meta crates to v260205.3.0
This upgrade includes raft-log 0.3.0 bug fixes, a committed-log-id flush fix, and a re-export refactor that removes the need for a direct `raft-log` dependency. raft-log 0.3.0 bug fixes: - Chunk rotation sent wrong file to FlushWorker; new chunk was never fsync'd. raft-log 0.3.0 refactoring: - Data writes moved into FlushWorker for batched I/O. - Replaced `seek+read` with `pread` to prevent race conditions. - `flush(callback)` now takes `Option<T::Callback>` for best-effort writes. databend-meta fixes: - `save_committed` now issues a fire-and-forget `flush(None)` to persist committed log id on a best-effort basis. databend-meta refactoring: - Re-export `raft_log` from `databend-meta-raft-store`, removing the need for downstream crates to depend on `raft-log` directly. Changes: - Remove direct `raft-log` dependency from workspace, `databend-meta-binaries`, and `databend-common-meta-control` - Use `databend_meta_raft_store::raft_log::` re-export path in `import.rs` and `metactl/main.rs` - Update compat docs with versions 1.2.881 and 1.2.882
1 parent 1cc88fb commit 5b37f9b

File tree

10 files changed

+69
-66
lines changed

10 files changed

+69
-66
lines changed

‎Cargo.lock‎

Lines changed: 37 additions & 39 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -148,20 +148,20 @@ databend-functions-scalar-geo = { path = "src/query/functions/src/scalars/geogra
148148
databend-functions-scalar-integer-basic-arithmetic = { path = "src/query/functions/src/scalars/integer_arithmetic" }
149149
databend-functions-scalar-math = { path = "src/query/functions/src/scalars/mathematics" }
150150
databend-functions-scalar-numeric-basic-arithmetic = { path = "src/query/functions/src/scalars/numeric_basic_arithmetic" }
151-
databend-meta = "260205.1.0"
151+
databend-meta = "260205.3.0"
152152
databend-meta-admin = { path = "src/meta/admin" }
153153
databend-meta-cli-config = { path = "src/meta/cli-config" }
154-
databend-meta-client = "260205.1.0"
155-
databend-meta-kvapi = "260205.1.0"
156-
databend-meta-kvapi-test-suite = "260205.1.0"
157-
databend-meta-raft-store = "260205.1.0"
154+
databend-meta-client = "260205.3.0"
155+
databend-meta-kvapi = "260205.3.0"
156+
databend-meta-kvapi-test-suite = "260205.3.0"
157+
databend-meta-raft-store = "260205.3.0"
158158
databend-meta-runtime = { path = "src/meta/runtime" }
159-
databend-meta-runtime-api = "260205.1.0"
160-
databend-meta-sled-store = "260205.1.0"
161-
databend-meta-test-harness = "260205.1.0"
162-
databend-meta-types = "260205.1.0"
159+
databend-meta-runtime-api = "260205.3.0"
160+
databend-meta-sled-store = "260205.3.0"
161+
databend-meta-test-harness = "260205.3.0"
162+
databend-meta-types = "260205.3.0"
163163
databend-meta-ver = { path = "src/meta/ver" }
164-
databend-meta-version = "260205.1.0"
164+
databend-meta-version = "260205.3.0"
165165
databend-query = { path = "src/query/service" }
166166
databend-sqllogictests = { path = "tests/sqllogictests" }
167167
databend-storages-common-blocks = { path = "src/query/storages/common/blocks" }
@@ -398,7 +398,6 @@ proptest = { version = "1", default-features = false, features = ["std"] }
398398
prost = { version = "0.13" }
399399
prost-build = { version = "0.13" }
400400
prqlc = "0.11.3"
401-
raft-log = { version = "0.2.13" }
402401
rand = { version = "0.8.5", features = ["small_rng", "serde1"] }
403402
rand_distr = "0.4.3"
404403
rayon = "1.9.0"
@@ -616,16 +615,16 @@ backtrace = { git = "https://github.com/rust-lang/backtrace-rs.git", rev = "7226
616615
color-eyre = { git = "https://github.com/eyre-rs/eyre.git", rev = "e5d92c3" }
617616
csv-core = { git = "https://github.com/youngsofun/rust-csv.git", rev = "44a0b3c" }
618617
databend-base = { git = "https://github.com/databendlabs/databend-base", tag = "v0.2.10" }
619-
databend-meta = { git = "https://github.com/databendlabs/databend-meta", tag = "v260205.1.0" }
620-
databend-meta-client = { git = "https://github.com/databendlabs/databend-meta", tag = "v260205.1.0" }
621-
databend-meta-kvapi = { git = "https://github.com/databendlabs/databend-meta", tag = "v260205.1.0" }
622-
databend-meta-kvapi-test-suite = { git = "https://github.com/databendlabs/databend-meta", tag = "v260205.1.0" }
623-
databend-meta-raft-store = { git = "https://github.com/databendlabs/databend-meta", tag = "v260205.1.0" }
624-
databend-meta-runtime-api = { git = "https://github.com/databendlabs/databend-meta", tag = "v260205.1.0" }
625-
databend-meta-sled-store = { git = "https://github.com/databendlabs/databend-meta", tag = "v260205.1.0" }
626-
databend-meta-test-harness = { git = "https://github.com/databendlabs/databend-meta", tag = "v260205.1.0" }
627-
databend-meta-types = { git = "https://github.com/databendlabs/databend-meta", tag = "v260205.1.0" }
628-
databend-meta-version = { git = "https://github.com/databendlabs/databend-meta", tag = "v260205.1.0" }
618+
databend-meta = { git = "https://github.com/databendlabs/databend-meta", tag = "v260205.3.0" }
619+
databend-meta-client = { git = "https://github.com/databendlabs/databend-meta", tag = "v260205.3.0" }
620+
databend-meta-kvapi = { git = "https://github.com/databendlabs/databend-meta", tag = "v260205.3.0" }
621+
databend-meta-kvapi-test-suite = { git = "https://github.com/databendlabs/databend-meta", tag = "v260205.3.0" }
622+
databend-meta-raft-store = { git = "https://github.com/databendlabs/databend-meta", tag = "v260205.3.0" }
623+
databend-meta-runtime-api = { git = "https://github.com/databendlabs/databend-meta", tag = "v260205.3.0" }
624+
databend-meta-sled-store = { git = "https://github.com/databendlabs/databend-meta", tag = "v260205.3.0" }
625+
databend-meta-test-harness = { git = "https://github.com/databendlabs/databend-meta", tag = "v260205.3.0" }
626+
databend-meta-types = { git = "https://github.com/databendlabs/databend-meta", tag = "v260205.3.0" }
627+
databend-meta-version = { git = "https://github.com/databendlabs/databend-meta", tag = "v260205.3.0" }
629628
deltalake = { git = "https://github.com/delta-io/delta-rs", rev = "9954bff" }
630629
jsonb = { git = "https://github.com/databendlabs/jsonb", rev = "fc84214" }
631630
map-api = { git = "https://github.com/databendlabs/map-api", tag = "v0.4.2" }

‎src/meta/binaries/Cargo.toml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ futures = { workspace = true }
4848
log = { workspace = true }
4949
mlua = { workspace = true }
5050
num_cpus = { workspace = true }
51-
raft-log = { workspace = true }
5251
rand = { workspace = true }
5352
serde = { workspace = true }
5453
serde_json = { workspace = true }

‎src/meta/binaries/metactl/main.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -322,8 +322,8 @@ return metrics, nil
322322
async fn dump_raft_log_wal(&self, args: &DumpRaftLogWalArgs) -> anyhow::Result<()> {
323323
use std::path::PathBuf;
324324

325-
use raft_log::Config;
326-
use raft_log::DumpApi;
325+
use databend_meta_raft_store::raft_log::Config;
326+
use databend_meta_raft_store::raft_log::DumpApi;
327327

328328
let mut wal_dir = PathBuf::from(&args.raft_dir);
329329
wal_dir.push("df_meta");
@@ -336,7 +336,7 @@ return metrics, nil
336336
});
337337

338338
let dump =
339-
raft_log::Dump::<databend_meta_raft_store::raft_log_v004::RaftLogTypes>::new(config)?;
339+
databend_meta_raft_store::raft_log::Dump::<databend_meta_raft_store::raft_log_v004::RaftLogTypes>::new(config)?;
340340
dump.write_display(io::stdout())?;
341341
Ok(())
342342
}

‎src/meta/control/Cargo.toml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ clap = { workspace = true }
2525
display-more = { workspace = true }
2626
futures = { workspace = true }
2727
mlua = { workspace = true }
28-
raft-log = { workspace = true }
2928
reqwest = { workspace = true }
3029
serde = { workspace = true }
3130
serde_json = { workspace = true }

‎src/meta/control/src/import.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ use databend_meta_types::raft_types::NodeId;
4343
use databend_meta_types::raft_types::StoredMembership;
4444
use databend_meta_types::raft_types::new_log_id;
4545
use display_more::display_option::DisplayOptionExt;
46-
use raft_log::api::raft_log_writer::RaftLogWriter;
46+
use databend_meta_raft_store::raft_log::api::raft_log_writer::RaftLogWriter;
4747
use url::Url;
4848

4949
use crate::args::ImportArgs;

‎src/meta/ver/compat_docs/generated/resolved_min_compatibles.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1583,3 +1583,5 @@ tag min_meta_server min_meta_client external_meta_crate
15831583
1.2.878 1.2.770 1.2.288 -
15841584
1.2.879 1.2.770 1.2.288 -
15851585
1.2.880 1.2.770 1.2.676 260205.0.0
1586+
1.2.881 1.2.770 1.2.676 260205.0.0
1587+
1.2.882 1.2.770 1.2.676 260205.0.0

‎src/meta/ver/compat_docs/meta_to_query.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1207,3 +1207,5 @@ meta: 1.2.877 query: [1.2.288, ~)
12071207
meta: 1.2.878 query: [1.2.288, ~)
12081208
meta: 1.2.879 query: [1.2.288, ~)
12091209
meta: 1.2.880 query: [1.2.676, ~)
1210+
meta: 1.2.881 query: [1.2.676, ~)
1211+
meta: 1.2.882 query: [1.2.676, ~)

‎src/meta/ver/compat_docs/query_to_meta.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1207,3 +1207,5 @@ query: 1.2.877 meta: [1.2.770, ~)
12071207
query: 1.2.878 meta: [1.2.770, ~)
12081208
query: 1.2.879 meta: [1.2.770, ~)
12091209
query: 1.2.880 meta: [1.2.770, ~)
1210+
query: 1.2.881 meta: [1.2.770, ~)
1211+
query: 1.2.882 meta: [1.2.770, ~)

‎src/meta/ver/compat_docs/src/min_compatible_versions.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1719,3 +1719,5 @@ tag MIN_SERVER MIN_CLIENT external-meta-version
17191719
1.2.878 1.2.770 1.2.288 -
17201720
1.2.879 1.2.770 1.2.288 -
17211721
1.2.880 - - 260205.0.0
1722+
1.2.881 - - 260205.0.0
1723+
1.2.882 - - 260205.0.0

0 commit comments

Comments
 (0)