From 4a09d62e952cafdaa5af1d983eeb6df13ff5bf9d Mon Sep 17 00:00:00 2001
From: "chunshao.rcs" <chunshao.rcs@antgroup.com>
Date: Thu, 28 Dec 2023 16:03:53 +0800
Subject: [PATCH] feat: upgrade horaedbproto

---
 Cargo.lock                   | 44 +++++++++++++++++++++++-------------
 Cargo.toml                   |  2 +-
 meta_client/src/meta_impl.rs |  4 ++--
 3 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5765b96156..7c79e49865 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -104,7 +104,7 @@ dependencies = [
  "futures 0.3.28",
  "generic_error",
  "hex",
- "horaedbproto",
+ "horaedbproto 2.0.0",
  "hyperloglog",
  "id_allocator",
  "itertools 0.10.5",
@@ -1440,7 +1440,7 @@ dependencies = [
  "etcd-client",
  "future_ext",
  "generic_error",
- "horaedbproto",
+ "horaedbproto 2.0.0",
  "logger",
  "macros",
  "meta_client",
@@ -1517,7 +1517,7 @@ dependencies = [
  "chrono",
  "datafusion",
  "hash_ext",
- "horaedbproto",
+ "horaedbproto 2.0.0",
  "macros",
  "paste 1.0.12",
  "prost",
@@ -2274,7 +2274,7 @@ dependencies = [
  "datafusion-proto",
  "futures 0.3.28",
  "generic_error",
- "horaedbproto",
+ "horaedbproto 2.0.0",
  "insta",
  "lazy_static",
  "prometheus 0.12.0",
@@ -3037,7 +3037,7 @@ dependencies = [
  "async-trait",
  "dashmap 5.4.0",
  "futures 0.3.28",
- "horaedbproto",
+ "horaedbproto 1.0.24",
  "paste 1.0.12",
  "thiserror",
  "tokio",
@@ -3073,6 +3073,18 @@ dependencies = [
  "walkdir",
 ]
 
+[[package]]
+name = "horaedbproto"
+version = "2.0.0"
+source = "git+https://github.com/apache/incubator-horaedb-proto.git?rev=92152841fc8a10729d6864d2873c62b7a334b2bd#92152841fc8a10729d6864d2873c62b7a334b2bd"
+dependencies = [
+ "prost",
+ "protoc-bin-vendored",
+ "tonic 0.8.3",
+ "tonic-build",
+ "walkdir",
+]
+
 [[package]]
 name = "http"
 version = "0.2.9"
@@ -3905,7 +3917,7 @@ dependencies = [
  "common_types",
  "futures 0.3.28",
  "generic_error",
- "horaedbproto",
+ "horaedbproto 2.0.0",
  "logger",
  "macros",
  "prost",
@@ -4433,7 +4445,7 @@ dependencies = [
  "futures 0.3.28",
  "generic_error",
  "hash_ext",
- "horaedbproto",
+ "horaedbproto 2.0.0",
  "lazy_static",
  "logger",
  "lru 0.7.8",
@@ -5311,7 +5323,7 @@ dependencies = [
  "df_operator",
  "futures 0.3.28",
  "generic_error",
- "horaedbproto",
+ "horaedbproto 2.0.0",
  "http",
  "influxdb-line-protocol",
  "interpreters",
@@ -5439,7 +5451,7 @@ dependencies = [
  "df_operator",
  "generic_error",
  "hash_ext",
- "horaedbproto",
+ "horaedbproto 2.0.0",
  "influxdb_influxql_parser",
  "iox_query_influxql",
  "itertools 0.10.5",
@@ -5745,7 +5757,7 @@ dependencies = [
  "common_types",
  "futures 0.3.28",
  "generic_error",
- "horaedbproto",
+ "horaedbproto 2.0.0",
  "logger",
  "macros",
  "router",
@@ -5874,7 +5886,7 @@ dependencies = [
  "cluster",
  "common_types",
  "generic_error",
- "horaedbproto",
+ "horaedbproto 2.0.0",
  "logger",
  "macros",
  "meta_client",
@@ -6255,7 +6267,7 @@ dependencies = [
  "future_ext",
  "futures 0.3.28",
  "generic_error",
- "horaedbproto",
+ "horaedbproto 2.0.0",
  "http",
  "influxdb-line-protocol",
  "interpreters",
@@ -6776,7 +6788,7 @@ dependencies = [
  "common_types",
  "futures 0.3.28",
  "generic_error",
- "horaedbproto",
+ "horaedbproto 2.0.0",
  "logger",
  "macros",
  "prost",
@@ -6801,7 +6813,7 @@ dependencies = [
  "futures 0.3.28",
  "generic_error",
  "hash_ext",
- "horaedbproto",
+ "horaedbproto 2.0.0",
  "itertools 0.10.5",
  "lazy_static",
  "logger",
@@ -6999,7 +7011,7 @@ version = "1.2.6-alpha"
 dependencies = [
  "chrono",
  "common_types",
- "horaedbproto",
+ "horaedbproto 2.0.0",
  "macros",
  "serde",
  "serde_json",
@@ -7654,7 +7666,7 @@ dependencies = [
  "common_types",
  "futures 0.3.28",
  "generic_error",
- "horaedbproto",
+ "horaedbproto 2.0.0",
  "lazy_static",
  "logger",
  "macros",
diff --git a/Cargo.toml b/Cargo.toml
index 263cf63be4..324e63fe69 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -97,7 +97,7 @@ bytes = "1"
 bytes_ext = { path = "components/bytes_ext" }
 catalog = { path = "catalog" }
 catalog_impls = { path = "catalog_impls" }
-horaedbproto = "1.0.24"
+horaedbproto = { git = "https://github.com/apache/incubator-horaedb-proto.git", rev = "92152841fc8a10729d6864d2873c62b7a334b2bd" }
 codec = { path = "components/codec" }
 chrono = "0.4"
 clap = "3.0"
diff --git a/meta_client/src/meta_impl.rs b/meta_client/src/meta_impl.rs
index b43a248129..5ba98de5fc 100644
--- a/meta_client/src/meta_impl.rs
+++ b/meta_client/src/meta_impl.rs
@@ -21,7 +21,7 @@ use async_trait::async_trait;
 use generic_error::BoxError;
 use horaedbproto::{
     common::ResponseHeader,
-    meta_service::{self, ceresmeta_rpc_service_client::CeresmetaRpcServiceClient},
+    meta_service::{self, meta_rpc_service_client::MetaRpcServiceClient},
 };
 use logger::{debug, info};
 use serde::{Deserialize, Serialize};
@@ -39,7 +39,7 @@ use crate::{
     FailRouteTables, FailSendHeartbeat, MetaClient, MetaClientRef, MissingHeader, Result,
 };
 
-type MetaServiceGrpcClient = CeresmetaRpcServiceClient<tonic::transport::Channel>;
+type MetaServiceGrpcClient = MetaRpcServiceClient<tonic::transport::Channel>;
 
 #[derive(Debug, Deserialize, Clone, Serialize)]
 #[serde(default)]