mirror of
https://github.com/facebook/rocksdb.git
synced 2026-10-23 08:09:02 +03:00
Summary: Pull Request resolved: https://github.com/facebook/rocksdb/pull/15394 ## Summary RocksDB's `.clang-tidy` enables several readability checks that existing code still violates: `readability-isolate-declaration` (476 findings), `readability-braces-around-statements` (49), `readability-redundant-string-init` (25), `modernize-use-using` (10), `misc-definitions-in-headers` (3) and `readability-duplicate-include` (1). They keep getting flagged whenever nearby lines change. This diff fixes 553 of the 564; upstream has since fixed the other 11. What changed: - Multi-variable declarations such as `std::string a, b;` are split into one declaration per variable. Pointer and reference declarators are kept per variable. - Braces are added around single-statement `if`/`else`/`for`/`while` bodies, and empty spin loops get an empty `{}` body. - `std::string s = ""` / `member("")` initializers are removed. - Remaining `typedef`s in the touched C++ files become `using`. C headers and `extern "C"` code are untouched. - `inline` is added to non-template function definitions in test headers. - A duplicate `#include "util/udt_util.h"` in `db_impl.cc` is removed. These are clang-tidy's own fix-its, applied mechanically and then clang-formatted on the changed lines. Three kinds of broken fix-it output were repaired by hand. Removing a `member("")` initializer left a dangling comma in constructor initializer lists (`ExternalSstFileInfo`, `ColumnFamilyMetaData` and others). The function-type typedefs in `block_test.cc` came out malformed. Empty `while (cond);` spin loops got a `{;` body. Splitting declarations also exposed two vectors in `db_etc2_test.cc` to `performance-inefficient-vector-operation`, so a `reserve()` was added for each. The lint bot reports every finding in a file a diff touches. This diff splits declarations in `options/configurable_test.cc`, so it also fixes that file's 14 older `cert-err58-cpp` and `cppcoreguidelines-avoid-non-const-global-variables` findings, which come from seven mutable file-level maps. Six are now `const` and built where they are used (function-local statics, or locals in their only user). The unused `imm_struct_option_info` is deleted. Compatibility: no behavior change. In public headers, the only edits are removed redundant `""` initializers, split declarations and added braces. Reviewed By: rban1 Differential Revision: D123186310 fbshipit-source-id: f9c8e88b00e997db0196f8725c7c8d880cf798da
130 lines
4.9 KiB
C++
130 lines
4.9 KiB
C++
// Copyright (c) 2011-present, Facebook, Inc. All rights reserved.
|
|
// This source code is licensed under both the GPLv2 (found in the
|
|
// COPYING file in the root directory) and Apache 2.0 License
|
|
// (found in the LICENSE.Apache file in the root directory).
|
|
|
|
#include "rocksdb/utilities/debug.h"
|
|
|
|
#include "db/db_impl/db_impl.h"
|
|
#include "rocksdb/utilities/options_type.h"
|
|
#include "util/cast_util.h"
|
|
|
|
namespace ROCKSDB_NAMESPACE {
|
|
|
|
static std::unordered_map<std::string, ValueType> value_type_string_map = {
|
|
{"TypeDeletion", ValueType::kTypeDeletion},
|
|
{"TypeValue", ValueType::kTypeValue},
|
|
{"TypeMerge", ValueType::kTypeMerge},
|
|
{"TypeLogData", ValueType::kTypeLogData},
|
|
{"TypeColumnFamilyDeletion", ValueType::kTypeColumnFamilyDeletion},
|
|
{"TypeColumnFamilyValue", ValueType::kTypeColumnFamilyValue},
|
|
{"TypeColumnFamilyMerge", ValueType::kTypeColumnFamilyMerge},
|
|
{"TypeSingleDeletion", ValueType::kTypeSingleDeletion},
|
|
{"TypeColumnFamilySingleDeletion",
|
|
ValueType::kTypeColumnFamilySingleDeletion},
|
|
{"TypeBeginPrepareXID", ValueType::kTypeBeginPrepareXID},
|
|
{"TypeEndPrepareXID", ValueType::kTypeEndPrepareXID},
|
|
{"TypeCommitXID", ValueType::kTypeCommitXID},
|
|
{"TypeRollbackXID", ValueType::kTypeRollbackXID},
|
|
{"TypeNoop", ValueType::kTypeNoop},
|
|
{"TypeColumnFamilyRangeDeletion",
|
|
ValueType::kTypeColumnFamilyRangeDeletion},
|
|
{"TypeRangeDeletion", ValueType::kTypeRangeDeletion},
|
|
{"TypeColumnFamilyBlobIndex", ValueType::kTypeColumnFamilyBlobIndex},
|
|
{"TypeBlobIndex", ValueType::kTypeBlobIndex},
|
|
{"TypeBeginPersistedPrepareXID", ValueType::kTypeBeginPersistedPrepareXID},
|
|
{"TypeBeginUnprepareXID", ValueType::kTypeBeginUnprepareXID},
|
|
{"TypeDeletionWithTimestamp", ValueType::kTypeDeletionWithTimestamp},
|
|
{"TypeCommitXIDAndTimestamp", ValueType::kTypeCommitXIDAndTimestamp},
|
|
{"TypeWideColumnEntity", ValueType::kTypeWideColumnEntity},
|
|
{"TypeColumnFamilyWideColumnEntity",
|
|
ValueType::kTypeColumnFamilyWideColumnEntity},
|
|
{"TypeValuePreferredSeqno", ValueType::kTypeValuePreferredSeqno},
|
|
{"TypeColumnFamilyValuePreferredSeqno",
|
|
ValueType::kTypeColumnFamilyValuePreferredSeqno},
|
|
};
|
|
|
|
std::string KeyVersion::GetTypeName() const {
|
|
std::string type_name;
|
|
if (SerializeEnum<ValueType>(value_type_string_map,
|
|
static_cast<ValueType>(type), &type_name)) {
|
|
return type_name;
|
|
} else {
|
|
return "Invalid";
|
|
}
|
|
}
|
|
|
|
Status GetAllKeyVersions(DB* db, OptSlice begin_key, OptSlice end_key,
|
|
size_t max_num_ikeys,
|
|
std::vector<KeyVersion>* key_versions) {
|
|
if (nullptr == db) {
|
|
return Status::InvalidArgument("db cannot be null.");
|
|
}
|
|
return GetAllKeyVersions(db, db->DefaultColumnFamily(), begin_key, end_key,
|
|
max_num_ikeys, key_versions);
|
|
}
|
|
|
|
Status GetAllKeyVersions(DB* db, ColumnFamilyHandle* cfh, OptSlice begin_key,
|
|
OptSlice end_key, size_t max_num_ikeys,
|
|
std::vector<KeyVersion>* key_versions) {
|
|
if (nullptr == db) {
|
|
return Status::InvalidArgument("db cannot be null.");
|
|
}
|
|
if (nullptr == cfh) {
|
|
return Status::InvalidArgument("Column family handle cannot be null.");
|
|
}
|
|
if (nullptr == key_versions) {
|
|
return Status::InvalidArgument("key_versions cannot be null.");
|
|
}
|
|
key_versions->clear();
|
|
|
|
DBImpl* idb = static_cast_with_check<DBImpl>(db->GetRootDB());
|
|
auto icmp = InternalKeyComparator(idb->GetOptions(cfh).comparator);
|
|
ReadOptions read_options;
|
|
Arena arena;
|
|
ScopedArenaPtr<InternalIterator> iter(
|
|
idb->NewInternalIterator(read_options, &arena, kMaxSequenceNumber, cfh));
|
|
|
|
const Comparator* ucmp = icmp.user_comparator();
|
|
size_t ts_sz = ucmp->timestamp_size();
|
|
|
|
std::string begin_key_buf;
|
|
std::string end_key_buf;
|
|
auto [from, end] = MaybeAddTimestampsToRange(begin_key, end_key, ts_sz,
|
|
&begin_key_buf, &end_key_buf);
|
|
if (begin_key.has_value()) {
|
|
assert(from.has_value());
|
|
InternalKey ikey;
|
|
ikey.SetMinPossibleForUserKey(from.value());
|
|
iter->Seek(ikey.Encode());
|
|
} else {
|
|
iter->SeekToFirst();
|
|
}
|
|
|
|
size_t num_keys = 0;
|
|
for (; iter->Valid(); iter->Next()) {
|
|
ParsedInternalKey ikey;
|
|
Status pik_status =
|
|
ParseInternalKey(iter->key(), &ikey, true /* log_err_key */); // TODO
|
|
if (!pik_status.ok()) {
|
|
return pik_status;
|
|
}
|
|
|
|
if (end_key.has_value() && end.has_value() &&
|
|
icmp.user_comparator()->Compare(ikey.user_key, end.value()) > 0) {
|
|
break;
|
|
}
|
|
|
|
key_versions->emplace_back(ikey.user_key.ToString() /* _user_key */,
|
|
iter->value().ToString() /* _value */,
|
|
ikey.sequence /* _sequence */,
|
|
static_cast<int>(ikey.type) /* _type */);
|
|
if (++num_keys >= max_num_ikeys) {
|
|
break;
|
|
}
|
|
}
|
|
return Status::OK();
|
|
}
|
|
|
|
} // namespace ROCKSDB_NAMESPACE
|