Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 961aa78

Browse files
authoredDec 1, 2023
fix(deps): Update the Java code generator (gapic-generator-java) to 2.30.0 (#2703)
* feat: add PG.OID type cod annotation PiperOrigin-RevId: 577053414 Source-Link: googleapis/googleapis@727c286 Source-Link: https://github.com/googleapis/googleapis-gen/commit/2015275a7dda2ad3d1609f06c4208125c7de8a9d Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMjAxNTI3NWE3ZGRhMmFkM2QxNjA5ZjA2YzQyMDgxMjVjN2RlOGE5ZCJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * feat(spanner): add directed_read_option in spanner.proto docs(spanner): updated comment formatting PiperOrigin-RevId: 578551679 Source-Link: googleapis/googleapis@7c80b96 Source-Link: https://github.com/googleapis/googleapis-gen/commit/7b1172ba5e020eaef7de75062a576a11b8e117e4 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiN2IxMTcyYmE1ZTAyMGVhZWY3ZGU3NTA2MmE1NzZhMTFiOGUxMTdlNCJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * fix(deps): Update the Java code generator (gapic-generator-java) to 2.30.0 PiperOrigin-RevId: 586674624 Source-Link: googleapis/googleapis@53ff6ca Source-Link: https://github.com/googleapis/googleapis-gen/commit/07fedaca77917547e1d29bbe7ebfdcb6ebe562b0 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMDdmZWRhY2E3NzkxNzU0N2UxZDI5YmJlN2ViZmRjYjZlYmU1NjJiMCJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * fix(deps): Update the Java code generator (gapic-generator-java) to 2.30.0 PiperOrigin-RevId: 586734351 Source-Link: googleapis/googleapis@5fa9214 Source-Link: https://github.com/googleapis/googleapis-gen/commit/3d5069b1de6cb9106b55ce4521b9b749a0e6a395 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiM2Q1MDY5YjFkZTZjYjkxMDZiNTVjZTQ1MjFiOWI3NDlhMGU2YTM5NSJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
1 parent b9d9571 commit 961aa78

34 files changed

+7217
-1326
lines changed
 

‎google-cloud-spanner/src/main/java/com/google/cloud/spanner/v1/SpannerClient.java

+6
Original file line numberDiff line numberDiff line change
@@ -942,6 +942,7 @@ public final UnaryCallable<DeleteSessionRequest, Empty> deleteSessionCallable()
942942
* .setSeqno(109325920)
943943
* .setQueryOptions(ExecuteSqlRequest.QueryOptions.newBuilder().build())
944944
* .setRequestOptions(RequestOptions.newBuilder().build())
945+
* .setDirectedReadOptions(DirectedReadOptions.newBuilder().build())
945946
* .setDataBoostEnabled(true)
946947
* .build();
947948
* ResultSet response = spannerClient.executeSql(request);
@@ -990,6 +991,7 @@ public final ResultSet executeSql(ExecuteSqlRequest request) {
990991
* .setSeqno(109325920)
991992
* .setQueryOptions(ExecuteSqlRequest.QueryOptions.newBuilder().build())
992993
* .setRequestOptions(RequestOptions.newBuilder().build())
994+
* .setDirectedReadOptions(DirectedReadOptions.newBuilder().build())
993995
* .setDataBoostEnabled(true)
994996
* .build();
995997
* ApiFuture<ResultSet> future = spannerClient.executeSqlCallable().futureCall(request);
@@ -1031,6 +1033,7 @@ public final UnaryCallable<ExecuteSqlRequest, ResultSet> executeSqlCallable() {
10311033
* .setSeqno(109325920)
10321034
* .setQueryOptions(ExecuteSqlRequest.QueryOptions.newBuilder().build())
10331035
* .setRequestOptions(RequestOptions.newBuilder().build())
1036+
* .setDirectedReadOptions(DirectedReadOptions.newBuilder().build())
10341037
* .setDataBoostEnabled(true)
10351038
* .build();
10361039
* ServerStream<PartialResultSet> stream =
@@ -1167,6 +1170,7 @@ public final ExecuteBatchDmlResponse executeBatchDml(ExecuteBatchDmlRequest requ
11671170
* .setResumeToken(ByteString.EMPTY)
11681171
* .setPartitionToken(ByteString.EMPTY)
11691172
* .setRequestOptions(RequestOptions.newBuilder().build())
1173+
* .setDirectedReadOptions(DirectedReadOptions.newBuilder().build())
11701174
* .setDataBoostEnabled(true)
11711175
* .build();
11721176
* ResultSet response = spannerClient.read(request);
@@ -1216,6 +1220,7 @@ public final ResultSet read(ReadRequest request) {
12161220
* .setResumeToken(ByteString.EMPTY)
12171221
* .setPartitionToken(ByteString.EMPTY)
12181222
* .setRequestOptions(RequestOptions.newBuilder().build())
1223+
* .setDirectedReadOptions(DirectedReadOptions.newBuilder().build())
12191224
* .setDataBoostEnabled(true)
12201225
* .build();
12211226
* ApiFuture<ResultSet> future = spannerClient.readCallable().futureCall(request);
@@ -1257,6 +1262,7 @@ public final UnaryCallable<ReadRequest, ResultSet> readCallable() {
12571262
* .setResumeToken(ByteString.EMPTY)
12581263
* .setPartitionToken(ByteString.EMPTY)
12591264
* .setRequestOptions(RequestOptions.newBuilder().build())
1265+
* .setDirectedReadOptions(DirectedReadOptions.newBuilder().build())
12601266
* .setDataBoostEnabled(true)
12611267
* .build();
12621268
* ServerStream<PartialResultSet> stream = spannerClient.streamingReadCallable().call(request);

‎google-cloud-spanner/src/main/resources/META-INF/native-image/com.google.cloud.spanner.v1/reflect-config.json

+81
Original file line numberDiff line numberDiff line change
@@ -1322,6 +1322,87 @@
13221322
"allDeclaredClasses": true,
13231323
"allPublicClasses": true
13241324
},
1325+
{
1326+
"name": "com.google.spanner.v1.DirectedReadOptions",
1327+
"queryAllDeclaredConstructors": true,
1328+
"queryAllPublicConstructors": true,
1329+
"queryAllDeclaredMethods": true,
1330+
"allPublicMethods": true,
1331+
"allDeclaredClasses": true,
1332+
"allPublicClasses": true
1333+
},
1334+
{
1335+
"name": "com.google.spanner.v1.DirectedReadOptions$Builder",
1336+
"queryAllDeclaredConstructors": true,
1337+
"queryAllPublicConstructors": true,
1338+
"queryAllDeclaredMethods": true,
1339+
"allPublicMethods": true,
1340+
"allDeclaredClasses": true,
1341+
"allPublicClasses": true
1342+
},
1343+
{
1344+
"name": "com.google.spanner.v1.DirectedReadOptions$ExcludeReplicas",
1345+
"queryAllDeclaredConstructors": true,
1346+
"queryAllPublicConstructors": true,
1347+
"queryAllDeclaredMethods": true,
1348+
"allPublicMethods": true,
1349+
"allDeclaredClasses": true,
1350+
"allPublicClasses": true
1351+
},
1352+
{
1353+
"name": "com.google.spanner.v1.DirectedReadOptions$ExcludeReplicas$Builder",
1354+
"queryAllDeclaredConstructors": true,
1355+
"queryAllPublicConstructors": true,
1356+
"queryAllDeclaredMethods": true,
1357+
"allPublicMethods": true,
1358+
"allDeclaredClasses": true,
1359+
"allPublicClasses": true
1360+
},
1361+
{
1362+
"name": "com.google.spanner.v1.DirectedReadOptions$IncludeReplicas",
1363+
"queryAllDeclaredConstructors": true,
1364+
"queryAllPublicConstructors": true,
1365+
"queryAllDeclaredMethods": true,
1366+
"allPublicMethods": true,
1367+
"allDeclaredClasses": true,
1368+
"allPublicClasses": true
1369+
},
1370+
{
1371+
"name": "com.google.spanner.v1.DirectedReadOptions$IncludeReplicas$Builder",
1372+
"queryAllDeclaredConstructors": true,
1373+
"queryAllPublicConstructors": true,
1374+
"queryAllDeclaredMethods": true,
1375+
"allPublicMethods": true,
1376+
"allDeclaredClasses": true,
1377+
"allPublicClasses": true
1378+
},
1379+
{
1380+
"name": "com.google.spanner.v1.DirectedReadOptions$ReplicaSelection",
1381+
"queryAllDeclaredConstructors": true,
1382+
"queryAllPublicConstructors": true,
1383+
"queryAllDeclaredMethods": true,
1384+
"allPublicMethods": true,
1385+
"allDeclaredClasses": true,
1386+
"allPublicClasses": true
1387+
},
1388+
{
1389+
"name": "com.google.spanner.v1.DirectedReadOptions$ReplicaSelection$Builder",
1390+
"queryAllDeclaredConstructors": true,
1391+
"queryAllPublicConstructors": true,
1392+
"queryAllDeclaredMethods": true,
1393+
"allPublicMethods": true,
1394+
"allDeclaredClasses": true,
1395+
"allPublicClasses": true
1396+
},
1397+
{
1398+
"name": "com.google.spanner.v1.DirectedReadOptions$ReplicaSelection$Type",
1399+
"queryAllDeclaredConstructors": true,
1400+
"queryAllPublicConstructors": true,
1401+
"queryAllDeclaredMethods": true,
1402+
"allPublicMethods": true,
1403+
"allDeclaredClasses": true,
1404+
"allPublicClasses": true
1405+
},
13251406
{
13261407
"name": "com.google.spanner.v1.ExecuteBatchDmlRequest",
13271408
"queryAllDeclaredConstructors": true,

‎google-cloud-spanner/src/test/java/com/google/cloud/spanner/v1/SpannerClientHttpJsonTest.java

+5
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
import com.google.spanner.v1.BatchCreateSessionsResponse;
3939
import com.google.spanner.v1.CommitResponse;
4040
import com.google.spanner.v1.DatabaseName;
41+
import com.google.spanner.v1.DirectedReadOptions;
4142
import com.google.spanner.v1.ExecuteBatchDmlRequest;
4243
import com.google.spanner.v1.ExecuteBatchDmlResponse;
4344
import com.google.spanner.v1.ExecuteSqlRequest;
@@ -598,6 +599,7 @@ public void executeSqlTest() throws Exception {
598599
.setSeqno(109325920)
599600
.setQueryOptions(ExecuteSqlRequest.QueryOptions.newBuilder().build())
600601
.setRequestOptions(RequestOptions.newBuilder().build())
602+
.setDirectedReadOptions(DirectedReadOptions.newBuilder().build())
601603
.setDataBoostEnabled(true)
602604
.build();
603605

@@ -640,6 +642,7 @@ public void executeSqlExceptionTest() throws Exception {
640642
.setSeqno(109325920)
641643
.setQueryOptions(ExecuteSqlRequest.QueryOptions.newBuilder().build())
642644
.setRequestOptions(RequestOptions.newBuilder().build())
645+
.setDirectedReadOptions(DirectedReadOptions.newBuilder().build())
643646
.setDataBoostEnabled(true)
644647
.build();
645648
client.executeSql(request);
@@ -744,6 +747,7 @@ public void readTest() throws Exception {
744747
.setResumeToken(ByteString.EMPTY)
745748
.setPartitionToken(ByteString.EMPTY)
746749
.setRequestOptions(RequestOptions.newBuilder().build())
750+
.setDirectedReadOptions(DirectedReadOptions.newBuilder().build())
747751
.setDataBoostEnabled(true)
748752
.build();
749753

@@ -786,6 +790,7 @@ public void readExceptionTest() throws Exception {
786790
.setResumeToken(ByteString.EMPTY)
787791
.setPartitionToken(ByteString.EMPTY)
788792
.setRequestOptions(RequestOptions.newBuilder().build())
793+
.setDirectedReadOptions(DirectedReadOptions.newBuilder().build())
789794
.setDataBoostEnabled(true)
790795
.build();
791796
client.read(request);

‎google-cloud-spanner/src/test/java/com/google/cloud/spanner/v1/SpannerClientTest.java

+11
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
import com.google.spanner.v1.CreateSessionRequest;
4848
import com.google.spanner.v1.DatabaseName;
4949
import com.google.spanner.v1.DeleteSessionRequest;
50+
import com.google.spanner.v1.DirectedReadOptions;
5051
import com.google.spanner.v1.ExecuteBatchDmlRequest;
5152
import com.google.spanner.v1.ExecuteBatchDmlResponse;
5253
import com.google.spanner.v1.ExecuteSqlRequest;
@@ -556,6 +557,7 @@ public void executeSqlTest() throws Exception {
556557
.setSeqno(109325920)
557558
.setQueryOptions(ExecuteSqlRequest.QueryOptions.newBuilder().build())
558559
.setRequestOptions(RequestOptions.newBuilder().build())
560+
.setDirectedReadOptions(DirectedReadOptions.newBuilder().build())
559561
.setDataBoostEnabled(true)
560562
.build();
561563

@@ -577,6 +579,7 @@ public void executeSqlTest() throws Exception {
577579
Assert.assertEquals(request.getSeqno(), actualRequest.getSeqno());
578580
Assert.assertEquals(request.getQueryOptions(), actualRequest.getQueryOptions());
579581
Assert.assertEquals(request.getRequestOptions(), actualRequest.getRequestOptions());
582+
Assert.assertEquals(request.getDirectedReadOptions(), actualRequest.getDirectedReadOptions());
580583
Assert.assertEquals(request.getDataBoostEnabled(), actualRequest.getDataBoostEnabled());
581584
Assert.assertTrue(
582585
channelProvider.isHeaderSent(
@@ -603,6 +606,7 @@ public void executeSqlExceptionTest() throws Exception {
603606
.setSeqno(109325920)
604607
.setQueryOptions(ExecuteSqlRequest.QueryOptions.newBuilder().build())
605608
.setRequestOptions(RequestOptions.newBuilder().build())
609+
.setDirectedReadOptions(DirectedReadOptions.newBuilder().build())
606610
.setDataBoostEnabled(true)
607611
.build();
608612
client.executeSql(request);
@@ -636,6 +640,7 @@ public void executeStreamingSqlTest() throws Exception {
636640
.setSeqno(109325920)
637641
.setQueryOptions(ExecuteSqlRequest.QueryOptions.newBuilder().build())
638642
.setRequestOptions(RequestOptions.newBuilder().build())
643+
.setDirectedReadOptions(DirectedReadOptions.newBuilder().build())
639644
.setDataBoostEnabled(true)
640645
.build();
641646

@@ -667,6 +672,7 @@ public void executeStreamingSqlExceptionTest() throws Exception {
667672
.setSeqno(109325920)
668673
.setQueryOptions(ExecuteSqlRequest.QueryOptions.newBuilder().build())
669674
.setRequestOptions(RequestOptions.newBuilder().build())
675+
.setDirectedReadOptions(DirectedReadOptions.newBuilder().build())
670676
.setDataBoostEnabled(true)
671677
.build();
672678

@@ -768,6 +774,7 @@ public void readTest() throws Exception {
768774
.setResumeToken(ByteString.EMPTY)
769775
.setPartitionToken(ByteString.EMPTY)
770776
.setRequestOptions(RequestOptions.newBuilder().build())
777+
.setDirectedReadOptions(DirectedReadOptions.newBuilder().build())
771778
.setDataBoostEnabled(true)
772779
.build();
773780

@@ -788,6 +795,7 @@ public void readTest() throws Exception {
788795
Assert.assertEquals(request.getResumeToken(), actualRequest.getResumeToken());
789796
Assert.assertEquals(request.getPartitionToken(), actualRequest.getPartitionToken());
790797
Assert.assertEquals(request.getRequestOptions(), actualRequest.getRequestOptions());
798+
Assert.assertEquals(request.getDirectedReadOptions(), actualRequest.getDirectedReadOptions());
791799
Assert.assertEquals(request.getDataBoostEnabled(), actualRequest.getDataBoostEnabled());
792800
Assert.assertTrue(
793801
channelProvider.isHeaderSent(
@@ -814,6 +822,7 @@ public void readExceptionTest() throws Exception {
814822
.setResumeToken(ByteString.EMPTY)
815823
.setPartitionToken(ByteString.EMPTY)
816824
.setRequestOptions(RequestOptions.newBuilder().build())
825+
.setDirectedReadOptions(DirectedReadOptions.newBuilder().build())
817826
.setDataBoostEnabled(true)
818827
.build();
819828
client.read(request);
@@ -847,6 +856,7 @@ public void streamingReadTest() throws Exception {
847856
.setResumeToken(ByteString.EMPTY)
848857
.setPartitionToken(ByteString.EMPTY)
849858
.setRequestOptions(RequestOptions.newBuilder().build())
859+
.setDirectedReadOptions(DirectedReadOptions.newBuilder().build())
850860
.setDataBoostEnabled(true)
851861
.build();
852862

@@ -878,6 +888,7 @@ public void streamingReadExceptionTest() throws Exception {
878888
.setResumeToken(ByteString.EMPTY)
879889
.setPartitionToken(ByteString.EMPTY)
880890
.setRequestOptions(RequestOptions.newBuilder().build())
891+
.setDirectedReadOptions(DirectedReadOptions.newBuilder().build())
881892
.setDataBoostEnabled(true)
882893
.build();
883894

There was a problem loading the remainder of the diff.

0 commit comments

Comments
 (0)
Failed to load comments.