Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 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
76 changes: 37 additions & 39 deletions Cargo.lock

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

41 changes: 20 additions & 21 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -148,20 +148,20 @@ databend-functions-scalar-geo = { path = "src/query/functions/src/scalars/geogra
databend-functions-scalar-integer-basic-arithmetic = { path = "src/query/functions/src/scalars/integer_arithmetic" }
databend-functions-scalar-math = { path = "src/query/functions/src/scalars/mathematics" }
databend-functions-scalar-numeric-basic-arithmetic = { path = "src/query/functions/src/scalars/numeric_basic_arithmetic" }
databend-meta = "260205.1.0"
databend-meta = "260205.3.0"
databend-meta-admin = { path = "src/meta/admin" }
databend-meta-cli-config = { path = "src/meta/cli-config" }
databend-meta-client = "260205.1.0"
databend-meta-kvapi = "260205.1.0"
databend-meta-kvapi-test-suite = "260205.1.0"
databend-meta-raft-store = "260205.1.0"
databend-meta-client = "260205.3.0"
databend-meta-kvapi = "260205.3.0"
databend-meta-kvapi-test-suite = "260205.3.0"
databend-meta-raft-store = "260205.3.0"
databend-meta-runtime = { path = "src/meta/runtime" }
databend-meta-runtime-api = "260205.1.0"
databend-meta-sled-store = "260205.1.0"
databend-meta-test-harness = "260205.1.0"
databend-meta-types = "260205.1.0"
databend-meta-runtime-api = "260205.3.0"
databend-meta-sled-store = "260205.3.0"
databend-meta-test-harness = "260205.3.0"
databend-meta-types = "260205.3.0"
databend-meta-ver = { path = "src/meta/ver" }
databend-meta-version = "260205.1.0"
databend-meta-version = "260205.3.0"
databend-query = { path = "src/query/service" }
databend-sqllogictests = { path = "tests/sqllogictests" }
databend-storages-common-blocks = { path = "src/query/storages/common/blocks" }
Expand Down Expand Up @@ -398,7 +398,6 @@ proptest = { version = "1", default-features = false, features = ["std"] }
prost = { version = "0.13" }
prost-build = { version = "0.13" }
prqlc = "0.11.3"
raft-log = { version = "0.2.13" }
rand = { version = "0.8.5", features = ["small_rng", "serde1"] }
rand_distr = "0.4.3"
rayon = "1.9.0"
Expand Down Expand Up @@ -616,16 +615,16 @@ backtrace = { git = "https://github.com/rust-lang/backtrace-rs.git", rev = "7226
color-eyre = { git = "https://github.com/eyre-rs/eyre.git", rev = "e5d92c3" }
csv-core = { git = "https://github.com/youngsofun/rust-csv.git", rev = "44a0b3c" }
databend-base = { git = "https://github.com/databendlabs/databend-base", tag = "v0.2.10" }
databend-meta = { git = "https://github.com/databendlabs/databend-meta", tag = "v260205.1.0" }
databend-meta-client = { git = "https://github.com/databendlabs/databend-meta", tag = "v260205.1.0" }
databend-meta-kvapi = { git = "https://github.com/databendlabs/databend-meta", tag = "v260205.1.0" }
databend-meta-kvapi-test-suite = { git = "https://github.com/databendlabs/databend-meta", tag = "v260205.1.0" }
databend-meta-raft-store = { git = "https://github.com/databendlabs/databend-meta", tag = "v260205.1.0" }
databend-meta-runtime-api = { git = "https://github.com/databendlabs/databend-meta", tag = "v260205.1.0" }
databend-meta-sled-store = { git = "https://github.com/databendlabs/databend-meta", tag = "v260205.1.0" }
databend-meta-test-harness = { git = "https://github.com/databendlabs/databend-meta", tag = "v260205.1.0" }
databend-meta-types = { git = "https://github.com/databendlabs/databend-meta", tag = "v260205.1.0" }
databend-meta-version = { git = "https://github.com/databendlabs/databend-meta", tag = "v260205.1.0" }
databend-meta = { git = "https://github.com/databendlabs/databend-meta", tag = "v260205.3.0" }
databend-meta-client = { git = "https://github.com/databendlabs/databend-meta", tag = "v260205.3.0" }
databend-meta-kvapi = { git = "https://github.com/databendlabs/databend-meta", tag = "v260205.3.0" }
databend-meta-kvapi-test-suite = { git = "https://github.com/databendlabs/databend-meta", tag = "v260205.3.0" }
databend-meta-raft-store = { git = "https://github.com/databendlabs/databend-meta", tag = "v260205.3.0" }
databend-meta-runtime-api = { git = "https://github.com/databendlabs/databend-meta", tag = "v260205.3.0" }
databend-meta-sled-store = { git = "https://github.com/databendlabs/databend-meta", tag = "v260205.3.0" }
databend-meta-test-harness = { git = "https://github.com/databendlabs/databend-meta", tag = "v260205.3.0" }
databend-meta-types = { git = "https://github.com/databendlabs/databend-meta", tag = "v260205.3.0" }
databend-meta-version = { git = "https://github.com/databendlabs/databend-meta", tag = "v260205.3.0" }
deltalake = { git = "https://github.com/delta-io/delta-rs", rev = "9954bff" }
jsonb = { git = "https://github.com/databendlabs/jsonb", rev = "fc84214" }
map-api = { git = "https://github.com/databendlabs/map-api", tag = "v0.4.2" }
Expand Down
1 change: 0 additions & 1 deletion src/meta/binaries/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ futures = { workspace = true }
log = { workspace = true }
mlua = { workspace = true }
num_cpus = { workspace = true }
raft-log = { workspace = true }
rand = { workspace = true }
serde = { workspace = true }
serde_json = { workspace = true }
Expand Down
9 changes: 5 additions & 4 deletions src/meta/binaries/metactl/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -322,8 +322,8 @@ return metrics, nil
async fn dump_raft_log_wal(&self, args: &DumpRaftLogWalArgs) -> anyhow::Result<()> {
use std::path::PathBuf;

use raft_log::Config;
use raft_log::DumpApi;
use databend_meta_raft_store::raft_log::Config;
use databend_meta_raft_store::raft_log::DumpApi;

let mut wal_dir = PathBuf::from(&args.raft_dir);
wal_dir.push("df_meta");
Expand All @@ -335,8 +335,9 @@ return metrics, nil
..Default::default()
});

let dump =
raft_log::Dump::<databend_meta_raft_store::raft_log_v004::RaftLogTypes>::new(config)?;
let dump = databend_meta_raft_store::raft_log::Dump::<
databend_meta_raft_store::raft_log_v004::RaftLogTypes,
>::new(config)?;
dump.write_display(io::stdout())?;
Ok(())
}
Expand Down
1 change: 0 additions & 1 deletion src/meta/control/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ clap = { workspace = true }
display-more = { workspace = true }
futures = { workspace = true }
mlua = { workspace = true }
raft-log = { workspace = true }
reqwest = { workspace = true }
serde = { workspace = true }
serde_json = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion src/meta/control/src/import.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ use std::str::FromStr;
use databend_meta::store::RaftStore;
use databend_meta_raft_store::config::RaftConfig;
use databend_meta_raft_store::ondisk::DataVersion;
use databend_meta_raft_store::raft_log::api::raft_log_writer::RaftLogWriter;
use databend_meta_raft_store::raft_log_v004;
use databend_meta_runtime_api::SpawnApi;
use databend_meta_sled_store::init_get_sled_db;
Expand All @@ -43,7 +44,6 @@ use databend_meta_types::raft_types::NodeId;
use databend_meta_types::raft_types::StoredMembership;
use databend_meta_types::raft_types::new_log_id;
use display_more::display_option::DisplayOptionExt;
use raft_log::api::raft_log_writer::RaftLogWriter;
use url::Url;

