refactor(meta): rename common-meta-grpc to common-meta-client

drmingdrmer · drmingdrmer · commit a90181d60a0f · 2022-09-09T12:01:03.000+08:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/binaries/Cargo.toml b/src/binaries/Cargo.toml
@@ -33,8 +33,8 @@ common-grpc = { path = "../common/grpc" }
 common-macros = { path = "../common/macros" }
 common-meta-api = { path = "../meta/api" }
 common-meta-app = { path = "../meta/app" }
+common-meta-client = { path = "../meta/client" }
 common-meta-embedded = { path = "../meta/embedded" }
-common-meta-grpc = { path = "../meta/grpc" }
 common-meta-raft-store = { path = "../meta/raft-store" }
 common-meta-sled-store = { path = "../meta/sled-store" }
 common-meta-store = { path = "../meta/store" }
diff --git a/src/binaries/metabench/main.rs b/src/binaries/metabench/main.rs
@@ -27,8 +27,8 @@ use common_meta_app::schema::DatabaseNameIdent;
 use common_meta_app::schema::GetTableReq;
 use common_meta_app::schema::TableNameIdent;
 use common_meta_app::schema::UpsertTableOptionReq;
-use common_meta_grpc::ClientHandle;
-use common_meta_grpc::MetaGrpcClient;
+use common_meta_client::ClientHandle;
+use common_meta_client::MetaGrpcClient;
 use common_meta_types::MatchSeq;
 use common_meta_types::Operation;
 use common_meta_types::UpsertKVReq;
diff --git a/src/binaries/metactl/grpc.rs b/src/binaries/metactl/grpc.rs
@@ -15,7 +15,7 @@
 use std::fs::File;
 use std::io::Write;
 
-use common_meta_grpc::MetaGrpcClient;
+use common_meta_client::MetaGrpcClient;
 use common_meta_types::protobuf::Empty;
 use tokio_stream::StreamExt;
 
diff --git a/src/binaries/metactl/main.rs b/src/binaries/metactl/main.rs
@@ -20,7 +20,7 @@ mod snapshot;
 use clap::Parser;
 use common_base::base::tokio;
 use common_meta_api::KVApi;
-use common_meta_grpc::MetaGrpcClient;
+use common_meta_client::MetaGrpcClient;
 use common_meta_raft_store::config::get_default_raft_advertise_host;
 use common_tracing::init_logging;
 use common_tracing::Config as LogConfig;
diff --git a/src/binaries/query/main.rs b/src/binaries/query/main.rs
@@ -18,8 +18,8 @@ use std::sync::Arc;
 
 use common_base::base::RuntimeTracker;
 use common_macros::databend_main;
+use common_meta_client::MIN_METASRV_SEMVER;
 use common_meta_embedded::MetaEmbedded;
-use common_meta_grpc::MIN_METASRV_SEMVER;
 use common_metrics::init_default_metrics_recorder;
 use common_tracing::set_panic_hook;
 use databend_query::api::HttpService;
diff --git a/src/meta/README.md b/src/meta/README.md
@@ -5,7 +5,7 @@ Databend Meta is a transactional metadata service.
 - [`api`](./api/), the user level api interface exposed based on the KVApi implementation.
 - [`app`](./app/), defines meta data types used by meta-client application.
 - [`embedded`](./embedded/), a meta store backed with a local sled::Tree.
-- [`grpc`](./grpc/), the client library based on grpc and is used to communicate with meta service.
+- [`grpc`](client/), the client library based on grpc and is used to communicate with meta service.
 - [`protos`](./protos/) defines the protobuf messages a meta client talks to a meta server.
 - [`proto-conv`](./proto-conv/) defines how to convert metadata types in rust from and to protobuf messages.
 - [`raft-store`](./raft-store/), the storage layer implementation of openraft, including the state machine.
diff --git a/src/meta/client/Cargo.toml b/src/meta/client/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "common-meta-grpc"
+name = "common-meta-client"
 version = "0.1.0"
 description = "common meta grpc"
 authors = ["Databend Authors <opensource@datafuselabs.com>"]
diff --git a/src/meta/client/build.rs b/src/meta/client/build.rs
diff --git a/src/meta/client/src/grpc_action.rs b/src/meta/client/src/grpc_action.rs
diff --git a/src/meta/client/src/grpc_client.rs b/src/meta/client/src/grpc_client.rs
diff --git a/src/meta/client/src/kv_api_impl.rs b/src/meta/client/src/kv_api_impl.rs
diff --git a/src/meta/client/src/lib.rs b/src/meta/client/src/lib.rs
diff --git a/src/meta/client/src/message.rs b/src/meta/client/src/message.rs
diff --git a/src/meta/client/tests/it/grpc_client.rs b/src/meta/client/tests/it/grpc_client.rs
@@ -18,7 +18,7 @@ use common_base::base::tokio;
 use common_exception::ErrorCode;
 use common_meta_api::SchemaApi;
 use common_meta_app::schema::GetDatabaseReq;
