Skip to content

(backport) compiler: avoid invoking experimental method in generated code #4055

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

Merged
merged 1 commit into from
Feb 9, 2018
Merged

(backport) compiler: avoid invoking experimental method in generated code #4055

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 53 additions & 28 deletions benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/BenchmarkServiceGrpc.java
View file
Open in desktop

Large diffs are not rendered by default.

19 changes: 12 additions & 7 deletions ...hmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/ReportQpsScenarioServiceGrpc.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,19 @@ private ReportQpsScenarioServiceGrpc() {}
@io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
@java.lang.Deprecated // Use {@link #getReportScenarioMethod()} instead.
public static final io.grpc.MethodDescriptor<io.grpc.benchmarks.proto.Control.ScenarioResult,
io.grpc.benchmarks.proto.Control.Void> METHOD_REPORT_SCENARIO = getReportScenarioMethod();
io.grpc.benchmarks.proto.Control.Void> METHOD_REPORT_SCENARIO = getReportScenarioMethodHelper();

private static volatile io.grpc.MethodDescriptor<io.grpc.benchmarks.proto.Control.ScenarioResult,
io.grpc.benchmarks.proto.Control.Void> getReportScenarioMethod;

@io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
public static io.grpc.MethodDescriptor<io.grpc.benchmarks.proto.Control.ScenarioResult,
io.grpc.benchmarks.proto.Control.Void> getReportScenarioMethod() {
return getReportScenarioMethodHelper();
}

