Dima/orion_greptime_proto
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: upgrade tonic and prost family to v0.14 (#301)

Browse Source 
* chore: upgrade tonic and prost family to v0.14

* fix ci
This commit is contained in:
LFC
2026-01-14 17:34:01 +08:00
committed by GitHub
parent 58aeee4926
commit 1353b0ada9
7 changed files with 28 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Cargo.toml
+5 -4
View File
@@ -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"
build.rs
+2 -2
View File
@@ -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",
c++/greptime/v1/meta/heartbeat.grpc.pb.h
+3 -6
View File
@@ -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);
go/greptime/v1/meta/heartbeat_grpc.pb.go
+6 -8
View File
@@ -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)
java/src/main/java/greptime/v1/meta/HeartbeatOuterClass.java
+10 -10
View File
@@ -6151,7 +6151,7 @@ com.google.protobuf.ByteString defaultValue);
*
* <code>uint32 cpus = 4 [deprecated = true];</code>
* @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);
*
* <code>uint64 memory_bytes = 5 [deprecated = true];</code>
* @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);
*
* <code>uint32 cpus = 4 [deprecated = true];</code>
* @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);
*
* <code>uint64 memory_bytes = 5 [deprecated = true];</code>
* @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);
*
* <code>uint32 cpus = 4 [deprecated = true];</code>
* @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);
*
* <code>uint32 cpus = 4 [deprecated = true];</code>
* @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);
*
* <code>uint32 cpus = 4 [deprecated = true];</code>
* @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);
*
* <code>uint64 memory_bytes = 5 [deprecated = true];</code>
* @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);
*
* <code>uint64 memory_bytes = 5 [deprecated = true];</code>
* @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);
*
* <code>uint64 memory_bytes = 5 [deprecated = true];</code>
* @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() {
proto/greptime/v1/meta/heartbeat.proto
+1 -2
View File
@@ -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) {}
src/v1/meta.rs
+1 -11
View File
@@ -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<H: Hasher>(&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)