Skip to content

Commit 75ddda2

Browse files
sduskiskolea2
sduskis
authored and
kolea2
committed
Revert "Regenerate spanner client (#4528)" (#4539)
This reverts commit 9e56353.
1 parent 7ee8aa1 commit 75ddda2

File tree

14 files changed

+160
-5471
lines changed

14 files changed

+160
-5471
lines changed

‎google-api-grpc/grpc-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/SpannerGrpc.java‎

Lines changed: 11 additions & 207 deletions
Original file line numberDiff line numberDiff line change
@@ -325,61 +325,6 @@ private SpannerGrpc() {}
325325
return getExecuteStreamingSqlMethod;
326326
}
327327

328-
@io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
329-
@java.lang.Deprecated // Use {@link #getExecuteBatchDmlMethod()} instead.
330-
public static final io.grpc.MethodDescriptor<
331-
com.google.spanner.v1.ExecuteBatchDmlRequest,
332-
com.google.spanner.v1.ExecuteBatchDmlResponse>
333-
METHOD_EXECUTE_BATCH_DML = getExecuteBatchDmlMethodHelper();
334-
335-
private static volatile io.grpc.MethodDescriptor<
336-
com.google.spanner.v1.ExecuteBatchDmlRequest,
337-
com.google.spanner.v1.ExecuteBatchDmlResponse>
338-
getExecuteBatchDmlMethod;
339-
340-
@io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
341-
public static io.grpc.MethodDescriptor<
342-
com.google.spanner.v1.ExecuteBatchDmlRequest,
343-
com.google.spanner.v1.ExecuteBatchDmlResponse>
344-
getExecuteBatchDmlMethod() {
345-
return getExecuteBatchDmlMethodHelper();
346-
}
347-
348-
private static io.grpc.MethodDescriptor<
349-
com.google.spanner.v1.ExecuteBatchDmlRequest,
350-
com.google.spanner.v1.ExecuteBatchDmlResponse>
351-
getExecuteBatchDmlMethodHelper() {
352-
io.grpc.MethodDescriptor<
353-
com.google.spanner.v1.ExecuteBatchDmlRequest,
354-
com.google.spanner.v1.ExecuteBatchDmlResponse>
355-
getExecuteBatchDmlMethod;
356-
if ((getExecuteBatchDmlMethod = SpannerGrpc.getExecuteBatchDmlMethod) == null) {
357-
synchronized (SpannerGrpc.class) {
358-
if ((getExecuteBatchDmlMethod = SpannerGrpc.getExecuteBatchDmlMethod) == null) {
359-
SpannerGrpc.getExecuteBatchDmlMethod =
360-
getExecuteBatchDmlMethod =
361-
io.grpc.MethodDescriptor
362-
.<com.google.spanner.v1.ExecuteBatchDmlRequest,
363-
com.google.spanner.v1.ExecuteBatchDmlResponse>
364-
newBuilder()
365-
.setType(io.grpc.MethodDescriptor.MethodType.UNARY)
366-
.setFullMethodName(
367-
generateFullMethodName("google.spanner.v1.Spanner", "ExecuteBatchDml"))
368-
.setSampledToLocalTracing(true)
369-
.setRequestMarshaller(
370-
io.grpc.protobuf.ProtoUtils.marshaller(
371-
com.google.spanner.v1.ExecuteBatchDmlRequest.getDefaultInstance()))
372-
.setResponseMarshaller(
373-
io.grpc.protobuf.ProtoUtils.marshaller(
374-
com.google.spanner.v1.ExecuteBatchDmlResponse.getDefaultInstance()))
375-
.setSchemaDescriptor(new SpannerMethodDescriptorSupplier("ExecuteBatchDml"))
376-
.build();
377-
}
378-
}
379-
}
380-
return getExecuteBatchDmlMethod;
381-
}
382-
383328
@io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
384329
@java.lang.Deprecated // Use {@link #getReadMethod()} instead.
385330
public static final io.grpc.MethodDescriptor<
@@ -812,9 +757,7 @@ public void listSessions(
812757
*
813758
*
814759
* <pre>
815-
* Ends a session, releasing server resources associated with it. This will
816-
* asynchronously trigger cancellation of any operations that are running with
817-
* this session.
760+
* Ends a session, releasing server resources associated with it.
818761
* </pre>
819762
*/
820763
public void deleteSession(
@@ -861,35 +804,6 @@ public void executeStreamingSql(
861804
asyncUnimplementedUnaryCall(getExecuteStreamingSqlMethodHelper(), responseObserver);
862805
}
863806

864-
/**
865-
*
866-
*
867-
* <pre>
868-
* Executes a batch of SQL DML statements. This method allows many statements
869-
* to be run with lower latency than submitting them sequentially with
870-
* [ExecuteSql][google.spanner.v1.Spanner.ExecuteSql].
871-
* Statements are executed in order, sequentially.
872-
* [ExecuteBatchDmlResponse][Spanner.ExecuteBatchDmlResponse] will contain a
873-
* [ResultSet][google.spanner.v1.ResultSet] for each DML statement that has successfully executed. If a
874-
* statement fails, its error status will be returned as part of the
875-
* [ExecuteBatchDmlResponse][Spanner.ExecuteBatchDmlResponse]. Execution will
876-
* stop at the first failed statement; the remaining statements will not run.
877-
* ExecuteBatchDml is expected to return an OK status with a response even if
878-
* there was an error while processing one of the DML statements. Clients must
879-
* inspect response.status to determine if there were any errors while
880-
* processing the request.
881-
* See more details in
882-
* [ExecuteBatchDmlRequest][Spanner.ExecuteBatchDmlRequest] and
883-
* [ExecuteBatchDmlResponse][Spanner.ExecuteBatchDmlResponse].
884-
* </pre>
885-
*/
886-
public void executeBatchDml(
887-
com.google.spanner.v1.ExecuteBatchDmlRequest request,
888-
io.grpc.stub.StreamObserver<com.google.spanner.v1.ExecuteBatchDmlResponse>
889-
responseObserver) {
890-
asyncUnimplementedUnaryCall(getExecuteBatchDmlMethodHelper(), responseObserver);
891-
}
892-
893807
/**
894808
*
895809
*
@@ -1070,13 +984,6 @@ public final io.grpc.ServerServiceDefinition bindService() {
1070984
com.google.spanner.v1.ExecuteSqlRequest,
1071985
com.google.spanner.v1.PartialResultSet>(
1072986
this, METHODID_EXECUTE_STREAMING_SQL)))
1073-
.addMethod(
1074-
getExecuteBatchDmlMethodHelper(),
1075-
asyncUnaryCall(
1076-
new MethodHandlers<
1077-
com.google.spanner.v1.ExecuteBatchDmlRequest,
1078-
com.google.spanner.v1.ExecuteBatchDmlResponse>(
1079-
this, METHODID_EXECUTE_BATCH_DML)))
1080987
.addMethod(
1081988
getReadMethodHelper(),
1082989
asyncUnaryCall(
@@ -1215,9 +1122,7 @@ public void listSessions(
12151122
*
12161123
*
12171124
* <pre>
1218-
* Ends a session, releasing server resources associated with it. This will
1219-
* asynchronously trigger cancellation of any operations that are running with
1220-
* this session.
1125+
* Ends a session, releasing server resources associated with it.
12211126
* </pre>
12221127
*/
12231128
public void deleteSession(
@@ -1273,38 +1178,6 @@ public void executeStreamingSql(
12731178
responseObserver);
12741179
}
12751180

1276-
/**
1277-
*
1278-
*
1279-
* <pre>
1280-
* Executes a batch of SQL DML statements. This method allows many statements
1281-
* to be run with lower latency than submitting them sequentially with
1282-
* [ExecuteSql][google.spanner.v1.Spanner.ExecuteSql].
1283-
* Statements are executed in order, sequentially.
1284-
* [ExecuteBatchDmlResponse][Spanner.ExecuteBatchDmlResponse] will contain a
1285-
* [ResultSet][google.spanner.v1.ResultSet] for each DML statement that has successfully executed. If a
1286-
* statement fails, its error status will be returned as part of the
1287-
* [ExecuteBatchDmlResponse][Spanner.ExecuteBatchDmlResponse]. Execution will
1288-
* stop at the first failed statement; the remaining statements will not run.
1289-
* ExecuteBatchDml is expected to return an OK status with a response even if
1290-
* there was an error while processing one of the DML statements. Clients must
1291-
* inspect response.status to determine if there were any errors while
1292-
* processing the request.
1293-
* See more details in
1294-
* [ExecuteBatchDmlRequest][Spanner.ExecuteBatchDmlRequest] and
1295-
* [ExecuteBatchDmlResponse][Spanner.ExecuteBatchDmlResponse].
1296-
* </pre>
1297-
*/
1298-
public void executeBatchDml(
1299-
com.google.spanner.v1.ExecuteBatchDmlRequest request,
1300-
io.grpc.stub.StreamObserver<com.google.spanner.v1.ExecuteBatchDmlResponse>
1301-
responseObserver) {
1302-
asyncUnaryCall(
1303-
getChannel().newCall(getExecuteBatchDmlMethodHelper(), getCallOptions()),
1304-
request,
1305-
responseObserver);
1306-
}
1307-
13081181
/**
13091182
*
13101183
*
@@ -1549,9 +1422,7 @@ public com.google.spanner.v1.ListSessionsResponse listSessions(
15491422
*
15501423
*
15511424
* <pre>
1552-
* Ends a session, releasing server resources associated with it. This will
1553-
* asynchronously trigger cancellation of any operations that are running with
1554-
* this session.
1425+
* Ends a session, releasing server resources associated with it.
15551426
* </pre>
15561427
*/
15571428
public com.google.protobuf.Empty deleteSession(
@@ -1598,34 +1469,6 @@ public java.util.Iterator<com.google.spanner.v1.PartialResultSet> executeStreami
15981469
getChannel(), getExecuteStreamingSqlMethodHelper(), getCallOptions(), request);
15991470
}
16001471

1601-
/**
1602-
*
1603-
*
1604-
* <pre>
1605-
* Executes a batch of SQL DML statements. This method allows many statements
1606-
* to be run with lower latency than submitting them sequentially with
1607-
* [ExecuteSql][google.spanner.v1.Spanner.ExecuteSql].
1608-
* Statements are executed in order, sequentially.
1609-
* [ExecuteBatchDmlResponse][Spanner.ExecuteBatchDmlResponse] will contain a
1610-
* [ResultSet][google.spanner.v1.ResultSet] for each DML statement that has successfully executed. If a
1611-
* statement fails, its error status will be returned as part of the
1612-
* [ExecuteBatchDmlResponse][Spanner.ExecuteBatchDmlResponse]. Execution will
1613-
* stop at the first failed statement; the remaining statements will not run.
1614-
* ExecuteBatchDml is expected to return an OK status with a response even if
1615-
* there was an error while processing one of the DML statements. Clients must
1616-
* inspect response.status to determine if there were any errors while
1617-
* processing the request.
1618-
* See more details in
1619-
* [ExecuteBatchDmlRequest][Spanner.ExecuteBatchDmlRequest] and
1620-
* [ExecuteBatchDmlResponse][Spanner.ExecuteBatchDmlResponse].
1621-
* </pre>
1622-
*/
1623-
public com.google.spanner.v1.ExecuteBatchDmlResponse executeBatchDml(
1624-
com.google.spanner.v1.ExecuteBatchDmlRequest request) {
1625-
return blockingUnaryCall(
1626-
getChannel(), getExecuteBatchDmlMethodHelper(), getCallOptions(), request);
1627-
}
1628-
16291472
/**
16301473
*
16311474
*
@@ -1846,9 +1689,7 @@ protected SpannerFutureStub build(io.grpc.Channel channel, io.grpc.CallOptions c
18461689
*
18471690
*
18481691
* <pre>
1849-
* Ends a session, releasing server resources associated with it. This will
1850-
* asynchronously trigger cancellation of any operations that are running with
1851-
* this session.
1692+
* Ends a session, releasing server resources associated with it.
18521693
* </pre>
18531694
*/
18541695
public com.google.common.util.concurrent.ListenableFuture<com.google.protobuf.Empty>
@@ -1878,35 +1719,6 @@ protected SpannerFutureStub build(io.grpc.Channel channel, io.grpc.CallOptions c
18781719
getChannel().newCall(getExecuteSqlMethodHelper(), getCallOptions()), request);
18791720
}
18801721

