Skip to content

Commit c234f47

Browse files
authored
fix: upgrade databend-meta crates to v260205.3.0 (#19438)
* 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 * chore fix lint * docs: fix broken links in meta and common READMEs After the meta-service refactoring in v1.2.874 that moved core implementation to the external databend-meta repository, several README links became stale. This fixes the broken links reported by the link checker (issue #19412). Changes: - Remove references to moved core/ directories (client, raft-store, types, etc.) - Update kvapi-test-suite to kvapi-tests (renamed directory) - Move core/store reference to top-level store - Remove non-existent auth directory from common README - Add link to external databend-meta repository - Fix: #19412
1 parent 022c639 commit c234f47

File tree

12 files changed

+74
-83
lines changed

12 files changed

+74
-83
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/common/README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# Databend Common
22

3-
- [`auth`](./auth/), a simple wrapper for authentication layer.
43
- [`base`](./base/) contains runtime, pool, allocator and rangemap.
54
- [`building`](./building/) sets up the environment for building components and internal use.
65
- [`cache`](./cache/) contains cache traits designed for memory and disk, and provides a basic LRU implementation.

src/meta/README.md

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,15 @@
22

33
2026 Feb 01
44

5-
since v1.2.874, after v1.2.873, meta impl is moved to external repository.
6-
5+
Since v1.2.874, core meta-service implementation is moved to [databend-meta](https://github.com/databendlabs/databend-meta) repository.
76

87
Databend Meta is a transactional metadata service.
98

10-
**Core components** (`core/`):
11-
- [`core/client`](./core/client/): gRPC client library for communicating with meta service.
12-
- [`core/raft-store`](./core/raft-store/): Raft state machine and storage layer implementation.
13-
- [`core/runtime-api`](./core/runtime-api/): Runtime API traits for async operations.
14-
- [`core/service`](./core/service/): `databend-meta`, the distributed meta service library.
15-
- [`core/sled-store`](./core/sled-store/): Sled store backend for raft state machine.
16-
- [`core/store`](./core/store/): MetaStore impl with either a local embedded store or a grpc-client.
17-
- [`core/test-harness`](./core/test-harness/): Test harness and utilities for meta-service tests.
18-
- [`core/types`](./core/types/): Rust types for metadata (Node, Endpoint, etc.).
19-
209
**Application layer**:
2110
- [`api`](./api/): User-level API interface exposed based on the KVApi implementation.
2211
- [`app`](./app/): Meta data types used by meta-client applications.
2312
- [`app-storage`](./app-storage/): Storage-related types split from app.
24-
- [`app-types`](./app-types/): Basic type definitions split from app.
25-
- [`kvapi`](./kvapi/): Key-value API interface definitions.
13+
- [`store`](./store/): MetaStore impl with either a local embedded store or a grpc-client.
2614

2715
**Serialization**:
2816
- [`protos`](./protos/): Protobuf message definitions for client-server communication.
@@ -46,7 +34,7 @@ Databend Meta is a transactional metadata service.
4634
- `databend-metaverifier`: Data verification tool.
4735

4836
**Test suites**:
49-
- [`kvapi-test-suite`](./kvapi-test-suite/): Test suite for KV API implementations.
37+
- [`kvapi-tests`](./kvapi-tests/): Test suite for KV API implementations.
5038
- [`schema-api-test-suite`](./schema-api-test-suite/): Test suite for schema API.
5139

5240
**Enterprise**:

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: 5 additions & 4 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");
@@ -335,8 +335,9 @@ return metrics, nil
335335
..Default::default()
336336
});
337337

338-
let dump =
339-
raft_log::Dump::<databend_meta_raft_store::raft_log_v004::RaftLogTypes>::new(config)?;
338+
let dump = databend_meta_raft_store::raft_log::Dump::<
339+
databend_meta_raft_store::raft_log_v004::RaftLogTypes,
340+
>::new(config)?;
340341
dump.write_display(io::stdout())?;
341342
Ok(())
342343
}

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 }

0 commit comments

Comments
 (0)