From 9a0d19afc28801cf7776d5c83be2769b786c04e4 Mon Sep 17 00:00:00 2001 From: Gaius Date: Fri, 28 Jul 2023 14:43:04 +0800 Subject: [PATCH] feat: tonic generates v2 rust code (#159) Signed-off-by: Gaius --- Cargo.toml | 8 +-- proto/common.proto | 12 ++-- proto/dfdaemon.proto | 12 ++-- proto/manager.proto | 6 +- proto/scheduler.proto | 30 ++++----- src/{common.rs => common.v2.rs} | 26 ++++---- src/descriptor.bin | Bin 73331 -> 74118 bytes src/{dfdaemon.rs => dfdaemon.v2.rs} | 46 +++++++------- src/lib.rs | 28 +++++++-- src/{manager.rs => manager.v2.rs} | 67 ++++++++++---------- src/{scheduler.rs => scheduler.v2.rs} | 86 +++++++++++++------------- 11 files changed, 173 insertions(+), 148 deletions(-) rename src/{common.rs => common.v2.rs} (97%) rename src/{dfdaemon.rs => dfdaemon.v2.rs} (95%) rename src/{manager.rs => manager.v2.rs} (96%) rename src/{scheduler.rs => scheduler.v2.rs} (94%) diff --git a/Cargo.toml b/Cargo.toml index ffb4e29..5c3a65d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "dragonfly-api" -version = "2.0.11" +version = "2.0.12" authors = ["Gaius "] edition = "2021" license = "Apache-2.0" @@ -12,9 +12,9 @@ readme = "README.md" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] tonic = "0.9.2" -prost = "0.11" -prost-types = "0.11" -tokio = { version = "1.28.1", features = ["rt-multi-thread", "macros"] } +prost = "0.11.9" +prost-types = "0.11.9" +tokio = { version = "1.29.1", features = ["rt-multi-thread", "macros"] } [build-dependencies] tonic-build = "0.9.2" diff --git a/proto/common.proto b/proto/common.proto index 9e6ae30..83ffdcc 100644 --- a/proto/common.proto +++ b/proto/common.proto @@ -16,7 +16,7 @@ syntax = "proto3"; -package common; +package common.v2; import "google/protobuf/duration.proto"; import "google/protobuf/timestamp.proto"; @@ -191,15 +191,15 @@ message Host { // Host kernel version. string kernel_version = 11; // CPU Stat. - // CPU cpu = 12; + CPU cpu = 12; // Memory Stat. - // Memory memory = 13; + Memory memory = 13; // Network Stat. - // Network network = 14; + Network network = 14; // Disk Stat. - // Disk disk = 15; + Disk disk = 15; // Build information. - // Build build = 16; + Build build = 16; } // CPU Stat. diff --git a/proto/dfdaemon.proto b/proto/dfdaemon.proto index 18f7cf5..5cb225e 100644 --- a/proto/dfdaemon.proto +++ b/proto/dfdaemon.proto @@ -16,7 +16,7 @@ syntax = "proto3"; -package dfdaemon; +package dfdaemon.v2; import "common.proto"; import "google/protobuf/empty.proto"; @@ -42,7 +42,7 @@ message SyncPiecesRequest{ // InterestedPiecesResponse represents interested pieces response of SyncPiecesResponse. message InterestedPiecesResponse { // Interested pieces of task. - repeated common.Piece pieces = 1; + repeated common.v2.Piece pieces = 1; } // SyncPiecesResponse represents response of SyncPieces. @@ -55,13 +55,13 @@ message SyncPiecesResponse { // DownloadTaskRequest represents request of DownloadTask. message DownloadTaskRequest { // Download information. - common.Download download = 1; + common.v2.Download download = 1; } // UploadTaskRequest represents request of UploadTask. message UploadTaskRequest { // Task metadata. - common.Task task = 1; + common.v2.Task task = 1; } // StatTaskRequest represents request of StatTask. @@ -73,7 +73,7 @@ message StatTaskRequest { // StatTaskResponse represents response of StatTask. message StatTaskResponse { // Task metadata. - common.Task task = 1; + common.v2.Task task = 1; } // DeleteTaskRequest represents request of DeleteTask. @@ -94,7 +94,7 @@ service Dfdaemon{ rpc UploadTask(UploadTaskRequest) returns(google.protobuf.Empty); // StatTask stats task information. - rpc StatTask(StatTaskRequest) returns(common.Task); + rpc StatTask(StatTaskRequest) returns(common.v2.Task); // DeleteTask deletes task from p2p network. rpc DeleteTask(DeleteTaskRequest) returns(google.protobuf.Empty); diff --git a/proto/manager.proto b/proto/manager.proto index 5ca9c0e..a1ed0b5 100644 --- a/proto/manager.proto +++ b/proto/manager.proto @@ -16,7 +16,7 @@ syntax = "proto3"; -package manager; +package manager.v2; import "common.proto"; import "google/protobuf/empty.proto"; @@ -261,13 +261,13 @@ message URLPriority { // URL regex. string regex = 1; // URL priority value. - common.Priority value = 2; + common.v2.Priority value = 2; } // ApplicationPriority represents config of application priority. message ApplicationPriority { // Priority value. - common.Priority value = 1; + common.v2.Priority value = 1; // URL priority. repeated URLPriority urls = 2; } diff --git a/proto/scheduler.proto b/proto/scheduler.proto index e7ba214..f033c92 100644 --- a/proto/scheduler.proto +++ b/proto/scheduler.proto @@ -16,7 +16,7 @@ syntax = "proto3"; -package scheduler; +package scheduler.v2; import "common.proto"; import "google/protobuf/empty.proto"; @@ -26,13 +26,13 @@ import "google/protobuf/timestamp.proto"; // RegisterPeerRequest represents peer registered request of AnnouncePeerRequest. message RegisterPeerRequest { // Download information. - common.Download download = 1; + common.v2.Download download = 1; } // RegisterSeedPeerRequest represents seed peer registered request of AnnouncePeerRequest. message RegisterSeedPeerRequest { // Download information. - common.Download download = 1; + common.v2.Download download = 1; } // DownloadPeerStartedRequest represents peer download started request of AnnouncePeerRequest. @@ -76,19 +76,19 @@ message DownloadPeerBackToSourceFailedRequest { // DownloadPieceFinishedRequest represents piece download finished request of AnnouncePeerRequest. message DownloadPieceFinishedRequest { // Piece info. - common.Piece piece = 1; + common.v2.Piece piece = 1; } // DownloadPieceBackToSourceFinishedRequest represents piece download back-to-source finished request of AnnouncePeerRequest. message DownloadPieceBackToSourceFinishedRequest { // Piece info. - common.Piece piece = 1; + common.v2.Piece piece = 1; } // DownloadPieceFailedRequest downloads piece failed request of AnnouncePeerRequest. message DownloadPieceFailedRequest { // Piece info. - common.Piece piece = 1; + common.v2.Piece piece = 1; // Temporary indicates whether the error is temporary. bool temporary = 2; } @@ -118,7 +118,7 @@ message OSSResponse { // DownloadPieceBackToSourceFailedRequest downloads piece back-to-source failed request of AnnouncePeerRequest. message DownloadPieceBackToSourceFailedRequest { // Piece info. - common.Piece piece = 1; + common.v2.Piece piece = 1; oneof response { HTTPResponse http_response = 2; @@ -185,7 +185,7 @@ message SmallTaskResponse { // NormalTaskResponse represents normal task response of AnnouncePeerResponse. message NormalTaskResponse { // Candidate parents. - repeated common.Peer candidate_parents = 1; + repeated common.v2.Peer candidate_parents = 1; // Concurrent downloading piece count from the peers. int32 concurrent_piece_count = 2; } @@ -251,7 +251,7 @@ message StatTaskRequest { // AnnounceHostRequest represents request of AnnounceHost. message AnnounceHostRequest { - common.Host host = 1; + common.v2.Host host = 1; } // LeaveHostRequest represents request of LeaveHost. @@ -267,7 +267,7 @@ message ProbeStartedRequest { // Probe information. message Probe { // Destination host metadata. - common.Host host = 1; + common.v2.Host host = 1; // RTT is the round-trip time sent via this pinger. google.protobuf.Duration rtt = 2; // Probe create time. @@ -283,7 +283,7 @@ message ProbeFinishedRequest { // FailedProbe information. message FailedProbe { // Destination host metadata. - common.Host host = 1; + common.v2.Host host = 1; // The description of probing failed. string description = 2; } @@ -297,7 +297,7 @@ message ProbeFailedRequest { // SyncProbesRequest represents request of SyncProbes. message SyncProbesRequest { // Source host metadata. - common.Host host = 1; + common.v2.Host host = 1; oneof request { ProbeStartedRequest probe_started_request = 2; @@ -309,7 +309,7 @@ message SyncProbesRequest { // SyncProbesResponse represents response of SyncProbes. message SyncProbesResponse { // Hosts needs to be probed. - repeated common.Host hosts = 1; + repeated common.v2.Host hosts = 1; } // Scheduler RPC Service. @@ -318,7 +318,7 @@ service Scheduler{ rpc AnnouncePeer(stream AnnouncePeerRequest) returns(stream AnnouncePeerResponse); // Checks information of peer. - rpc StatPeer(StatPeerRequest)returns(common.Peer); + rpc StatPeer(StatPeerRequest)returns(common.v2.Peer); // LeavePeer releases peer in scheduler. rpc LeavePeer(LeavePeerRequest)returns(google.protobuf.Empty); @@ -328,7 +328,7 @@ service Scheduler{ rpc ExchangePeer(ExchangePeerRequest)returns(ExchangePeerResponse); // Checks information of task. - rpc StatTask(StatTaskRequest)returns(common.Task); + rpc StatTask(StatTaskRequest)returns(common.v2.Task); // AnnounceHost announces host to scheduler. rpc AnnounceHost(AnnounceHostRequest)returns(google.protobuf.Empty); diff --git a/src/common.rs b/src/common.v2.rs similarity index 97% rename from src/common.rs rename to src/common.v2.rs index 8e129d0..ed8cb1e 100644 --- a/src/common.rs +++ b/src/common.v2.rs @@ -133,19 +133,23 @@ pub struct Host { #[prost(string, tag = "10")] pub platform_version: ::prost::alloc::string::String, /// Host kernel version. - /// - /// CPU Stat. - /// CPU cpu = 12; - /// Memory Stat. - /// Memory memory = 13; - /// Network Stat. - /// Network network = 14; - /// Disk Stat. - /// Disk disk = 15; - /// Build information. - /// Build build = 16; #[prost(string, tag = "11")] pub kernel_version: ::prost::alloc::string::String, + /// CPU Stat. + #[prost(message, optional, tag = "12")] + pub cpu: ::core::option::Option, + /// Memory Stat. + #[prost(message, optional, tag = "13")] + pub memory: ::core::option::Option, + /// Network Stat. + #[prost(message, optional, tag = "14")] + pub network: ::core::option::Option, + /// Disk Stat. + #[prost(message, optional, tag = "15")] + pub disk: ::core::option::Option, + /// Build information. + #[prost(message, optional, tag = "16")] + pub build: ::core::option::Option, } /// CPU Stat. #[allow(clippy::derive_partial_eq_without_eq)] diff --git a/src/descriptor.bin b/src/descriptor.bin index 2d515a0d763e519731ee8d4a9dfe4ac84c4bd26a..0dfb081fcf5d59d310623c904d58fc4b49cf8714 100644 GIT binary patch delta 6621 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 diff --git a/src/dfdaemon.rs b/src/dfdaemon.v2.rs similarity index 95% rename from src/dfdaemon.rs rename to src/dfdaemon.v2.rs index a2484ab..7c4f309 100644 --- a/src/dfdaemon.rs +++ b/src/dfdaemon.v2.rs @@ -34,7 +34,7 @@ pub mod sync_pieces_request { pub struct InterestedPiecesResponse { /// Interested pieces of task. #[prost(message, repeated, tag = "1")] - pub pieces: ::prost::alloc::vec::Vec, + pub pieces: ::prost::alloc::vec::Vec, } /// SyncPiecesResponse represents response of SyncPieces. #[allow(clippy::derive_partial_eq_without_eq)] @@ -58,7 +58,7 @@ pub mod sync_pieces_response { pub struct DownloadTaskRequest { /// Download information. #[prost(message, optional, tag = "1")] - pub download: ::core::option::Option, + pub download: ::core::option::Option, } /// UploadTaskRequest represents request of UploadTask. #[allow(clippy::derive_partial_eq_without_eq)] @@ -66,7 +66,7 @@ pub struct DownloadTaskRequest { pub struct UploadTaskRequest { /// Task metadata. #[prost(message, optional, tag = "1")] - pub task: ::core::option::Option, + pub task: ::core::option::Option, } /// StatTaskRequest represents request of StatTask. #[allow(clippy::derive_partial_eq_without_eq)] @@ -82,7 +82,7 @@ pub struct StatTaskRequest { pub struct StatTaskResponse { /// Task metadata. #[prost(message, optional, tag = "1")] - pub task: ::core::option::Option, + pub task: ::core::option::Option, } /// DeleteTaskRequest represents request of DeleteTask. #[allow(clippy::derive_partial_eq_without_eq)] @@ -197,11 +197,11 @@ pub mod dfdaemon_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/dfdaemon.Dfdaemon/SyncPieces", + "/dfdaemon.v2.Dfdaemon/SyncPieces", ); let mut req = request.into_streaming_request(); req.extensions_mut() - .insert(GrpcMethod::new("dfdaemon.Dfdaemon", "SyncPieces")); + .insert(GrpcMethod::new("dfdaemon.v2.Dfdaemon", "SyncPieces")); self.inner.streaming(req, path, codec).await } /// DownloadTask downloads task back-to-source. @@ -220,11 +220,11 @@ pub mod dfdaemon_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/dfdaemon.Dfdaemon/DownloadTask", + "/dfdaemon.v2.Dfdaemon/DownloadTask", ); let mut req = request.into_request(); req.extensions_mut() - .insert(GrpcMethod::new("dfdaemon.Dfdaemon", "DownloadTask")); + .insert(GrpcMethod::new("dfdaemon.v2.Dfdaemon", "DownloadTask")); self.inner.unary(req, path, codec).await } /// UploadTask uploads task to p2p network. @@ -243,11 +243,11 @@ pub mod dfdaemon_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/dfdaemon.Dfdaemon/UploadTask", + "/dfdaemon.v2.Dfdaemon/UploadTask", ); let mut req = request.into_request(); req.extensions_mut() - .insert(GrpcMethod::new("dfdaemon.Dfdaemon", "UploadTask")); + .insert(GrpcMethod::new("dfdaemon.v2.Dfdaemon", "UploadTask")); self.inner.unary(req, path, codec).await } /// StatTask stats task information. @@ -255,7 +255,7 @@ pub mod dfdaemon_client { &mut self, request: impl tonic::IntoRequest, ) -> std::result::Result< - tonic::Response, + tonic::Response, tonic::Status, > { self.inner @@ -269,11 +269,11 @@ pub mod dfdaemon_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/dfdaemon.Dfdaemon/StatTask", + "/dfdaemon.v2.Dfdaemon/StatTask", ); let mut req = request.into_request(); req.extensions_mut() - .insert(GrpcMethod::new("dfdaemon.Dfdaemon", "StatTask")); + .insert(GrpcMethod::new("dfdaemon.v2.Dfdaemon", "StatTask")); self.inner.unary(req, path, codec).await } /// DeleteTask deletes task from p2p network. @@ -292,11 +292,11 @@ pub mod dfdaemon_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/dfdaemon.Dfdaemon/DeleteTask", + "/dfdaemon.v2.Dfdaemon/DeleteTask", ); let mut req = request.into_request(); req.extensions_mut() - .insert(GrpcMethod::new("dfdaemon.Dfdaemon", "DeleteTask")); + .insert(GrpcMethod::new("dfdaemon.v2.Dfdaemon", "DeleteTask")); self.inner.unary(req, path, codec).await } } @@ -334,7 +334,7 @@ pub mod dfdaemon_server { &self, request: tonic::Request, ) -> std::result::Result< - tonic::Response, + tonic::Response, tonic::Status, >; /// DeleteTask deletes task from p2p network. @@ -423,7 +423,7 @@ pub mod dfdaemon_server { fn call(&mut self, req: http::Request) -> Self::Future { let inner = self.inner.clone(); match req.uri().path() { - "/dfdaemon.Dfdaemon/SyncPieces" => { + "/dfdaemon.v2.Dfdaemon/SyncPieces" => { #[allow(non_camel_case_types)] struct SyncPiecesSvc(pub Arc); impl< @@ -470,7 +470,7 @@ pub mod dfdaemon_server { }; Box::pin(fut) } - "/dfdaemon.Dfdaemon/DownloadTask" => { + "/dfdaemon.v2.Dfdaemon/DownloadTask" => { #[allow(non_camel_case_types)] struct DownloadTaskSvc(pub Arc); impl< @@ -516,7 +516,7 @@ pub mod dfdaemon_server { }; Box::pin(fut) } - "/dfdaemon.Dfdaemon/UploadTask" => { + "/dfdaemon.v2.Dfdaemon/UploadTask" => { #[allow(non_camel_case_types)] struct UploadTaskSvc(pub Arc); impl< @@ -560,12 +560,12 @@ pub mod dfdaemon_server { }; Box::pin(fut) } - "/dfdaemon.Dfdaemon/StatTask" => { + "/dfdaemon.v2.Dfdaemon/StatTask" => { #[allow(non_camel_case_types)] struct StatTaskSvc(pub Arc); impl tonic::server::UnaryService for StatTaskSvc { - type Response = super::super::common::Task; + type Response = super::super::super::common::v2::Task; type Future = BoxFuture< tonic::Response, tonic::Status, @@ -602,7 +602,7 @@ pub mod dfdaemon_server { }; Box::pin(fut) } - "/dfdaemon.Dfdaemon/DeleteTask" => { + "/dfdaemon.v2.Dfdaemon/DeleteTask" => { #[allow(non_camel_case_types)] struct DeleteTaskSvc(pub Arc); impl< @@ -684,6 +684,6 @@ pub mod dfdaemon_server { } } impl tonic::server::NamedService for DfdaemonServer { - const NAME: &'static str = "dfdaemon.Dfdaemon"; + const NAME: &'static str = "dfdaemon.v2.Dfdaemon"; } } diff --git a/src/lib.rs b/src/lib.rs index 6df04a2..c6838f0 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,7 +1,27 @@ -pub mod common; -pub mod dfdaemon; -pub mod manager; -pub mod scheduler; +#[path = ""] +pub mod common { + #[path = "common.v2.rs"] + pub mod v2; +} + +#[path = ""] +pub mod dfdaemon { + #[path = "dfdaemon.v2.rs"] + pub mod v2; +} + +#[path = ""] +pub mod manager { + #[path = "manager.v2.rs"] + pub mod v2; +} + +#[path = ""] +pub mod scheduler { + #[path = "scheduler.v2.rs"] + pub mod v2; +} + pub mod security; // FILE_DESCRIPTOR_SET is the serialized FileDescriptorSet of the proto files. diff --git a/src/manager.rs b/src/manager.v2.rs similarity index 96% rename from src/manager.rs rename to src/manager.v2.rs index ba61fd5..5d672d2 100644 --- a/src/manager.rs +++ b/src/manager.v2.rs @@ -329,7 +329,7 @@ pub struct UrlPriority { #[prost(string, tag = "1")] pub regex: ::prost::alloc::string::String, /// URL priority value. - #[prost(enumeration = "super::common::Priority", tag = "2")] + #[prost(enumeration = "super::super::common::v2::Priority", tag = "2")] pub value: i32, } /// ApplicationPriority represents config of application priority. @@ -337,7 +337,7 @@ pub struct UrlPriority { #[derive(Clone, PartialEq, ::prost::Message)] pub struct ApplicationPriority { /// Priority value. - #[prost(enumeration = "super::common::Priority", tag = "1")] + #[prost(enumeration = "super::super::common::v2::Priority", tag = "1")] pub value: i32, /// URL priority. #[prost(message, repeated, tag = "2")] @@ -592,11 +592,11 @@ pub mod manager_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/manager.Manager/GetSeedPeer", + "/manager.v2.Manager/GetSeedPeer", ); let mut req = request.into_request(); req.extensions_mut() - .insert(GrpcMethod::new("manager.Manager", "GetSeedPeer")); + .insert(GrpcMethod::new("manager.v2.Manager", "GetSeedPeer")); self.inner.unary(req, path, codec).await } /// Update SeedPeer configuration. @@ -615,11 +615,11 @@ pub mod manager_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/manager.Manager/UpdateSeedPeer", + "/manager.v2.Manager/UpdateSeedPeer", ); let mut req = request.into_request(); req.extensions_mut() - .insert(GrpcMethod::new("manager.Manager", "UpdateSeedPeer")); + .insert(GrpcMethod::new("manager.v2.Manager", "UpdateSeedPeer")); self.inner.unary(req, path, codec).await } /// Get Scheduler and Scheduler cluster configuration. @@ -638,11 +638,11 @@ pub mod manager_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/manager.Manager/GetScheduler", + "/manager.v2.Manager/GetScheduler", ); let mut req = request.into_request(); req.extensions_mut() - .insert(GrpcMethod::new("manager.Manager", "GetScheduler")); + .insert(GrpcMethod::new("manager.v2.Manager", "GetScheduler")); self.inner.unary(req, path, codec).await } /// Update scheduler configuration. @@ -661,11 +661,11 @@ pub mod manager_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/manager.Manager/UpdateScheduler", + "/manager.v2.Manager/UpdateScheduler", ); let mut req = request.into_request(); req.extensions_mut() - .insert(GrpcMethod::new("manager.Manager", "UpdateScheduler")); + .insert(GrpcMethod::new("manager.v2.Manager", "UpdateScheduler")); self.inner.unary(req, path, codec).await } /// List acitve schedulers configuration. @@ -687,11 +687,11 @@ pub mod manager_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/manager.Manager/ListSchedulers", + "/manager.v2.Manager/ListSchedulers", ); let mut req = request.into_request(); req.extensions_mut() - .insert(GrpcMethod::new("manager.Manager", "ListSchedulers")); + .insert(GrpcMethod::new("manager.v2.Manager", "ListSchedulers")); self.inner.unary(req, path, codec).await } /// Get ObjectStorage configuration. @@ -710,11 +710,11 @@ pub mod manager_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/manager.Manager/GetObjectStorage", + "/manager.v2.Manager/GetObjectStorage", ); let mut req = request.into_request(); req.extensions_mut() - .insert(GrpcMethod::new("manager.Manager", "GetObjectStorage")); + .insert(GrpcMethod::new("manager.v2.Manager", "GetObjectStorage")); self.inner.unary(req, path, codec).await } /// List buckets configuration. @@ -736,11 +736,11 @@ pub mod manager_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/manager.Manager/ListBuckets", + "/manager.v2.Manager/ListBuckets", ); let mut req = request.into_request(); req.extensions_mut() - .insert(GrpcMethod::new("manager.Manager", "ListBuckets")); + .insert(GrpcMethod::new("manager.v2.Manager", "ListBuckets")); self.inner.unary(req, path, codec).await } /// List applications configuration. @@ -762,11 +762,11 @@ pub mod manager_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/manager.Manager/ListApplications", + "/manager.v2.Manager/ListApplications", ); let mut req = request.into_request(); req.extensions_mut() - .insert(GrpcMethod::new("manager.Manager", "ListApplications")); + .insert(GrpcMethod::new("manager.v2.Manager", "ListApplications")); self.inner.unary(req, path, codec).await } /// Create model and update data of model to object storage. @@ -785,11 +785,11 @@ pub mod manager_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/manager.Manager/CreateModel", + "/manager.v2.Manager/CreateModel", ); let mut req = request.into_request(); req.extensions_mut() - .insert(GrpcMethod::new("manager.Manager", "CreateModel")); + .insert(GrpcMethod::new("manager.v2.Manager", "CreateModel")); self.inner.unary(req, path, codec).await } /// KeepAlive with manager. @@ -808,10 +808,11 @@ pub mod manager_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/manager.Manager/KeepAlive", + "/manager.v2.Manager/KeepAlive", ); let mut req = request.into_streaming_request(); - req.extensions_mut().insert(GrpcMethod::new("manager.Manager", "KeepAlive")); + req.extensions_mut() + .insert(GrpcMethod::new("manager.v2.Manager", "KeepAlive")); self.inner.client_streaming(req, path, codec).await } } @@ -963,7 +964,7 @@ pub mod manager_server { fn call(&mut self, req: http::Request) -> Self::Future { let inner = self.inner.clone(); match req.uri().path() { - "/manager.Manager/GetSeedPeer" => { + "/manager.v2.Manager/GetSeedPeer" => { #[allow(non_camel_case_types)] struct GetSeedPeerSvc(pub Arc); impl< @@ -1009,7 +1010,7 @@ pub mod manager_server { }; Box::pin(fut) } - "/manager.Manager/UpdateSeedPeer" => { + "/manager.v2.Manager/UpdateSeedPeer" => { #[allow(non_camel_case_types)] struct UpdateSeedPeerSvc(pub Arc); impl< @@ -1055,7 +1056,7 @@ pub mod manager_server { }; Box::pin(fut) } - "/manager.Manager/GetScheduler" => { + "/manager.v2.Manager/GetScheduler" => { #[allow(non_camel_case_types)] struct GetSchedulerSvc(pub Arc); impl< @@ -1101,7 +1102,7 @@ pub mod manager_server { }; Box::pin(fut) } - "/manager.Manager/UpdateScheduler" => { + "/manager.v2.Manager/UpdateScheduler" => { #[allow(non_camel_case_types)] struct UpdateSchedulerSvc(pub Arc); impl< @@ -1147,7 +1148,7 @@ pub mod manager_server { }; Box::pin(fut) } - "/manager.Manager/ListSchedulers" => { + "/manager.v2.Manager/ListSchedulers" => { #[allow(non_camel_case_types)] struct ListSchedulersSvc(pub Arc); impl< @@ -1193,7 +1194,7 @@ pub mod manager_server { }; Box::pin(fut) } - "/manager.Manager/GetObjectStorage" => { + "/manager.v2.Manager/GetObjectStorage" => { #[allow(non_camel_case_types)] struct GetObjectStorageSvc(pub Arc); impl< @@ -1239,7 +1240,7 @@ pub mod manager_server { }; Box::pin(fut) } - "/manager.Manager/ListBuckets" => { + "/manager.v2.Manager/ListBuckets" => { #[allow(non_camel_case_types)] struct ListBucketsSvc(pub Arc); impl< @@ -1285,7 +1286,7 @@ pub mod manager_server { }; Box::pin(fut) } - "/manager.Manager/ListApplications" => { + "/manager.v2.Manager/ListApplications" => { #[allow(non_camel_case_types)] struct ListApplicationsSvc(pub Arc); impl< @@ -1331,7 +1332,7 @@ pub mod manager_server { }; Box::pin(fut) } - "/manager.Manager/CreateModel" => { + "/manager.v2.Manager/CreateModel" => { #[allow(non_camel_case_types)] struct CreateModelSvc(pub Arc); impl< @@ -1377,7 +1378,7 @@ pub mod manager_server { }; Box::pin(fut) } - "/manager.Manager/KeepAlive" => { + "/manager.v2.Manager/KeepAlive" => { #[allow(non_camel_case_types)] struct KeepAliveSvc(pub Arc); impl< @@ -1461,6 +1462,6 @@ pub mod manager_server { } } impl tonic::server::NamedService for ManagerServer { - const NAME: &'static str = "manager.Manager"; + const NAME: &'static str = "manager.v2.Manager"; } } diff --git a/src/scheduler.rs b/src/scheduler.v2.rs similarity index 94% rename from src/scheduler.rs rename to src/scheduler.v2.rs index 3dc79f2..26f6eea 100644 --- a/src/scheduler.rs +++ b/src/scheduler.v2.rs @@ -4,7 +4,7 @@ pub struct RegisterPeerRequest { /// Download information. #[prost(message, optional, tag = "1")] - pub download: ::core::option::Option, + pub download: ::core::option::Option, } /// RegisterSeedPeerRequest represents seed peer registered request of AnnouncePeerRequest. #[allow(clippy::derive_partial_eq_without_eq)] @@ -12,7 +12,7 @@ pub struct RegisterPeerRequest { pub struct RegisterSeedPeerRequest { /// Download information. #[prost(message, optional, tag = "1")] - pub download: ::core::option::Option, + pub download: ::core::option::Option, } /// DownloadPeerStartedRequest represents peer download started request of AnnouncePeerRequest. #[allow(clippy::derive_partial_eq_without_eq)] @@ -70,7 +70,7 @@ pub struct DownloadPeerBackToSourceFailedRequest { pub struct DownloadPieceFinishedRequest { /// Piece info. #[prost(message, optional, tag = "1")] - pub piece: ::core::option::Option, + pub piece: ::core::option::Option, } /// DownloadPieceBackToSourceFinishedRequest represents piece download back-to-source finished request of AnnouncePeerRequest. #[allow(clippy::derive_partial_eq_without_eq)] @@ -78,7 +78,7 @@ pub struct DownloadPieceFinishedRequest { pub struct DownloadPieceBackToSourceFinishedRequest { /// Piece info. #[prost(message, optional, tag = "1")] - pub piece: ::core::option::Option, + pub piece: ::core::option::Option, } /// DownloadPieceFailedRequest downloads piece failed request of AnnouncePeerRequest. #[allow(clippy::derive_partial_eq_without_eq)] @@ -86,7 +86,7 @@ pub struct DownloadPieceBackToSourceFinishedRequest { pub struct DownloadPieceFailedRequest { /// Piece info. #[prost(message, optional, tag = "1")] - pub piece: ::core::option::Option, + pub piece: ::core::option::Option, /// Temporary indicates whether the error is temporary. #[prost(bool, tag = "2")] pub temporary: bool, @@ -126,7 +126,7 @@ pub struct OssResponse {} pub struct DownloadPieceBackToSourceFailedRequest { /// Piece info. #[prost(message, optional, tag = "1")] - pub piece: ::core::option::Option, + pub piece: ::core::option::Option, #[prost( oneof = "download_piece_back_to_source_failed_request::Response", tags = "2, 3, 4, 5" @@ -252,7 +252,7 @@ pub struct SmallTaskResponse {} pub struct NormalTaskResponse { /// Candidate parents. #[prost(message, repeated, tag = "1")] - pub candidate_parents: ::prost::alloc::vec::Vec, + pub candidate_parents: ::prost::alloc::vec::Vec, /// Concurrent downloading piece count from the peers. #[prost(int32, tag = "2")] pub concurrent_piece_count: i32, @@ -350,7 +350,7 @@ pub struct StatTaskRequest { #[derive(Clone, PartialEq, ::prost::Message)] pub struct AnnounceHostRequest { #[prost(message, optional, tag = "1")] - pub host: ::core::option::Option, + pub host: ::core::option::Option, } /// LeaveHostRequest represents request of LeaveHost. #[allow(clippy::derive_partial_eq_without_eq)] @@ -370,7 +370,7 @@ pub struct ProbeStartedRequest {} pub struct Probe { /// Destination host metadata. #[prost(message, optional, tag = "1")] - pub host: ::core::option::Option, + pub host: ::core::option::Option, /// RTT is the round-trip time sent via this pinger. #[prost(message, optional, tag = "2")] pub rtt: ::core::option::Option<::prost_types::Duration>, @@ -392,7 +392,7 @@ pub struct ProbeFinishedRequest { pub struct FailedProbe { /// Destination host metadata. #[prost(message, optional, tag = "1")] - pub host: ::core::option::Option, + pub host: ::core::option::Option, /// The description of probing failed. #[prost(string, tag = "2")] pub description: ::prost::alloc::string::String, @@ -411,7 +411,7 @@ pub struct ProbeFailedRequest { pub struct SyncProbesRequest { /// Source host metadata. #[prost(message, optional, tag = "1")] - pub host: ::core::option::Option, + pub host: ::core::option::Option, #[prost(oneof = "sync_probes_request::Request", tags = "2, 3, 4")] pub request: ::core::option::Option, } @@ -434,7 +434,7 @@ pub mod sync_probes_request { pub struct SyncProbesResponse { /// Hosts needs to be probed. #[prost(message, repeated, tag = "1")] - pub hosts: ::prost::alloc::vec::Vec, + pub hosts: ::prost::alloc::vec::Vec, } /// Generated client implementations. pub mod scheduler_client { @@ -543,11 +543,11 @@ pub mod scheduler_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/scheduler.Scheduler/AnnouncePeer", + "/scheduler.v2.Scheduler/AnnouncePeer", ); let mut req = request.into_streaming_request(); req.extensions_mut() - .insert(GrpcMethod::new("scheduler.Scheduler", "AnnouncePeer")); + .insert(GrpcMethod::new("scheduler.v2.Scheduler", "AnnouncePeer")); self.inner.streaming(req, path, codec).await } /// Checks information of peer. @@ -555,7 +555,7 @@ pub mod scheduler_client { &mut self, request: impl tonic::IntoRequest, ) -> std::result::Result< - tonic::Response, + tonic::Response, tonic::Status, > { self.inner @@ -569,11 +569,11 @@ pub mod scheduler_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/scheduler.Scheduler/StatPeer", + "/scheduler.v2.Scheduler/StatPeer", ); let mut req = request.into_request(); req.extensions_mut() - .insert(GrpcMethod::new("scheduler.Scheduler", "StatPeer")); + .insert(GrpcMethod::new("scheduler.v2.Scheduler", "StatPeer")); self.inner.unary(req, path, codec).await } /// LeavePeer releases peer in scheduler. @@ -592,11 +592,11 @@ pub mod scheduler_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/scheduler.Scheduler/LeavePeer", + "/scheduler.v2.Scheduler/LeavePeer", ); let mut req = request.into_request(); req.extensions_mut() - .insert(GrpcMethod::new("scheduler.Scheduler", "LeavePeer")); + .insert(GrpcMethod::new("scheduler.v2.Scheduler", "LeavePeer")); self.inner.unary(req, path, codec).await } /// TODO exchange peer api definition. @@ -619,11 +619,11 @@ pub mod scheduler_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/scheduler.Scheduler/ExchangePeer", + "/scheduler.v2.Scheduler/ExchangePeer", ); let mut req = request.into_request(); req.extensions_mut() - .insert(GrpcMethod::new("scheduler.Scheduler", "ExchangePeer")); + .insert(GrpcMethod::new("scheduler.v2.Scheduler", "ExchangePeer")); self.inner.unary(req, path, codec).await } /// Checks information of task. @@ -631,7 +631,7 @@ pub mod scheduler_client { &mut self, request: impl tonic::IntoRequest, ) -> std::result::Result< - tonic::Response, + tonic::Response, tonic::Status, > { self.inner @@ -645,11 +645,11 @@ pub mod scheduler_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/scheduler.Scheduler/StatTask", + "/scheduler.v2.Scheduler/StatTask", ); let mut req = request.into_request(); req.extensions_mut() - .insert(GrpcMethod::new("scheduler.Scheduler", "StatTask")); + .insert(GrpcMethod::new("scheduler.v2.Scheduler", "StatTask")); self.inner.unary(req, path, codec).await } /// AnnounceHost announces host to scheduler. @@ -668,11 +668,11 @@ pub mod scheduler_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/scheduler.Scheduler/AnnounceHost", + "/scheduler.v2.Scheduler/AnnounceHost", ); let mut req = request.into_request(); req.extensions_mut() - .insert(GrpcMethod::new("scheduler.Scheduler", "AnnounceHost")); + .insert(GrpcMethod::new("scheduler.v2.Scheduler", "AnnounceHost")); self.inner.unary(req, path, codec).await } /// LeaveHost releases host in scheduler. @@ -691,11 +691,11 @@ pub mod scheduler_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/scheduler.Scheduler/LeaveHost", + "/scheduler.v2.Scheduler/LeaveHost", ); let mut req = request.into_request(); req.extensions_mut() - .insert(GrpcMethod::new("scheduler.Scheduler", "LeaveHost")); + .insert(GrpcMethod::new("scheduler.v2.Scheduler", "LeaveHost")); self.inner.unary(req, path, codec).await } /// SyncProbes sync probes of the host. @@ -717,11 +717,11 @@ pub mod scheduler_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/scheduler.Scheduler/SyncProbes", + "/scheduler.v2.Scheduler/SyncProbes", ); let mut req = request.into_streaming_request(); req.extensions_mut() - .insert(GrpcMethod::new("scheduler.Scheduler", "SyncProbes")); + .insert(GrpcMethod::new("scheduler.v2.Scheduler", "SyncProbes")); self.inner.streaming(req, path, codec).await } } @@ -752,7 +752,7 @@ pub mod scheduler_server { &self, request: tonic::Request, ) -> std::result::Result< - tonic::Response, + tonic::Response, tonic::Status, >; /// LeavePeer releases peer in scheduler. @@ -774,7 +774,7 @@ pub mod scheduler_server { &self, request: tonic::Request, ) -> std::result::Result< - tonic::Response, + tonic::Response, tonic::Status, >; /// AnnounceHost announces host to scheduler. @@ -879,7 +879,7 @@ pub mod scheduler_server { fn call(&mut self, req: http::Request) -> Self::Future { let inner = self.inner.clone(); match req.uri().path() { - "/scheduler.Scheduler/AnnouncePeer" => { + "/scheduler.v2.Scheduler/AnnouncePeer" => { #[allow(non_camel_case_types)] struct AnnouncePeerSvc(pub Arc); impl< @@ -928,14 +928,14 @@ pub mod scheduler_server { }; Box::pin(fut) } - "/scheduler.Scheduler/StatPeer" => { + "/scheduler.v2.Scheduler/StatPeer" => { #[allow(non_camel_case_types)] struct StatPeerSvc(pub Arc); impl< T: Scheduler, > tonic::server::UnaryService for StatPeerSvc { - type Response = super::super::common::Peer; + type Response = super::super::super::common::v2::Peer; type Future = BoxFuture< tonic::Response, tonic::Status, @@ -972,7 +972,7 @@ pub mod scheduler_server { }; Box::pin(fut) } - "/scheduler.Scheduler/LeavePeer" => { + "/scheduler.v2.Scheduler/LeavePeer" => { #[allow(non_camel_case_types)] struct LeavePeerSvc(pub Arc); impl< @@ -1016,7 +1016,7 @@ pub mod scheduler_server { }; Box::pin(fut) } - "/scheduler.Scheduler/ExchangePeer" => { + "/scheduler.v2.Scheduler/ExchangePeer" => { #[allow(non_camel_case_types)] struct ExchangePeerSvc(pub Arc); impl< @@ -1062,14 +1062,14 @@ pub mod scheduler_server { }; Box::pin(fut) } - "/scheduler.Scheduler/StatTask" => { + "/scheduler.v2.Scheduler/StatTask" => { #[allow(non_camel_case_types)] struct StatTaskSvc(pub Arc); impl< T: Scheduler, > tonic::server::UnaryService for StatTaskSvc { - type Response = super::super::common::Task; + type Response = super::super::super::common::v2::Task; type Future = BoxFuture< tonic::Response, tonic::Status, @@ -1106,7 +1106,7 @@ pub mod scheduler_server { }; Box::pin(fut) } - "/scheduler.Scheduler/AnnounceHost" => { + "/scheduler.v2.Scheduler/AnnounceHost" => { #[allow(non_camel_case_types)] struct AnnounceHostSvc(pub Arc); impl< @@ -1152,7 +1152,7 @@ pub mod scheduler_server { }; Box::pin(fut) } - "/scheduler.Scheduler/LeaveHost" => { + "/scheduler.v2.Scheduler/LeaveHost" => { #[allow(non_camel_case_types)] struct LeaveHostSvc(pub Arc); impl< @@ -1196,7 +1196,7 @@ pub mod scheduler_server { }; Box::pin(fut) } - "/scheduler.Scheduler/SyncProbes" => { + "/scheduler.v2.Scheduler/SyncProbes" => { #[allow(non_camel_case_types)] struct SyncProbesSvc(pub Arc); impl< @@ -1281,6 +1281,6 @@ pub mod scheduler_server { } } impl tonic::server::NamedService for SchedulerServer { - const NAME: &'static str = "scheduler.Scheduler"; + const NAME: &'static str = "scheduler.v2.Scheduler"; } }