Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add an optional implementation of streams using generics #7057

Merged
merged 16 commits into from May 3, 2024
Merged

Add an optional implementation of streams using generics #7057

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
d551dad
Add generic interfaces and implementations for streams
aarongable Mar 20, 2024
faab808
Add codegen to use the new generic implementations
aarongable Mar 20, 2024
f75c2d6
Update route_guide example to show the result
aarongable Mar 20, 2024
06c9a00
Fix go-vet complaint
aarongable Mar 20, 2024
9ddc54d
Regenerate all protos
aarongable Apr 3, 2024
8a9ade3
Undo comment change in vet.sh
aarongable Apr 6, 2024
617090d
Merge branch master into generic-streams
aarongable Apr 15, 2024
cc25c38
Move from experimental package to grpc package
aarongable Apr 15, 2024
ba0d4e3
Regenerate all protos with new version
aarongable Apr 15, 2024
586bde9
Factor out interface type construction into helper func
aarongable Apr 15, 2024
9f4fa15
Change type in generated interfaces and signatures
aarongable Apr 15, 2024
2230a4e
Merge branch master into generic-streams
aarongable Apr 22, 2024
08f3f64
Address review comments
aarongable Apr 22, 2024
f159599
Fix protoc-gen-go-grpc_test.sh to match regenerate.sh
aarongable Apr 22, 2024
8c66d69
Fix Req->Res in ServerStreaming interfaces
aarongable Apr 23, 2024
8f93711
Mark flag as experimental
aarongable May 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 8 additions & 8 deletions cmd/protoc-gen-go-grpc/grpc.go
View file
Open in desktop
Expand Up @@ -317,11 +317,11 @@ func clientSignature(g *protogen.GeneratedFile, method *protogen.Method) string
func clientStreamInterface(g *protogen.GeneratedFile, method *protogen.Method) string {
typeParam := g.QualifiedGoIdent(method.Input.GoIdent) + ", " + g.QualifiedGoIdent(method.Output.GoIdent)
if method.Desc.IsStreamingClient() && method.Desc.IsStreamingServer() {
return g.QualifiedGoIdent(grpcPackage.Ident("BidiStreamClient")) + "[" + typeParam + "]"
return g.QualifiedGoIdent(grpcPackage.Ident("BidiStreamingClient")) + "[" + typeParam + "]"
} else if method.Desc.IsStreamingClient() {
return g.QualifiedGoIdent(grpcPackage.Ident("ClientStreamClient")) + "[" + typeParam + "]"
return g.QualifiedGoIdent(grpcPackage.Ident("ClientStreamingClient")) + "[" + typeParam + "]"
} else { // i.e. if method.Desc.IsStreamingServer()
return g.QualifiedGoIdent(grpcPackage.Ident("ServerStreamClient")) + "[" + g.QualifiedGoIdent(method.Output.GoIdent) + "]"
return g.QualifiedGoIdent(grpcPackage.Ident("ServerStreamingClient")) + "[" + g.QualifiedGoIdent(method.Output.GoIdent) + "]"
}
}

Expand All @@ -347,7 +347,7 @@ func genClientMethod(gen *protogen.Plugin, file *protogen.File, g *protogen.Gene
streamImpl := unexport(service.GoName) + method.GoName + "Client"
if *useGenericStreams {
typeParam := g.QualifiedGoIdent(method.Input.GoIdent) + ", " + g.QualifiedGoIdent(method.Output.GoIdent)
streamImpl = g.QualifiedGoIdent(grpcPackage.Ident("StreamClientImpl")) + "[" + typeParam + "]"
streamImpl = g.QualifiedGoIdent(grpcPackage.Ident("GenericClientStream")) + "[" + typeParam + "]"
}

serviceDescVar := service.GoName + "_ServiceDesc"
Expand Down Expand Up @@ -484,11 +484,11 @@ func genServiceDesc(file *protogen.File, g *protogen.GeneratedFile, serviceDescV
func serverStreamInterface(g *protogen.GeneratedFile, method *protogen.Method) string {
typeParam := g.QualifiedGoIdent(method.Input.GoIdent) + ", " + g.QualifiedGoIdent(method.Output.GoIdent)
if method.Desc.IsStreamingClient() && method.Desc.IsStreamingServer() {
return g.QualifiedGoIdent(grpcPackage.Ident("BidiStreamServer")) + "[" + typeParam + "]"
return g.QualifiedGoIdent(grpcPackage.Ident("BidiStreamingServer")) + "[" + typeParam + "]"
} else if method.Desc.IsStreamingClient() {
return g.QualifiedGoIdent(grpcPackage.Ident("ClientStreamServer")) + "[" + typeParam + "]"
return g.QualifiedGoIdent(grpcPackage.Ident("ClientStreamingServer")) + "[" + typeParam + "]"
} else { // i.e. if method.Desc.IsStreamingServer()
return g.QualifiedGoIdent(grpcPackage.Ident("ServerStreamServer")) + "[" + g.QualifiedGoIdent(method.Output.GoIdent) + "]"
return g.QualifiedGoIdent(grpcPackage.Ident("ServerStreamingServer")) + "[" + g.QualifiedGoIdent(method.Output.GoIdent) + "]"
}
}

Expand Down Expand Up @@ -518,7 +518,7 @@ func genServerMethod(gen *protogen.Plugin, file *protogen.File, g *protogen.Gene
streamImpl := unexport(service.GoName) + method.GoName + "Server"
if *useGenericStreams {
typeParam := g.QualifiedGoIdent(method.Input.GoIdent) + ", " + g.QualifiedGoIdent(method.Output.GoIdent)
streamImpl = g.QualifiedGoIdent(grpcPackage.Ident("StreamServerImpl")) + "[" + typeParam + "]"
streamImpl = g.QualifiedGoIdent(grpcPackage.Ident("GenericServerStream")) + "[" + typeParam + "]"
}

g.P("func ", hnameFuncNameFormatter(hname), "(srv interface{}, stream ", grpcPackage.Ident("ServerStream"), ") error {")
Expand Down
16 changes: 8 additions & 8 deletions credentials/alts/internal/proto/grpc_gcp/handshaker_grpc.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

48 changes: 24 additions & 24 deletions examples/features/proto/echo/echo_grpc.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.