[kudu] branch branch-1.10.x updated: [hms] Adjust storage handler package follow up

[adar]

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

adar pushed a commit to branch branch-1.10.x
in repository https://gitbox.apache.org/repos/asf/kudu.git


The following commit(s) were added to refs/heads/branch-1.10.x by this push:
     new 1244c6f  [hms] Adjust storage handler package follow up
1244c6f is described below

commit 1244c6f28690b2035930d838753c96630fd77521
Author: Grant Henke <granthe...@apache.org>
AuthorDate: Wed Jun 12 09:44:55 2019 -0500

    [hms] Adjust storage handler package follow up
    
    This is a follow up to commit 71b0940 to remove the
    temporary support for the old storage handler.
    
    Change-Id: I6596da12f2a7f4f5f9fdc5ed3f8012ec0e57d779
    Reviewed-on: http://gerrit.cloudera.org:8080/13595
    Tested-by: Kudu Jenkins
    Reviewed-by: Hao Hao <hao....@cloudera.com>
    (cherry picked from commit bfcb653c343e275e27c61c54baa29fcf3e95f8f3)
    Reviewed-on: http://gerrit.cloudera.org:8080/13603
    Reviewed-by: Andrew Wong <aw...@cloudera.com>
---
 .../java/org/apache/kudu/hive/metastore/KuduMetastorePlugin.java   | 6 +-----
 src/kudu/hms/hms_client.cc                                         | 7 +------
 src/kudu/hms/hms_client.h                                          | 2 --
 3 files changed, 2 insertions(+), 13 deletions(-)

diff --git 
a/java/kudu-hive/src/main/java/org/apache/kudu/hive/metastore/KuduMetastorePlugin.java
 
b/java/kudu-hive/src/main/java/org/apache/kudu/hive/metastore/KuduMetastorePlugin.java
index d40238e..bf72cef 100644
--- 
a/java/kudu-hive/src/main/java/org/apache/kudu/hive/metastore/KuduMetastorePlugin.java
+++ 
b/java/kudu-hive/src/main/java/org/apache/kudu/hive/metastore/KuduMetastorePlugin.java
@@ -66,9 +66,6 @@ import org.apache.hadoop.hive.metastore.events.ListenerEvent;
  */
 public class KuduMetastorePlugin extends MetaStoreEventListener {
 
-  // TODO(ghenke): Remove this after Impala integration of the adjusted 
KUDU_STORAGE_HANDLER.
-  @VisibleForTesting
-  static final String TEMP_KUDU_STORAGE_HANDLER = 
"org.apache.kudu.hive.KuduStorageHandler";
   @VisibleForTesting
   static final String KUDU_STORAGE_HANDLER = 
"org.apache.hadoop.hive.kudu.KuduStorageHandler";
   @VisibleForTesting
@@ -241,8 +238,7 @@ public class KuduMetastorePlugin extends 
MetaStoreEventListener {
    */
   private boolean isKuduTable(Table table) {
     String storageHandler = 
table.getParameters().get(hive_metastoreConstants.META_TABLE_STORAGE);
-    return KUDU_STORAGE_HANDLER.equals(storageHandler) ||
-        TEMP_KUDU_STORAGE_HANDLER.equals(storageHandler);
+    return KUDU_STORAGE_HANDLER.equals(storageHandler);
   }
 
   /**
diff --git a/src/kudu/hms/hms_client.cc b/src/kudu/hms/hms_client.cc
index 0fa8ba1..0286fcf 100644
--- a/src/kudu/hms/hms_client.cc
+++ b/src/kudu/hms/hms_client.cc
@@ -112,7 +112,6 @@ const char* const HmsClient::kKuduMasterEventKey = 
"kudu.master_event";
 const char* const HmsClient::kKuduCheckIdKey = "kudu.check_id";
 const char* const HmsClient::kKuduStorageHandler =
     "org.apache.hadoop.hive.kudu.KuduStorageHandler";
-const char* const HmsClient::kOldKuduStorageHandler = 
"org.apache.kudu.hive.KuduStorageHandler";
 
 const char* const HmsClient::kTransactionalEventListeners =
   "hive.metastore.transactional.event.listeners";
@@ -403,11 +402,7 @@ bool HmsClient::IsKuduTable(const hive::Table& table) {
   if (!storage_handler) {
     return false;
   }
-
-  // TODO(ghenke): Remove special kOldKuduStorageHandler handling after Impala 
integration
-  //  of the adjusted kKuduStorageHandler.
-  return *storage_handler == hms::HmsClient::kKuduStorageHandler ||
-         *storage_handler == hms::HmsClient::kOldKuduStorageHandler;
+  return *storage_handler == hms::HmsClient::kKuduStorageHandler;
 }
 
 } // namespace hms
diff --git a/src/kudu/hms/hms_client.h b/src/kudu/hms/hms_client.h
index aa4ef92..4012dae 100644
--- a/src/kudu/hms/hms_client.h
+++ b/src/kudu/hms/hms_client.h
@@ -66,8 +66,6 @@ class HmsClient {
   static const char* const kKuduCheckIdKey;
   static const char* const kStorageHandlerKey;
   static const char* const kKuduStorageHandler;
-  // TODO(ghenke): Remove this after Impala integration of the adjusted 
kKuduStorageHandler.
-  static const char* const kOldKuduStorageHandler;
   static const char* const kHiveFilterFieldParams;
 
   static const char* const kTransactionalEventListeners;