Skip to content

Commit 35833cd

Browse files
igorbernstein2pongad
authored andcommitted
---
yaml --- r: 9245 b: refs/heads/spanner-gapic-migration c: 362ac3c h: refs/heads/master i: 9243: 0f3c485
1 parent e911578 commit 35833cd

7 files changed

Lines changed: 423 additions & 52 deletions

File tree

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ refs/tags/v0.35.0: c28951c5f4cc97a1be07900d19df6984115a4bd6
8181
refs/tags/v0.36.0: 6b75c61f73e6827b3ca379bd54f88f750290162f
8282
refs/tags/v0.37.0: db2e142f92601709fdd48db159776f905742e30f
8383
refs/heads/mrschmidt-sizefix: 627a3bfa30bb6f4f76af47b228c38b208dd921e0
84-
refs/heads/spanner-gapic-migration: ccb39e86e26e2a51661f0cf0917515d79c73b565
84+
refs/heads/spanner-gapic-migration: 362ac3c236d4ded521906ca9e9aea0c42a2fff18
8585
refs/tags/v0.38.0: c235ee4df5e1248e1769dae3f86a0d7ab7fd8301
8686
refs/tags/v0.39.0: ab231c9d22475242a43d6d9554aa4a3f736dab01
8787
refs/tags/v0.40.0: a1d5b05206cce7734365f1b910396a2c9d6605ec
Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
1-
src/test/java/com/google/cloud/bigtable/data/v2/MockBigtable.java
2-
src/test/java/com/google/cloud/bigtable/data/v2/BaseBigtableDataClientTest.java
31
src/test/java/com/google/cloud/bigtable/data/v2/MockBigtableImpl.java
4-
src/main/java/com/google/cloud/bigtable/data/v2/BaseBigtableDataClient.java
2+
src/test/java/com/google/cloud/bigtable/data/v2/BaseBigtableDataClientTest.java
3+
src/test/java/com/google/cloud/bigtable/data/v2/MockBigtable.java
4+
src/main/java/com/google/cloud/bigtable/data/v2/package-info.java
55
src/main/java/com/google/cloud/bigtable/data/v2/BaseBigtableDataSettings.java
6-
src/main/java/com/google/cloud/bigtable/data/v2/stub/BigtableStubSettings.java
76
src/main/java/com/google/cloud/bigtable/data/v2/stub/BigtableStub.java
87
src/main/java/com/google/cloud/bigtable/data/v2/stub/GrpcBigtableStub.java
9-
src/main/java/com/google/cloud/bigtable/data/v2/package-info.java
10-
src/test/java/com/google/cloud/bigtable/admin/v2/MockBigtableInstanceAdminImpl.java
11-
src/test/java/com/google/cloud/bigtable/admin/v2/MockBigtableInstanceAdmin.java
12-
src/test/java/com/google/cloud/bigtable/admin/v2/MockBigtableTableAdminImpl.java
13-
src/test/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClientTest.java
14-
src/test/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminClientTest.java
8+
src/main/java/com/google/cloud/bigtable/data/v2/stub/BigtableStubSettings.java
9+
src/main/java/com/google/cloud/bigtable/data/v2/BaseBigtableDataClient.java
1510
src/test/java/com/google/cloud/bigtable/admin/v2/MockBigtableTableAdmin.java
11+
src/test/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminClientTest.java
12+
src/test/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClientTest.java
13+
src/test/java/com/google/cloud/bigtable/admin/v2/MockBigtableTableAdminImpl.java
14+
src/test/java/com/google/cloud/bigtable/admin/v2/MockBigtableInstanceAdmin.java
15+
src/test/java/com/google/cloud/bigtable/admin/v2/MockBigtableInstanceAdminImpl.java
16+
src/main/java/com/google/cloud/bigtable/admin/v2/package-info.java
1617
src/main/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminSettings.java
17-
src/main/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminSettings.java
18-
src/main/java/com/google/cloud/bigtable/admin/v2/stub/GrpcBigtableTableAdminStub.java
1918
src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableInstanceAdminStub.java
20-
src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableTableAdminStubSettings.java
21-
src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableInstanceAdminStubSettings.java
2219
src/main/java/com/google/cloud/bigtable/admin/v2/stub/GrpcBigtableInstanceAdminStub.java
20+
src/main/java/com/google/cloud/bigtable/admin/v2/stub/GrpcBigtableTableAdminStub.java
2321
src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableTableAdminStub.java
24-
src/main/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminClient.java
22+
src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableTableAdminStubSettings.java
23+
src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableInstanceAdminStubSettings.java
2524
src/main/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClient.java
26-
src/main/java/com/google/cloud/bigtable/admin/v2/package-info.java
25+
src/main/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminSettings.java
26+
src/main/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminClient.java
Lines changed: 61 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,76 @@
11
src/test/resources/com/google/cloud/bigtable/data/v2/stub/readrows/read-rows-acceptance-test.json
2-
src/test/java/com/google/cloud/bigtable/gaxx/.DS_Store
32
src/test/java/com/google/cloud/bigtable/gaxx/reframing/ReframingResponseObserverTest.java
4-
src/test/java/com/google/cloud/bigtable/gaxx/testing/FakeStreamingApi.java
53
src/test/java/com/google/cloud/bigtable/gaxx/testing/FakeStatusCode.java
6-
src/test/java/com/google/cloud/bigtable/gaxx/testing/MockStreamingApi.java
74
src/test/java/com/google/cloud/bigtable/gaxx/testing/package-info.java
8-
src/test/java/com/google/cloud/bigtable/data/v2/internal/RegexUtilTest.java
9-
src/test/java/com/google/cloud/bigtable/data/v2/internal/ByteStringComparatorTest.java
10-
src/test/java/com/google/cloud/bigtable/data/v2/models/MutationTest.java
11-
src/test/java/com/google/cloud/bigtable/data/v2/models/FiltersTest.java
12-
src/test/java/com/google/cloud/bigtable/data/v2/models/RowMutationTest.java
13-
src/test/java/com/google/cloud/bigtable/data/v2/models/QueryTest.java
14-
src/test/java/com/google/cloud/bigtable/data/v2/models/RangeTest.java
15-
src/test/java/com/google/cloud/bigtable/data/v2/models/RowTest.java
16-
src/test/java/com/google/cloud/bigtable/data/v2/models/DefaultRowAdapterTest.java
17-
src/test/java/com/google/cloud/bigtable/data/v2/BigtableDataClientTest.java
5+
src/test/java/com/google/cloud/bigtable/gaxx/testing/MockStreamingApi.java
6+
src/test/java/com/google/cloud/bigtable/gaxx/testing/FakeStreamingApi.java
7+
src/test/java/com/google/cloud/bigtable/data/v2/stub/CheckAndMutateRowCallableTest.java
8+
src/test/java/com/google/cloud/bigtable/data/v2/stub/mutaterows/MutateRowsBatchingDescriptorTest.java
9+
src/test/java/com/google/cloud/bigtable/data/v2/stub/mutaterows/BulkMutateRowsRetryTest.java
10+
src/test/java/com/google/cloud/bigtable/data/v2/stub/SampleRowKeysCallableTest.java
11+
src/test/java/com/google/cloud/bigtable/data/v2/stub/MutateRowCallableTest.java
12+
src/test/java/com/google/cloud/bigtable/data/v2/stub/readrows/ReadRowsRetryTest.java
1813
src/test/java/com/google/cloud/bigtable/data/v2/stub/readrows/RowMergingCallableTest.java
1914
src/test/java/com/google/cloud/bigtable/data/v2/stub/readrows/ReadRowsMergingAcceptanceTest.java
15+
src/test/java/com/google/cloud/bigtable/data/v2/stub/readrows/ReadRowsUserCallableTest.java
16+
src/test/java/com/google/cloud/bigtable/data/v2/stub/readrows/FilterMarkerRowsCallableTest.java
17+
src/test/java/com/google/cloud/bigtable/data/v2/stub/readrows/ReadRowsFirstCallableTest.java
18+
src/test/java/com/google/cloud/bigtable/data/v2/stub/ReadModifyWriteRowCallableTest.java
2019
src/test/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStubSettingsTest.java
20+
src/test/java/com/google/cloud/bigtable/data/v2/BigtableDataClientTest.java
21+
src/test/java/com/google/cloud/bigtable/data/v2/models/FiltersTest.java
22+
src/test/java/com/google/cloud/bigtable/data/v2/models/DefaultRowAdapterTest.java
23+
src/test/java/com/google/cloud/bigtable/data/v2/models/QueryTest.java
24+
src/test/java/com/google/cloud/bigtable/data/v2/models/ConditionalRowMutationTest.java
25+
src/test/java/com/google/cloud/bigtable/data/v2/models/ReadModifyWriteRowTest.java
26+
src/test/java/com/google/cloud/bigtable/data/v2/models/MutationTest.java
27+
src/test/java/com/google/cloud/bigtable/data/v2/models/RowTest.java
28+
src/test/java/com/google/cloud/bigtable/data/v2/models/RowMutationTest.java
29+
src/test/java/com/google/cloud/bigtable/data/v2/models/RangeTest.java
30+
src/test/java/com/google/cloud/bigtable/data/v2/internal/RegexUtilTest.java
31+
src/test/java/com/google/cloud/bigtable/data/v2/internal/ByteStringComparatorTest.java
32+
src/main/java/com/google/cloud/bigtable/gaxx/package-info.java
33+
src/main/java/com/google/cloud/bigtable/gaxx/reframing/package-info.java
2134
src/main/java/com/google/cloud/bigtable/gaxx/reframing/IncompleteStreamException.java
2235
src/main/java/com/google/cloud/bigtable/gaxx/reframing/ReframingResponseObserver.java
2336
src/main/java/com/google/cloud/bigtable/gaxx/reframing/Reframer.java
24-
src/main/java/com/google/cloud/bigtable/gaxx/reframing/package-info.java
25-
src/main/java/com/google/cloud/bigtable/gaxx/package-info.java
26-
src/main/java/com/google/cloud/bigtable/data/.DS_Store
27-
src/main/java/com/google/cloud/bigtable/data/v2/.DS_Store
28-
src/main/java/com/google/cloud/bigtable/data/v2/internal/ByteStringComparator.java
29-
src/main/java/com/google/cloud/bigtable/data/v2/internal/RequestContext.java
30-
src/main/java/com/google/cloud/bigtable/data/v2/internal/RegexUtil.java
31-
src/main/java/com/google/cloud/bigtable/data/v2/models/MutationApi.java
32-
src/main/java/com/google/cloud/bigtable/data/v2/models/Mutation.java
33-
src/main/java/com/google/cloud/bigtable/data/v2/models/RowAdapter.java
34-
src/main/java/com/google/cloud/bigtable/data/v2/models/DefaultRowAdapter.java
35-
src/main/java/com/google/cloud/bigtable/data/v2/models/Filters.java
36-
src/main/java/com/google/cloud/bigtable/data/v2/models/Row.java
37-
src/main/java/com/google/cloud/bigtable/data/v2/models/Validations.java
38-
src/main/java/com/google/cloud/bigtable/data/v2/models/KeyOffset.java
39-
src/main/java/com/google/cloud/bigtable/data/v2/models/Query.java
40-
src/main/java/com/google/cloud/bigtable/data/v2/models/RowCell.java
41-
src/main/java/com/google/cloud/bigtable/data/v2/models/Range.java
42-
src/main/java/com/google/cloud/bigtable/data/v2/models/RowMutation.java
4337
src/main/java/com/google/cloud/bigtable/data/v2/BigtableDataSettings.java
38+
src/main/java/com/google/cloud/bigtable/data/v2/BigtableDataClient.java
39+
src/main/java/com/google/cloud/bigtable/data/v2/stub/CheckAndMutateRowCallable.java
4440
src/main/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStub.java
41+
src/main/java/com/google/cloud/bigtable/data/v2/stub/mutaterows/MutateRowsUserFacingCallable.java
42+
src/main/java/com/google/cloud/bigtable/data/v2/stub/mutaterows/package-info.java
43+
src/main/java/com/google/cloud/bigtable/data/v2/stub/mutaterows/MutateRowsBatchingDescriptor.java
44+
src/main/java/com/google/cloud/bigtable/data/v2/stub/mutaterows/MutateRowsSpoolingCallable.java
45+
src/main/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStubSettings.java
4546
src/main/java/com/google/cloud/bigtable/data/v2/stub/readrows/RowMergingCallable.java
47+
src/main/java/com/google/cloud/bigtable/data/v2/stub/readrows/package-info.java
48+
src/main/java/com/google/cloud/bigtable/data/v2/stub/readrows/ReadRowsFirstCallable.java
49+
src/main/java/com/google/cloud/bigtable/data/v2/stub/readrows/ReadRowsResumptionStrategy.java
4650
src/main/java/com/google/cloud/bigtable/data/v2/stub/readrows/RowMerger.java
4751
src/main/java/com/google/cloud/bigtable/data/v2/stub/readrows/StateMachine.java
48-
src/main/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStubSettings.java
49-
src/main/java/com/google/cloud/bigtable/data/v2/BigtableDataClient.java
52+
src/main/java/com/google/cloud/bigtable/data/v2/stub/readrows/ReadRowsRetryCompletedCallable.java
53+
src/main/java/com/google/cloud/bigtable/data/v2/stub/readrows/ReadRowsUserCallable.java
54+
src/main/java/com/google/cloud/bigtable/data/v2/stub/readrows/FilterMarkerRowsCallable.java
55+
src/main/java/com/google/cloud/bigtable/data/v2/stub/SampleRowKeysCallable.java
56+
src/main/java/com/google/cloud/bigtable/data/v2/stub/MutateRowCallable.java
57+
src/main/java/com/google/cloud/bigtable/data/v2/stub/ReadModifyWriteRowCallable.java
58+
src/main/java/com/google/cloud/bigtable/data/v2/models/ReadModifyWriteRow.java
59+
src/main/java/com/google/cloud/bigtable/data/v2/models/RowCell.java
60+
src/main/java/com/google/cloud/bigtable/data/v2/models/Validations.java
61+
src/main/java/com/google/cloud/bigtable/data/v2/models/RowMutation.java
62+
src/main/java/com/google/cloud/bigtable/data/v2/models/BulkMutationBatcher.java
63+
src/main/java/com/google/cloud/bigtable/data/v2/models/Mutation.java
64+
src/main/java/com/google/cloud/bigtable/data/v2/models/DefaultRowAdapter.java
65+
src/main/java/com/google/cloud/bigtable/data/v2/models/RowAdapter.java
66+
src/main/java/com/google/cloud/bigtable/data/v2/models/KeyOffset.java
67+
src/main/java/com/google/cloud/bigtable/data/v2/models/Range.java
68+
src/main/java/com/google/cloud/bigtable/data/v2/models/ConditionalRowMutation.java
69+
src/main/java/com/google/cloud/bigtable/data/v2/models/Filters.java
70+
src/main/java/com/google/cloud/bigtable/data/v2/models/MutationApi.java
71+
src/main/java/com/google/cloud/bigtable/data/v2/models/Row.java
72+
src/main/java/com/google/cloud/bigtable/data/v2/models/Query.java
73+
src/main/java/com/google/cloud/bigtable/data/v2/internal/ByteStringComparator.java
74+
src/main/java/com/google/cloud/bigtable/data/v2/internal/DummyBatchingDescriptor.java
75+
src/main/java/com/google/cloud/bigtable/data/v2/internal/RequestContext.java
76+
src/main/java/com/google/cloud/bigtable/data/v2/internal/RegexUtil.java

branches/spanner-gapic-migration/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableTableAdminStubSettings.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -594,7 +594,7 @@ private static Builder initDefaults(Builder builder) {
594594

595595
builder
596596
.checkConsistencySettings()
597-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
597+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
598598
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
599599

600600
builder

0 commit comments

Comments
 (0)