[beam] branch master updated: Address failing BT read tests in #27319 (#27322)

[yhu]

This is an automated email from the ASF dual-hosted git repository.

yhu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git


The following commit(s) were added to refs/heads/master by this push:
     new 7eaef18bcbf Address failing BT read tests in #27319 (#27322)
7eaef18bcbf is described below

commit 7eaef18bcbfb48fb112884564b1362f638fe5834
Author: Ahmed Abualsaud <65791736+ahmedab...@users.noreply.github.com>
AuthorDate: Thu Jul 6 20:55:17 2023 +0000

    Address failing BT read tests in #27319 (#27322)
    
    * create table during setup instead
    
    * spotless
    
    * use slf4j logging
    
    * spotless
---
 .../BigtableReadSchemaTransformProviderIT.java     | 42 ++++++++++++----------
 1 file changed, 24 insertions(+), 18 deletions(-)

diff --git 
a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigtable/BigtableReadSchemaTransformProviderIT.java
 
b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigtable/BigtableReadSchemaTransformProviderIT.java
index 0c3429bf1f7..81d3103f38b 100644
--- 
a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigtable/BigtableReadSchemaTransformProviderIT.java
+++ 
b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigtable/BigtableReadSchemaTransformProviderIT.java
@@ -32,6 +32,7 @@ import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -49,14 +50,19 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 @RunWith(JUnit4.class)
 public class BigtableReadSchemaTransformProviderIT {
+  private static final Logger LOG =
+      LoggerFactory.getLogger(BigtableReadSchemaTransformProviderIT.class);
+
   @Rule public final transient TestPipeline p = TestPipeline.create();
 
   private static final String COLUMN_FAMILY_NAME_1 = "test_cf_1";
   private static final String COLUMN_FAMILY_NAME_2 = "test_cf_2";
-  private BigtableTableAdminClient adminClient;
+  private BigtableTableAdminClient tableAdminClient;
   private BigtableDataClient dataClient;
   private String tableId;
   private String projectId;
@@ -106,31 +112,31 @@ public class BigtableReadSchemaTransformProviderIT {
             .setProjectId(projectId)
             .setInstanceId(instanceId)
             .build();
-    adminClient = BigtableTableAdminClient.create(adminSettings);
+    tableAdminClient = BigtableTableAdminClient.create(adminSettings);
+
+    tableId = String.format("BTReadSchemaTransformIT-%tF-%<tH-%<tM-%<tS-%<tL", 
new Date());
+    if (!tableAdminClient.exists(tableId)) {
+      CreateTableRequest createTableRequest =
+          CreateTableRequest.of(tableId)
+              .addFamily(COLUMN_FAMILY_NAME_1)
+              .addFamily(COLUMN_FAMILY_NAME_2);
+      tableAdminClient.createTable(createTableRequest);
+    }
   }
 
   @After
   public void tearDown() {
     try {
-      adminClient.deleteTable(tableId);
-      System.out.printf("Table %s deleted successfully%n", tableId);
+      tableAdminClient.deleteTable(tableId);
+      LOG.info("Table {} deleted successfully.", tableId);
     } catch (NotFoundException e) {
-      System.err.println("Failed to delete a non-existent table: " + 
e.getMessage());
+      LOG.warn("Failed to delete a non-existent table [{}]: \n{}", tableId, 
e.getMessage());
     }
     dataClient.close();
-    adminClient.close();
+    tableAdminClient.close();
   }
 
-  public List<Row> writeToTable(int numRows) throws Exception {
-    // Checks if table exists, creates table if does not exist.
-    if (!adminClient.exists(tableId)) {
-      CreateTableRequest createTableRequest =
-          CreateTableRequest.of(tableId)
-              .addFamily(COLUMN_FAMILY_NAME_1)
-              .addFamily(COLUMN_FAMILY_NAME_2);
-      adminClient.createTable(createTableRequest);
-    }
-
+  public List<Row> writeToTable(int numRows) {
     List<Row> expectedRows = new ArrayList<>();
 
     try {
@@ -199,6 +205,7 @@ public class BigtableReadSchemaTransformProviderIT {
 
         expectedRows.add(expectedRow);
       }
+      LOG.info("Finished writing {} rows to table {}", numRows, tableId);
     } catch (NotFoundException e) {
       throw new RuntimeException("Failed to write to table", e);
     }
@@ -206,8 +213,7 @@ public class BigtableReadSchemaTransformProviderIT {
   }
 
   @Test
-  public void testRead() throws Exception {
-    tableId = "BigtableReadSchemaTransformIT";
+  public void testRead() {
     List<Row> expectedRows = writeToTable(20);
 
     BigtableReadSchemaTransformConfiguration config =