Skip to content

Commit 8889599

Browse files
committed
chore(bigtable-samples): address gemini review optimizations
1 parent 922dd1d commit 8889599

2 files changed

Lines changed: 27 additions & 29 deletions

File tree

java-bigtable/samples/snippets/src/test/java/com/example/bigtable/HelloWorldTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ private static boolean exists(String tableId) {
6262
adminClient.getTable(
6363
com.google.bigtable.admin.v2.GetTableRequest.newBuilder()
6464
.setName("projects/" + projectId + "/instances/" + instanceId + "/tables/" + tableId)
65+
.setView(com.google.bigtable.admin.v2.Table.View.NAME_ONLY)
6566
.build());
6667
return true;
6768
} catch (com.google.api.gax.rpc.NotFoundException e) {

java-bigtable/samples/snippets/src/test/java/com/example/bigtable/deletes/DeletesTest.java

Lines changed: 26 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,11 @@
4141
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
4242
public class DeletesTest extends MobileTimeSeriesBaseTest {
4343
public static BigtableDataClient bigtableDataClient;
44+
private static BigtableTableAdminClientV2 adminClient;
4445

45-
private static boolean exists(BigtableTableAdminClientV2 client, String tableId) {
46+
private static boolean exists(String tableId) {
4647
try {
47-
client.getTable(
48+
adminClient.getTable(
4849
com.google.bigtable.admin.v2.GetTableRequest.newBuilder()
4950
.setName("projects/" + projectId + "/instances/" + instanceId + "/tables/" + tableId)
5051
.setView(com.google.bigtable.admin.v2.Table.View.NAME_ONLY)
@@ -62,11 +63,17 @@ public static void beforeClass() throws IOException {
6263
writeStatsData();
6364
writePlanData();
6465
bigtableDataClient = BigtableDataClient.create(projectId, instanceId);
66+
BaseBigtableTableAdminSettings adminSettings =
67+
BaseBigtableTableAdminSettings.newBuilder().build();
68+
adminClient = BigtableTableAdminClientV2.create(adminSettings);
6569
}
6670

6771
@AfterClass
6872
public static void afterClass() throws IOException {
6973
cleanupTable();
74+
if (adminClient != null) {
75+
adminClient.close();
76+
}
7077
}
7178

7279
@Test
@@ -176,38 +183,28 @@ public void test6_testDeleteFromColumnFamily() throws IOException {
176183

177184
@Test
178185
public void test7_testDeleteColumnFamily() throws IOException {
179-
BaseBigtableTableAdminSettings adminSettings =
180-
BaseBigtableTableAdminSettings.newBuilder().build();
181-
try (BigtableTableAdminClientV2 tableAdminClient =
182-
BigtableTableAdminClientV2.create(adminSettings)) {
183-
com.google.bigtable.admin.v2.GetTableRequest request =
184-
com.google.bigtable.admin.v2.GetTableRequest.newBuilder()
185-
.setName("projects/" + projectId + "/instances/" + instanceId + "/tables/" + TABLE_ID)
186-
.build();
187-
Truth.assertThat(tableAdminClient.getTable(request).getColumnFamiliesMap().keySet())
188-
.contains(COLUMN_FAMILY_NAME_STATS);
189-
190-
DeleteColumnFamilyExample deleteColumnFamilyExample = new DeleteColumnFamilyExample();
191-
deleteColumnFamilyExample.deleteColumnFamily(
192-
projectId, instanceId, TABLE_ID, COLUMN_FAMILY_NAME_STATS);
193-
194-
Truth.assertThat(tableAdminClient.getTable(request).getColumnFamiliesMap().keySet())
195-
.doesNotContain(COLUMN_FAMILY_NAME_STATS);
196-
}
186+
com.google.bigtable.admin.v2.GetTableRequest request =
187+
com.google.bigtable.admin.v2.GetTableRequest.newBuilder()
188+
.setName("projects/" + projectId + "/instances/" + instanceId + "/tables/" + TABLE_ID)
189+
.build();
190+
Truth.assertThat(adminClient.getTable(request).getColumnFamiliesMap().keySet())
191+
.contains(COLUMN_FAMILY_NAME_STATS);
192+
193+
DeleteColumnFamilyExample deleteColumnFamilyExample = new DeleteColumnFamilyExample();
194+
deleteColumnFamilyExample.deleteColumnFamily(
195+
projectId, instanceId, TABLE_ID, COLUMN_FAMILY_NAME_STATS);
196+
197+
Truth.assertThat(adminClient.getTable(request).getColumnFamiliesMap().keySet())
198+
.doesNotContain(COLUMN_FAMILY_NAME_STATS);
197199
}
198200

199201
@Test
200202
public void test8_testDeleteTable() throws IOException {
201-
BaseBigtableTableAdminSettings adminSettings =
202-
BaseBigtableTableAdminSettings.newBuilder().build();
203-
try (BigtableTableAdminClientV2 tableAdminClient =
204-
BigtableTableAdminClientV2.create(adminSettings)) {
205-
Truth.assertThat(exists(tableAdminClient, TABLE_ID)).isTrue();
203+
Truth.assertThat(exists(TABLE_ID)).isTrue();
206204

207-
DeleteTableExample deleteTableExample = new DeleteTableExample();
208-
deleteTableExample.deleteTable(projectId, instanceId, TABLE_ID);
205+
DeleteTableExample deleteTableExample = new DeleteTableExample();
206+
deleteTableExample.deleteTable(projectId, instanceId, TABLE_ID);
209207

210-
Truth.assertThat(exists(tableAdminClient, TABLE_ID)).isFalse();
211-
}
208+
Truth.assertThat(exists(TABLE_ID)).isFalse();
212209
}
213210
}

0 commit comments

Comments
 (0)