1881-
/**
1882-
*
1883-
*
1884-
* <pre>
1885-
* Executes a batch of SQL DML statements. This method allows many statements
1886-
* to be run with lower latency than submitting them sequentially with
1887-
* [ExecuteSql][google.spanner.v1.Spanner.ExecuteSql].
1888-
* Statements are executed in order, sequentially.
1889-
* [ExecuteBatchDmlResponse][Spanner.ExecuteBatchDmlResponse] will contain a
1890-
* [ResultSet][google.spanner.v1.ResultSet] for each DML statement that has successfully executed. If a
1891-
* statement fails, its error status will be returned as part of the
1892-
* [ExecuteBatchDmlResponse][Spanner.ExecuteBatchDmlResponse]. Execution will
1893-
* stop at the first failed statement; the remaining statements will not run.
1894-
* ExecuteBatchDml is expected to return an OK status with a response even if
1895-
* there was an error while processing one of the DML statements. Clients must
1896-
* inspect response.status to determine if there were any errors while
1897-
* processing the request.
1898-
* See more details in
1899-
* [ExecuteBatchDmlRequest][Spanner.ExecuteBatchDmlRequest] and
1900-
* [ExecuteBatchDmlResponse][Spanner.ExecuteBatchDmlResponse].
1901-
* </pre>
1902-
*/
1903-
public com.google.common.util.concurrent.ListenableFuture<
1904-
com.google.spanner.v1.ExecuteBatchDmlResponse>
1905-
executeBatchDml(com.google.spanner.v1.ExecuteBatchDmlRequest request) {
1906-
return futureUnaryCall(
1907-
getChannel().newCall(getExecuteBatchDmlMethodHelper(), getCallOptions()), request);
1908-
}
1909-
19101722
/**
19111723
*
19121724
*
@@ -2039,14 +1851,13 @@ public com.google.common.util.concurrent.ListenableFuture<com.google.protobuf.Em
20391851
private static final int METHODID_DELETE_SESSION = 3;
20401852
private static final int METHODID_EXECUTE_SQL = 4;
20411853
private static final int METHODID_EXECUTE_STREAMING_SQL = 5;
2042-
private static final int METHODID_EXECUTE_BATCH_DML = 6;
2043-
private static final int METHODID_READ = 7;
2044-
private static final int METHODID_STREAMING_READ = 8;
2045-
private static final int METHODID_BEGIN_TRANSACTION = 9;
2046-
private static final int METHODID_COMMIT = 10;
2047-
private static final int METHODID_ROLLBACK = 11;
2048-
private static final int METHODID_PARTITION_QUERY = 12;
2049-
private static final int METHODID_PARTITION_READ = 13;
1854+
private static final int METHODID_READ = 6;
1855+
private static final int METHODID_STREAMING_READ = 7;
1856+
private static final int METHODID_BEGIN_TRANSACTION = 8;
1857+
private static final int METHODID_COMMIT = 9;
1858+
private static final int METHODID_ROLLBACK = 10;
1859+
private static final int METHODID_PARTITION_QUERY = 11;
1860+
private static final int METHODID_PARTITION_READ = 12;
20501861

20511862
private static final class MethodHandlers<Req, Resp>
20521863
implements io.grpc.stub.ServerCalls.UnaryMethod<Req, Resp>,
@@ -2097,12 +1908,6 @@ public void invoke(Req request, io.grpc.stub.StreamObserver<Resp> responseObserv
20971908
(io.grpc.stub.StreamObserver<com.google.spanner.v1.PartialResultSet>)
20981909
responseObserver);
20991910
break;
2100-
case METHODID_EXECUTE_BATCH_DML:
2101-
serviceImpl.executeBatchDml(
2102-
(com.google.spanner.v1.ExecuteBatchDmlRequest) request,
2103-
(io.grpc.stub.StreamObserver<com.google.spanner.v1.ExecuteBatchDmlResponse>)
2104-
responseObserver);
2105-
break;
21061911
case METHODID_READ:
21071912
serviceImpl.read(
21081913
(com.google.spanner.v1.ReadRequest) request,
@@ -2209,7 +2014,6 @@ public static io.grpc.ServiceDescriptor getServiceDescriptor() {
22092014
.addMethod(getDeleteSessionMethodHelper())
22102015
.addMethod(getExecuteSqlMethodHelper())
22112016
.addMethod(getExecuteStreamingSqlMethodHelper())
2212-
.addMethod(getExecuteBatchDmlMethodHelper())
22132017
.addMethod(getReadMethodHelper())
22142018
.addMethod(getStreamingReadMethodHelper())
22152019
.addMethod(getBeginTransactionMethodHelper())

0 commit comments

Comments
 (0)