-use common_meta_grpc::MetaGrpcClient;
+use common_meta_client::MetaGrpcClient;
 
 use crate::grpc_server::start_grpc_server;
 
diff --git a/src/meta/client/tests/it/grpc_server.rs b/src/meta/client/tests/it/grpc_server.rs
diff --git a/src/meta/client/tests/it/main.rs b/src/meta/client/tests/it/main.rs
diff --git a/src/meta/service/Cargo.toml b/src/meta/service/Cargo.toml
@@ -30,7 +30,7 @@ common-exception = { path = "../../common/exception" }
 common-grpc = { path = "../../common/grpc" }
 common-http = { path = "../../common/http" }
 common-meta-api = { path = "../api" }
-common-meta-grpc = { path = "../grpc" }
+common-meta-client = { path = "../client" }
 common-meta-raft-store = { path = "../raft-store" }
 common-meta-sled-store = { path = "../sled-store" }
 common-meta-types = { path = "../types" }
diff --git a/src/meta/service/src/api/grpc/grpc_service.rs b/src/meta/service/src/api/grpc/grpc_service.rs
@@ -21,8 +21,8 @@ use common_arrow::arrow_format::flight::data::BasicAuth;
 use common_base::base::tokio::sync::mpsc;
 use common_grpc::GrpcClaim;
 use common_grpc::GrpcToken;
-use common_meta_grpc::MetaGrpcReadReq;
-use common_meta_grpc::MetaGrpcWriteReq;
+use common_meta_client::MetaGrpcReadReq;
+use common_meta_client::MetaGrpcWriteReq;
 use common_meta_types::protobuf::meta_service_server::MetaService;
 use common_meta_types::protobuf::ClientInfo;
 use common_meta_types::protobuf::Empty;
diff --git a/src/meta/service/src/executor/action_handler.rs b/src/meta/service/src/executor/action_handler.rs
@@ -15,9 +15,9 @@
 use std::sync::Arc;
 
 use common_meta_api::KVApi;
-use common_meta_grpc::MetaGrpcReadReq;
-use common_meta_grpc::MetaGrpcWriteReq;
-use common_meta_grpc::RequestFor;
+use common_meta_client::MetaGrpcReadReq;
+use common_meta_client::MetaGrpcWriteReq;
+use common_meta_client::RequestFor;
 use common_meta_types::protobuf::RaftReply;
 use common_meta_types::MetaError;
 use common_meta_types::TxnReply;
diff --git a/src/meta/service/tests/it/grpc/metasrv_grpc_api.rs b/src/meta/service/tests/it/grpc/metasrv_grpc_api.rs
@@ -19,7 +19,7 @@ use anyerror::AnyError;
 use common_base::base::tokio;
 use common_base::base::Stoppable;
 use common_meta_api::KVApi;
-use common_meta_grpc::MetaGrpcClient;
+use common_meta_client::MetaGrpcClient;
 use common_meta_types::MatchSeq;
 use common_meta_types::MetaManagementError;
 use common_meta_types::Operation;
diff --git a/src/meta/service/tests/it/grpc/metasrv_grpc_export.rs b/src/meta/service/tests/it/grpc/metasrv_grpc_export.rs
@@ -16,7 +16,7 @@ use std::time::Duration;
 
 use common_base::base::tokio;
 use common_meta_api::KVApi;
-use common_meta_grpc::MetaGrpcClient;
+use common_meta_client::MetaGrpcClient;
 use common_meta_types::protobuf::Empty;
 use common_meta_types::MatchSeq;
 use common_meta_types::Operation;
diff --git a/src/meta/service/tests/it/grpc/metasrv_grpc_get_client_info.rs b/src/meta/service/tests/it/grpc/metasrv_grpc_get_client_info.rs
@@ -15,7 +15,7 @@
 use std::time::Duration;
 
 use common_base::base::tokio;
-use common_meta_grpc::MetaGrpcClient;
+use common_meta_client::MetaGrpcClient;
 use pretty_assertions::assert_eq;
 use regex::Regex;
 
diff --git a/src/meta/service/tests/it/grpc/metasrv_grpc_handshake.rs b/src/meta/service/tests/it/grpc/metasrv_grpc_handshake.rs
@@ -20,11 +20,11 @@ use std::time::Duration;
 
 use common_base::base::tokio;
 use common_grpc::ConnectionFactory;
-use common_meta_grpc::from_digit_ver;
-use common_meta_grpc::to_digit_ver;
-use common_meta_grpc::MetaGrpcClient;
-use common_meta_grpc::METACLI_COMMIT_SEMVER;
-use common_meta_grpc::MIN_METASRV_SEMVER;
+use common_meta_client::from_digit_ver;
+use common_meta_client::to_digit_ver;
+use common_meta_client::MetaGrpcClient;
+use common_meta_client::METACLI_COMMIT_SEMVER;
+use common_meta_client::MIN_METASRV_SEMVER;
 use common_meta_types::protobuf::meta_service_client::MetaServiceClient;
 use databend_meta::version::MIN_METACLI_SEMVER;
 use semver::Version;