use crate::args::ImportArgs;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1583,3 +1583,5 @@ tag min_meta_server min_meta_client external_meta_crate
1.2.878 1.2.770 1.2.288 -
1.2.879 1.2.770 1.2.288 -
1.2.880 1.2.770 1.2.676 260205.0.0
1.2.881 1.2.770 1.2.676 260205.0.0
1.2.882 1.2.770 1.2.676 260205.0.0
2 changes: 2 additions & 0 deletions src/meta/ver/compat_docs/meta_to_query.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1207,3 +1207,5 @@ meta: 1.2.877 query: [1.2.288, ~)
meta: 1.2.878 query: [1.2.288, ~)
meta: 1.2.879 query: [1.2.288, ~)
meta: 1.2.880 query: [1.2.676, ~)
meta: 1.2.881 query: [1.2.676, ~)
meta: 1.2.882 query: [1.2.676, ~)
2 changes: 2 additions & 0 deletions src/meta/ver/compat_docs/query_to_meta.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1207,3 +1207,5 @@ query: 1.2.877 meta: [1.2.770, ~)
query: 1.2.878 meta: [1.2.770, ~)
query: 1.2.879 meta: [1.2.770, ~)
query: 1.2.880 meta: [1.2.770, ~)
query: 1.2.881 meta: [1.2.770, ~)
query: 1.2.882 meta: [1.2.770, ~)
2 changes: 2 additions & 0 deletions src/meta/ver/compat_docs/src/min_compatible_versions.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1719,3 +1719,5 @@ tag MIN_SERVER MIN_CLIENT external-meta-version
1.2.878 1.2.770 1.2.288 -
1.2.879 1.2.770 1.2.288 -
1.2.880 - - 260205.0.0
1.2.881 - - 260205.0.0
1.2.882 - - 260205.0.0
Loading