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 318e5e1f4 Fix misspellings
318e5e1f4 is described below
commit 318e5e1f43117cad9c8cdc126959ce72e554d205
Author: Ádám Bakai <[email protected]>
AuthorDate: Tue Nov 19 13:34:07 2024 +0100
Fix misspellings
fs::BlockManager::MergeReport argument variable was called need_merage
consistently through multiple files. All of the occurrences were
changed to need_merge.
Change-Id: Ia99c0507e6329a7888b6bd289619cb3950dc58a9
Reviewed-on: http://gerrit.cloudera.org:8080/22077
Reviewed-by: Alexey Serbin <[email protected]>
Reviewed-by: Attila Bukor <[email protected]>
Reviewed-by: Mahesh Reddy <[email protected]>
Tested-by: Alexey Serbin <[email protected]>
---
src/kudu/fs/block_manager.h | 2 +-
src/kudu/fs/file_block_manager.cc | 4 ++--
src/kudu/fs/file_block_manager.h | 2 +-
src/kudu/fs/fs_manager.cc | 6 +++---
src/kudu/fs/fs_manager.h | 2 +-
src/kudu/fs/log_block_manager.cc | 4 ++--
src/kudu/fs/log_block_manager.h | 2 +-
7 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/kudu/fs/block_manager.h b/src/kudu/fs/block_manager.h
index 3ca81ee7b..d7e786275 100644
--- a/src/kudu/fs/block_manager.h
+++ b/src/kudu/fs/block_manager.h
@@ -226,7 +226,7 @@ class BlockManager : public
RefCountedThreadSafe<BlockManager> {
// If 'containers_processed' and 'containers_total' are not nullptr, they
will
// be populated with total containers attempted to be opened/processed and
// total containers present respectively.
- virtual Status Open(FsReport* report, MergeReport need_merage,
+ virtual Status Open(FsReport* report, MergeReport need_merge,
std::atomic<int>* containers_processed,
std::atomic<int>* containers_total) = 0;
diff --git a/src/kudu/fs/file_block_manager.cc
b/src/kudu/fs/file_block_manager.cc
index f15bc716b..041667c12 100644
--- a/src/kudu/fs/file_block_manager.cc
+++ b/src/kudu/fs/file_block_manager.cc
@@ -729,7 +729,7 @@ FileBlockManager::FileBlockManager(Env* env,
FileBlockManager::~FileBlockManager() {
}
-Status FileBlockManager::Open(FsReport* report, MergeReport need_merage,
+Status FileBlockManager::Open(FsReport* report, MergeReport need_merge,
atomic<int>* /* containers_processed */,
atomic<int>* /* containers_total */) {
// Prepare the filesystem report and either return or log it.
@@ -751,7 +751,7 @@ Status FileBlockManager::Open(FsReport* report, MergeReport
need_merage,
local_report.data_dirs.push_back(dd->dir());
}
if (report) {
- if (need_merage == MergeReport::REQUIRED) {
+ if (need_merge == MergeReport::REQUIRED) {
report->MergeFrom(local_report);
} else {
*report = std::move(local_report);
diff --git a/src/kudu/fs/file_block_manager.h b/src/kudu/fs/file_block_manager.h
index 27ba6e531..c5923d7e0 100644
--- a/src/kudu/fs/file_block_manager.h
+++ b/src/kudu/fs/file_block_manager.h
@@ -82,7 +82,7 @@ class FileBlockManager : public BlockManager {
~FileBlockManager() override;
- Status Open(FsReport* report, MergeReport need_merage,
+ Status Open(FsReport* report, MergeReport need_merge,
std::atomic<int>* containers_processed,
std::atomic<int>* containers_total) override;
diff --git a/src/kudu/fs/fs_manager.cc b/src/kudu/fs/fs_manager.cc
index 3f1edca82..e2bc1958b 100644
--- a/src/kudu/fs/fs_manager.cc
+++ b/src/kudu/fs/fs_manager.cc
@@ -725,14 +725,14 @@ Status FsManager::InitAndOpenBlockManager(FsReport*
report,
std::atomic<int>*
containers_processed,
std::atomic<int>* containers_total,
const string& tenant_id,
- BlockManager::MergeReport
need_merage) {
+ BlockManager::MergeReport
need_merge) {
auto block_manager = InitBlockManager(tenant_id);
DCHECK(block_manager);
LOG_TIMING(INFO, "opening block manager") {
if (opts_.block_manager_type == "file") {
- RETURN_NOT_OK(block_manager->Open(report, need_merage, nullptr,
nullptr));
+ RETURN_NOT_OK(block_manager->Open(report, need_merge, nullptr, nullptr));
} else {
- RETURN_NOT_OK(block_manager->Open(report, need_merage,
+ RETURN_NOT_OK(block_manager->Open(report, need_merge,
containers_processed,
containers_total));
}
}
diff --git a/src/kudu/fs/fs_manager.h b/src/kudu/fs/fs_manager.h
index 435a4cbf1..d0f94383b 100644
--- a/src/kudu/fs/fs_manager.h
+++ b/src/kudu/fs/fs_manager.h
@@ -596,7 +596,7 @@ class FsManager {
std::atomic<int>* containers_processed =
nullptr,
std::atomic<int>* containers_total = nullptr,
const std::string& tenant_id =
fs::kDefaultTenantID,
- fs::BlockManager::MergeReport need_merage =
+ fs::BlockManager::MergeReport need_merge =
fs::BlockManager::MergeReport::NOT_REQUIRED);
// Add data dir manager to the 'dd_manager_map_' keyed by tenant_id.
diff --git a/src/kudu/fs/log_block_manager.cc b/src/kudu/fs/log_block_manager.cc
index fb565abcb..cf610526b 100644
--- a/src/kudu/fs/log_block_manager.cc
+++ b/src/kudu/fs/log_block_manager.cc
@@ -2861,7 +2861,7 @@ Status LogBlockManagerNativeMeta::OpenContainer(Dir* dir,
return LogBlockContainerNativeMeta::Open(this, dir, report, id, container);
}
-Status LogBlockManager::Open(FsReport* report, MergeReport need_merage,
+Status LogBlockManager::Open(FsReport* report, MergeReport need_merge,
std::atomic<int>* containers_processed,
std::atomic<int>* containers_total) {
// Establish (and log) block limits for each data directory using kernel,
@@ -3006,7 +3006,7 @@ Status LogBlockManager::Open(FsReport* report,
MergeReport need_merage,
// Either return or log the report.
if (report) {
- if (need_merage == MergeReport::REQUIRED) {
+ if (need_merge == MergeReport::REQUIRED) {
report->MergeFrom(merged_report);
} else {
*report = std::move(merged_report);
diff --git a/src/kudu/fs/log_block_manager.h b/src/kudu/fs/log_block_manager.h
index 84083b4d4..fb53e01a3 100644
--- a/src/kudu/fs/log_block_manager.h
+++ b/src/kudu/fs/log_block_manager.h
@@ -187,7 +187,7 @@ class LogBlockManager : public BlockManager {
~LogBlockManager() override;
- Status Open(FsReport* report, MergeReport need_merage,
+ Status Open(FsReport* report, MergeReport need_merge,
std::atomic<int>* containers_processed,
std::atomic<int>* containers_total) override;
