mirror of
https://github.com/facebook/rocksdb.git
synced 2026-10-23 08:09:02 +03:00
014e1c43c1
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
101 lines
3.2 KiB
C++
101 lines
3.2 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/write_batch_base.h"
|
|
|
|
#include <string>
|
|
|
|
#include "rocksdb/slice.h"
|
|
#include "rocksdb/status.h"
|
|
|
|
namespace ROCKSDB_NAMESPACE {
|
|
|
|
// Simple implementation of SlicePart variants of Put(). Child classes
|
|
// can override these method with more performant solutions if they choose.
|
|
Status WriteBatchBase::Put(ColumnFamilyHandle* column_family,
|
|
const SliceParts& key, const SliceParts& value) {
|
|
std::string key_buf;
|
|
std::string value_buf;
|
|
Slice key_slice(key, &key_buf);
|
|
Slice value_slice(value, &value_buf);
|
|
|
|
return Put(column_family, key_slice, value_slice);
|
|
}
|
|
|
|
Status WriteBatchBase::Put(const SliceParts& key, const SliceParts& value) {
|
|
std::string key_buf;
|
|
std::string value_buf;
|
|
Slice key_slice(key, &key_buf);
|
|
Slice value_slice(value, &value_buf);
|
|
|
|
return Put(key_slice, value_slice);
|
|
}
|
|
|
|
Status WriteBatchBase::Delete(ColumnFamilyHandle* column_family,
|
|
const SliceParts& key) {
|
|
std::string key_buf;
|
|
Slice key_slice(key, &key_buf);
|
|
return Delete(column_family, key_slice);
|
|
}
|
|
|
|
Status WriteBatchBase::Delete(const SliceParts& key) {
|
|
std::string key_buf;
|
|
Slice key_slice(key, &key_buf);
|
|
return Delete(key_slice);
|
|
}
|
|
|
|
Status WriteBatchBase::SingleDelete(ColumnFamilyHandle* column_family,
|
|
const SliceParts& key) {
|
|
std::string key_buf;
|
|
Slice key_slice(key, &key_buf);
|
|
return SingleDelete(column_family, key_slice);
|
|
}
|
|
|
|
Status WriteBatchBase::SingleDelete(const SliceParts& key) {
|
|
std::string key_buf;
|
|
Slice key_slice(key, &key_buf);
|
|
return SingleDelete(key_slice);
|
|
}
|
|
|
|
Status WriteBatchBase::DeleteRange(ColumnFamilyHandle* column_family,
|
|
const SliceParts& begin_key,
|
|
const SliceParts& end_key) {
|
|
std::string begin_key_buf;
|
|
std::string end_key_buf;
|
|
Slice begin_key_slice(begin_key, &begin_key_buf);
|
|
Slice end_key_slice(end_key, &end_key_buf);
|
|
return DeleteRange(column_family, begin_key_slice, end_key_slice);
|
|
}
|
|
|
|
Status WriteBatchBase::DeleteRange(const SliceParts& begin_key,
|
|
const SliceParts& end_key) {
|
|
std::string begin_key_buf;
|
|
std::string end_key_buf;
|
|
Slice begin_key_slice(begin_key, &begin_key_buf);
|
|
Slice end_key_slice(end_key, &end_key_buf);
|
|
return DeleteRange(begin_key_slice, end_key_slice);
|
|
}
|
|
|
|
Status WriteBatchBase::Merge(ColumnFamilyHandle* column_family,
|
|
const SliceParts& key, const SliceParts& value) {
|
|
std::string key_buf;
|
|
std::string value_buf;
|
|
Slice key_slice(key, &key_buf);
|
|
Slice value_slice(value, &value_buf);
|
|
|
|
return Merge(column_family, key_slice, value_slice);
|
|
}
|
|
|
|
Status WriteBatchBase::Merge(const SliceParts& key, const SliceParts& value) {
|
|
std::string key_buf;
|
|
std::string value_buf;
|
|
Slice key_slice(key, &key_buf);
|
|
Slice value_slice(value, &value_buf);
|
|
|
|
return Merge(key_slice, value_slice);
|
|
}
|
|
|
|
} // namespace ROCKSDB_NAMESPACE
|