Skip to content

Commit 9736214

Browse files
igorbernstein2pongad
igorbernstein2
authored and
pongad
committed
Bigtable: update helper script to work with the latest artman changes (googleapis#2943)
- gapic client dir name changed - fix rm to ignore missing files
1 parent 6c773d2 commit 9736214

File tree

3 files changed

+54
-11
lines changed

3 files changed

+54
-11
lines changed

‎google-cloud-bigtable/autogen_files.lst‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,5 @@ src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableInstanceAdminStubS
2222
src/main/java/com/google/cloud/bigtable/admin/v2/stub/GrpcBigtableInstanceAdminStub.java
2323
src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableTableAdminStub.java
2424
src/main/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminClient.java
25-
src/main/java/com/google/cloud/bigtable/admin/v2/PagedResponseWrappers.java
2625
src/main/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClient.java
2726
src/main/java/com/google/cloud/bigtable/admin/v2/package-info.java

‎google-cloud-bigtable/handwritten_files.lst‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
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
3+
src/test/java/com/google/cloud/bigtable/gaxx/reframing/ReframingResponseObserverTest.java
4+
src/test/java/com/google/cloud/bigtable/gaxx/testing/FakeStreamingApi.java
5+
src/test/java/com/google/cloud/bigtable/gaxx/testing/FakeStatusCode.java
6+
src/test/java/com/google/cloud/bigtable/gaxx/testing/MockStreamingApi.java
7+
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
18+
src/test/java/com/google/cloud/bigtable/data/v2/stub/readrows/RowMergingCallableTest.java
19+
src/test/java/com/google/cloud/bigtable/data/v2/stub/readrows/ReadRowsMergingAcceptanceTest.java
20+
src/test/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStubSettingsTest.java
21+
src/main/java/com/google/cloud/bigtable/gaxx/reframing/IncompleteStreamException.java
22+
src/main/java/com/google/cloud/bigtable/gaxx/reframing/ReframingResponseObserver.java
23+
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
43+
src/main/java/com/google/cloud/bigtable/data/v2/BigtableDataSettings.java
44+
src/main/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStub.java
45+
src/main/java/com/google/cloud/bigtable/data/v2/stub/readrows/RowMergingCallable.java
46+
src/main/java/com/google/cloud/bigtable/data/v2/stub/readrows/RowMerger.java
47+
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

‎google-cloud-bigtable/scripts/regenerate.sh‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -93,34 +93,29 @@ function copy_api_client_staging {
9393
"$WORKDIR/artman-genfiles/java/grpc-google-cloud-bigtable-admin-v2" \
9494
"$WORKDIR/artman-genfiles/java/proto-google-cloud-bigtable-v2" \
9595
"$WORKDIR/artman-genfiles/java/proto-google-cloud-bigtable-admin-v2" \
96+
"$WORKDIR/artman-genfiles/java/gapic-google-cloud-bigtable-v2" \
97+
"$WORKDIR/artman-genfiles/java/gapic-google-cloud-bigtable-admin-v2" \
9698
"$WORKDIR/api-client-staging/generated/java/"
97-
98-
cp -r \
99-
"$WORKDIR/artman-genfiles/java/google-cloud-bigtable" \
100-
"$WORKDIR/api-client-staging/generated/java/gapic-google-cloud-bigtable-v2"
101-
cp -r \
102-
"$WORKDIR/artman-genfiles/java/google-cloud-bigtable-admin" \
103-
"$WORKDIR/api-client-staging/generated/java/gapic-google-cloud-bigtable-admin-v2"
10499
}
105100

106101
function copy_google_cloud_java {
107102
log "Copying google-cloud-java"
108103

109104
# Delete old files
110-
xargs rm < autogen_files.lst
105+
xargs rm -f < autogen_files.lst
111106
cat /dev/null > autogen_files.lst
112107

113108
# Update manual files
114109
find src -type f > $PROJECT_DIR/handwritten_files.lst
115110

116111
# Generate a list of new files
117112
# Data
118-
pushd "$WORKDIR/artman-genfiles/java/google-cloud-bigtable"
113+
pushd "$WORKDIR/artman-genfiles/java/gapic-google-cloud-bigtable-v2"
119114
find src -type f >> $PROJECT_DIR/autogen_files.lst
120115
cp -r "src" "$PROJECT_DIR"
121116
popd
122117
# Admin
123-
pushd "$WORKDIR/artman-genfiles/java/google-cloud-bigtable-admin"
118+
pushd "$WORKDIR/artman-genfiles/java/gapic-google-cloud-bigtable-admin-v2"
124119
find src -type f >> $PROJECT_DIR/autogen_files.lst
125120
cp -r "src" "$PROJECT_DIR"
126121
popd

0 commit comments

Comments
 (0)