Repository: kudu Updated Branches: refs/heads/master ca3e38759 -> 5d113ec3c
Rename Hive MetaStore to Metastore Hive isn't consistent about the capitilization so it's not clear which is more correct, but we should at least be consistent ourselves. Change-Id: I47c0a6534de9d612787c23e2886b4150e3b69527 Reviewed-on: http://gerrit.cloudera.org:8080/10379 Tested-by: Kudu Jenkins Reviewed-by: Dan Burkert <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/kudu/repo Commit: http://git-wip-us.apache.org/repos/asf/kudu/commit/5d113ec3 Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/5d113ec3 Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/5d113ec3 Branch: refs/heads/master Commit: 5d113ec3c3a7296cc7a704bad415c74aab9f49fa Parents: ca3e387 Author: Dan Burkert <[email protected]> Authored: Fri May 11 10:41:13 2018 -0700 Committer: Dan Burkert <[email protected]> Committed: Mon May 14 19:44:24 2018 +0000 ---------------------------------------------------------------------- src/kudu/hms/hms_client.cc | 30 +++++++++++++++--------------- src/kudu/hms/hms_client.h | 2 +- src/kudu/hms/mini_hms.cc | 6 +++--- 3 files changed, 19 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kudu/blob/5d113ec3/src/kudu/hms/hms_client.cc ---------------------------------------------------------------------- diff --git a/src/kudu/hms/hms_client.cc b/src/kudu/hms/hms_client.cc index ca6fdb8..3f1f948 100644 --- a/src/kudu/hms/hms_client.cc +++ b/src/kudu/hms/hms_client.cc @@ -53,7 +53,7 @@ // Default to 100 MiB to match Thrift TSaslTransport.receiveSaslMessage and the // HMS metastore.server.max.message.size config. DEFINE_int32(hms_client_max_buf_size, 100 * 1024 * 1024, - "Maximum size of Hive MetaStore objects that can be received by the " + "Maximum size of Hive Metastore objects that can be received by the " "HMS client in bytes."); TAG_FLAG(hms_client_max_buf_size, experimental); // Note: despite being marked as a runtime flag, the new buf size value will @@ -176,13 +176,13 @@ HmsClient::~HmsClient() { Status HmsClient::Start() { SCOPED_LOG_SLOW_EXECUTION(WARNING, kSlowExecutionWarningThresholdMs, "starting HMS client"); HMS_RET_NOT_OK(client_.getOutputProtocol()->getTransport()->open(), - "failed to open Hive MetaStore connection"); + "failed to open Hive Metastore connection"); // Immediately after connecting to the HMS, check that it is configured with // the required event listeners. string event_listener_config; HMS_RET_NOT_OK(client_.get_config_value(event_listener_config, kTransactionalEventListeners, ""), - Substitute("failed to get Hive MetaStore $0 configuration", + Substitute("failed to get Hive Metastore $0 configuration", kTransactionalEventListeners)); // Parse the set of listeners from the configuration string. @@ -214,7 +214,7 @@ Status HmsClient::Start() { HMS_RET_NOT_OK(client_.get_config_value(disallow_incompatible_column_type_changes, kDisallowIncompatibleColTypeChanges, "false"), - Substitute("failed to get Hive MetaStore $0 configuration", + Substitute("failed to get Hive Metastore $0 configuration", kDisallowIncompatibleColTypeChanges)); if (boost::iequals(disallow_incompatible_column_type_changes, "true")) { @@ -229,7 +229,7 @@ Status HmsClient::Start() { Status HmsClient::Stop() { SCOPED_LOG_SLOW_EXECUTION(WARNING, kSlowExecutionWarningThresholdMs, "stopping HMS client"); HMS_RET_NOT_OK(client_.getInputProtocol()->getTransport()->close(), - "failed to close Hive MetaStore connection"); + "failed to close Hive Metastore connection"); return Status::OK(); } @@ -239,14 +239,14 @@ bool HmsClient::IsConnected() { Status HmsClient::CreateDatabase(const hive::Database& database) { SCOPED_LOG_SLOW_EXECUTION(WARNING, kSlowExecutionWarningThresholdMs, "create HMS database"); - HMS_RET_NOT_OK(client_.create_database(database), "failed to create Hive MetaStore database"); + HMS_RET_NOT_OK(client_.create_database(database), "failed to create Hive Metastore database"); return Status::OK(); } Status HmsClient::DropDatabase(const string& database_name, Cascade cascade) { SCOPED_LOG_SLOW_EXECUTION(WARNING, kSlowExecutionWarningThresholdMs, "drop HMS database"); HMS_RET_NOT_OK(client_.drop_database(database_name, true, cascade == Cascade::kTrue), - "failed to drop Hive MetaStore database"); + "failed to drop Hive Metastore database"); return Status::OK(); } @@ -254,7 +254,7 @@ Status HmsClient::GetAllDatabases(vector<string>* databases) { DCHECK(databases); SCOPED_LOG_SLOW_EXECUTION(WARNING, kSlowExecutionWarningThresholdMs, "get all HMS databases"); HMS_RET_NOT_OK(client_.get_all_databases(*databases), - "failed to get Hive MetaStore databases"); + "failed to get Hive Metastore databases"); return Status::OK(); } @@ -262,7 +262,7 @@ Status HmsClient::GetDatabase(const string& pattern, hive::Database* database) { DCHECK(database); SCOPED_LOG_SLOW_EXECUTION(WARNING, kSlowExecutionWarningThresholdMs, "get HMS database"); HMS_RET_NOT_OK(client_.get_database(*database, pattern), - "failed to get Hive MetaStore database"); + "failed to get Hive Metastore database"); return Status::OK(); } @@ -290,7 +290,7 @@ Status HmsClient::DropTable(const string& database_name, SCOPED_LOG_SLOW_EXECUTION(WARNING, kSlowExecutionWarningThresholdMs, "drop HMS table"); HMS_RET_NOT_OK(client_.drop_table_with_environment_context(database_name, table_name, true, env_ctx), - "failed to drop Hive MetaStore table"); + "failed to drop Hive Metastore table"); return Status::OK(); } @@ -299,7 +299,7 @@ Status HmsClient::GetAllTables(const string& database_name, DCHECK(tables); SCOPED_LOG_SLOW_EXECUTION(WARNING, kSlowExecutionWarningThresholdMs, "get all HMS tables"); HMS_RET_NOT_OK(client_.get_all_tables(*tables, database_name), - "failed to get Hive MetaStore tables"); + "failed to get Hive Metastore tables"); return Status::OK(); } @@ -309,7 +309,7 @@ Status HmsClient::GetTable(const string& database_name, DCHECK(table); SCOPED_LOG_SLOW_EXECUTION(WARNING, kSlowExecutionWarningThresholdMs, "get HMS table"); HMS_RET_NOT_OK(client_.get_table(*table, database_name, table_name), - "failed to get Hive MetaStore table"); + "failed to get Hive Metastore table"); return Status::OK(); } @@ -319,7 +319,7 @@ Status HmsClient::GetCurrentNotificationEventId(int64_t* event_id) { "get HMS current notification event ID"); hive::CurrentNotificationEventId response; HMS_RET_NOT_OK(client_.get_current_notificationEventId(response), - "failed to get Hive MetaStore current event ID"); + "failed to get Hive Metastore current event ID"); *event_id = response.eventId; return Status::OK(); } @@ -335,7 +335,7 @@ Status HmsClient::GetNotificationEvents(int64_t last_event_id, request.__set_maxEvents(max_events); hive::NotificationEventResponse response; HMS_RET_NOT_OK(client_.get_next_notification(response, request), - "failed to get Hive MetaStore next notification"); + "failed to get Hive Metastore next notification"); events->swap(response.events); return Status::OK(); } @@ -352,7 +352,7 @@ Status HmsClient::AddPartitions(const string& database_name, request.parts = std::move(partitions); HMS_RET_NOT_OK(client_.add_partitions_req(response, request), - "failed to add Hive MetaStore table partitions"); + "failed to add Hive Metastore table partitions"); return Status::OK(); } http://git-wip-us.apache.org/repos/asf/kudu/blob/5d113ec3/src/kudu/hms/hms_client.h ---------------------------------------------------------------------- diff --git a/src/kudu/hms/hms_client.h b/src/kudu/hms/hms_client.h index 0b650bc..baee762 100644 --- a/src/kudu/hms/hms_client.h +++ b/src/kudu/hms/hms_client.h @@ -62,7 +62,7 @@ struct HmsClientOptions { bool enable_kerberos = false; }; -// A client for the Hive MetaStore. +// A client for the Hive Metastore. // // All operations are synchronous, and may block. // http://git-wip-us.apache.org/repos/asf/kudu/blob/5d113ec3/src/kudu/hms/mini_hms.cc ---------------------------------------------------------------------- diff --git a/src/kudu/hms/mini_hms.cc b/src/kudu/hms/mini_hms.cc index 2618020..aabea83 100644 --- a/src/kudu/hms/mini_hms.cc +++ b/src/kudu/hms/mini_hms.cc @@ -154,7 +154,7 @@ Status MiniHms::Stop() { if (hms_process_) { VLOG(1) << "Stopping HMS"; unique_ptr<Subprocess> proc = std::move(hms_process_); - RETURN_NOT_OK_PREPEND(proc->KillAndWait(SIGTERM), "failed to stop the Hive MetaStore process"); + RETURN_NOT_OK_PREPEND(proc->KillAndWait(SIGTERM), "failed to stop the Hive Metastore process"); } return Status::OK(); } @@ -163,7 +163,7 @@ Status MiniHms::Pause() { CHECK(hms_process_); VLOG(1) << "Pausing HMS"; RETURN_NOT_OK_PREPEND(hms_process_->Kill(SIGSTOP), - "failed to pause the Hive MetaStore process"); + "failed to pause the Hive Metastore process"); return Status::OK(); } @@ -171,7 +171,7 @@ Status MiniHms::Resume() { CHECK(hms_process_); VLOG(1) << "Resuming HMS"; RETURN_NOT_OK_PREPEND(hms_process_->Kill(SIGCONT), - "failed to unpause the Hive MetaStore process"); + "failed to unpause the Hive Metastore process"); return Status::OK(); }
