(kudu) branch master updated: [fs] fix const-correctness of a few methods

[alexey]

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


The following commit(s) were added to refs/heads/master by this push:
     new 328b040cb [fs] fix const-correctness of a few methods
328b040cb is described below

commit 328b040cb0238954392f560a18d8829a8c6f2af6
Author: Alexey Serbin <ale...@apache.org>
AuthorDate: Mon Aug 19 15:09:45 2024 -0700

    [fs] fix const-correctness of a few methods
    
    This patch doesn't contain any functional modifications.
    
    Change-Id: I6f6cda8f33ad524097b33d238fd1e6d6fd9b2d3d
    Reviewed-on: http://gerrit.cloudera.org:8080/21693
    Reviewed-by: Yingchun Lai <laiyingc...@apache.org>
    Reviewed-by: Mahesh Reddy <mre...@cloudera.com>
    Tested-by: Kudu Jenkins
---
 src/kudu/fs/dir_manager.cc       | 2 +-
 src/kudu/fs/dir_manager.h        | 4 ++--
 src/kudu/fs/dir_util.cc          | 9 +++++----
 src/kudu/fs/dir_util.h           | 4 ++--
 src/kudu/fs/log_block_manager.cc | 4 ++--
 5 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/kudu/fs/dir_manager.cc b/src/kudu/fs/dir_manager.cc
index 052f5f9d9..9bc71bfe8 100644
--- a/src/kudu/fs/dir_manager.cc
+++ b/src/kudu/fs/dir_manager.cc
@@ -882,7 +882,7 @@ Dir* DirManager::FindDirByFullPathForTests(const 
std::string& full_path) const {
   return nullptr;
 }
 
-bool DirManager::FindUuidIndexByDir(Dir* dir, int* uuid_idx) const {
+bool DirManager::FindUuidIndexByDir(const Dir* dir, int* uuid_idx) const {
   return FindCopy(uuid_idx_by_dir_, dir, uuid_idx);
 }
 
diff --git a/src/kudu/fs/dir_manager.h b/src/kudu/fs/dir_manager.h
index 16435b239..37aedb99d 100644
--- a/src/kudu/fs/dir_manager.h
+++ b/src/kudu/fs/dir_manager.h
@@ -336,7 +336,7 @@ class DirManager {
   Dir* FindDirByUuidIndex(int uuid_idx) const;
 
   // Finds a uuid index by directory, returning false if it can't be found.
-  bool FindUuidIndexByDir(Dir* dir, int* uuid_idx) const;
+  bool FindUuidIndexByDir(const Dir* dir, int* uuid_idx) const;
 
   // Finds a uuid index by root path, returning false if it can't be found.
   bool FindUuidIndexByRoot(const std::string& root, int* uuid_idx) const;
@@ -506,7 +506,7 @@ class DirManager {
   typedef std::unordered_map<int, Dir*> UuidIndexMap;
   UuidIndexMap dir_by_uuid_idx_;
 
-  typedef std::unordered_map<Dir*, int> ReverseUuidIndexMap;
+  typedef std::unordered_map<const Dir*, int> ReverseUuidIndexMap;
   ReverseUuidIndexMap uuid_idx_by_dir_;
 
   typedef std::unordered_map<int, std::set<std::string>> TabletsByUuidIndexMap;
diff --git a/src/kudu/fs/dir_util.cc b/src/kudu/fs/dir_util.cc
index d6aebb9ac..29f85ad72 100644
--- a/src/kudu/fs/dir_util.cc
+++ b/src/kudu/fs/dir_util.cc
@@ -137,13 +137,14 @@ Status CheckHolePunch(Env* env, const string& path) {
 } while (0)
 
 DirInstanceMetadataFile::DirInstanceMetadataFile(Env* env,
-                                                   string uuid,
-                                                   string dir_type,
-                                                   string filename)
+                                                 string uuid,
+                                                 string dir_type,
+                                                 string filename)
     : env_(env),
       uuid_(std::move(uuid)),
       dir_type_(std::move(dir_type)),
-      filename_(std::move(filename)) {}
+      filename_(std::move(filename)) {
+}
 
 DirInstanceMetadataFile::~DirInstanceMetadataFile() {
   if (lock_) {
diff --git a/src/kudu/fs/dir_util.h b/src/kudu/fs/dir_util.h
index c55436eaf..2a0bf0ddf 100644
--- a/src/kudu/fs/dir_util.h
+++ b/src/kudu/fs/dir_util.h
@@ -93,10 +93,10 @@ class DirInstanceMetadataFile {
     return health_status_;
   }
 
-  std::string uuid() const { return uuid_; }
+  const std::string& uuid() const { return uuid_; }
   std::string dir() const { return DirName(filename_); }
   const std::string& path() const { return filename_; }
-  DirInstanceMetadataPB* metadata() const { return metadata_.get(); }
+  const DirInstanceMetadataPB* metadata() const { return metadata_.get(); }
 
  private:
   Env* env_;
diff --git a/src/kudu/fs/log_block_manager.cc b/src/kudu/fs/log_block_manager.cc
index 20047628d..fb565abcb 100644
--- a/src/kudu/fs/log_block_manager.cc
+++ b/src/kudu/fs/log_block_manager.cc
@@ -619,7 +619,7 @@ class LogBlockContainer: public 
RefCountedThreadSafe<LogBlockContainer> {
   virtual bool full() const { return data_full(); }
   bool dead() const { return dead_; }
   const LogBlockManagerMetrics* metrics() const { return metrics_; }
-  Dir* data_dir() const { return data_dir_; }
+  const Dir* data_dir() const { return data_dir_; }
   const DirInstanceMetadataPB* instance() const { return 
data_dir_->instance()->metadata(); }
 
   // Adjusts the number of blocks being written.
@@ -719,7 +719,7 @@ class LogBlockContainer: public 
RefCountedThreadSafe<LogBlockContainer> {
   Dir* data_dir_;
 
   // The unique id of this container.
-  string id_;
+  const string id_;
 
   const optional<int64_t> max_num_blocks_;