chore: more utility clean up from bigtable-hbase module

rahulKQL · rahulKQL · commit 5912923de825 · 2020-04-16T15:47:39.000+05:30
This PR removes references of `BigtableInstanceName` and `ThreadUtil`, which resides in bigtable-core module. ThreadUtil is copied over to `bigtable-hbase`.
diff --git a/bigtable-client-core-parent/bigtable-client-core/src/main/java/com/google/cloud/bigtable/util/ThreadUtil.java b/bigtable-client-core-parent/bigtable-client-core/src/main/java/com/google/cloud/bigtable/util/ThreadUtil.java
@@ -22,7 +22,7 @@
 import java.util.concurrent.ThreadFactory;
 
 /**
- * Creates a {@link ThreadFactory} that's safe to use in App Engine.
+ * Utility class to create a {@link ThreadFactory} that's safe to use in App Engine.
  *
  * <p>This class copies code that originates in {@link
  * io.grpc.internal.GrpcUtil#getThreadFactory(String, boolean)}.
@@ -33,11 +33,10 @@
 public class ThreadUtil {
 
   /**
-   * Get a {@link ThreadFactory} suitable for use in the current environment.
+   * Creates a {@link ThreadFactory} suitable for use in the current environment.
    *
    * @param nameFormat to apply to threads created by the factory.
-   * @param daemon {@code true} if the threads the factory creates are daemon threads, {@code false}
-   *     otherwise.
+   * @param daemon if {@code true} then this factory creates daemon threads.
    * @return a {@link ThreadFactory}.
    */
   public static ThreadFactory getThreadFactory(String nameFormat, boolean daemon) {
diff --git a/bigtable-client-core-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/util/ThreadUtil.java b/bigtable-client-core-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/util/ThreadUtil.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2020 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.cloud.bigtable.hbase.util;
+
+import com.google.api.core.InternalApi;
+import com.google.cloud.PlatformInformation;
+import com.google.common.util.concurrent.MoreExecutors;
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import java.util.concurrent.ThreadFactory;
+
+/**
+ * Creates a {@link ThreadFactory} that's safe to use in App Engine.
+ *
+ * <p>This class copies code that originates in {@link
+ * io.grpc.internal.GrpcUtil#getThreadFactory(String, boolean)}.
+ *
+ * <p>For internal use only - public for technical reasons.
+ */
+@InternalApi("For internal usage only")
+public class ThreadUtil {
+
+  /**
+   * Get a {@link ThreadFactory} suitable for use in the current environment.
+   *
+   * @param nameFormat to apply to threads created by the factory.
+   * @param daemon {@code true} if the threads the factory creates are daemon threads, {@code false}
+   *     otherwise.
+   * @return a {@link ThreadFactory}.
+   */
+  public static ThreadFactory getThreadFactory(String nameFormat, boolean daemon) {
+    if (PlatformInformation.isOnGAEStandard7() || PlatformInformation.isOnGAEStandard8()) {
+      return MoreExecutors.platformThreadFactory();
+    } else {
+      return new ThreadFactoryBuilder().setDaemon(daemon).setNameFormat(nameFormat).build();
+    }
+  }
+}
diff --git a/bigtable-client-core-parent/bigtable-hbase/src/main/java/org/apache/hadoop/hbase/client/AbstractBigtableAdmin.java b/bigtable-client-core-parent/bigtable-hbase/src/main/java/org/apache/hadoop/hbase/client/AbstractBigtableAdmin.java
@@ -26,7 +26,6 @@
 import com.google.cloud.bigtable.admin.v2.models.CreateTableRequest;
 import com.google.cloud.bigtable.admin.v2.models.ModifyColumnFamiliesRequest;
 import com.google.cloud.bigtable.admin.v2.models.Table;
-import com.google.cloud.bigtable.grpc.BigtableInstanceName;
 import com.google.cloud.bigtable.hbase.BigtableOptionsFactory;
 import com.google.cloud.bigtable.hbase.adapters.admin.TableAdapter;
 import com.google.cloud.bigtable.hbase.util.Logger;
@@ -93,7 +92,6 @@ public abstract class AbstractBigtableAdmin implements Admin {
   private final BigtableHBaseSettings settings;
   protected final CommonConnection connection;
   protected final AdminClientWrapper tableAdminClientWrapper;
-  protected final BigtableInstanceName bigtableInstanceName;
 
   /**
    * Constructor for AbstractBigtableAdmin.
@@ -107,8 +105,6 @@ public AbstractBigtableAdmin(CommonConnection connection) throws IOException {
     settings = connection.getBigtableSettings();
     this.connection = connection;
     disabledTables = connection.getDisabledTables();
-    bigtableInstanceName =
-        new BigtableInstanceName(settings.getProjectId(), settings.getInstanceId());
     tableAdminClientWrapper = connection.getBigtableApi().getAdminClient();
   }
 
diff --git a/bigtable-hbase-1.x-parent/bigtable-hbase-1.x/src/test/java/com/google/cloud/bigtable/hbase/ManyThreadDriver.java b/bigtable-hbase-1.x-parent/bigtable-hbase-1.x/src/test/java/com/google/cloud/bigtable/hbase/ManyThreadDriver.java
@@ -18,11 +18,11 @@
 import com.codahale.metrics.MetricFilter;
 import com.codahale.metrics.graphite.GraphiteReporter;
 import com.codahale.metrics.graphite.PickledGraphite;
+import com.google.cloud.bigtable.hbase.util.ThreadUtil;
 import com.google.cloud.bigtable.metrics.BigtableClientMetrics;
 import com.google.cloud.bigtable.metrics.BigtableClientMetrics.MetricLevel;
 import com.google.cloud.bigtable.metrics.DropwizardMetricRegistry;
 import com.google.cloud.bigtable.metrics.MetricRegistry;
-import com.google.cloud.bigtable.util.ThreadUtil;
 import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.util.concurrent.ExecutorService;
diff --git a/bigtable-hbase-2.x-parent/bigtable-hbase-2.x/src/main/java/com/google/cloud/bigtable/hbase2_x/BigtableAsyncAdmin.java b/bigtable-hbase-2.x-parent/bigtable-hbase-2.x/src/main/java/com/google/cloud/bigtable/hbase2_x/BigtableAsyncAdmin.java
@@ -19,9 +19,9 @@
 import static com.google.cloud.bigtable.hbase2_x.FutureUtils.toCompletableFuture;
 
 import com.google.api.core.InternalApi;
+import com.google.cloud.bigtable.admin.v2.internal.NameUtil;
 import com.google.cloud.bigtable.admin.v2.models.CreateTableRequest;
 import com.google.cloud.bigtable.admin.v2.models.Table;
-import com.google.cloud.bigtable.grpc.BigtableInstanceName;
 import com.google.cloud.bigtable.hbase.util.Logger;
 import com.google.cloud.bigtable.hbase.util.ModifyTableBuilder;
 import com.google.cloud.bigtable.hbase.wrappers.AdminClientWrapper;
@@ -89,16 +89,14 @@ public class BigtableAsyncAdmin implements AsyncAdmin {
 
   private final Set<TableName> disabledTables;
   private final AdminClientWrapper bigtableTableAdminClient;
-  private final BigtableInstanceName bigtableInstanceName;
+  private final BigtableHBaseSettings settings;
   private final CommonConnection asyncConnection;
 
   public BigtableAsyncAdmin(CommonConnection asyncConnection) throws IOException {
     LOG.debug("Creating BigtableAsyncAdmin");
-    BigtableHBaseSettings settings = asyncConnection.getBigtableSettings();
+    this.settings = asyncConnection.getBigtableSettings();
     this.bigtableTableAdminClient = asyncConnection.getBigtableApi().getAdminClient();
     this.disabledTables = asyncConnection.getDisabledTables();
-    this.bigtableInstanceName =
-        new BigtableInstanceName(settings.getProjectId(), settings.getInstanceId());
     this.asyncConnection = asyncConnection;
   }
 
@@ -229,7 +227,9 @@ private CompletableFuture<List<TableDescriptor>> listTables(Optional<Pattern> ta
                     .map(
                         m ->
                             com.google.bigtable.admin.v2.Table.newBuilder()
-                                .setName(bigtableInstanceName.toTableNameStr(m))
+                                .setName(
+                                    NameUtil.formatTableName(
+                                        settings.getProjectId(), settings.getInstanceId(), m))
                                 .build())
                     .map(Table::fromProto)
                     .map(TableAdapter2x::adapt)
diff --git a/bigtable-hbase-2.x-parent/bigtable-hbase-2.x/src/test/java/com/google/cloud/bigtable/hbase/ManyThreadDriver.java b/bigtable-hbase-2.x-parent/bigtable-hbase-2.x/src/test/java/com/google/cloud/bigtable/hbase/ManyThreadDriver.java
@@ -18,11 +18,11 @@
 import com.codahale.metrics.MetricFilter;
 import com.codahale.metrics.graphite.GraphiteReporter;
 import com.codahale.metrics.graphite.PickledGraphite;
+import com.google.cloud.bigtable.hbase.util.ThreadUtil;
 import com.google.cloud.bigtable.metrics.BigtableClientMetrics;
 import com.google.cloud.bigtable.metrics.BigtableClientMetrics.MetricLevel;
 import com.google.cloud.bigtable.metrics.DropwizardMetricRegistry;
 import com.google.cloud.bigtable.metrics.MetricRegistry;
-import com.google.cloud.bigtable.util.ThreadUtil;
 import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.util.concurrent.ExecutorService;
diff --git a/bigtable-hbase-2.x-parent/bigtable-hbase-2.x/src/test/java/com/google/cloud/bigtable/hbase/RecreateConnectionDriver.java b/bigtable-hbase-2.x-parent/bigtable-hbase-2.x/src/test/java/com/google/cloud/bigtable/hbase/RecreateConnectionDriver.java
@@ -15,7 +15,7 @@
  */
 package com.google.cloud.bigtable.hbase;
 
-import com.google.cloud.bigtable.util.ThreadUtil;
+import com.google.cloud.bigtable.hbase.util.ThreadUtil;
 import java.io.IOException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
