review - 1

Author: dengzhhu653

itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestMetastoreVersion.java

@@ -25,6 +25,7 @@
 import org.apache.hadoop.hive.conf.HiveConf;
 import org.apache.hadoop.hive.conf.HiveConfForTest;
 import org.apache.hadoop.hive.metastore.api.MetaException;
+import org.apache.hadoop.hive.metastore.handler.BaseHandler;
 import org.apache.hadoop.hive.ql.DriverFactory;
 import org.apache.hadoop.hive.ql.IDriver;
 import org.apache.hadoop.hive.ql.metadata.Hive;
@@ -55,8 +56,7 @@ public class TestMetastoreVersion {
 
   @Before
   public void setUp() throws Exception {
-
-    Field defDb = HMSHandler.class.getDeclaredField("currentUrl");
+    Field defDb = BaseHandler.class.getDeclaredField("currentUrl");
     defDb.setAccessible(true);
     defDb.set(null, null);
     // reset defaults

standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/HMSHandler.java

@@ -135,6 +135,24 @@ public HMSHandler(String name, Configuration conf) {
     isInTest = MetastoreConf.getBoolVar(this.conf, HIVE_IN_TEST);
   }
 
+  @Override
+  public void init() throws MetaException {
+    super.init();
+    DataConnectorProviderFactory.getInstance(this);
+  }
+
+  /**
+   * Get a cached RawStore.
+   *
+   * @return the cached RawStore
+   * @throws MetaException
+   */
+  @Override
+  public RawStore getMS() throws MetaException {
+    Configuration conf = getConf();
+    return getMSForConf(conf);
+  }
+
   public static RawStore getMSForConf(Configuration conf) throws MetaException {
     RawStore ms = getRawStore();
     if (ms == null) {

standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/RetryingHMSHandler.java

@@ -55,7 +55,7 @@ public RetryingHMSHandler(Configuration conf, IHMSHandler baseHandler, boolean l
     try {
       //invoking init method of baseHandler this way since it adds the retry logic
       //in case of transient failures in init method
-      invoke(baseHandler, baseHandler.getClass().getMethod("init", (Class<?>[]) null),
+      invoke(baseHandler, baseHandler.getClass().getDeclaredMethod("init", (Class<?>[]) null),
           null);
     } catch (Throwable e) {
       LOG.error("HMSHandler Fatal error: " + ExceptionUtils.getStackTrace(e));

standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/handler/BaseHandler.java

@@ -47,7 +47,6 @@
 import org.apache.hadoop.hive.metastore.AlterHandler;
 import org.apache.hadoop.hive.metastore.DefaultMetaStoreFilterHookImpl;
 import org.apache.hadoop.hive.metastore.FileMetadataManager;
-import org.apache.hadoop.hive.metastore.HMSHandler;
 import org.apache.hadoop.hive.metastore.HMSHandlerContext;
 import org.apache.hadoop.hive.metastore.HMSMetricsListener;
 import org.apache.hadoop.hive.metastore.HiveMetaStore;
@@ -235,7 +234,7 @@ public void init(Warehouse wh) throws MetaException {
     }
     if (conf.getBoolean(MetastoreConf.ConfVars.METASTORE_CACHE_CAN_USE_EVENT.getVarname(), false) &&
         !canCachedStoreCanUseEvent) {
-      throw new MetaException("CahcedStore can not use events for invalidation as there is no " +
+      throw new MetaException("CachedStore can not use events for invalidation as there is no " +
           " TransactionalMetaStoreEventListener to add events to notification table");
     }
 
@@ -362,18 +361,6 @@ public AbstractMap<String, Long> getCounters() {
     return counters;
   }
 
-  /**
-   * Get a cached RawStore.
-   *
-   * @return the cached RawStore
-   * @throws MetaException
-   */
-  @Override
-  public RawStore getMS() throws MetaException {
-    Configuration conf = getConf();
-    return HMSHandler.getMSForConf(conf);
-  }
-
   @Override
   public TxnStore getTxnHandler() {
     return HMSHandlerContext.getTxnStore(conf);
@@ -390,7 +377,7 @@ protected static void logAndAudit(final String m) {
   }
 
   // This will return null if the metastore is not being accessed from a metastore Thrift server,
-  // or if the TTransport being used to connect is not an instance of TSocket, or if kereberos
+  // or if the TTransport being used to connect is not an instance of TSocket, or if kerberos
   // is used
   public static String getThreadLocalIpAddress() {
     return HMSHandlerContext.getIpAddress().orElse(null);
@@ -952,7 +939,7 @@ public void setMetaConf(String key, String value) throws MetaException {
           new ConfigChangeEvent(this, key, oldValue, value));
     }
     if (MetastoreConf.ConfVars.TRY_DIRECT_SQL == confVar) {
-      HMSHandler.LOG.info("Direct SQL optimization = {}",  value);
+      LOG.info("Direct SQL optimization = {}",  value);
     }
   }
 

standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/handler/TransactionHandler.java

@@ -521,7 +521,8 @@ public ReplayedTxnsForPolicyResult get_replayed_txns_for_policy(String policyNam
       ret = getTxnHandler().getReplayedTxnsForPolicy(policyName);
     } catch (Exception e) {
       ex = e;
-      throw new MetaException("Failed to get replayed txns details for policy " + e.getMessage());
+      throw new MetaException(
+          "Failed to get replayed txns details for policy '" + policyName + "': " + e.getMessage());
     } finally {
       endFunction("get_replayed_txns_for_policy", ret != null, ex);
     }

standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/utils/MetaStoreServerUtils.java

@@ -18,7 +18,6 @@
 package org.apache.hadoop.hive.metastore.utils;
 
 import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
 import com.google.common.base.Predicates;
 import com.google.common.collect.ImmutableListMultimap;
 import com.google.common.collect.Lists;
@@ -1827,7 +1826,9 @@ public static boolean canUpdateStats(Configuration conf, Table tbl) {
 
   public static List<String> getPartValsFromName(Table t, String partName)
       throws MetaException, InvalidObjectException {
-    Preconditions.checkArgument(t != null, "Table can not be null");
+    if (t == null) {
+      throw new MetaException("Table cannot be null");
+    }
     // Unescape the partition name
     LinkedHashMap<String, String> hm = Warehouse.makeSpecFromName(partName);