Skip to content

Commit 2e17512

Browse files
hx235facebook-github-bot
authored andcommitted
Rename Env::IOActivity::kReadManifest (#13471)
Summary: Context/Summary: as mentioned in the [comment](#13178) , we want to rename this public name to align with the naming convention. Pull Request resolved: #13471 Test Plan: - Compilation - Manually check for no internal usage of this name. Hopefully it's good for OSS as well as this field is relatively new and the whole IOActivity is marked "EXPERIMENTAL" Reviewed By: mszeszko-meta Differential Revision: D71485300 Pulled By: hx235 fbshipit-source-id: 318c8b6c2a4d874f2f831e3ca690aa2fb8974c0f
1 parent 0a43d8a commit 2e17512

File tree

6 files changed

+11
-8
lines changed

6 files changed

+11
-8
lines changed

db/experimental.cc

+2-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,8 @@ Status GetFileChecksumsFromCurrentManifest(FileSystem* fs,
5757
}
5858
assert(checksum_list);
5959

60-
const ReadOptions read_options(Env::IOActivity::kReadManifest);
60+
const ReadOptions read_options(
61+
Env::IOActivity::kGetFileChecksumsFromCurrentManifest);
6162
checksum_list->reset();
6263

6364
std::unique_ptr<SequentialFileReader> file_reader;

env/env.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -754,8 +754,8 @@ std::string Env::IOActivityToString(IOActivity activity) {
754754
return "GetEntity";
755755
case Env::IOActivity::kMultiGetEntity:
756756
return "MultiGetEntity";
757-
case Env::IOActivity::kReadManifest:
758-
return "ReadManifest";
757+
case Env::IOActivity::kGetFileChecksumsFromCurrentManifest:
758+
return "GetFileChecksumsFromCurrentManifest";
759759
case Env::IOActivity::kUnknown:
760760
return "Unknown";
761761
};

include/rocksdb/env.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -455,7 +455,7 @@ class Env : public Customizable {
455455
kVerifyFileChecksums = 7,
456456
kGetEntity = 8,
457457
kMultiGetEntity = 9,
458-
kReadManifest = 10,
458+
kGetFileChecksumsFromCurrentManifest = 10,
459459
kUnknown, // Keep last for easy array of non-unknowns
460460
};
461461

include/rocksdb/thread_status.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ struct ThreadStatus {
6464
OP_VERIFY_FILE_CHECKSUMS,
6565
OP_GETENTITY,
6666
OP_MULTIGETENTITY,
67-
OP_READ_MANIFEST,
67+
OP_GET_FILE_CHECKSUMS_FROM_CURRENT_MANIFEST,
6868
NUM_OP_TYPES
6969
};
7070

monitoring/thread_status_util_debug.cc

+3-2
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,9 @@ Env::IOActivity ThreadStatusUtil::TEST_GetExpectedIOActivity(
5050
return Env::IOActivity::kGetEntity;
5151
case ThreadStatus::OperationType::OP_MULTIGETENTITY:
5252
return Env::IOActivity::kMultiGetEntity;
53-
case ThreadStatus::OperationType::OP_READ_MANIFEST:
54-
return Env::IOActivity::kReadManifest;
53+
case ThreadStatus::OperationType::
54+
OP_GET_FILE_CHECKSUMS_FROM_CURRENT_MANIFEST:
55+
return Env::IOActivity::kGetFileChecksumsFromCurrentManifest;
5556
default:
5657
return Env::IOActivity::kUnknown;
5758
}

util/thread_operation.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@ static OperationInfo global_operation_table[] = {
4747
{ThreadStatus::OP_VERIFY_FILE_CHECKSUMS, "VerifyFileChecksums"},
4848
{ThreadStatus::OP_GETENTITY, "GetEntity"},
4949
{ThreadStatus::OP_MULTIGETENTITY, "MultiGetEntity"},
50-
{ThreadStatus::OP_READ_MANIFEST, "ReadManifest"},
50+
{ThreadStatus::OP_GET_FILE_CHECKSUMS_FROM_CURRENT_MANIFEST,
51+
"GetFileChecksumsFromCurrentManifest"},
5152

5253
};
5354

0 commit comments

Comments
 (0)