refactor: flatten kvapi crate by removing redundant kvapi/ subdirectory

crates/client/client/src/client_handle.rs

@@ -201,7 +201,7 @@ impl<RT: SpawnApi> ClientHandle<RT> {
     pub async fn streamed_get_many(
         &self,
         req: StreamedGetMany,
-    ) -> Result<databend_meta_kvapi::kvapi::KVStream<MetaError>, MetaClientError> {
+    ) -> Result<databend_meta_kvapi::KVStream<MetaError>, MetaClientError> {
         self.request(req).await
     }
 

crates/client/client/src/grpc_client.rs

@@ -419,7 +419,7 @@ impl<RT: RuntimeApi> MetaGrpcClient<RT> {
         futures_util::stream::BoxStream<'static, Result<pb::StreamItem, MetaError>>,
         MetaClientError,
     > {
-        use databend_meta_kvapi::kvapi::fail_fast;
+        use databend_meta_kvapi::fail_fast;
 
         let mut keys = req.keys;
         let input_err: Arc<Mutex<Option<MetaError>>> = Arc::new(Mutex::new(None));

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;

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;

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;
 

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;

crates/client/kvapi/src/kvapi/api.rs → 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]

crates/client/kvapi/src/kvapi/dir_name.rs → 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<K: Key> Key for DirName<K> {
 #[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() {

crates/client/kvapi/src/kvapi/helper.rs → 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.
 ///

crates/client/kvapi/src/kvapi/item.rs → 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)]

crates/client/kvapi/src/kvapi/key.rs → 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() {

crates/client/kvapi/src/kvapi/key_builder.rs → 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<u8>,
@@ -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<()> {

crates/client/kvapi/src/kvapi/key_codec.rs → 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 {

crates/client/kvapi/src/kvapi/key_parser.rs → 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<()> {

crates/client/kvapi/src/kvapi/kv_api_ext.rs → 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 {

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;

crates/client/kvapi/src/kvapi/pair.rs → 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)]

crates/client/kvapi/src/kvapi/testing.rs → 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)]