HBASE-24964 Remove MetaTableAccessor.tableExists (#2330)

Signed-off-by: Viraj Jasani <[email protected]>

hbase-client/src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java

@@ -446,21 +446,6 @@ private static boolean isMergeQualifierPrefix(Cell cell) {
       PrivateCellUtil.qualifierStartsWith(cell, HConstants.MERGE_QUALIFIER_PREFIX);
   }
 
-  /**
-   * Checks if the specified table exists.  Looks at the hbase:meta table hosted on
-   * the specified server.
-   * @param connection connection we're using
-   * @param tableName table to check
-   * @return true if the table exists in meta, false if not
-   */
-  public static boolean tableExists(Connection connection,
-      final TableName tableName)
-  throws IOException {
-    // Catalog tables always exist.
-    return tableName.equals(TableName.META_TABLE_NAME) ||
-        getTableState(connection, tableName) != null;
-  }
-
   /**
    * Lists all of the regions currently in META.
    *

hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java

@@ -464,7 +464,7 @@ public boolean tableExists(final TableName tableName) throws IOException {
     return executeCallable(new RpcRetryingCallable<Boolean>() {
       @Override
       protected Boolean rpcCall(int callTimeout) throws Exception {
-        return MetaTableAccessor.tableExists(connection, tableName);
+        return MetaTableAccessor.getTableState(getConnection(), tableName) != null;
       }
     });
   }
@@ -2026,7 +2026,7 @@ private TableName checkTableExists(final TableName tableName)
     return executeCallable(new RpcRetryingCallable<TableName>() {
       @Override
       protected TableName rpcCall(int callTimeout) throws Exception {
-        if (!MetaTableAccessor.tableExists(connection, tableName)) {
+        if (MetaTableAccessor.getTableState(getConnection(), tableName) == null) {
           throw new TableNotFoundException(tableName);
         }
         return tableName;

hbase-server/src/main/java/org/apache/hadoop/hbase/TableDescriptors.java

@@ -28,6 +28,14 @@
  */
 @InterfaceAudience.Private
 public interface TableDescriptors {
+
+  /**
+   * Test whether a given table exists, i.e, has a table descriptor.
+   */
+  default boolean exists(TableName tableName) throws IOException {
+    return get(tableName) != null;
+  }
+
   /**
    * @return TableDescriptor for tablename
    */

hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java

@@ -2576,8 +2576,8 @@ protected String getDescription() {
   }
 
   private void checkTableExists(final TableName tableName)
-      throws IOException, TableNotFoundException {
-    if (!MetaTableAccessor.tableExists(getConnection(), tableName)) {
+    throws IOException, TableNotFoundException {
+    if (!tableDescriptors.exists(tableName)) {
       throw new TableNotFoundException(tableName);
     }
   }

hbase-server/src/main/java/org/apache/hadoop/hbase/master/TableNamespaceManager.java

@@ -21,7 +21,6 @@
 import java.io.IOException;
 import java.io.InterruptedIOException;
 import java.util.NavigableSet;
-
 import org.apache.commons.lang3.StringUtils;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.Cell;
@@ -30,7 +29,6 @@
 import org.apache.hadoop.hbase.CellUtil;
 import org.apache.hadoop.hbase.DoNotRetryIOException;
 import org.apache.hadoop.hbase.HTableDescriptor;
-import org.apache.hadoop.hbase.MetaTableAccessor;
 import org.apache.hadoop.hbase.NamespaceDescriptor;
 import org.apache.hadoop.hbase.Stoppable;
 import org.apache.hadoop.hbase.TableName;
@@ -48,16 +46,18 @@
 import org.apache.hadoop.hbase.master.procedure.MasterProcedureEnv;
 import org.apache.hadoop.hbase.master.procedure.ProcedurePrepareLatch;
 import org.apache.hadoop.hbase.procedure2.ProcedureExecutor;
-import org.apache.hbase.thirdparty.com.google.common.collect.Sets;
-import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil;
-import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;
 import org.apache.hadoop.hbase.util.Threads;
 import org.apache.yetus.audience.InterfaceAudience;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import org.apache.hbase.thirdparty.com.google.common.collect.Sets;
+
+import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil;
+import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos;
+
 /**
  * This is a helper class used internally to manage the namespace metadata that is stored in
  * TableName.NAMESPACE_TABLE_NAME. It also mirrors updates to the ZK store by forwarding updates to
@@ -91,8 +91,7 @@ public class TableNamespaceManager implements Stoppable {
   }
 
   public void start() throws IOException {
-    if (!MetaTableAccessor.tableExists(masterServices.getConnection(),
-        TableName.NAMESPACE_TABLE_NAME)) {
+    if (!masterServices.getTableDescriptors().exists(TableName.NAMESPACE_TABLE_NAME)) {
       LOG.info("Namespace table not found. Creating...");
       createNamespaceTable(masterServices);
     }

hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/AbstractStateMachineRegionProcedure.java

@@ -19,8 +19,6 @@
 package org.apache.hadoop.hbase.master.procedure;
 
 import java.io.IOException;
-
-import org.apache.hadoop.hbase.MetaTableAccessor;
 import org.apache.hadoop.hbase.TableName;
 import org.apache.hadoop.hbase.TableNotFoundException;
 import org.apache.hadoop.hbase.client.RegionInfo;
@@ -78,19 +76,6 @@ public void toStringClassDetails(final StringBuilder sb) {
     sb.append(", region=").append(getRegion().getShortNameToLog());
   }
 
-  /**
-   * Check whether a table is modifiable - exists and either offline or online with config set
-   * @param env MasterProcedureEnv
-   * @throws IOException
-   */
-  @Override
-  protected void checkTableModifiable(final MasterProcedureEnv env) throws IOException {
-    // Checks whether the table exists
-    if (!MetaTableAccessor.tableExists(env.getMasterServices().getConnection(), getTableName())) {
-      throw new TableNotFoundException(getTableName());
-    }
-  }
-
   @Override
   protected boolean holdLock(MasterProcedureEnv env) {
     return true;

hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/AbstractStateMachineTableProcedure.java

@@ -20,7 +20,6 @@
 import java.io.IOException;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.hbase.HBaseIOException;
-import org.apache.hadoop.hbase.MetaTableAccessor;
 import org.apache.hadoop.hbase.TableName;
 import org.apache.hadoop.hbase.TableNotDisabledException;
 import org.apache.hadoop.hbase.TableNotEnabledException;
@@ -120,11 +119,10 @@ protected void releaseSyncLatch() {
   /**
    * Check whether a table is modifiable - exists and either offline or online with config set
    * @param env MasterProcedureEnv
-   * @throws IOException
    */
   protected void checkTableModifiable(final MasterProcedureEnv env) throws IOException {
     // Checks whether the table exists
-    if (!MetaTableAccessor.tableExists(env.getMasterServices().getConnection(), getTableName())) {
+    if (!env.getMasterServices().getTableDescriptors().exists(getTableName())) {
       throw new TableNotFoundException(getTableName());
     }
   }

hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/CloneSnapshotProcedure.java

@@ -27,7 +27,6 @@
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.hbase.MetaTableAccessor;
 import org.apache.hadoop.hbase.TableExistsException;
 import org.apache.hadoop.hbase.TableName;
 import org.apache.hadoop.hbase.client.RegionInfo;
@@ -330,12 +329,11 @@ protected void deserializeStateData(ProcedureStateSerializer serializer)
   /**
    * Action before any real action of cloning from snapshot.
    * @param env MasterProcedureEnv
-   * @throws IOException
    */
   private void prepareClone(final MasterProcedureEnv env) throws IOException {
     final TableName tableName = getTableName();
-    if (MetaTableAccessor.tableExists(env.getMasterServices().getConnection(), tableName)) {
-      throw new TableExistsException(getTableName());
+    if (env.getMasterServices().getTableDescriptors().exists(tableName)) {
+      throw new TableExistsException(tableName);
     }
   }
 

hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/CreateTableProcedure.java

@@ -240,7 +240,7 @@ protected boolean waitInitialized(MasterProcedureEnv env) {
 
   private boolean prepareCreate(final MasterProcedureEnv env) throws IOException {
     final TableName tableName = getTableName();
-    if (MetaTableAccessor.tableExists(env.getMasterServices().getConnection(), tableName)) {
+    if (env.getMasterServices().getTableDescriptors().exists(tableName)) {
       setFailure("master-create-table", new TableExistsException(getTableName()));
       return false;
     }

hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/DisableTableProcedure.java

@@ -246,7 +246,7 @@ private boolean prepareDisable(final MasterProcedureEnv env) throws IOException
       setFailure("master-disable-table",
         new ConstraintException("Cannot disable " + this.tableName));
       canTableBeDisabled = false;
-    } else if (!MetaTableAccessor.tableExists(env.getMasterServices().getConnection(), tableName)) {
+    } else if (!env.getMasterServices().getTableDescriptors().exists(tableName)) {
       setFailure("master-disable-table", new TableNotFoundException(tableName));
       canTableBeDisabled = false;
     } else if (!skipTableStateCheck) {

hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/EnableTableProcedure.java

@@ -281,9 +281,8 @@ public TableOperationType getTableOperationType() {
    */
   private boolean prepareEnable(final MasterProcedureEnv env) throws IOException {
     boolean canTableBeEnabled = true;
-
     // Check whether table exists
-    if (!MetaTableAccessor.tableExists(env.getMasterServices().getConnection(), tableName)) {
+    if (!env.getMasterServices().getTableDescriptors().exists(tableName)) {
       setFailure("master-enable-table", new TableNotFoundException(tableName));
       canTableBeEnabled = false;
     } else {

hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/ModifyTableProcedure.java

@@ -275,7 +275,7 @@ public TableOperationType getTableOperationType() {
    */
   private void prepareModify(final MasterProcedureEnv env) throws IOException {
     // Checks whether the table exists
-    if (!MetaTableAccessor.tableExists(env.getMasterServices().getConnection(), getTableName())) {
+    if (!env.getMasterServices().getTableDescriptors().exists(getTableName())) {
       throw new TableNotFoundException(getTableName());
     }
 

hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/RestoreSnapshotProcedure.java

@@ -24,7 +24,6 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.hbase.DoNotRetryIOException;
@@ -54,6 +53,7 @@
 import org.apache.yetus.audience.InterfaceAudience;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil;
 import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos;
 import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProcedureProtos;
@@ -330,7 +330,7 @@ protected void deserializeStateData(ProcedureStateSerializer serializer)
   private void prepareRestore(final MasterProcedureEnv env) throws IOException {
     final TableName tableName = getTableName();
     // Checks whether the table exists
-    if (!MetaTableAccessor.tableExists(env.getMasterServices().getConnection(), tableName)) {
+    if (!env.getMasterServices().getTableDescriptors().exists(tableName)) {
       throw new TableNotFoundException(tableName);
     }
 

hbase-server/src/main/java/org/apache/hadoop/hbase/master/slowlog/SlowLogMasterService.java

@@ -63,7 +63,7 @@ public void init() throws IOException {
       LOG.info("Slow/Large requests logging to system table hbase:slowlog is disabled. Quitting.");
       return;
     }
-    if (!MetaTableAccessor.tableExists(masterServices.getConnection(),
+    if (!masterServices.getTableDescriptors().exists(
         SlowLogTableAccessor.SLOW_LOG_TABLE_NAME)) {
       LOG.info("slowlog table not found. Creating.");
       this.masterServices.createSystemTable(TABLE_DESCRIPTOR_BUILDER.build());

hbase-server/src/main/java/org/apache/hadoop/hbase/master/snapshot/SnapshotManager.java

@@ -42,7 +42,6 @@
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.hbase.HBaseInterfaceAudience;
 import org.apache.hadoop.hbase.HConstants;
-import org.apache.hadoop.hbase.MetaTableAccessor;
 import org.apache.hadoop.hbase.Stoppable;
 import org.apache.hadoop.hbase.TableName;
 import org.apache.hadoop.hbase.client.TableDescriptor;
@@ -851,7 +850,7 @@ public long restoreOrCloneSnapshot(final SnapshotDescription reqSnapshot, final
 
     // Execute the restore/clone operation
     long procId;
-    if (MetaTableAccessor.tableExists(master.getConnection(), tableName)) {
+    if (master.getTableDescriptors().exists(tableName)) {
       procId = restoreSnapshot(reqSnapshot, tableName, snapshot, snapshotTableDesc, nonceKey,
         restoreAcl);
     } else {

hbase-server/src/main/java/org/apache/hadoop/hbase/namespace/NamespaceAuditor.java

@@ -66,7 +66,7 @@ public void start() throws IOException {
   public void checkQuotaToCreateTable(TableName tName, int regions) throws IOException {
     if (stateManager.isInitialized()) {
       // We do this check to fail fast.
-      if (MetaTableAccessor.tableExists(this.masterServices.getConnection(), tName)) {
+      if (masterServices.getTableDescriptors().exists(tName)) {
         throw new TableExistsException(tName);
       }
       stateManager.checkAndUpdateNamespaceTableCount(tName, regions);

hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/MasterQuotaManager.java

@@ -28,12 +28,10 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
-
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.hbase.DoNotRetryIOException;
-import org.apache.hadoop.hbase.MetaTableAccessor;
 import org.apache.hadoop.hbase.NamespaceDescriptor;
 import org.apache.hadoop.hbase.RegionStateListener;
 import org.apache.hadoop.hbase.TableName;
@@ -105,8 +103,7 @@ public void start() throws IOException {
     }
 
     // Create the quota table if missing
-    if (!MetaTableAccessor.tableExists(masterServices.getConnection(),
-          QuotaUtil.QUOTA_TABLE_NAME)) {
+    if (!masterServices.getTableDescriptors().exists(QuotaUtil.QUOTA_TABLE_NAME)) {
       LOG.info("Quota table not found. Creating...");
       createQuotaTable();
     }

hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/SpaceQuotaRefresherChore.java

@@ -21,19 +21,18 @@
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.concurrent.TimeUnit;
-
 import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hbase.MetaTableAccessor;
 import org.apache.hadoop.hbase.ScheduledChore;
 import org.apache.hadoop.hbase.TableName;
-import org.apache.yetus.audience.InterfaceAudience;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.hadoop.hbase.client.Admin;
 import org.apache.hadoop.hbase.client.Connection;
 import org.apache.hadoop.hbase.client.Result;
 import org.apache.hadoop.hbase.client.ResultScanner;
 import org.apache.hadoop.hbase.client.Table;
 import org.apache.hadoop.hbase.util.Bytes;
+import org.apache.yetus.audience.InterfaceAudience;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A {@link ScheduledChore} which periodically updates the {@link RegionServerSpaceQuotaManager}
@@ -160,7 +159,9 @@ protected void chore() {
    * @throws IOException throws IOException
    */
   boolean checkQuotaTableExists() throws IOException {
-    return MetaTableAccessor.tableExists(getConnection(), QuotaUtil.QUOTA_TABLE_NAME);
+    try (Admin admin = getConnection().getAdmin()) {
+      return admin.tableExists(QuotaUtil.QUOTA_TABLE_NAME);
+    }
   }
 
   /**

hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/SnapshotScannerHDFSAclCleaner.java

@@ -122,6 +122,6 @@ private boolean namespaceExists(String namespace) throws IOException {
   }
 
   private boolean tableExists(TableName tableName) throws IOException {
-    return master != null && MetaTableAccessor.tableExists(master.getConnection(), tableName);
+    return master != null && master.getTableDescriptors().exists(tableName);
   }
 }