This is an automated email from the ASF dual-hosted git repository. alexey pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/kudu.git
commit 271ce3c91d61c54732f8bcb8e08b121b2f5e6b57 Author: Alexey Serbin <[email protected]> AuthorDate: Thu Jan 30 18:50:13 2025 -0800 [master] tablet_id() accessors return const reference This patch doesn't contain any functional modifications. Change-Id: If9d2aee19c0eade2ea41042b553c116b5028e49f Reviewed-on: http://gerrit.cloudera.org:8080/22429 Tested-by: Kudu Jenkins Reviewed-by: Ashwani Raina <[email protected]> Reviewed-by: Mahesh Reddy <[email protected]> Reviewed-by: Yifan Zhang <[email protected]> --- src/kudu/master/catalog_manager.cc | 10 +++++----- src/kudu/master/sys_catalog.cc | 4 ++-- src/kudu/master/sys_catalog.h | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/kudu/master/catalog_manager.cc b/src/kudu/master/catalog_manager.cc index ef1ffdb47..d275b61a9 100644 --- a/src/kudu/master/catalog_manager.cc +++ b/src/kudu/master/catalog_manager.cc @@ -4496,7 +4496,7 @@ class RetryingTSRpcTask : public MonitoredTask { } // Return the id of the tablet that is the subject of the async request. - virtual string tablet_id() const = 0; + virtual const string& tablet_id() const = 0; MonoTime start_timestamp() const override { return start_ts_; } MonoTime completion_timestamp() const override { return end_ts_; } @@ -4766,7 +4766,7 @@ class AsyncCreateReplica : public RetrySpecificTSRpcTask { } protected: - string tablet_id() const override { return tablet_id_; } + const string& tablet_id() const override { return tablet_id_; } void HandleResponse(int attempt) override { if (!resp_.has_error()) { @@ -4826,7 +4826,7 @@ class AsyncDeleteReplica : public RetrySpecificTSRpcTask { } protected: - string tablet_id() const override { return tablet_id_; } + const string& tablet_id() const override { return tablet_id_; } void HandleResponse(int attempt) override { if (resp_.has_error()) { @@ -4931,7 +4931,7 @@ class AsyncAlterTable : public RetryingTSRpcTask { } private: - string tablet_id() const override { return tablet_->id(); } + const string& tablet_id() const override { return tablet_->id(); } void HandleResponse(int /*attempt*/) override { if (resp_.has_error()) { @@ -5010,7 +5010,7 @@ class AsyncChangeConfigTask : public RetryingTSRpcTask { consensus::ChangeConfigResponsePB resp_; private: - string tablet_id() const override { return tablet_->id(); } + const string& tablet_id() const override { return tablet_->id(); } }; AsyncChangeConfigTask::AsyncChangeConfigTask(Master* master, diff --git a/src/kudu/master/sys_catalog.cc b/src/kudu/master/sys_catalog.cc index 545dfad0b..abff6e565 100644 --- a/src/kudu/master/sys_catalog.cc +++ b/src/kudu/master/sys_catalog.cc @@ -261,7 +261,7 @@ Status SysCatalogTable::Load(FsManager *fs_manager) { } LOG(INFO) << "Verifying existing consensus state"; - const string tablet_id = metadata->tablet_id(); + const auto& tablet_id = metadata->tablet_id(); scoped_refptr<ConsensusMetadata> cmeta; RETURN_NOT_OK_PREPEND(cmeta_manager_->Load(tablet_id, &cmeta), "Unable to load consensus metadata for tablet " + tablet_id); @@ -378,7 +378,7 @@ Status SysCatalogTable::CreateNew(FsManager *fs_manager) { } } - string tablet_id = metadata->tablet_id(); + const auto& tablet_id = metadata->tablet_id(); RETURN_NOT_OK_PREPEND(cmeta_manager_->Create(tablet_id, config, consensus::kMinimumTerm), "Unable to persist consensus metadata for tablet " + tablet_id); diff --git a/src/kudu/master/sys_catalog.h b/src/kudu/master/sys_catalog.h index 79a697afc..2cbe7984a 100644 --- a/src/kudu/master/sys_catalog.h +++ b/src/kudu/master/sys_catalog.h @@ -321,7 +321,7 @@ class SysCatalogTable { Status CreateDistributedConfig(const MasterOptions& options, consensus::RaftConfigPB* committed_config); - std::string tablet_id() const { + const std::string& tablet_id() const { return tablet_replica_->tablet_id(); }
