[kudu] branch master updated: catalog_manager: rename HMS catalog accessor

[ad...@apache.org]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 76cba44  catalog_manager: rename HMS catalog accessor
76cba44 is described below

commit 76cba44964be5e50a8c9a8d009580939b2515fb6
Author: Adar Dembo <ad...@cloudera.com>
AuthorDate: Fri Jan 10 11:52:53 2020 -0800

    catalog_manager: rename HMS catalog accessor
    
    The new name better conforms to our style.
    
    Change-Id: I6cca06e4123e6384dfe31efafd312734bc2183e2
    Reviewed-on: http://gerrit.cloudera.org:8080/15008
    Reviewed-by: Alexey Serbin <as...@cloudera.com>
    Tested-by: Adar Dembo <ad...@cloudera.com>
---
 src/kudu/master/catalog_manager.h                | 2 +-
 src/kudu/master/hms_notification_log_listener.cc | 5 ++---
 src/kudu/master/master_service.cc                | 3 +--
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/kudu/master/catalog_manager.h b/src/kudu/master/catalog_manager.h
index 2d3f3a9..7c5ed7a 100644
--- a/src/kudu/master/catalog_manager.h
+++ b/src/kudu/master/catalog_manager.h
@@ -757,7 +757,7 @@ class CatalogManager : public tserver::TabletReplicaLookupIf {
   // must be initialized before calling this method.
   consensus::RaftPeerPB::Role Role() const;
 
-  hms::HmsCatalog* HmsCatalog() const {
+  hms::HmsCatalog* hms_catalog() const {
     return hms_catalog_.get();
   }
 
diff --git a/src/kudu/master/hms_notification_log_listener.cc b/src/kudu/master/hms_notification_log_listener.cc
index c94b5f8..a401d1c 100644
--- a/src/kudu/master/hms_notification_log_listener.cc
+++ b/src/kudu/master/hms_notification_log_listener.cc
@@ -250,9 +250,8 @@ Status HmsNotificationLogListenerTask::Poll() {
       }
     }
 
-    RETURN_NOT_OK_PREPEND(catalog_manager_->HmsCatalog()->GetNotificationEvents(processed_event_id,
-                                                                                batch_size,
-                                                                                &events),
+    RETURN_NOT_OK_PREPEND(catalog_manager_->hms_catalog()->GetNotificationEvents(
+        processed_event_id, batch_size, &events),
                           "failed to retrieve notification log events");
 
     for (const auto& event : events) {
diff --git a/src/kudu/master/master_service.cc b/src/kudu/master/master_service.cc
index 627004b..50ed51d 100644
--- a/src/kudu/master/master_service.cc
+++ b/src/kudu/master/master_service.cc
@@ -26,7 +26,6 @@
 
 #include <boost/optional/optional.hpp>
 #include <gflags/gflags.h>
-#include <gflags/gflags_declare.h>
 #include <glog/logging.h>
 
 #include "kudu/common/common.pb.h"
@@ -680,7 +679,7 @@ void MasterServiceImpl::ConnectToMaster(const ConnectToMasterRequestPB* /*req*/,
     metastore_config->set_hms_uris(FLAGS_hive_metastore_uris);
     metastore_config->set_hms_sasl_enabled(FLAGS_hive_metastore_sasl_enabled);
     string uuid;
-    if (server_->catalog_manager()->HmsCatalog()->GetUuid(&uuid).ok()) {
+    if (server_->catalog_manager()->hms_catalog()->GetUuid(&uuid).ok()) {
       metastore_config->set_hms_uuid(std::move(uuid));
     }
   }