Skip to content

Commit 2d80188

Browse files
billyjacobsongcf-owl-bot[bot]
billyjacobson
and
gcf-owl-bot[bot]
authored
docs: make delete examples consistent with other languages (#1710)
* docs: make delete examples consistent with other languages * 🦉 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 ce0799b commit 2d80188

File tree

6 files changed

+74
-22
lines changed

6 files changed

+74
-22
lines changed

‎README.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -504,9 +504,10 @@ Samples are in the [`samples/`](https://github.com/googleapis/java-bigtable/tree
504504
| Write Simple | [source code](https://github.com/googleapis/java-bigtable/blob/main/samples/snippets/src/main/java/com/example/bigtable/WriteSimple.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-bigtable&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/bigtable/WriteSimple.java) |
505505
| Batch Delete Example | [source code](https://github.com/googleapis/java-bigtable/blob/main/samples/snippets/src/main/java/com/example/bigtable/deletes/BatchDeleteExample.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-bigtable&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/bigtable/deletes/BatchDeleteExample.java) |
506506
| Conditional Delete Example | [source code](https://github.com/googleapis/java-bigtable/blob/main/samples/snippets/src/main/java/com/example/bigtable/deletes/ConditionalDeleteExample.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-bigtable&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/bigtable/deletes/ConditionalDeleteExample.java) |
507-
| Delete Column Cells Example | [source code](https://github.com/googleapis/java-bigtable/blob/main/samples/snippets/src/main/java/com/example/bigtable/deletes/DeleteColumnCellsExample.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-bigtable&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/bigtable/deletes/DeleteColumnCellsExample.java) |
508507
| Delete Column Family Example | [source code](https://github.com/googleapis/java-bigtable/blob/main/samples/snippets/src/main/java/com/example/bigtable/deletes/DeleteColumnFamilyExample.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-bigtable&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/bigtable/deletes/DeleteColumnFamilyExample.java) |
509-
| Delete Row Example | [source code](https://github.com/googleapis/java-bigtable/blob/main/samples/snippets/src/main/java/com/example/bigtable/deletes/DeleteRowExample.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-bigtable&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/bigtable/deletes/DeleteRowExample.java) |
508+
| Delete From Column Example | [source code](https://github.com/googleapis/java-bigtable/blob/main/samples/snippets/src/main/java/com/example/bigtable/deletes/DeleteFromColumnExample.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-bigtable&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/bigtable/deletes/DeleteFromColumnExample.java) |
509+
| Delete From Column Family Example | [source code](https://github.com/googleapis/java-bigtable/blob/main/samples/snippets/src/main/java/com/example/bigtable/deletes/DeleteFromColumnFamilyExample.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-bigtable&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/bigtable/deletes/DeleteFromColumnFamilyExample.java) |
510+
| Delete From Row Example | [source code](https://github.com/googleapis/java-bigtable/blob/main/samples/snippets/src/main/java/com/example/bigtable/deletes/DeleteFromRowExample.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-bigtable&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/bigtable/deletes/DeleteFromRowExample.java) |
510511
| Delete Table Example | [source code](https://github.com/googleapis/java-bigtable/blob/main/samples/snippets/src/main/java/com/example/bigtable/deletes/DeleteTableExample.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-bigtable&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/bigtable/deletes/DeleteTableExample.java) |
511512
| Drop Row Range Example | [source code](https://github.com/googleapis/java-bigtable/blob/main/samples/snippets/src/main/java/com/example/bigtable/deletes/DropRowRangeExample.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-bigtable&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/bigtable/deletes/DropRowRangeExample.java) |
512513

‎samples/snippets/src/main/java/com/example/bigtable/deletes/DeleteColumnFamilyExample.java‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2022 Google LLC
2+
* Copyright 2023 Google LLC
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -17,16 +17,18 @@
1717
package com.example.bigtable.deletes;
1818

1919
// [START bigtable_delete_column_family]
20-
import com.google.cloud.bigtable.data.v2.BigtableDataClient;
21-
import com.google.cloud.bigtable.data.v2.models.RowMutation;
20+
import com.google.cloud.bigtable.admin.v2.BigtableTableAdminClient;
21+
import com.google.cloud.bigtable.admin.v2.models.ModifyColumnFamiliesRequest;
2222
import java.io.IOException;
2323

2424
public class DeleteColumnFamilyExample {
25-
public void deleteColumnFamily(String projectId, String instanceId, String tableId)
26-
throws IOException {
27-
try (BigtableDataClient dataClient = BigtableDataClient.create(projectId, instanceId)) {
28-
dataClient.mutateRow(
29-
RowMutation.create(tableId, "phone#5c10102#20190501").deleteFamily("stats_summary"));
25+
public void deleteColumnFamily(
26+
String projectId, String instanceId, String tableId, String columnFamily) throws IOException {
27+
try (BigtableTableAdminClient tableAdminClient =
28+
BigtableTableAdminClient.create(projectId, instanceId)) {
29+
ModifyColumnFamiliesRequest modifyColumnFamiliesRequest =
30+
ModifyColumnFamiliesRequest.of(tableId).dropFamily(columnFamily);
31+
tableAdminClient.modifyFamilies(modifyColumnFamiliesRequest);
3032
}
3133
}
3234
}

‎samples/snippets/src/main/java/com/example/bigtable/deletes/DeleteColumnCellsExample.java‎ renamed to ‎samples/snippets/src/main/java/com/example/bigtable/deletes/DeleteFromColumnExample.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
import com.google.cloud.bigtable.data.v2.models.RowMutation;
2323
import java.io.IOException;
2424

25-
public class DeleteColumnCellsExample {
26-
public void deleteColumnCells(String projectId, String instanceId, String tableId)
25+
public class DeleteFromColumnExample {
26+
public void deleteFromColumnCells(String projectId, String instanceId, String tableId)
2727
throws IOException {
2828
try (BigtableDataClient dataClient = BigtableDataClient.create(projectId, instanceId)) {
2929
Mutation mutation = Mutation.create().deleteCells("cell_plan", "data_plan_01gb");

‎samples/snippets/src/main/java/com/example/bigtable/deletes/DeleteFromColumnFamilyExample.java‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
/*
2+
* Copyright 2022 Google LLC
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package com.example.bigtable.deletes;
18+
19+
// [START bigtable_delete_from_column_family]
20+
import com.google.cloud.bigtable.data.v2.BigtableDataClient;
21+
import com.google.cloud.bigtable.data.v2.models.RowMutation;
22+
import java.io.IOException;
23+
24+
public class DeleteFromColumnFamilyExample {
25+
public void deleteFromColumnFamily(String projectId, String instanceId, String tableId)
26+
throws IOException {
27+
try (BigtableDataClient dataClient = BigtableDataClient.create(projectId, instanceId)) {
28+
dataClient.mutateRow(
29+
RowMutation.create(tableId, "phone#5c10102#20190501").deleteFamily("stats_summary"));
30+
}
31+
}
32+
}
33+
// [END bigtable_delete_from_column_family]

‎samples/snippets/src/main/java/com/example/bigtable/deletes/DeleteRowExample.java‎ renamed to ‎samples/snippets/src/main/java/com/example/bigtable/deletes/DeleteFromRowExample.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,9 @@
2222
import com.google.cloud.bigtable.data.v2.models.RowMutation;
2323
import java.io.IOException;
2424

25-
public class DeleteRowExample {
26-
public void deleteRow(String projectId, String instanceId, String tableId) throws IOException {
25+
public class DeleteFromRowExample {
26+
public void deleteFromRow(String projectId, String instanceId, String tableId)
27+
throws IOException {
2728
try (BigtableDataClient dataClient = BigtableDataClient.create(projectId, instanceId)) {
2829
Mutation mutation = Mutation.create().deleteRow();
2930
dataClient.mutateRow(RowMutation.create(tableId, "phone#4c410523#20190501", mutation));

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

Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ public void test1_testDeleteFromColumn() throws IOException {
6363

6464
Truth.assertThat(cells).isNotEmpty();
6565

66-
DeleteColumnCellsExample deleteColumnCellsExample = new DeleteColumnCellsExample();
67-
deleteColumnCellsExample.deleteColumnCells(projectId, instanceId, TABLE_ID);
66+
DeleteFromColumnExample deleteFromColumnExample = new DeleteFromColumnExample();
67+
deleteFromColumnExample.deleteFromColumnCells(projectId, instanceId, TABLE_ID);
6868
row = bigtableDataClient.readRow(TABLE_ID, rowKey);
6969
List<RowCell> cellsAfterDelete = row.getCells(COLUMN_FAMILY_NAME_PLAN, qualifier);
7070

@@ -78,8 +78,8 @@ public void test2_testDeleteFromRow() throws IOException {
7878

7979
Truth.assertThat(row).isNotNull();
8080

81-
DeleteRowExample deleteRowExample = new DeleteRowExample();
82-
deleteRowExample.deleteRow(projectId, instanceId, TABLE_ID);
81+
DeleteFromRowExample deleteFromRowExample = new DeleteFromRowExample();
82+
deleteFromRowExample.deleteFromRow(projectId, instanceId, TABLE_ID);
8383
row = bigtableDataClient.readRow(TABLE_ID, rowKey);
8484

8585
Truth.assertThat(row).isNull();
@@ -143,23 +143,38 @@ public void test5_testDropRowRange() throws IOException {
143143
}
144144

145145
@Test
146-
public void test6_testDeleteColumnFamily() throws IOException {
146+
public void test6_testDeleteFromColumnFamily() throws IOException {
147147
String rowKey = "phone#5c10102#20190501";
148148
Row row = bigtableDataClient.readRow(TABLE_ID, rowKey);
149149
List<RowCell> cells = row.getCells(COLUMN_FAMILY_NAME_STATS);
150150

151151
Truth.assertThat(cells).isNotEmpty();
152152

153-
DeleteColumnFamilyExample deleteColumnFamilyExample = new DeleteColumnFamilyExample();
154-
deleteColumnFamilyExample.deleteColumnFamily(projectId, instanceId, TABLE_ID);
153+
DeleteFromColumnFamilyExample deleteFromColumnFamilyExample =
154+
new DeleteFromColumnFamilyExample();
155+
deleteFromColumnFamilyExample.deleteFromColumnFamily(projectId, instanceId, TABLE_ID);
155156
row = bigtableDataClient.readRow(TABLE_ID, rowKey);
156157
List<RowCell> cellsAfterDelete = row.getCells(COLUMN_FAMILY_NAME_STATS);
157158

158159
Truth.assertThat(cellsAfterDelete).isEmpty();
159160
}
160161

161162
@Test
162-
public void test7_testDeleteTable() throws IOException {
163+
public void test7_testDeleteColumnFamily() throws IOException {
164+
try (BigtableTableAdminClient tableAdminClient =
165+
BigtableTableAdminClient.create(projectId, instanceId)) {
166+
Truth.assertThat(tableAdminClient.getTable(TABLE_ID).getColumnFamilies().size()).isEqualTo(2);
167+
168+
DeleteColumnFamilyExample deleteColumnFamilyExample = new DeleteColumnFamilyExample();
169+
deleteColumnFamilyExample.deleteColumnFamily(
170+
projectId, instanceId, TABLE_ID, COLUMN_FAMILY_NAME_STATS);
171+
172+
Truth.assertThat(tableAdminClient.getTable(TABLE_ID).getColumnFamilies().size()).isEqualTo(1);
173+
}
174+
}
175+
176+
@Test
177+
public void test8_testDeleteTable() throws IOException {
163178
try (BigtableTableAdminClient tableAdminClient =
164179
BigtableTableAdminClient.create(projectId, instanceId)) {
165180
Truth.assertThat(tableAdminClient.exists(TABLE_ID)).isTrue();

0 commit comments

Comments
 (0)