feat: use afit to optimize gen code (#240)

cloudwego · Oct 23, 2023 · afde195 · afde195
1 parent 9fb6a2c
commit afde195
Show file tree

Hide file tree

Showing 23 changed files with 56 additions and 66 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -21,9 +21,9 @@ repository = "https://github.com/cloudwego/volo"
 license = "MIT OR Apache-2.0"
 
 [workspace.dependencies]
-# pilota = "0.8"
-# pilota-build = "0.8"
-# pilota-thrift-parser = "0.4"
+# pilota = "0.9"
+# pilota-build = "0.9"
+# pilota-thrift-parser = "0.9"
 pilota = { git = "https://github.com/cloudwego/pilota", branch = "main" }
 pilota-build = { git = "https://github.com/cloudwego/pilota", branch = "main" }
 pilota-thrift-parser = { git = "https://github.com/cloudwego/pilota", branch = "main" }
@@ -36,7 +36,6 @@ metainfo = "0.7"
 anyhow = "1"
 async-broadcast = "0.6"
 async-stream = "0.3"
-async-trait = "0.1"
 base64 = "0.13"
 bytes = "1"
 chrono = { version = "0.4", default-features = false, features = [

diff --git a/examples/Cargo.toml b/examples/Cargo.toml
@@ -66,7 +66,6 @@ path = "src/unknown/thrift_client.rs"
 [dependencies]
 anyhow.workspace = true
 async-stream.workspace = true
-async-trait.workspace = true
 lazy_static.workspace = true
 metainfo.workspace = true
 tokio = { workspace = true, features = ["full"] }

diff --git a/examples/src/compression/grpc_server.rs b/examples/src/compression/grpc_server.rs
@@ -10,7 +10,6 @@ use volo_grpc::{
 
 pub struct S;
 
-#[volo::async_trait]
 impl volo_gen::proto_gen::hello::Greeter for S {
     async fn say_hello(
         &self,

diff --git a/examples/src/hello/grpc_server.rs b/examples/src/hello/grpc_server.rs
@@ -4,7 +4,6 @@ use volo_grpc::server::{Server, ServiceBuilder};
 
 pub struct S;
 
-#[volo::async_trait]
 impl volo_gen::proto_gen::hello::Greeter for S {
     async fn say_hello(
         &self,

diff --git a/examples/src/hello/thrift_server.rs b/examples/src/hello/thrift_server.rs
@@ -2,7 +2,6 @@ use std::net::SocketAddr;
 
 pub struct S;
 
-#[volo::async_trait]
 impl volo_gen::thrift_gen::hello::HelloService for S {
     async fn hello(
         &self,

diff --git a/examples/src/loadbalance/grpc_server.rs b/examples/src/loadbalance/grpc_server.rs
@@ -14,7 +14,6 @@ impl S {
     }
 }
 
-#[volo::async_trait]
 impl volo_gen::proto_gen::hello::Greeter for S {
     async fn say_hello(
         &self,

diff --git a/examples/src/multiplex/grpc_server.rs b/examples/src/multiplex/grpc_server.rs
@@ -4,7 +4,6 @@ use volo_grpc::server::{Server, ServiceBuilder};
 
 pub struct G;
 
-#[volo::async_trait]
 impl volo_gen::proto_gen::hello::Greeter for G {
     async fn say_hello(
         &self,
@@ -20,7 +19,6 @@ impl volo_gen::proto_gen::hello::Greeter for G {
 
 pub struct E;
 
-#[volo::async_trait]
 impl volo_gen::proto_gen::echo::Echo for E {
     async fn echo(
         &self,

diff --git a/examples/src/streaming/grpc_server.rs b/examples/src/streaming/grpc_server.rs
@@ -10,7 +10,6 @@ use volo_grpc::{
 
 pub struct S;
 
-#[volo::async_trait]
 impl volo_gen::proto_gen::streaming::Streaming for S {
     async fn unary(
         &self,

diff --git a/examples/src/unknown/thrift_server.rs b/examples/src/unknown/thrift_server.rs
@@ -2,7 +2,6 @@ use std::net::SocketAddr;
 
 pub struct S;
 
-#[volo::async_trait]
 impl volo_gen::thrift_gen::echo_unknown::EchoService for S {
     async fn hello(
         &self,

diff --git a/examples/volo-gen/Cargo.toml b/examples/volo-gen/Cargo.toml
@@ -12,7 +12,6 @@ publish = false
 
 [dependencies]
 anyhow.workspace = true
-async-trait.workspace = true
 futures.workspace = true
 tokio = { workspace = true, features = ["full"] }
 

diff --git a/volo-build/Cargo.toml b/volo-build/Cargo.toml
@@ -22,7 +22,6 @@ volo = { version = "0.8", path = "../volo" }
 pilota-build.workspace = true
 
 anyhow.workspace = true
-async-trait.workspace = true
 dirs.workspace = true
 heck.workspace = true
 itertools.workspace = true

diff --git a/volo-build/src/grpc_backend.rs b/volo-build/src/grpc_backend.rs
@@ -590,7 +590,10 @@ impl CodegenBackend for VoloGrpcBackend {
 
         let name = self.cx().rust_name(method.def_id);
 
-        format!("async fn {name}(&self, {args}) -> ::std::result::Result<{ret_ty}>;")
+        format!(
+            "fn {name}(&self, {args}) -> impl ::std::future::Future<Output = \
+             ::std::result::Result<{ret_ty}>> + Send;"
+        )
     }
 
     fn codegen_service_method_with_global_path(

diff --git a/volo-build/src/thrift_backend.rs b/volo-build/src/thrift_backend.rs
@@ -627,7 +627,10 @@ impl pilota_build::CodegenBackend for VoloThriftBackend {
             "::volo_thrift::AnyhowError".into()
         };
 
-        format!("async fn {name}(&self, {args}) -> ::core::result::Result<{ret_ty}, {exception}>;")
+        format!(
+            "fn {name}(&self, {args}) -> impl ::std::future::Future<Output = \
+             ::core::result::Result<{ret_ty}, {exception}>> + Send;"
+        )
     }
 
     fn codegen_service_method_with_global_path(

diff --git a/volo-cli/src/templates/grpc/src/lib_rs b/volo-cli/src/templates/grpc/src/lib_rs
@@ -2,7 +2,6 @@
 
 pub struct S;
 
-#[volo::async_trait]
 impl volo_gen::{service_global_name} for S {{
 	{methods}
 }}
diff --git a/volo-cli/src/templates/thrift/src/lib_rs b/volo-cli/src/templates/thrift/src/lib_rs
@@ -2,7 +2,6 @@
 
 pub struct S;
 
-#[volo::async_trait]
 impl volo_gen::{service_global_name} for S {{
 	{methods}
 }}
diff --git a/volo-grpc/Cargo.toml b/volo-grpc/Cargo.toml
@@ -25,7 +25,6 @@ metainfo.workspace = true
 
 anyhow.workspace = true
 async-stream.workspace = true
-async-trait.workspace = true
 base64.workspace = true
 bytes.workspace = true
 fxhash.workspace = true

diff --git a/volo-thrift/Cargo.toml b/volo-thrift/Cargo.toml
@@ -24,7 +24,6 @@ motore.workspace = true
 metainfo.workspace = true
 
 anyhow.workspace = true
-async-trait.workspace = true
 bytes.workspace = true
 chrono.workspace = true
 futures.workspace = true

diff --git a/volo-thrift/src/error.rs b/volo-thrift/src/error.rs
@@ -120,6 +120,7 @@ impl From<DecodeError> for Error {
                 pilota::thrift::ProtocolErrorKind::Unknown,
                 value.to_string(),
             )),
+            pilota::thrift::DecodeErrorKind::Unknown => protocol_err!(Unknown),
         }
     }
 }

diff --git a/volo/Cargo.toml b/volo/Cargo.toml
@@ -23,7 +23,6 @@ maintenance = { status = "actively-developed" }
 motore.workspace = true
 
 async-broadcast.workspace = true
-async-trait.workspace = true
 dashmap.workspace = true
 faststr.workspace = true
 futures.workspace = true