chore: upgrade tonic and prost family to v0.14 (#301)
* chore: upgrade tonic and prost family to v0.14 * fix ci
This commit is contained in:
+5
-4
@@ -5,13 +5,14 @@ edition = "2021"
|
|||||||
license = "Apache-2.0"
|
license = "Apache-2.0"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
prost = "0.13"
|
prost = "0.14"
|
||||||
prost-types = "0.13"
|
prost-types = "0.14"
|
||||||
serde = { version = "1.0", features = ["derive"] }
|
serde = { version = "1.0", features = ["derive"] }
|
||||||
serde_json = "1.0"
|
serde_json = "1.0"
|
||||||
strum = "0.25"
|
strum = "0.25"
|
||||||
strum_macros = "0.25"
|
strum_macros = "0.25"
|
||||||
tonic = "0.13"
|
tonic = "0.14"
|
||||||
|
tonic-prost = "0.14"
|
||||||
|
|
||||||
[build-dependencies]
|
[build-dependencies]
|
||||||
tonic-build = "0.13"
|
tonic-prost-build = "0.14"
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ fn main() {
|
|||||||
.expect("cargo built-in env value 'OUT_DIR' must be set during compilation"),
|
.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"))
|
.file_descriptor_set_path(out_dir.join("greptime_grpc_desc.bin"))
|
||||||
.type_attribute(
|
.type_attribute(
|
||||||
".greptime.v1.SemanticType",
|
".greptime.v1.SemanticType",
|
||||||
@@ -50,7 +50,7 @@ fn main() {
|
|||||||
"region.RegionRequest.body",
|
"region.RegionRequest.body",
|
||||||
"#[derive(strum_macros::AsRefStr)]",
|
"#[derive(strum_macros::AsRefStr)]",
|
||||||
)
|
)
|
||||||
.bytes([".greptime.v1.ArrowIpc"])
|
.bytes(".greptime.v1.ArrowIpc")
|
||||||
.compile_protos(
|
.compile_protos(
|
||||||
&[
|
&[
|
||||||
"proto/greptime/v1/database.proto",
|
"proto/greptime/v1/database.proto",
|
||||||
|
|||||||
@@ -53,8 +53,7 @@ class Heartbeat final {
|
|||||||
public:
|
public:
|
||||||
virtual ~StubInterface() {}
|
virtual ~StubInterface() {}
|
||||||
// Heartbeat, there may be many contents of the heartbeat, such as:
|
// Heartbeat, there may be many contents of the heartbeat, such as:
|
||||||
// 1. Metadata to be registered to meta server and discoverable by other
|
// 1. Metadata to be registered to meta server and discoverable by other nodes.
|
||||||
// nodes.
|
|
||||||
// 2. Some performance metrics, such as Load, CPU usage, etc.
|
// 2. Some performance metrics, such as Load, CPU usage, etc.
|
||||||
// 3. The number of computing tasks being executed.
|
// 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) {
|
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:
|
public:
|
||||||
virtual ~async_interface() {}
|
virtual ~async_interface() {}
|
||||||
// Heartbeat, there may be many contents of the heartbeat, such as:
|
// Heartbeat, there may be many contents of the heartbeat, such as:
|
||||||
// 1. Metadata to be registered to meta server and discoverable by other
|
// 1. Metadata to be registered to meta server and discoverable by other nodes.
|
||||||
// nodes.
|
|
||||||
// 2. Some performance metrics, such as Load, CPU usage, etc.
|
// 2. Some performance metrics, such as Load, CPU usage, etc.
|
||||||
// 3. The number of computing tasks being executed.
|
// 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;
|
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();
|
Service();
|
||||||
virtual ~Service();
|
virtual ~Service();
|
||||||
// Heartbeat, there may be many contents of the heartbeat, such as:
|
// Heartbeat, there may be many contents of the heartbeat, such as:
|
||||||
// 1. Metadata to be registered to meta server and discoverable by other
|
// 1. Metadata to be registered to meta server and discoverable by other nodes.
|
||||||
// nodes.
|
|
||||||
// 2. Some performance metrics, such as Load, CPU usage, etc.
|
// 2. Some performance metrics, such as Load, CPU usage, etc.
|
||||||
// 3. The number of computing tasks being executed.
|
// 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);
|
virtual ::grpc::Status Heartbeat(::grpc::ServerContext* context, ::grpc::ServerReaderWriter< ::greptime::v1::meta::HeartbeatResponse, ::greptime::v1::meta::HeartbeatRequest>* stream);
|
||||||
|
|||||||
@@ -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.
|
// 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 {
|
type HeartbeatClient interface {
|
||||||
// Heartbeat, there may be many contents of the heartbeat, such as:
|
// Heartbeat, there may be many contents of the heartbeat, such as:
|
||||||
// 1. Metadata to be registered to meta server and discoverable by other
|
// 1. Metadata to be registered to meta server and discoverable by other nodes.
|
||||||
// nodes.
|
// 2. Some performance metrics, such as Load, CPU usage, etc.
|
||||||
// 2. Some performance metrics, such as Load, CPU usage, etc.
|
// 3. The number of computing tasks being executed.
|
||||||
// 3. The number of computing tasks being executed.
|
|
||||||
Heartbeat(ctx context.Context, opts ...grpc.CallOption) (Heartbeat_HeartbeatClient, error)
|
Heartbeat(ctx context.Context, opts ...grpc.CallOption) (Heartbeat_HeartbeatClient, error)
|
||||||
// Ask leader's endpoint.
|
// Ask leader's endpoint.
|
||||||
AskLeader(ctx context.Context, in *AskLeaderRequest, opts ...grpc.CallOption) (*AskLeaderResponse, error)
|
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
|
// for forward compatibility
|
||||||
type HeartbeatServer interface {
|
type HeartbeatServer interface {
|
||||||
// Heartbeat, there may be many contents of the heartbeat, such as:
|
// Heartbeat, there may be many contents of the heartbeat, such as:
|
||||||
// 1. Metadata to be registered to meta server and discoverable by other
|
// 1. Metadata to be registered to meta server and discoverable by other nodes.
|
||||||
// nodes.
|
// 2. Some performance metrics, such as Load, CPU usage, etc.
|
||||||
// 2. Some performance metrics, such as Load, CPU usage, etc.
|
// 3. The number of computing tasks being executed.
|
||||||
// 3. The number of computing tasks being executed.
|
|
||||||
Heartbeat(Heartbeat_HeartbeatServer) error
|
Heartbeat(Heartbeat_HeartbeatServer) error
|
||||||
// Ask leader's endpoint.
|
// Ask leader's endpoint.
|
||||||
AskLeader(context.Context, *AskLeaderRequest) (*AskLeaderResponse, error)
|
AskLeader(context.Context, *AskLeaderRequest) (*AskLeaderResponse, error)
|
||||||
|
|||||||
@@ -6151,7 +6151,7 @@ com.google.protobuf.ByteString defaultValue);
|
|||||||
*
|
*
|
||||||
* <code>uint32 cpus = 4 [deprecated = true];</code>
|
* <code>uint32 cpus = 4 [deprecated = true];</code>
|
||||||
* @deprecated greptime.v1.meta.NodeInfo.cpus is deprecated.
|
* @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.
|
* @return The cpus.
|
||||||
*/
|
*/
|
||||||
@java.lang.Deprecated int getCpus();
|
@java.lang.Deprecated int getCpus();
|
||||||
@@ -6163,7 +6163,7 @@ com.google.protobuf.ByteString defaultValue);
|
|||||||
*
|
*
|
||||||
* <code>uint64 memory_bytes = 5 [deprecated = true];</code>
|
* <code>uint64 memory_bytes = 5 [deprecated = true];</code>
|
||||||
* @deprecated greptime.v1.meta.NodeInfo.memory_bytes is deprecated.
|
* @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.
|
* @return The memoryBytes.
|
||||||
*/
|
*/
|
||||||
@java.lang.Deprecated long getMemoryBytes();
|
@java.lang.Deprecated long getMemoryBytes();
|
||||||
@@ -6479,7 +6479,7 @@ com.google.protobuf.ByteString defaultValue);
|
|||||||
*
|
*
|
||||||
* <code>uint32 cpus = 4 [deprecated = true];</code>
|
* <code>uint32 cpus = 4 [deprecated = true];</code>
|
||||||
* @deprecated greptime.v1.meta.NodeInfo.cpus is deprecated.
|
* @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.
|
* @return The cpus.
|
||||||
*/
|
*/
|
||||||
@java.lang.Override
|
@java.lang.Override
|
||||||
@@ -6496,7 +6496,7 @@ com.google.protobuf.ByteString defaultValue);
|
|||||||
*
|
*
|
||||||
* <code>uint64 memory_bytes = 5 [deprecated = true];</code>
|
* <code>uint64 memory_bytes = 5 [deprecated = true];</code>
|
||||||
* @deprecated greptime.v1.meta.NodeInfo.memory_bytes is deprecated.
|
* @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.
|
* @return The memoryBytes.
|
||||||
*/
|
*/
|
||||||
@java.lang.Override
|
@java.lang.Override
|
||||||
@@ -7314,7 +7314,7 @@ com.google.protobuf.ByteString defaultValue);
|
|||||||
*
|
*
|
||||||
* <code>uint32 cpus = 4 [deprecated = true];</code>
|
* <code>uint32 cpus = 4 [deprecated = true];</code>
|
||||||
* @deprecated greptime.v1.meta.NodeInfo.cpus is deprecated.
|
* @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.
|
* @return The cpus.
|
||||||
*/
|
*/
|
||||||
@java.lang.Override
|
@java.lang.Override
|
||||||
@@ -7328,7 +7328,7 @@ com.google.protobuf.ByteString defaultValue);
|
|||||||
*
|
*
|
||||||
* <code>uint32 cpus = 4 [deprecated = true];</code>
|
* <code>uint32 cpus = 4 [deprecated = true];</code>
|
||||||
* @deprecated greptime.v1.meta.NodeInfo.cpus is deprecated.
|
* @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.
|
* @param value The cpus to set.
|
||||||
* @return This builder for chaining.
|
* @return This builder for chaining.
|
||||||
*/
|
*/
|
||||||
@@ -7345,7 +7345,7 @@ com.google.protobuf.ByteString defaultValue);
|
|||||||
*
|
*
|
||||||
* <code>uint32 cpus = 4 [deprecated = true];</code>
|
* <code>uint32 cpus = 4 [deprecated = true];</code>
|
||||||
* @deprecated greptime.v1.meta.NodeInfo.cpus is deprecated.
|
* @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.
|
* @return This builder for chaining.
|
||||||
*/
|
*/
|
||||||
@java.lang.Deprecated public Builder clearCpus() {
|
@java.lang.Deprecated public Builder clearCpus() {
|
||||||
@@ -7363,7 +7363,7 @@ com.google.protobuf.ByteString defaultValue);
|
|||||||
*
|
*
|
||||||
* <code>uint64 memory_bytes = 5 [deprecated = true];</code>
|
* <code>uint64 memory_bytes = 5 [deprecated = true];</code>
|
||||||
* @deprecated greptime.v1.meta.NodeInfo.memory_bytes is deprecated.
|
* @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.
|
* @return The memoryBytes.
|
||||||
*/
|
*/
|
||||||
@java.lang.Override
|
@java.lang.Override
|
||||||
@@ -7377,7 +7377,7 @@ com.google.protobuf.ByteString defaultValue);
|
|||||||
*
|
*
|
||||||
* <code>uint64 memory_bytes = 5 [deprecated = true];</code>
|
* <code>uint64 memory_bytes = 5 [deprecated = true];</code>
|
||||||
* @deprecated greptime.v1.meta.NodeInfo.memory_bytes is deprecated.
|
* @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.
|
* @param value The memoryBytes to set.
|
||||||
* @return This builder for chaining.
|
* @return This builder for chaining.
|
||||||
*/
|
*/
|
||||||
@@ -7394,7 +7394,7 @@ com.google.protobuf.ByteString defaultValue);
|
|||||||
*
|
*
|
||||||
* <code>uint64 memory_bytes = 5 [deprecated = true];</code>
|
* <code>uint64 memory_bytes = 5 [deprecated = true];</code>
|
||||||
* @deprecated greptime.v1.meta.NodeInfo.memory_bytes is deprecated.
|
* @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.
|
* @return This builder for chaining.
|
||||||
*/
|
*/
|
||||||
@java.lang.Deprecated public Builder clearMemoryBytes() {
|
@java.lang.Deprecated public Builder clearMemoryBytes() {
|
||||||
|
|||||||
@@ -22,8 +22,7 @@ option go_package = "github.com/GreptimeTeam/greptime-proto/go/greptime/v1/meta"
|
|||||||
|
|
||||||
service Heartbeat {
|
service Heartbeat {
|
||||||
// Heartbeat, there may be many contents of the heartbeat, such as:
|
// Heartbeat, there may be many contents of the heartbeat, such as:
|
||||||
// 1. Metadata to be registered to meta server and discoverable by other
|
// 1. Metadata to be registered to meta server and discoverable by other nodes.
|
||||||
// nodes.
|
|
||||||
// 2. Some performance metrics, such as Load, CPU usage, etc.
|
// 2. Some performance metrics, such as Load, CPU usage, etc.
|
||||||
// 3. The number of computing tasks being executed.
|
// 3. The number of computing tasks being executed.
|
||||||
rpc Heartbeat(stream HeartbeatRequest) returns (stream HeartbeatResponse) {}
|
rpc Heartbeat(stream HeartbeatRequest) returns (stream HeartbeatResponse) {}
|
||||||
|
|||||||
+1
-11
@@ -18,7 +18,7 @@ mod mailbox;
|
|||||||
|
|
||||||
use std::collections::HashMap;
|
use std::collections::HashMap;
|
||||||
use std::fmt::{Display, Formatter};
|
use std::fmt::{Display, Formatter};
|
||||||
use std::hash::{Hash, Hasher};
|
use std::hash::Hash;
|
||||||
|
|
||||||
pub const PROTOCOL_VERSION: u64 = 1;
|
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 {
|
impl Display for Peer {
|
||||||
fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
|
fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
|
||||||
write!(f, "peer-{}({})", self.id, self.addr)
|
write!(f, "peer-{}({})", self.id, self.addr)
|
||||||
|
|||||||
Reference in New Issue
Block a user