From 1353b0ada9e17890c7ba0e402ba29b2b57816ff1 Mon Sep 17 00:00:00 2001 From: LFC <990479+MichaelScofield@users.noreply.github.com> Date: Wed, 14 Jan 2026 17:34:01 +0800 Subject: [PATCH] chore: upgrade tonic and prost family to v0.14 (#301) * chore: upgrade tonic and prost family to v0.14 * fix ci --- Cargo.toml | 9 +++++---- build.rs | 4 ++-- c++/greptime/v1/meta/heartbeat.grpc.pb.h | 9 +++------ go/greptime/v1/meta/heartbeat_grpc.pb.go | 14 ++++++------- .../greptime/v1/meta/HeartbeatOuterClass.java | 20 +++++++++---------- proto/greptime/v1/meta/heartbeat.proto | 3 +-- src/v1/meta.rs | 12 +---------- 7 files changed, 28 insertions(+), 43 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 92ab30d..b9547df 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,13 +5,14 @@ edition = "2021" license = "Apache-2.0" [dependencies] -prost = "0.13" -prost-types = "0.13" +prost = "0.14" +prost-types = "0.14" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" strum = "0.25" strum_macros = "0.25" -tonic = "0.13" +tonic = "0.14" +tonic-prost = "0.14" [build-dependencies] -tonic-build = "0.13" +tonic-prost-build = "0.14" diff --git a/build.rs b/build.rs index 131fce1..e5d6214 100644 --- a/build.rs +++ b/build.rs @@ -20,7 +20,7 @@ fn main() { .expect("cargo built-in env value 'OUT_DIR' must be set during compilation"), ); - tonic_build::configure() + tonic_prost_build::configure() .file_descriptor_set_path(out_dir.join("greptime_grpc_desc.bin")) .type_attribute( ".greptime.v1.SemanticType", @@ -50,7 +50,7 @@ fn main() { "region.RegionRequest.body", "#[derive(strum_macros::AsRefStr)]", ) - .bytes([".greptime.v1.ArrowIpc"]) + .bytes(".greptime.v1.ArrowIpc") .compile_protos( &[ "proto/greptime/v1/database.proto", diff --git a/c++/greptime/v1/meta/heartbeat.grpc.pb.h b/c++/greptime/v1/meta/heartbeat.grpc.pb.h index 8be77ec..199f038 100644 --- a/c++/greptime/v1/meta/heartbeat.grpc.pb.h +++ b/c++/greptime/v1/meta/heartbeat.grpc.pb.h @@ -53,8 +53,7 @@ class Heartbeat final { public: virtual ~StubInterface() {} // Heartbeat, there may be many contents of the heartbeat, such as: - // 1. Metadata to be registered to meta server and discoverable by other - // nodes. + // 1. Metadata to be registered to meta server and discoverable by other nodes. // 2. Some performance metrics, such as Load, CPU usage, etc. // 3. The number of computing tasks being executed. std::unique_ptr< ::grpc::ClientReaderWriterInterface< ::greptime::v1::meta::HeartbeatRequest, ::greptime::v1::meta::HeartbeatResponse>> Heartbeat(::grpc::ClientContext* context) { @@ -78,8 +77,7 @@ class Heartbeat final { public: virtual ~async_interface() {} // Heartbeat, there may be many contents of the heartbeat, such as: - // 1. Metadata to be registered to meta server and discoverable by other - // nodes. + // 1. Metadata to be registered to meta server and discoverable by other nodes. // 2. Some performance metrics, such as Load, CPU usage, etc. // 3. The number of computing tasks being executed. virtual void Heartbeat(::grpc::ClientContext* context, ::grpc::ClientBidiReactor< ::greptime::v1::meta::HeartbeatRequest,::greptime::v1::meta::HeartbeatResponse>* reactor) = 0; @@ -148,8 +146,7 @@ class Heartbeat final { Service(); virtual ~Service(); // Heartbeat, there may be many contents of the heartbeat, such as: - // 1. Metadata to be registered to meta server and discoverable by other - // nodes. + // 1. Metadata to be registered to meta server and discoverable by other nodes. // 2. Some performance metrics, such as Load, CPU usage, etc. // 3. The number of computing tasks being executed. virtual ::grpc::Status Heartbeat(::grpc::ServerContext* context, ::grpc::ServerReaderWriter< ::greptime::v1::meta::HeartbeatResponse, ::greptime::v1::meta::HeartbeatRequest>* stream); diff --git a/go/greptime/v1/meta/heartbeat_grpc.pb.go b/go/greptime/v1/meta/heartbeat_grpc.pb.go index d342b83..814728d 100644 --- a/go/greptime/v1/meta/heartbeat_grpc.pb.go +++ b/go/greptime/v1/meta/heartbeat_grpc.pb.go @@ -23,10 +23,9 @@ const _ = grpc.SupportPackageIsVersion7 // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. type HeartbeatClient interface { // Heartbeat, there may be many contents of the heartbeat, such as: - // 1. Metadata to be registered to meta server and discoverable by other - // nodes. - // 2. Some performance metrics, such as Load, CPU usage, etc. - // 3. The number of computing tasks being executed. + // 1. Metadata to be registered to meta server and discoverable by other nodes. + // 2. Some performance metrics, such as Load, CPU usage, etc. + // 3. The number of computing tasks being executed. Heartbeat(ctx context.Context, opts ...grpc.CallOption) (Heartbeat_HeartbeatClient, error) // Ask leader's endpoint. AskLeader(ctx context.Context, in *AskLeaderRequest, opts ...grpc.CallOption) (*AskLeaderResponse, error) @@ -85,10 +84,9 @@ func (c *heartbeatClient) AskLeader(ctx context.Context, in *AskLeaderRequest, o // for forward compatibility type HeartbeatServer interface { // Heartbeat, there may be many contents of the heartbeat, such as: - // 1. Metadata to be registered to meta server and discoverable by other - // nodes. - // 2. Some performance metrics, such as Load, CPU usage, etc. - // 3. The number of computing tasks being executed. + // 1. Metadata to be registered to meta server and discoverable by other nodes. + // 2. Some performance metrics, such as Load, CPU usage, etc. + // 3. The number of computing tasks being executed. Heartbeat(Heartbeat_HeartbeatServer) error // Ask leader's endpoint. AskLeader(context.Context, *AskLeaderRequest) (*AskLeaderResponse, error) diff --git a/java/src/main/java/greptime/v1/meta/HeartbeatOuterClass.java b/java/src/main/java/greptime/v1/meta/HeartbeatOuterClass.java index 3b3f71f..ee1b76a 100644 --- a/java/src/main/java/greptime/v1/meta/HeartbeatOuterClass.java +++ b/java/src/main/java/greptime/v1/meta/HeartbeatOuterClass.java @@ -6151,7 +6151,7 @@ com.google.protobuf.ByteString defaultValue); * * uint32 cpus = 4 [deprecated = true]; * @deprecated greptime.v1.meta.NodeInfo.cpus is deprecated. - * See greptime/v1/meta/heartbeat.proto;l=97 + * See greptime/v1/meta/heartbeat.proto;l=96 * @return The cpus. */ @java.lang.Deprecated int getCpus(); @@ -6163,7 +6163,7 @@ com.google.protobuf.ByteString defaultValue); * * uint64 memory_bytes = 5 [deprecated = true]; * @deprecated greptime.v1.meta.NodeInfo.memory_bytes is deprecated. - * See greptime/v1/meta/heartbeat.proto;l=99 + * See greptime/v1/meta/heartbeat.proto;l=98 * @return The memoryBytes. */ @java.lang.Deprecated long getMemoryBytes(); @@ -6479,7 +6479,7 @@ com.google.protobuf.ByteString defaultValue); * * uint32 cpus = 4 [deprecated = true]; * @deprecated greptime.v1.meta.NodeInfo.cpus is deprecated. - * See greptime/v1/meta/heartbeat.proto;l=97 + * See greptime/v1/meta/heartbeat.proto;l=96 * @return The cpus. */ @java.lang.Override @@ -6496,7 +6496,7 @@ com.google.protobuf.ByteString defaultValue); * * uint64 memory_bytes = 5 [deprecated = true]; * @deprecated greptime.v1.meta.NodeInfo.memory_bytes is deprecated. - * See greptime/v1/meta/heartbeat.proto;l=99 + * See greptime/v1/meta/heartbeat.proto;l=98 * @return The memoryBytes. */ @java.lang.Override @@ -7314,7 +7314,7 @@ com.google.protobuf.ByteString defaultValue); * * uint32 cpus = 4 [deprecated = true]; * @deprecated greptime.v1.meta.NodeInfo.cpus is deprecated. - * See greptime/v1/meta/heartbeat.proto;l=97 + * See greptime/v1/meta/heartbeat.proto;l=96 * @return The cpus. */ @java.lang.Override @@ -7328,7 +7328,7 @@ com.google.protobuf.ByteString defaultValue); * * uint32 cpus = 4 [deprecated = true]; * @deprecated greptime.v1.meta.NodeInfo.cpus is deprecated. - * See greptime/v1/meta/heartbeat.proto;l=97 + * See greptime/v1/meta/heartbeat.proto;l=96 * @param value The cpus to set. * @return This builder for chaining. */ @@ -7345,7 +7345,7 @@ com.google.protobuf.ByteString defaultValue); * * uint32 cpus = 4 [deprecated = true]; * @deprecated greptime.v1.meta.NodeInfo.cpus is deprecated. - * See greptime/v1/meta/heartbeat.proto;l=97 + * See greptime/v1/meta/heartbeat.proto;l=96 * @return This builder for chaining. */ @java.lang.Deprecated public Builder clearCpus() { @@ -7363,7 +7363,7 @@ com.google.protobuf.ByteString defaultValue); * * uint64 memory_bytes = 5 [deprecated = true]; * @deprecated greptime.v1.meta.NodeInfo.memory_bytes is deprecated. - * See greptime/v1/meta/heartbeat.proto;l=99 + * See greptime/v1/meta/heartbeat.proto;l=98 * @return The memoryBytes. */ @java.lang.Override @@ -7377,7 +7377,7 @@ com.google.protobuf.ByteString defaultValue); * * uint64 memory_bytes = 5 [deprecated = true]; * @deprecated greptime.v1.meta.NodeInfo.memory_bytes is deprecated. - * See greptime/v1/meta/heartbeat.proto;l=99 + * See greptime/v1/meta/heartbeat.proto;l=98 * @param value The memoryBytes to set. * @return This builder for chaining. */ @@ -7394,7 +7394,7 @@ com.google.protobuf.ByteString defaultValue); * * uint64 memory_bytes = 5 [deprecated = true]; * @deprecated greptime.v1.meta.NodeInfo.memory_bytes is deprecated. - * See greptime/v1/meta/heartbeat.proto;l=99 + * See greptime/v1/meta/heartbeat.proto;l=98 * @return This builder for chaining. */ @java.lang.Deprecated public Builder clearMemoryBytes() { diff --git a/proto/greptime/v1/meta/heartbeat.proto b/proto/greptime/v1/meta/heartbeat.proto index 18c2b3f..584bb81 100644 --- a/proto/greptime/v1/meta/heartbeat.proto +++ b/proto/greptime/v1/meta/heartbeat.proto @@ -22,8 +22,7 @@ option go_package = "github.com/GreptimeTeam/greptime-proto/go/greptime/v1/meta" service Heartbeat { // Heartbeat, there may be many contents of the heartbeat, such as: - // 1. Metadata to be registered to meta server and discoverable by other - // nodes. + // 1. Metadata to be registered to meta server and discoverable by other nodes. // 2. Some performance metrics, such as Load, CPU usage, etc. // 3. The number of computing tasks being executed. rpc Heartbeat(stream HeartbeatRequest) returns (stream HeartbeatResponse) {} diff --git a/src/v1/meta.rs b/src/v1/meta.rs index dfdb22f..c67b09a 100644 --- a/src/v1/meta.rs +++ b/src/v1/meta.rs @@ -18,7 +18,7 @@ mod mailbox; use std::collections::HashMap; use std::fmt::{Display, Formatter}; -use std::hash::{Hash, Hasher}; +use std::hash::Hash; pub const PROTOCOL_VERSION: u64 = 1; @@ -48,16 +48,6 @@ impl PeerDict { } } -#[allow(clippy::derived_hash_with_manual_eq)] -impl Hash for Peer { - fn hash(&self, state: &mut H) { - self.id.hash(state); - self.addr.hash(state); - } -} - -impl Eq for Peer {} - impl Display for Peer { fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result { write!(f, "peer-{}({})", self.id, self.addr)