diff --git a/crates/client/client/src/client_handle.rs b/crates/client/client/src/client_handle.rs index 3094c36..82cc845 100644 --- a/crates/client/client/src/client_handle.rs +++ b/crates/client/client/src/client_handle.rs @@ -201,7 +201,7 @@ impl ClientHandle { pub async fn streamed_get_many( &self, req: StreamedGetMany, - ) -> Result, MetaClientError> { + ) -> Result, MetaClientError> { self.request(req).await } diff --git a/crates/client/client/src/grpc_client.rs b/crates/client/client/src/grpc_client.rs index 4f2d888..db0eb04 100644 --- a/crates/client/client/src/grpc_client.rs +++ b/crates/client/client/src/grpc_client.rs @@ -419,7 +419,7 @@ impl MetaGrpcClient { futures_util::stream::BoxStream<'static, Result>, MetaClientError, > { - use databend_meta_kvapi::kvapi::fail_fast; + use databend_meta_kvapi::fail_fast; let mut keys = req.keys; let input_err: Arc>> = Arc::new(Mutex::new(None)); diff --git a/crates/client/client/src/kvapi_impl.rs b/crates/client/client/src/kvapi_impl.rs index 297b8c0..3762793 100644 --- a/crates/client/client/src/kvapi_impl.rs +++ b/crates/client/client/src/kvapi_impl.rs @@ -13,11 +13,11 @@ // limitations under the License. use async_trait::async_trait; -use databend_meta_kvapi::kvapi; -use databend_meta_kvapi::kvapi::KVStream; -use databend_meta_kvapi::kvapi::ListOptions; -use databend_meta_kvapi::kvapi::fail_fast; -use databend_meta_kvapi::kvapi::limit_stream; +use databend_meta_kvapi as kvapi; +use databend_meta_kvapi::KVStream; +use databend_meta_kvapi::ListOptions; +use databend_meta_kvapi::fail_fast; +use databend_meta_kvapi::limit_stream; use databend_meta_runtime_api::SpawnApi; use databend_meta_types::MetaError; use databend_meta_types::MetaNetworkError; diff --git a/crates/client/client/tests/it/grpc_client.rs b/crates/client/client/tests/it/grpc_client.rs index d6f6f62..0ea4db1 100644 --- a/crates/client/client/tests/it/grpc_client.rs +++ b/crates/client/client/tests/it/grpc_client.rs @@ -23,7 +23,7 @@ use databend_meta_client::MetaChannelManager; use databend_meta_client::MetaGrpcClient; use databend_meta_client::Streamed; use databend_meta_client::handshake; -use databend_meta_kvapi::kvapi::KvApiExt; +use databend_meta_kvapi::KvApiExt; use databend_meta_runtime_api::SpawnApi; use databend_meta_runtime_api::TokioRuntime; use databend_meta_types::MetaError; diff --git a/crates/client/kvapi-test-suite/src/kvapi_test_suite.rs b/crates/client/kvapi-test-suite/src/kvapi_test_suite.rs index ca9b08a..7d22bab 100644 --- a/crates/client/kvapi-test-suite/src/kvapi_test_suite.rs +++ b/crates/client/kvapi-test-suite/src/kvapi_test_suite.rs @@ -15,9 +15,9 @@ use std::time::Duration; use std::time::SystemTime; -use databend_meta_kvapi::kvapi; -use databend_meta_kvapi::kvapi::KvApiExt; -use databend_meta_kvapi::kvapi::ListOptions; +use databend_meta_kvapi as kvapi; +use databend_meta_kvapi::KvApiExt; +use databend_meta_kvapi::ListOptions; use databend_meta_types::ConditionResult; use databend_meta_types::MatchSeq; use databend_meta_types::MetaSpec; @@ -507,7 +507,7 @@ impl TestSuite { &self, kv: &KV, ) -> anyhow::Result<()> { - use databend_meta_kvapi::kvapi::KVStream; + use databend_meta_kvapi::KVStream; use databend_meta_types::errors::IncompleteStream; use futures_util::StreamExt; diff --git a/crates/client/kvapi-tests/tests/it/metasrv_builder.rs b/crates/client/kvapi-tests/tests/it/metasrv_builder.rs index 1c0f3ab..5e84e72 100644 --- a/crates/client/kvapi-tests/tests/it/metasrv_builder.rs +++ b/crates/client/kvapi-tests/tests/it/metasrv_builder.rs @@ -17,7 +17,7 @@ use std::sync::Mutex; use async_trait::async_trait; use databend_meta_client::ClientHandle; -use databend_meta_kvapi::kvapi; +use databend_meta_kvapi as kvapi; use databend_meta_runtime_api::TokioRuntime; use databend_meta_test_harness::MetaSrvTestContext; use databend_meta_test_harness::make_grpc_client; diff --git a/crates/client/kvapi/src/kvapi/api.rs b/crates/client/kvapi/src/api.rs similarity index 98% rename from crates/client/kvapi/src/kvapi/api.rs rename to crates/client/kvapi/src/api.rs index a6cc726..223b74a 100644 --- a/crates/client/kvapi/src/kvapi/api.rs +++ b/crates/client/kvapi/src/api.rs @@ -23,8 +23,8 @@ use futures_util::Stream; use futures_util::StreamExt; use futures_util::stream::BoxStream; -use crate::kvapi; -use crate::kvapi::ListOptions; +use crate as kvapi; +use crate::ListOptions; /// Build an API impl instance or a cluster of API impl #[async_trait] diff --git a/crates/client/kvapi/src/kvapi/dir_name.rs b/crates/client/kvapi/src/dir_name.rs similarity index 94% rename from crates/client/kvapi/src/kvapi/dir_name.rs rename to crates/client/kvapi/src/dir_name.rs index 083d59a..22805ff 100644 --- a/crates/client/kvapi/src/kvapi/dir_name.rs +++ b/crates/client/kvapi/src/dir_name.rs @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -use crate::kvapi; -use crate::kvapi::Key; -use crate::kvapi::KeyCodec; -use crate::kvapi::KeyError; +use crate as kvapi; +use crate::Key; +use crate::KeyCodec; +use crate::KeyError; /// The dir name of a key. /// @@ -96,9 +96,9 @@ impl Key for DirName { #[cfg(test)] mod tests { - use crate::kvapi::Key; - use crate::kvapi::dir_name::DirName; - use crate::kvapi::testing::FooKey; + use crate::Key; + use crate::dir_name::DirName; + use crate::testing::FooKey; #[test] fn test_dir_name_from_key() { diff --git a/crates/client/kvapi/src/kvapi/helper.rs b/crates/client/kvapi/src/helper.rs similarity index 99% rename from crates/client/kvapi/src/kvapi/helper.rs rename to crates/client/kvapi/src/helper.rs index 5640aaf..b5393bb 100644 --- a/crates/client/kvapi/src/kvapi/helper.rs +++ b/crates/client/kvapi/src/helper.rs @@ -14,7 +14,7 @@ use std::string::FromUtf8Error; -use crate::kvapi::KeyError; +use crate::KeyError; /// Function that escapes special characters in a string. /// diff --git a/crates/client/kvapi/src/kvapi/item.rs b/crates/client/kvapi/src/item.rs similarity index 98% rename from crates/client/kvapi/src/kvapi/item.rs rename to crates/client/kvapi/src/item.rs index 638759a..7501450 100644 --- a/crates/client/kvapi/src/kvapi/item.rs +++ b/crates/client/kvapi/src/item.rs @@ -14,7 +14,7 @@ use databend_meta_types::SeqV; -use crate::kvapi::Key; +use crate::Key; /// Key-Value item contains key and optional value with seq number. #[derive(Clone, Debug, PartialEq, Eq)] diff --git a/crates/client/kvapi/src/kvapi/key.rs b/crates/client/kvapi/src/key.rs similarity index 94% rename from crates/client/kvapi/src/kvapi/key.rs rename to crates/client/kvapi/src/key.rs index 7c63ce0..4253019 100644 --- a/crates/client/kvapi/src/kvapi/key.rs +++ b/crates/client/kvapi/src/key.rs @@ -17,8 +17,8 @@ use std::fmt::Debug; use std::string::FromUtf8Error; -use crate::kvapi; -use crate::kvapi::key_codec::KeyCodec; +use crate as kvapi; +use crate::key_codec::KeyCodec; #[derive(Debug, Clone, PartialEq, Eq, thiserror::Error)] pub enum KeyError { @@ -80,9 +80,9 @@ where Self: Sized #[cfg(test)] mod tests { - use crate::kvapi::DirName; - use crate::kvapi::Key; - use crate::kvapi::testing::FooKey; + use crate::DirName; + use crate::Key; + use crate::testing::FooKey; #[test] fn test_with_key_space() { diff --git a/crates/client/kvapi/src/kvapi/key_builder.rs b/crates/client/kvapi/src/key_builder.rs similarity index 94% rename from crates/client/kvapi/src/kvapi/key_builder.rs rename to crates/client/kvapi/src/key_builder.rs index 8fe6b26..eef2cc0 100644 --- a/crates/client/kvapi/src/kvapi/key_builder.rs +++ b/crates/client/kvapi/src/key_builder.rs @@ -14,8 +14,8 @@ //! A helper for building a string key from a structured key -use crate::kvapi::helper::escape; -use crate::kvapi::helper::escape_specified; +use crate::helper::escape; +use crate::helper::escape_specified; pub struct KeyBuilder { buf: Vec, @@ -67,7 +67,7 @@ impl KeyBuilder { #[cfg(test)] mod tests { - use crate::kvapi::key_builder::KeyBuilder; + use crate::key_builder::KeyBuilder; #[test] fn test_key_builder() -> anyhow::Result<()> { diff --git a/crates/client/kvapi/src/kvapi/key_codec.rs b/crates/client/kvapi/src/key_codec.rs similarity index 91% rename from crates/client/kvapi/src/kvapi/key_codec.rs rename to crates/client/kvapi/src/key_codec.rs index 0a2de2f..b9a04e0 100644 --- a/crates/client/kvapi/src/kvapi/key_codec.rs +++ b/crates/client/kvapi/src/key_codec.rs @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -use crate::kvapi; -use crate::kvapi::KeyError; +use crate as kvapi; +use crate::KeyError; /// Encode or decode part of a meta-service key. pub trait KeyCodec { @@ -26,10 +26,10 @@ pub trait KeyCodec { } mod impls { - use crate::kvapi::KeyBuilder; - use crate::kvapi::KeyCodec; - use crate::kvapi::KeyError; - use crate::kvapi::KeyParser; + use crate::KeyBuilder; + use crate::KeyCodec; + use crate::KeyError; + use crate::KeyParser; impl KeyCodec for String { fn encode_key(&self, b: KeyBuilder) -> KeyBuilder { diff --git a/crates/client/kvapi/src/kvapi/key_parser.rs b/crates/client/kvapi/src/key_parser.rs similarity index 97% rename from crates/client/kvapi/src/kvapi/key_parser.rs rename to crates/client/kvapi/src/key_parser.rs index 4043ec2..89108c5 100644 --- a/crates/client/kvapi/src/kvapi/key_parser.rs +++ b/crates/client/kvapi/src/key_parser.rs @@ -18,10 +18,10 @@ use std::string::FromUtf8Error; use databend_base::non_empty::NonEmptyString; -use crate::kvapi::KeyError; -use crate::kvapi::helper::decode_id; -use crate::kvapi::helper::unescape; -use crate::kvapi::helper::unescape_specified; +use crate::KeyError; +use crate::helper::decode_id; +use crate::helper::unescape; +use crate::helper::unescape_specified; /// A helper for parsing a string key into structured key. pub struct KeyParser<'s> { @@ -179,8 +179,8 @@ impl<'s> KeyParser<'s> { #[cfg(test)] mod tests { - use crate::kvapi::KeyError; - use crate::kvapi::key_parser::KeyParser; + use crate::KeyError; + use crate::key_parser::KeyParser; #[test] fn test_key_parser_new_prefixed() -> anyhow::Result<()> { diff --git a/crates/client/kvapi/src/kvapi/kv_api_ext.rs b/crates/client/kvapi/src/kv_api_ext.rs similarity index 97% rename from crates/client/kvapi/src/kvapi/kv_api_ext.rs rename to crates/client/kvapi/src/kv_api_ext.rs index 15ee176..44dcde1 100644 --- a/crates/client/kvapi/src/kvapi/kv_api_ext.rs +++ b/crates/client/kvapi/src/kv_api_ext.rs @@ -22,9 +22,9 @@ use futures_util::StreamExt; use futures_util::TryStreamExt; use log::debug; -use crate::kvapi::KVApi; -use crate::kvapi::KVStream; -use crate::kvapi::ListOptions; +use crate::KVApi; +use crate::KVStream; +use crate::ListOptions; /// Extend the `KVApi` trait with auto implemented handy methods. #[async_trait] @@ -133,12 +133,12 @@ mod tests { use futures_util::TryStreamExt; use futures_util::stream::BoxStream; - use crate::kvapi; - use crate::kvapi::KVStream; - use crate::kvapi::KvApiExt; - use crate::kvapi::ListOptions; - use crate::kvapi::fail_fast; - use crate::kvapi::limit_stream; + use crate as kvapi; + use crate::KVStream; + use crate::KvApiExt; + use crate::ListOptions; + use crate::fail_fast; + use crate::limit_stream; /// In-memory mock of KVApi backed by a BTreeMap of protobuf SeqV. struct MockKVApi { diff --git a/crates/client/kvapi/src/kvapi/mod.rs b/crates/client/kvapi/src/kvapi/mod.rs deleted file mode 100644 index dbfecef..0000000 --- a/crates/client/kvapi/src/kvapi/mod.rs +++ /dev/null @@ -1,58 +0,0 @@ -// Copyright 2021 Datafuse Labs -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -mod api; -mod dir_name; -mod helper; -mod item; -mod key; -mod key_builder; -mod key_codec; -mod key_parser; -mod kv_api_ext; -mod list_options; -mod message; -mod pair; -mod value; -mod value_with_name; - -pub(crate) mod testing; - -pub use api::ApiBuilder; -pub use api::KVApi; -pub use api::KVStream; -pub use api::fail_fast; -pub use api::limit_stream; -pub use dir_name::DirName; -pub use item::Item; -pub use item::NonEmptyItem; -pub use key::Key; -pub use key::KeyError; -pub use key_builder::KeyBuilder; -pub use key_codec::KeyCodec; -pub use key_parser::KeyParser; -pub use kv_api_ext::KvApiExt; -pub use list_options::ListOptions; -pub use message::GetKVReply; -pub use message::GetKVReq; -pub use message::ListKVReply; -pub use message::ListKVReq; -pub use message::MGetKVReply; -pub use message::MGetKVReq; -pub use message::UpsertKVReply; -pub use pair::BasicPair; -pub use pair::Pair; -pub use pair::SeqPair; -pub use value::Value; -pub use value_with_name::ValueWithName; diff --git a/crates/client/kvapi/src/lib.rs b/crates/client/kvapi/src/lib.rs index 4ce7597..91038c2 100644 --- a/crates/client/kvapi/src/lib.rs +++ b/crates/client/kvapi/src/lib.rs @@ -14,4 +14,47 @@ #![allow(clippy::uninlined_format_args)] -pub mod kvapi; +mod api; +mod dir_name; +mod helper; +mod item; +mod key; +mod key_builder; +mod key_codec; +mod key_parser; +mod kv_api_ext; +mod list_options; +mod message; +mod pair; +mod value; +mod value_with_name; + +pub(crate) mod testing; + +pub use api::ApiBuilder; +pub use api::KVApi; +pub use api::KVStream; +pub use api::fail_fast; +pub use api::limit_stream; +pub use dir_name::DirName; +pub use item::Item; +pub use item::NonEmptyItem; +pub use key::Key; +pub use key::KeyError; +pub use key_builder::KeyBuilder; +pub use key_codec::KeyCodec; +pub use key_parser::KeyParser; +pub use kv_api_ext::KvApiExt; +pub use list_options::ListOptions; +pub use message::GetKVReply; +pub use message::GetKVReq; +pub use message::ListKVReply; +pub use message::ListKVReq; +pub use message::MGetKVReply; +pub use message::MGetKVReq; +pub use message::UpsertKVReply; +pub use pair::BasicPair; +pub use pair::Pair; +pub use pair::SeqPair; +pub use value::Value; +pub use value_with_name::ValueWithName; diff --git a/crates/client/kvapi/src/kvapi/list_options.rs b/crates/client/kvapi/src/list_options.rs similarity index 100% rename from crates/client/kvapi/src/kvapi/list_options.rs rename to crates/client/kvapi/src/list_options.rs diff --git a/crates/client/kvapi/src/kvapi/message.rs b/crates/client/kvapi/src/message.rs similarity index 100% rename from crates/client/kvapi/src/kvapi/message.rs rename to crates/client/kvapi/src/message.rs diff --git a/crates/client/kvapi/src/kvapi/pair.rs b/crates/client/kvapi/src/pair.rs similarity index 99% rename from crates/client/kvapi/src/kvapi/pair.rs rename to crates/client/kvapi/src/pair.rs index 695d673..6be3fff 100644 --- a/crates/client/kvapi/src/kvapi/pair.rs +++ b/crates/client/kvapi/src/pair.rs @@ -14,7 +14,7 @@ use databend_meta_types::SeqV; -use crate::kvapi; +use crate as kvapi; /// A Key-Value pair for type Key. The value does not have a seq number. #[derive(Clone, Debug, PartialEq, Eq)] diff --git a/crates/client/kvapi/src/kvapi/testing.rs b/crates/client/kvapi/src/testing.rs similarity index 91% rename from crates/client/kvapi/src/kvapi/testing.rs rename to crates/client/kvapi/src/testing.rs index 9abe8f1..b22a737 100644 --- a/crates/client/kvapi/src/kvapi/testing.rs +++ b/crates/client/kvapi/src/testing.rs @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -use crate::kvapi; -use crate::kvapi::Key; -use crate::kvapi::KeyCodec; -use crate::kvapi::KeyError; -use crate::kvapi::KeyParser; -use crate::kvapi::Value; +use crate as kvapi; +use crate::Key; +use crate::KeyCodec; +use crate::KeyError; +use crate::KeyParser; +use crate::Value; #[allow(dead_code)] #[derive(Debug, Clone, PartialEq, Eq)] diff --git a/crates/client/kvapi/src/kvapi/value.rs b/crates/client/kvapi/src/value.rs similarity index 98% rename from crates/client/kvapi/src/kvapi/value.rs rename to crates/client/kvapi/src/value.rs index ca1f064..eb00883 100644 --- a/crates/client/kvapi/src/kvapi/value.rs +++ b/crates/client/kvapi/src/value.rs @@ -14,7 +14,7 @@ use std::fmt::Debug; -use crate::kvapi; +use crate as kvapi; /// A value that can be stored in kvapi::KVApi. pub trait Value: Debug { diff --git a/crates/client/kvapi/src/kvapi/value_with_name.rs b/crates/client/kvapi/src/value_with_name.rs similarity index 97% rename from crates/client/kvapi/src/kvapi/value_with_name.rs rename to crates/client/kvapi/src/value_with_name.rs index 523e0a1..ea545c7 100644 --- a/crates/client/kvapi/src/kvapi/value_with_name.rs +++ b/crates/client/kvapi/src/value_with_name.rs @@ -14,7 +14,7 @@ //! Define behaviors of a `kvapi::Value` that contains a name. -use crate::kvapi; +use crate as kvapi; /// Define behaviors of a `kvapi::Value` that contains a name. pub trait ValueWithName: kvapi::Value { diff --git a/crates/server/raft-store/src/sm_v003/sm_v003_kv_api.rs b/crates/server/raft-store/src/sm_v003/sm_v003_kv_api.rs index adcf3a3..b68888b 100644 --- a/crates/server/raft-store/src/sm_v003/sm_v003_kv_api.rs +++ b/crates/server/raft-store/src/sm_v003/sm_v003_kv_api.rs @@ -16,10 +16,10 @@ use std::future; use std::io; use std::sync::Arc; -use databend_meta_kvapi::kvapi; -use databend_meta_kvapi::kvapi::KVStream; -use databend_meta_kvapi::kvapi::ListOptions; -use databend_meta_kvapi::kvapi::limit_stream; +use databend_meta_kvapi as kvapi; +use databend_meta_kvapi::KVStream; +use databend_meta_kvapi::ListOptions; +use databend_meta_kvapi::limit_stream; use databend_meta_types::SeqV; use databend_meta_types::TxnReply; use databend_meta_types::TxnRequest; @@ -114,7 +114,7 @@ fn state_machine_snapshot_get_many_kv( keys: BoxStream<'static, Result>, local_now_ms: u64, ) -> KVStream { - use databend_meta_kvapi::kvapi::fail_fast; + use databend_meta_kvapi::fail_fast; use futures_util::StreamExt; use futures_util::TryStreamExt; diff --git a/crates/server/raft-store/src/sm_v003/sm_v003_test.rs b/crates/server/raft-store/src/sm_v003/sm_v003_test.rs index 30db937..c4561dc 100644 --- a/crates/server/raft-store/src/sm_v003/sm_v003_test.rs +++ b/crates/server/raft-store/src/sm_v003/sm_v003_test.rs @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -use databend_meta_kvapi::kvapi::KVApi; -use databend_meta_kvapi::kvapi::ListOptions; +use databend_meta_kvapi::KVApi; +use databend_meta_kvapi::ListOptions; use databend_meta_types::CmdContext; use databend_meta_types::SeqV; use databend_meta_types::UpsertKV; diff --git a/crates/server/service/src/message.rs b/crates/server/service/src/message.rs index 2f371e9..520ce52 100644 --- a/crates/server/service/src/message.rs +++ b/crates/server/service/src/message.rs @@ -14,12 +14,12 @@ use anyerror::AnyError; use databend_meta_client::MetaGrpcReadReq; -use databend_meta_kvapi::kvapi::GetKVReply; -use databend_meta_kvapi::kvapi::GetKVReq; -use databend_meta_kvapi::kvapi::ListKVReply; -use databend_meta_kvapi::kvapi::ListKVReq; -use databend_meta_kvapi::kvapi::MGetKVReply; -use databend_meta_kvapi::kvapi::MGetKVReq; +use databend_meta_kvapi::GetKVReply; +use databend_meta_kvapi::GetKVReq; +use databend_meta_kvapi::ListKVReply; +use databend_meta_kvapi::ListKVReq; +use databend_meta_kvapi::MGetKVReply; +use databend_meta_kvapi::MGetKVReq; use databend_meta_types::AppliedState; use databend_meta_types::Endpoint; use databend_meta_types::GrpcHelper; diff --git a/crates/server/service/src/meta_node/meta_handle.rs b/crates/server/service/src/meta_node/meta_handle.rs index 94d7a5f..93acc52 100644 --- a/crates/server/service/src/meta_node/meta_handle.rs +++ b/crates/server/service/src/meta_node/meta_handle.rs @@ -22,7 +22,7 @@ use std::time::Duration; use databend_base::futures::ElapsedFutureExt; use databend_meta_client::MetaGrpcReadReq; -use databend_meta_kvapi::kvapi::UpsertKVReply; +use databend_meta_kvapi::UpsertKVReply; use databend_meta_raft_store::leveled_store::db_exporter::DBExporter; use databend_meta_runtime_api::SpawnApi; use databend_meta_types::AppliedState; diff --git a/crates/server/service/src/meta_service/meta_leader.rs b/crates/server/service/src/meta_service/meta_leader.rs index 4e1405c..152dce0 100644 --- a/crates/server/service/src/meta_service/meta_leader.rs +++ b/crates/server/service/src/meta_service/meta_leader.rs @@ -20,9 +20,9 @@ use std::time::SystemTime; use anyerror::AnyError; use databend_base::counter::Counter; use databend_meta_client::MetaGrpcReadReq; -use databend_meta_kvapi::kvapi::KVApi; -use databend_meta_kvapi::kvapi::KvApiExt; -use databend_meta_kvapi::kvapi::ListOptions; +use databend_meta_kvapi::KVApi; +use databend_meta_kvapi::KvApiExt; +use databend_meta_kvapi::ListOptions; use databend_meta_runtime_api::SpawnApi; use databend_meta_sled_store::openraft::ChangeMembers; use databend_meta_sled_store::openraft::async_runtime::WatchReceiver; diff --git a/crates/server/service/tests/it/grpc/metasrv_connection_error.rs b/crates/server/service/tests/it/grpc/metasrv_connection_error.rs index a31e69f..4b1be9a 100644 --- a/crates/server/service/tests/it/grpc/metasrv_connection_error.rs +++ b/crates/server/service/tests/it/grpc/metasrv_connection_error.rs @@ -23,7 +23,7 @@ use databend_meta_client::ClientHandle; use databend_meta_client::DEFAULT_GRPC_MESSAGE_SIZE; use databend_meta_client::MetaGrpcClient; use databend_meta_client::errors::CreationError; -use databend_meta_kvapi::kvapi::KvApiExt; +use databend_meta_kvapi::KvApiExt; use databend_meta_runtime_api::TokioRuntime; use databend_meta_types::UpsertKV; use log::info; diff --git a/crates/server/service/tests/it/grpc/metasrv_grpc_api.rs b/crates/server/service/tests/it/grpc/metasrv_grpc_api.rs index 6268a41..ec3bc00 100644 --- a/crates/server/service/tests/it/grpc/metasrv_grpc_api.rs +++ b/crates/server/service/tests/it/grpc/metasrv_grpc_api.rs @@ -15,8 +15,8 @@ //! Test arrow-grpc API of metasrv use std::collections::HashSet; -use databend_meta_kvapi::kvapi::KvApiExt; -use databend_meta_kvapi::kvapi::UpsertKVReply; +use databend_meta_kvapi::KvApiExt; +use databend_meta_kvapi::UpsertKVReply; use databend_meta_runtime_api::TokioRuntime; use databend_meta_sled_store::openraft::async_runtime::WatchReceiver; use databend_meta_types::SeqV; diff --git a/crates/server/service/tests/it/grpc/metasrv_grpc_export.rs b/crates/server/service/tests/it/grpc/metasrv_grpc_export.rs index ddbf7a8..e2edfdc 100644 --- a/crates/server/service/tests/it/grpc/metasrv_grpc_export.rs +++ b/crates/server/service/tests/it/grpc/metasrv_grpc_export.rs @@ -14,7 +14,7 @@ use std::time::Duration; -use databend_meta_kvapi::kvapi::KvApiExt; +use databend_meta_kvapi::KvApiExt; use databend_meta_runtime_api::TokioRuntime; use databend_meta_types::UpsertKV; use databend_meta_types::protobuf as pb; diff --git a/crates/server/service/tests/it/grpc/metasrv_grpc_kv_api_restart_cluster.rs b/crates/server/service/tests/it/grpc/metasrv_grpc_kv_api_restart_cluster.rs index 1df2a61..5aac0b1 100644 --- a/crates/server/service/tests/it/grpc/metasrv_grpc_kv_api_restart_cluster.rs +++ b/crates/server/service/tests/it/grpc/metasrv_grpc_kv_api_restart_cluster.rs @@ -20,7 +20,7 @@ use std::time::Duration; use databend_meta_client::ClientHandle; use databend_meta_client::DEFAULT_GRPC_MESSAGE_SIZE; use databend_meta_client::MetaGrpcClient; -use databend_meta_kvapi::kvapi::KvApiExt; +use databend_meta_kvapi::KvApiExt; use databend_meta_runtime_api::TokioRuntime; use databend_meta_types::UpsertKV; use log::info; diff --git a/crates/server/service/tests/it/grpc/metasrv_grpc_kv_get_many.rs b/crates/server/service/tests/it/grpc/metasrv_grpc_kv_get_many.rs index 5f31b02..4181ae2 100644 --- a/crates/server/service/tests/it/grpc/metasrv_grpc_kv_get_many.rs +++ b/crates/server/service/tests/it/grpc/metasrv_grpc_kv_get_many.rs @@ -16,7 +16,7 @@ use std::time::Duration; -use databend_meta_kvapi::kvapi::KvApiExt; +use databend_meta_kvapi::KvApiExt; use databend_meta_runtime_api::TokioRuntime; use databend_meta_types::GrpcHelper; use databend_meta_types::UpsertKV; diff --git a/crates/server/service/tests/it/grpc/metasrv_grpc_kv_list.rs b/crates/server/service/tests/it/grpc/metasrv_grpc_kv_list.rs index a19bc14..05aa2ef 100644 --- a/crates/server/service/tests/it/grpc/metasrv_grpc_kv_list.rs +++ b/crates/server/service/tests/it/grpc/metasrv_grpc_kv_list.rs @@ -16,7 +16,7 @@ use std::time::Duration; -use databend_meta_kvapi::kvapi::KvApiExt; +use databend_meta_kvapi::KvApiExt; use databend_meta_runtime_api::TokioRuntime; use databend_meta_types::GrpcHelper; use databend_meta_types::UpsertKV; diff --git a/crates/server/service/tests/it/grpc/metasrv_grpc_kv_read_v1.rs b/crates/server/service/tests/it/grpc/metasrv_grpc_kv_read_v1.rs index bbed71b..16aae90 100644 --- a/crates/server/service/tests/it/grpc/metasrv_grpc_kv_read_v1.rs +++ b/crates/server/service/tests/it/grpc/metasrv_grpc_kv_read_v1.rs @@ -22,7 +22,7 @@ use databend_meta_client::ClientHandle; use databend_meta_client::ListKVReq; use databend_meta_client::MGetKVReq; use databend_meta_client::Streamed; -use databend_meta_kvapi::kvapi::KvApiExt; +use databend_meta_kvapi::KvApiExt; use databend_meta_runtime_api::TokioRuntime; use databend_meta_types::MetaSpec; use databend_meta_types::UpsertKV; diff --git a/crates/server/service/tests/it/grpc/metasrv_grpc_kv_transaction.rs b/crates/server/service/tests/it/grpc/metasrv_grpc_kv_transaction.rs index 48b6498..4942b42 100644 --- a/crates/server/service/tests/it/grpc/metasrv_grpc_kv_transaction.rs +++ b/crates/server/service/tests/it/grpc/metasrv_grpc_kv_transaction.rs @@ -14,7 +14,7 @@ //! Integration tests for the `KvTransaction` gRPC endpoint. -use databend_meta_kvapi::kvapi::KvApiExt; +use databend_meta_kvapi::KvApiExt; use databend_meta_runtime_api::TokioRuntime; use databend_meta_types::SeqV; use databend_meta_types::TxnCondition; diff --git a/crates/server/service/tests/it/grpc/metasrv_grpc_watch.rs b/crates/server/service/tests/it/grpc/metasrv_grpc_watch.rs index 7124143..a3f4a01 100644 --- a/crates/server/service/tests/it/grpc/metasrv_grpc_watch.rs +++ b/crates/server/service/tests/it/grpc/metasrv_grpc_watch.rs @@ -26,7 +26,7 @@ use databend_meta::meta_service::MetaNode; use databend_meta_client::ClientHandle; use databend_meta_client::DEFAULT_GRPC_MESSAGE_SIZE; use databend_meta_client::MetaGrpcClient; -use databend_meta_kvapi::kvapi::KvApiExt; +use databend_meta_kvapi::KvApiExt; use databend_meta_runtime_api::SpawnApi; use databend_meta_runtime_api::TokioRuntime; use databend_meta_types::ConditionResult; diff --git a/crates/server/service/tests/it/grpc/t53_metasrv_grpc_snapshot_keys_layout.rs b/crates/server/service/tests/it/grpc/t53_metasrv_grpc_snapshot_keys_layout.rs index 0aa96e1..a9466b0 100644 --- a/crates/server/service/tests/it/grpc/t53_metasrv_grpc_snapshot_keys_layout.rs +++ b/crates/server/service/tests/it/grpc/t53_metasrv_grpc_snapshot_keys_layout.rs @@ -14,7 +14,7 @@ use std::time::Duration; -use databend_meta_kvapi::kvapi::KvApiExt; +use databend_meta_kvapi::KvApiExt; use databend_meta_runtime_api::TokioRuntime; use databend_meta_types::UpsertKV; use databend_meta_types::protobuf as pb; diff --git a/crates/server/service/tests/it/meta_node/meta_node_kv_api_expire.rs b/crates/server/service/tests/it/meta_node/meta_node_kv_api_expire.rs index c3dee45..66b1f98 100644 --- a/crates/server/service/tests/it/meta_node/meta_node_kv_api_expire.rs +++ b/crates/server/service/tests/it/meta_node/meta_node_kv_api_expire.rs @@ -14,7 +14,7 @@ use std::time::Duration; -use databend_meta_kvapi::kvapi::KvApiExt; +use databend_meta_kvapi::KvApiExt; use databend_meta_types::Cmd; use databend_meta_types::LogEntry; use databend_meta_types::MatchSeq; diff --git a/crates/server/service/tests/it/meta_node/meta_node_lifecycle.rs b/crates/server/service/tests/it/meta_node/meta_node_lifecycle.rs index 50b5de6..4f6aaae 100644 --- a/crates/server/service/tests/it/meta_node/meta_node_lifecycle.rs +++ b/crates/server/service/tests/it/meta_node/meta_node_lifecycle.rs @@ -21,7 +21,7 @@ use databend_meta::message::ForwardRequestBody; use databend_meta::message::JoinRequest; use databend_meta::message::LeaveRequest; use databend_meta::meta_service::MetaNode; -use databend_meta_kvapi::kvapi::KvApiExt; +use databend_meta_kvapi::KvApiExt; use databend_meta_runtime_api::TokioRuntime; use databend_meta_sled_store::openraft::LogIdOptionExt; use databend_meta_sled_store::openraft::RaftLogReader; diff --git a/crates/server/service/tests/it/meta_node/t90_time_revert_cross_snapshot_boundary.rs b/crates/server/service/tests/it/meta_node/t90_time_revert_cross_snapshot_boundary.rs index 90e050f..2e5dc06 100644 --- a/crates/server/service/tests/it/meta_node/t90_time_revert_cross_snapshot_boundary.rs +++ b/crates/server/service/tests/it/meta_node/t90_time_revert_cross_snapshot_boundary.rs @@ -15,7 +15,7 @@ use std::time::Duration; use databend_meta::meta_service::MetaNode; -use databend_meta_kvapi::kvapi::KvApiExt; +use databend_meta_kvapi::KvApiExt; use databend_meta_runtime_api::TokioRuntime; use databend_meta_types::Cmd; use databend_meta_types::LogEntry;