diff --git a/src/meta/service/tests/it/grpc/metasrv_grpc_kv_api_restart_cluster.rs b/src/meta/service/tests/it/grpc/metasrv_grpc_kv_api_restart_cluster.rs
@@ -20,8 +20,8 @@ use std::time::Duration;
 use common_base::base::tokio;
 use common_base::base::Stoppable;
 use common_meta_api::KVApi;
-use common_meta_grpc::ClientHandle;
-use common_meta_grpc::MetaGrpcClient;
+use common_meta_client::ClientHandle;
+use common_meta_client::MetaGrpcClient;
 use common_meta_types::MatchSeq;
 use common_meta_types::Operation;
 use common_meta_types::UpsertKVReq;
diff --git a/src/meta/service/tests/it/grpc/metasrv_grpc_tls.rs b/src/meta/service/tests/it/grpc/metasrv_grpc_tls.rs
@@ -19,7 +19,7 @@ use common_exception::ErrorCode;
 use common_grpc::RpcClientTlsConfig;
 use common_meta_api::KVApi;
 use common_meta_api::SchemaApi;
-use common_meta_grpc::MetaGrpcClient;
+use common_meta_client::MetaGrpcClient;
 use pretty_assertions::assert_eq;
 
 use crate::init_meta_ut;
diff --git a/src/meta/service/tests/it/grpc/metasrv_grpc_watch.rs b/src/meta/service/tests/it/grpc/metasrv_grpc_watch.rs
@@ -18,7 +18,7 @@ use common_base::base::tokio;
 use common_meta_api::get_start_and_end_of_prefix;
 use common_meta_api::prefix_of_string;
 use common_meta_api::KVApi;
-use common_meta_grpc::MetaGrpcClient;
+use common_meta_client::MetaGrpcClient;
 use common_meta_types::protobuf::watch_request::FilterType;
 use common_meta_types::protobuf::Event;
 use common_meta_types::protobuf::SeqV;
diff --git a/src/meta/service/tests/it/tests/service.rs b/src/meta/service/tests/it/tests/service.rs
@@ -22,8 +22,8 @@ use common_base::base::tokio;
 use common_base::base::GlobalSequence;
 use common_base::base::Stoppable;
 use common_meta_api::ApiBuilder;
-use common_meta_grpc::ClientHandle;
-use common_meta_grpc::MetaGrpcClient;
+use common_meta_client::ClientHandle;
+use common_meta_client::MetaGrpcClient;
 use common_meta_sled_store::openraft::NodeId;
 use common_meta_types::protobuf::raft_service_client::RaftServiceClient;
 use common_meta_types::ForwardRequest;
diff --git a/src/meta/store/Cargo.toml b/src/meta/store/Cargo.toml
@@ -19,8 +19,8 @@ io-uring = ["common-meta-embedded/io-uring"]
 common-exception = { path = "../../common/exception" }
 common-grpc = { path = "../../common/grpc" }
 common-meta-api = { path = "../api" }
+common-meta-client = { path = "../client" }
 common-meta-embedded = { path = "../embedded" }
-common-meta-grpc = { path = "../grpc" }
 common-meta-types = { path = "../types" }
 
 # Crates.io dependencies
diff --git a/src/meta/store/src/lib.rs b/src/meta/store/src/lib.rs
@@ -19,9 +19,9 @@ use std::sync::Arc;
 use common_exception::Result;
 use common_grpc::RpcClientConf;
 use common_meta_api::KVApi;
+use common_meta_client::ClientHandle;
+use common_meta_client::MetaGrpcClient;
 use common_meta_embedded::MetaEmbedded;
-use common_meta_grpc::ClientHandle;
-use common_meta_grpc::MetaGrpcClient;
 use common_meta_types::GetKVReply;
 use common_meta_types::ListKVReply;
 use common_meta_types::MGetKVReply;
diff --git a/src/query/service/Cargo.toml b/src/query/service/Cargo.toml
@@ -49,8 +49,8 @@ common-legacy-parser = { path = "../legacy-parser" }
 common-management = { path = "../management" }
 common-meta-api = { path = "../../meta/api" }
 common-meta-app = { path = "../../meta/app" }
+common-meta-client = { path = "../../meta/client" }
 common-meta-embedded = { path = "../../meta/embedded" }
-common-meta-grpc = { path = "../../meta/grpc" }
 common-meta-raft-store = { path = "../../meta/raft-store" }
 common-meta-sled-store = { path = "../../meta/sled-store" }
 common-meta-store = { path = "../../meta/store" }