private static io.grpc.MethodDescriptor<io.grpc.benchmarks.proto.Control.ScenarioResult,
io.grpc.benchmarks.proto.Control.Void> getReportScenarioMethodHelper() {
io.grpc.MethodDescriptor<io.grpc.benchmarks.proto.Control.ScenarioResult, io.grpc.benchmarks.proto.Control.Void> getReportScenarioMethod;
if ((getReportScenarioMethod = ReportQpsScenarioServiceGrpc.getReportScenarioMethod) == null) {
synchronized (ReportQpsScenarioServiceGrpc.class) {
Expand Down Expand Up @@ -94,13 +99,13 @@ public static abstract class ReportQpsScenarioServiceImplBase implements io.grpc
*/
public void reportScenario(io.grpc.benchmarks.proto.Control.ScenarioResult request,
io.grpc.stub.StreamObserver<io.grpc.benchmarks.proto.Control.Void> responseObserver) {
asyncUnimplementedUnaryCall(getReportScenarioMethod(), responseObserver);
asyncUnimplementedUnaryCall(getReportScenarioMethodHelper(), responseObserver);
}

@java.lang.Override public final io.grpc.ServerServiceDefinition bindService() {
return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor())
.addMethod(
getReportScenarioMethod(),
getReportScenarioMethodHelper(),
asyncUnaryCall(
new MethodHandlers<
io.grpc.benchmarks.proto.Control.ScenarioResult,
Expand Down Expand Up @@ -136,7 +141,7 @@ protected ReportQpsScenarioServiceStub build(io.grpc.Channel channel,
public void reportScenario(io.grpc.benchmarks.proto.Control.ScenarioResult request,
io.grpc.stub.StreamObserver<io.grpc.benchmarks.proto.Control.Void> responseObserver) {
asyncUnaryCall(
getChannel().newCall(getReportScenarioMethod(), getCallOptions()), request, responseObserver);
getChannel().newCall(getReportScenarioMethodHelper(), getCallOptions()), request, responseObserver);
}
}

Expand Down Expand Up @@ -165,7 +170,7 @@ protected ReportQpsScenarioServiceBlockingStub build(io.grpc.Channel channel,
*/
public io.grpc.benchmarks.proto.Control.Void reportScenario(io.grpc.benchmarks.proto.Control.ScenarioResult request) {
return blockingUnaryCall(
getChannel(), getReportScenarioMethod(), getCallOptions(), request);
getChannel(), getReportScenarioMethodHelper(), getCallOptions(), request);
}
}

Expand Down Expand Up @@ -195,7 +200,7 @@ protected ReportQpsScenarioServiceFutureStub build(io.grpc.Channel channel,
public com.google.common.util.concurrent.ListenableFuture<io.grpc.benchmarks.proto.Control.Void> reportScenario(
io.grpc.benchmarks.proto.Control.ScenarioResult request) {
return futureUnaryCall(
getChannel().newCall(getReportScenarioMethod(), getCallOptions()), request);
getChannel().newCall(getReportScenarioMethodHelper(), getCallOptions()), request);
}
}

Expand Down Expand Up @@ -283,7 +288,7 @@ public static io.grpc.ServiceDescriptor getServiceDescriptor() {
if (result == null) {
serviceDescriptor = result = io.grpc.ServiceDescriptor.newBuilder(SERVICE_NAME)
.setSchemaDescriptor(new ReportQpsScenarioServiceFileDescriptorSupplier())
.addMethod(getReportScenarioMethod())
.addMethod(getReportScenarioMethodHelper())
.build();
}
}
Expand Down
68 changes: 44 additions & 24 deletions benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/WorkerServiceGrpc.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,19 @@ private WorkerServiceGrpc() {}
@io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
@java.lang.Deprecated // Use {@link #getRunServerMethod()} instead.
public static final io.grpc.MethodDescriptor<io.grpc.benchmarks.proto.Control.ServerArgs,
io.grpc.benchmarks.proto.Control.ServerStatus> METHOD_RUN_SERVER = getRunServerMethod();
io.grpc.benchmarks.proto.Control.ServerStatus> METHOD_RUN_SERVER = getRunServerMethodHelper();

private static volatile io.grpc.MethodDescriptor<io.grpc.benchmarks.proto.Control.ServerArgs,
io.grpc.benchmarks.proto.Control.ServerStatus> getRunServerMethod;

@io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
public static io.grpc.MethodDescriptor<io.grpc.benchmarks.proto.Control.ServerArgs,
io.grpc.benchmarks.proto.Control.ServerStatus> getRunServerMethod() {
return getRunServerMethodHelper();
}

private static io.grpc.MethodDescriptor<io.grpc.benchmarks.proto.Control.ServerArgs,
io.grpc.benchmarks.proto.Control.ServerStatus> getRunServerMethodHelper() {
io.grpc.MethodDescriptor<io.grpc.benchmarks.proto.Control.ServerArgs, io.grpc.benchmarks.proto.Control.ServerStatus> getRunServerMethod;
if ((getRunServerMethod = WorkerServiceGrpc.getRunServerMethod) == null) {
synchronized (WorkerServiceGrpc.class) {
Expand All @@ -62,14 +67,19 @@ io.grpc.benchmarks.proto.Control.ServerStatus> getRunServerMethod() {
@io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
@java.lang.Deprecated // Use {@link #getRunClientMethod()} instead.
public static final io.grpc.MethodDescriptor<io.grpc.benchmarks.proto.Control.ClientArgs,
io.grpc.benchmarks.proto.Control.ClientStatus> METHOD_RUN_CLIENT = getRunClientMethod();
io.grpc.benchmarks.proto.Control.ClientStatus> METHOD_RUN_CLIENT = getRunClientMethodHelper();

private static volatile io.grpc.MethodDescriptor<io.grpc.benchmarks.proto.Control.ClientArgs,
io.grpc.benchmarks.proto.Control.ClientStatus> getRunClientMethod;

@io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
public static io.grpc.MethodDescriptor<io.grpc.benchmarks.proto.Control.ClientArgs,
io.grpc.benchmarks.proto.Control.ClientStatus> getRunClientMethod() {
return getRunClientMethodHelper();
}

private static io.grpc.MethodDescriptor<io.grpc.benchmarks.proto.Control.ClientArgs,
io.grpc.benchmarks.proto.Control.ClientStatus> getRunClientMethodHelper() {
io.grpc.MethodDescriptor<io.grpc.benchmarks.proto.Control.ClientArgs, io.grpc.benchmarks.proto.Control.ClientStatus> getRunClientMethod;
if ((getRunClientMethod = WorkerServiceGrpc.getRunClientMethod) == null) {
synchronized (WorkerServiceGrpc.class) {
Expand All @@ -94,14 +104,19 @@ io.grpc.benchmarks.proto.Control.ClientStatus> getRunClientMethod() {
@io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
@java.lang.Deprecated // Use {@link #getCoreCountMethod()} instead.
public static final io.grpc.MethodDescriptor<io.grpc.benchmarks.proto.Control.CoreRequest,
io.grpc.benchmarks.proto.Control.CoreResponse> METHOD_CORE_COUNT = getCoreCountMethod();
io.grpc.benchmarks.proto.Control.CoreResponse> METHOD_CORE_COUNT = getCoreCountMethodHelper();

private static volatile io.grpc.MethodDescriptor<io.grpc.benchmarks.proto.Control.CoreRequest,
io.grpc.benchmarks.proto.Control.CoreResponse> getCoreCountMethod;

@io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
public static io.grpc.MethodDescriptor<io.grpc.benchmarks.proto.Control.CoreRequest,
io.grpc.benchmarks.proto.Control.CoreResponse> getCoreCountMethod() {
return getCoreCountMethodHelper();
}

private static io.grpc.MethodDescriptor<io.grpc.benchmarks.proto.Control.CoreRequest,
io.grpc.benchmarks.proto.Control.CoreResponse> getCoreCountMethodHelper() {
io.grpc.MethodDescriptor<io.grpc.benchmarks.proto.Control.CoreRequest, io.grpc.benchmarks.proto.Control.CoreResponse> getCoreCountMethod;
if ((getCoreCountMethod = WorkerServiceGrpc.getCoreCountMethod) == null) {
synchronized (WorkerServiceGrpc.class) {
Expand All @@ -126,14 +141,19 @@ io.grpc.benchmarks.proto.Control.CoreResponse> getCoreCountMethod() {
@io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
@java.lang.Deprecated // Use {@link #getQuitWorkerMethod()} instead.
public static final io.grpc.MethodDescriptor<io.grpc.benchmarks.proto.Control.Void,
io.grpc.benchmarks.proto.Control.Void> METHOD_QUIT_WORKER = getQuitWorkerMethod();
io.grpc.benchmarks.proto.Control.Void> METHOD_QUIT_WORKER = getQuitWorkerMethodHelper();

private static volatile io.grpc.MethodDescriptor<io.grpc.benchmarks.proto.Control.Void,
io.grpc.benchmarks.proto.Control.Void> getQuitWorkerMethod;

@io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
public static io.grpc.MethodDescriptor<io.grpc.benchmarks.proto.Control.Void,
io.grpc.benchmarks.proto.Control.Void> getQuitWorkerMethod() {
return getQuitWorkerMethodHelper();
}

private static io.grpc.MethodDescriptor<io.grpc.benchmarks.proto.Control.Void,
io.grpc.benchmarks.proto.Control.Void> getQuitWorkerMethodHelper() {
io.grpc.MethodDescriptor<io.grpc.benchmarks.proto.Control.Void, io.grpc.benchmarks.proto.Control.Void> getQuitWorkerMethod;
if ((getQuitWorkerMethod = WorkerServiceGrpc.getQuitWorkerMethod) == null) {
synchronized (WorkerServiceGrpc.class) {
Expand Down Expand Up @@ -195,7 +215,7 @@ public static abstract class WorkerServiceImplBase implements io.grpc.BindableSe
*/
public io.grpc.stub.StreamObserver<io.grpc.benchmarks.proto.Control.ServerArgs> runServer(
io.grpc.stub.StreamObserver<io.grpc.benchmarks.proto.Control.ServerStatus> responseObserver) {
return asyncUnimplementedStreamingCall(getRunServerMethod(), responseObserver);
return asyncUnimplementedStreamingCall(getRunServerMethodHelper(), responseObserver);
}

/**
Expand All @@ -210,7 +230,7 @@ public io.grpc.stub.StreamObserver<io.grpc.benchmarks.proto.Control.ServerArgs>
*/
public io.grpc.stub.StreamObserver<io.grpc.benchmarks.proto.Control.ClientArgs> runClient(
io.grpc.stub.StreamObserver<io.grpc.benchmarks.proto.Control.ClientStatus> responseObserver) {
return asyncUnimplementedStreamingCall(getRunClientMethod(), responseObserver);
return asyncUnimplementedStreamingCall(getRunClientMethodHelper(), responseObserver);
}

/**
Expand All @@ -220,7 +240,7 @@ public io.grpc.stub.StreamObserver<io.grpc.benchmarks.proto.Control.ClientArgs>
*/
public void coreCount(io.grpc.benchmarks.proto.Control.CoreRequest request,
io.grpc.stub.StreamObserver<io.grpc.benchmarks.proto.Control.CoreResponse> responseObserver) {
asyncUnimplementedUnaryCall(getCoreCountMethod(), responseObserver);
asyncUnimplementedUnaryCall(getCoreCountMethodHelper(), responseObserver);
}

/**
Expand All @@ -230,34 +250,34 @@ public void coreCount(io.grpc.benchmarks.proto.Control.CoreRequest request,
*/
public void quitWorker(io.grpc.benchmarks.proto.Control.Void request,
io.grpc.stub.StreamObserver<io.grpc.benchmarks.proto.Control.Void> responseObserver) {
asyncUnimplementedUnaryCall(getQuitWorkerMethod(), responseObserver);
asyncUnimplementedUnaryCall(getQuitWorkerMethodHelper(), responseObserver);
}

@java.lang.Override public final io.grpc.ServerServiceDefinition bindService() {
return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor())
.addMethod(
getRunServerMethod(),
getRunServerMethodHelper(),
asyncBidiStreamingCall(
new MethodHandlers<
io.grpc.benchmarks.proto.Control.ServerArgs,
io.grpc.benchmarks.proto.Control.ServerStatus>(
this, METHODID_RUN_SERVER)))
.addMethod(
getRunClientMethod(),
getRunClientMethodHelper(),
asyncBidiStreamingCall(
new MethodHandlers<
io.grpc.benchmarks.proto.Control.ClientArgs,
io.grpc.benchmarks.proto.Control.ClientStatus>(
this, METHODID_RUN_CLIENT)))
.addMethod(
getCoreCountMethod(),
getCoreCountMethodHelper(),
asyncUnaryCall(
new MethodHandlers<
io.grpc.benchmarks.proto.Control.CoreRequest,
io.grpc.benchmarks.proto.Control.CoreResponse>(
this, METHODID_CORE_COUNT)))
.addMethod(
getQuitWorkerMethod(),
getQuitWorkerMethodHelper(),
asyncUnaryCall(
new MethodHandlers<
io.grpc.benchmarks.proto.Control.Void,
Expand Down Expand Up @@ -298,7 +318,7 @@ protected WorkerServiceStub build(io.grpc.Channel channel,
public io.grpc.stub.StreamObserver<io.grpc.benchmarks.proto.Control.ServerArgs> runServer(
io.grpc.stub.StreamObserver<io.grpc.benchmarks.proto.Control.ServerStatus> responseObserver) {
return asyncBidiStreamingCall(
getChannel().newCall(getRunServerMethod(), getCallOptions()), responseObserver);
getChannel().newCall(getRunServerMethodHelper(), getCallOptions()), responseObserver);
}

/**
Expand All @@ -314,7 +334,7 @@ public io.grpc.stub.StreamObserver<io.grpc.benchmarks.proto.Control.ServerArgs>
public io.grpc.stub.StreamObserver<io.grpc.benchmarks.proto.Control.ClientArgs> runClient(
io.grpc.stub.StreamObserver<io.grpc.benchmarks.proto.Control.ClientStatus> responseObserver) {
return asyncBidiStreamingCall(
getChannel().newCall(getRunClientMethod(), getCallOptions()), responseObserver);
getChannel().newCall(getRunClientMethodHelper(), getCallOptions()), responseObserver);
}

/**
Expand All @@ -325,7 +345,7 @@ public io.grpc.stub.StreamObserver<io.grpc.benchmarks.proto.Control.ClientArgs>
public void coreCount(io.grpc.benchmarks.proto.Control.CoreRequest request,
io.grpc.stub.StreamObserver<io.grpc.benchmarks.proto.Control.CoreResponse> responseObserver) {
asyncUnaryCall(
getChannel().newCall(getCoreCountMethod(), getCallOptions()), request, responseObserver);
getChannel().newCall(getCoreCountMethodHelper(), getCallOptions()), request, responseObserver);
}

/**
Expand All @@ -336,7 +356,7 @@ public void coreCount(io.grpc.benchmarks.proto.Control.CoreRequest request,
public void quitWorker(io.grpc.benchmarks.proto.Control.Void request,
io.grpc.stub.StreamObserver<io.grpc.benchmarks.proto.Control.Void> responseObserver) {
asyncUnaryCall(
getChannel().newCall(getQuitWorkerMethod(), getCallOptions()), request, responseObserver);
getChannel().newCall(getQuitWorkerMethodHelper(), getCallOptions()), request, responseObserver);
}
}

Expand Down Expand Up @@ -365,7 +385,7 @@ protected WorkerServiceBlockingStub build(io.grpc.Channel channel,
*/
public io.grpc.benchmarks.proto.Control.CoreResponse coreCount(io.grpc.benchmarks.proto.Control.CoreRequest request) {
return blockingUnaryCall(
getChannel(), getCoreCountMethod(), getCallOptions(), request);
getChannel(), getCoreCountMethodHelper(), getCallOptions(), request);
}

/**
Expand All @@ -375,7 +395,7 @@ public io.grpc.benchmarks.proto.Control.CoreResponse coreCount(io.grpc.benchmark
*/
public io.grpc.benchmarks.proto.Control.Void quitWorker(io.grpc.benchmarks.proto.Control.Void request) {
return blockingUnaryCall(
getChannel(), getQuitWorkerMethod(), getCallOptions(), request);
getChannel(), getQuitWorkerMethodHelper(), getCallOptions(), request);
}
}

Expand Down Expand Up @@ -405,7 +425,7 @@ protected WorkerServiceFutureStub build(io.grpc.Channel channel,
public com.google.common.util.concurrent.ListenableFuture<io.grpc.benchmarks.proto.Control.CoreResponse> coreCount(
io.grpc.benchmarks.proto.Control.CoreRequest request) {
return futureUnaryCall(
getChannel().newCall(getCoreCountMethod(), getCallOptions()), request);
getChannel().newCall(getCoreCountMethodHelper(), getCallOptions()), request);
}

/**
Expand All @@ -416,7 +436,7 @@ public com.google.common.util.concurrent.ListenableFuture<io.grpc.benchmarks.pro
public com.google.common.util.concurrent.ListenableFuture<io.grpc.benchmarks.proto.Control.Void> quitWorker(
io.grpc.benchmarks.proto.Control.Void request) {
return futureUnaryCall(
getChannel().newCall(getQuitWorkerMethod(), getCallOptions()), request);
getChannel().newCall(getQuitWorkerMethodHelper(), getCallOptions()), request);
}
}

Expand Down Expand Up @@ -517,10 +537,10 @@ public static io.grpc.ServiceDescriptor getServiceDescriptor() {
if (result == null) {
serviceDescriptor = result = io.grpc.ServiceDescriptor.newBuilder(SERVICE_NAME)
.setSchemaDescriptor(new WorkerServiceFileDescriptorSupplier())
.addMethod(getRunServerMethod())
.addMethod(getRunClientMethod())
.addMethod(getCoreCountMethod())
.addMethod(getQuitWorkerMethod())
.addMethod(getRunServerMethodHelper())
.addMethod(getRunClientMethodHelper())
.addMethod(getCoreCountMethodHelper())
.addMethod(getQuitWorkerMethodHelper())
.build();
}
}
Expand Down
Loading