Skip to content

Commit 9796fbd

Browse files
committed
Merge branch 'main' into PR #3928 to update
2 parents b11ccc9 + 2349908 commit 9796fbd

File tree

7 files changed

+43
-73
lines changed

7 files changed

+43
-73
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ If you are using Maven without the BOM, add this to your dependencies:
4949
If you are using Gradle 5.x or later, add this to your dependencies:
5050

5151
```Groovy
52-
implementation platform('com.google.cloud:libraries-bom:26.71.0')
52+
implementation platform('com.google.cloud:libraries-bom:26.72.0')
5353
5454
implementation 'com.google.cloud:google-cloud-spanner'
5555
```

generation_config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
gapic_generator_version: 2.64.1
2-
googleapis_commitish: 15fa97d38ad2a38319426328c795ef76a03448bd
3-
libraries_bom_version: 26.71.0
2+
googleapis_commitish: ded7ed1e4cce7c165c56a417572cebea9bc1d82c
3+
libraries_bom_version: 26.72.0
44
libraries:
55
- api_shortname: spanner
66
name_pretty: Cloud Spanner

proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/RoutingHint.java

Lines changed: 14 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1023,10 +1023,8 @@ public com.google.spanner.v1.RoutingHint.SkippedTabletOrBuilder getSkippedTablet
10231023
*
10241024
*
10251025
* <pre>
1026-
* If present, the client's current location. In the Spanner managed service,
1027-
* this should be the name of a Google Cloud zone or region, such as
1028-
* "us-central1". In Spanner Omni, this should correspond to a previously
1029-
* created location.
1026+
* If present, the client's current location. This should be the name of a
1027+
* Google Cloud zone or region, such as "us-central1".
10301028
*
10311029
* If absent, the client's location will be assumed to be the same as the
10321030
* location of the server the client ends up connected to.
@@ -1056,10 +1054,8 @@ public java.lang.String getClientLocation() {
10561054
*
10571055
*
10581056
* <pre>
1059-
* If present, the client's current location. In the Spanner managed service,
1060-
* this should be the name of a Google Cloud zone or region, such as
1061-
* "us-central1". In Spanner Omni, this should correspond to a previously
1062-
* created location.
1057+
* If present, the client's current location. This should be the name of a
1058+
* Google Cloud zone or region, such as "us-central1".
10631059
*
10641060
* If absent, the client's location will be assumed to be the same as the
10651061
* location of the server the client ends up connected to.
@@ -2661,10 +2657,8 @@ public com.google.spanner.v1.RoutingHint.SkippedTablet.Builder addSkippedTabletU
26612657
*
26622658
*
26632659
* <pre>
2664-
* If present, the client's current location. In the Spanner managed service,
2665-
* this should be the name of a Google Cloud zone or region, such as
2666-
* "us-central1". In Spanner Omni, this should correspond to a previously
2667-
* created location.
2660+
* If present, the client's current location. This should be the name of a
2661+
* Google Cloud zone or region, such as "us-central1".
26682662
*
26692663
* If absent, the client's location will be assumed to be the same as the
26702664
* location of the server the client ends up connected to.
@@ -2693,10 +2687,8 @@ public java.lang.String getClientLocation() {
26932687
*
26942688
*
26952689
* <pre>
2696-
* If present, the client's current location. In the Spanner managed service,
2697-
* this should be the name of a Google Cloud zone or region, such as
2698-
* "us-central1". In Spanner Omni, this should correspond to a previously
2699-
* created location.
2690+
* If present, the client's current location. This should be the name of a
2691+
* Google Cloud zone or region, such as "us-central1".
27002692
*
27012693
* If absent, the client's location will be assumed to be the same as the
27022694
* location of the server the client ends up connected to.
@@ -2725,10 +2717,8 @@ public com.google.protobuf.ByteString getClientLocationBytes() {
27252717
*
27262718
*
27272719
* <pre>
2728-
* If present, the client's current location. In the Spanner managed service,
2729-
* this should be the name of a Google Cloud zone or region, such as
2730-
* "us-central1". In Spanner Omni, this should correspond to a previously
2731-
* created location.
2720+
* If present, the client's current location. This should be the name of a
2721+
* Google Cloud zone or region, such as "us-central1".
27322722
*
27332723
* If absent, the client's location will be assumed to be the same as the
27342724
* location of the server the client ends up connected to.
@@ -2756,10 +2746,8 @@ public Builder setClientLocation(java.lang.String value) {
27562746
*
27572747
*
27582748
* <pre>
2759-
* If present, the client's current location. In the Spanner managed service,
2760-
* this should be the name of a Google Cloud zone or region, such as
2761-
* "us-central1". In Spanner Omni, this should correspond to a previously
2762-
* created location.
2749+
* If present, the client's current location. This should be the name of a
2750+
* Google Cloud zone or region, such as "us-central1".
27632751
*
27642752
* If absent, the client's location will be assumed to be the same as the
27652753
* location of the server the client ends up connected to.
@@ -2783,10 +2771,8 @@ public Builder clearClientLocation() {
27832771
*
27842772
*
27852773
* <pre>
2786-
* If present, the client's current location. In the Spanner managed service,
2787-
* this should be the name of a Google Cloud zone or region, such as
2788-
* "us-central1". In Spanner Omni, this should correspond to a previously
2789-
* created location.
2774+
* If present, the client's current location. This should be the name of a
2775+
* Google Cloud zone or region, such as "us-central1".
27902776
*
27912777
* If absent, the client's location will be assumed to be the same as the
27922778
* location of the server the client ends up connected to.

proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/RoutingHintOrBuilder.java

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -230,10 +230,8 @@ public interface RoutingHintOrBuilder
230230
*
231231
*
232232
* <pre>
233-
* If present, the client's current location. In the Spanner managed service,
234-
* this should be the name of a Google Cloud zone or region, such as
235-
* "us-central1". In Spanner Omni, this should correspond to a previously
236-
* created location.
233+
* If present, the client's current location. This should be the name of a
234+
* Google Cloud zone or region, such as "us-central1".
237235
*
238236
* If absent, the client's location will be assumed to be the same as the
239237
* location of the server the client ends up connected to.
@@ -252,10 +250,8 @@ public interface RoutingHintOrBuilder
252250
*
253251
*
254252
* <pre>
255-
* If present, the client's current location. In the Spanner managed service,
256-
* this should be the name of a Google Cloud zone or region, such as
257-
* "us-central1". In Spanner Omni, this should correspond to a previously
258-
* created location.
253+
* If present, the client's current location. This should be the name of a
254+
* Google Cloud zone or region, such as "us-central1".
259255
*
260256
* If absent, the client's location will be assumed to be the same as the
261257
* location of the server the client ends up connected to.

proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Tablet.java

Lines changed: 14 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -310,9 +310,8 @@ public com.google.protobuf.ByteString getServerAddressBytes() {
310310
*
311311
*
312312
* <pre>
313-
* Where this tablet is located. In the Spanner managed service, this is the
314-
* name of a region, such as "us-central1". In Spanner Omni, this is a
315-
* previously created location.
313+
* Where this tablet is located. This is the name of a Google Cloud region,
314+
* such as "us-central1".
316315
* </pre>
317316
*
318317
* <code>string location = 3;</code>
@@ -336,9 +335,8 @@ public java.lang.String getLocation() {
336335
*
337336
*
338337
* <pre>
339-
* Where this tablet is located. In the Spanner managed service, this is the
340-
* name of a region, such as "us-central1". In Spanner Omni, this is a
341-
* previously created location.
338+
* Where this tablet is located. This is the name of a Google Cloud region,
339+
* such as "us-central1".
342340
* </pre>
343341
*
344342
* <code>string location = 3;</code>
@@ -1146,9 +1144,8 @@ public Builder setServerAddressBytes(com.google.protobuf.ByteString value) {
11461144
*
11471145
*
11481146
* <pre>
1149-
* Where this tablet is located. In the Spanner managed service, this is the
1150-
* name of a region, such as "us-central1". In Spanner Omni, this is a
1151-
* previously created location.
1147+
* Where this tablet is located. This is the name of a Google Cloud region,
1148+
* such as "us-central1".
11521149
* </pre>
11531150
*
11541151
* <code>string location = 3;</code>
@@ -1171,9 +1168,8 @@ public java.lang.String getLocation() {
11711168
*
11721169
*
11731170
* <pre>
1174-
* Where this tablet is located. In the Spanner managed service, this is the
1175-
* name of a region, such as "us-central1". In Spanner Omni, this is a
1176-
* previously created location.
1171+
* Where this tablet is located. This is the name of a Google Cloud region,
1172+
* such as "us-central1".
11771173
* </pre>
11781174
*
11791175
* <code>string location = 3;</code>
@@ -1196,9 +1192,8 @@ public com.google.protobuf.ByteString getLocationBytes() {
11961192
*
11971193
*
11981194
* <pre>
1199-
* Where this tablet is located. In the Spanner managed service, this is the
1200-
* name of a region, such as "us-central1". In Spanner Omni, this is a
1201-
* previously created location.
1195+
* Where this tablet is located. This is the name of a Google Cloud region,
1196+
* such as "us-central1".
12021197
* </pre>
12031198
*
12041199
* <code>string location = 3;</code>
@@ -1220,9 +1215,8 @@ public Builder setLocation(java.lang.String value) {
12201215
*
12211216
*
12221217
* <pre>
1223-
* Where this tablet is located. In the Spanner managed service, this is the
1224-
* name of a region, such as "us-central1". In Spanner Omni, this is a
1225-
* previously created location.
1218+
* Where this tablet is located. This is the name of a Google Cloud region,
1219+
* such as "us-central1".
12261220
* </pre>
12271221
*
12281222
* <code>string location = 3;</code>
@@ -1240,9 +1234,8 @@ public Builder clearLocation() {
12401234
*
12411235
*
12421236
* <pre>
1243-
* Where this tablet is located. In the Spanner managed service, this is the
1244-
* name of a region, such as "us-central1". In Spanner Omni, this is a
1245-
* previously created location.
1237+
* Where this tablet is located. This is the name of a Google Cloud region,
1238+
* such as "us-central1".
12461239
* </pre>
12471240
*
12481241
* <code>string location = 3;</code>

proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TabletOrBuilder.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,8 @@ public interface TabletOrBuilder
7070
*
7171
*
7272
* <pre>
73-
* Where this tablet is located. In the Spanner managed service, this is the
74-
* name of a region, such as "us-central1". In Spanner Omni, this is a
75-
* previously created location.
73+
* Where this tablet is located. This is the name of a Google Cloud region,
74+
* such as "us-central1".
7675
* </pre>
7776
*
7877
* <code>string location = 3;</code>
@@ -85,9 +84,8 @@ public interface TabletOrBuilder
8584
*
8685
*
8786
* <pre>
88-
* Where this tablet is located. In the Spanner managed service, this is the
89-
* name of a region, such as "us-central1". In Spanner Omni, this is a
90-
* previously created location.
87+
* Where this tablet is located. This is the name of a Google Cloud region,
88+
* such as "us-central1".
9189
* </pre>
9290
*
9391
* <code>string location = 3;</code>

proto-google-cloud-spanner-v1/src/main/proto/google/spanner/v1/location.proto

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,8 @@ message Tablet {
8686
// address or DNS hostname and a port number.
8787
string server_address = 2;
8888

89-
// Where this tablet is located. In the Spanner managed service, this is the
90-
// name of a region, such as "us-central1". In Spanner Omni, this is a
91-
// previously created location.
89+
// Where this tablet is located. This is the name of a Google Cloud region,
90+
// such as "us-central1".
9291
string location = 3;
9392

9493
// The role of the tablet.
@@ -377,10 +376,8 @@ message RoutingHint {
377376
// with new locations for those tablets.
378377
repeated SkippedTablet skipped_tablet_uid = 9;
379378

380-
// If present, the client's current location. In the Spanner managed service,
381-
// this should be the name of a Google Cloud zone or region, such as
382-
// "us-central1". In Spanner Omni, this should correspond to a previously
383-
// created location.
379+
// If present, the client's current location. This should be the name of a
380+
// Google Cloud zone or region, such as "us-central1".
384381
//
385382
// If absent, the client's location will be assumed to be the same as the
386383
// location of the server the client ends up connected to.

0 commit comments

Comments
 (0)