andreacavalli/rocksdb
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Print file checksum in hex (#9196)

Browse Source 
Summary:
Printing file checksum (usually an integer) in non-hex format is barely useful. To make the matter
worse, it can mess with the output format. If you use `less` to redirect the output of `ldb manifest_dump`,
non-hex file checksum can cause `less` not to function as expected.

Also output some additional fields to json output.

Pull Request resolved: https://github.com/facebook/rocksdb/pull/9196

Test Plan: manually test `ldb manifest_dump`.

Reviewed By: ajkr

Differential Revision: D32590253

Pulled By: riversand963

fbshipit-source-id: de434b7e60dd05b0b7cb76eff2240b21f9ae4b32
This commit is contained in:
Yanqin Jin 2021-11-22 09:29:30 -08:00 committed by Facebook GitHub Bot
parent d561432de8
commit 12e98add68
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
db/version_edit.cc
View File

@ -801,16 +801,19 @@ std::string VersionEdit::DebugString(bool hex_key) const {
r.append(" blob_file:"); r.append(" blob_file:");
AppendNumberTo(&r, f.oldest_blob_file_number); AppendNumberTo(&r, f.oldest_blob_file_number);
} }
if (f.min_timestamp != kDisableUserTimestamp) {
assert(f.max_timestamp != kDisableUserTimestamp);
r.append(" min_timestamp:"); r.append(" min_timestamp:");
r.append(Slice(f.min_timestamp).ToString(true)); r.append(Slice(f.min_timestamp).ToString(true));
r.append(" max_timestamp:"); r.append(" max_timestamp:");
r.append(Slice(f.max_timestamp).ToString(true)); r.append(Slice(f.max_timestamp).ToString(true));
}
r.append(" oldest_ancester_time:"); r.append(" oldest_ancester_time:");
AppendNumberTo(&r, f.oldest_ancester_time); AppendNumberTo(&r, f.oldest_ancester_time);
r.append(" file_creation_time:"); r.append(" file_creation_time:");
AppendNumberTo(&r, f.file_creation_time); AppendNumberTo(&r, f.file_creation_time);
r.append(" file_checksum:"); r.append(" file_checksum:");
r.append(f.file_checksum); r.append(Slice(f.file_checksum).ToString(true));
r.append(" file_checksum_func_name: "); r.append(" file_checksum_func_name: ");
r.append(f.file_checksum_func_name); r.append(f.file_checksum_func_name);
if (f.temperature != Temperature::kUnknown) { if (f.temperature != Temperature::kUnknown) {
@ -923,6 +926,13 @@ std::string VersionEdit::DebugJSON(int edit_num, bool hex_key) const {
jw << "MinTimestamp" << Slice(f.min_timestamp).ToString(true); jw << "MinTimestamp" << Slice(f.min_timestamp).ToString(true);
jw << "MaxTimestamp" << Slice(f.max_timestamp).ToString(true); jw << "MaxTimestamp" << Slice(f.max_timestamp).ToString(true);
} }
jw << "OldestAncesterTime" << f.oldest_ancester_time;
jw << "FileCreationTime" << f.file_creation_time;
jw << "FileChecksum" << Slice(f.file_checksum).ToString(true);
jw << "FileChecksumFuncName" << f.file_checksum_func_name;
if (f.temperature != Temperature::kUnknown) {
jw << "temperature" << ToString(static_cast<int>(f.temperature));
}
if (f.oldest_blob_file_number != kInvalidBlobFileNumber) { if (f.oldest_blob_file_number != kInvalidBlobFileNumber) {
jw << "OldestBlobFile" << f.oldest_blob_file_number; jw << "OldestBlobFile" << f.oldest_blob_file_number;
} }