9a690a74e1
Summary: Fixes Issue https://github.com/facebook/rocksdb/issues/7497 When allow_data_in_errors db_options is set, log error key details in `ParseInternalKey()` Have fixed most of the calls. Have few TODOs still pending - because have to make more deeper changes to pass in the allow_data_in_errors flag. Will do those in a separate PR later. Tests: - make check - some of the existing tests that exercise the "internal key too small" condition are: dbformat_test, cuckoo_table_builder_test - some of the existing tests that exercise the corrupted key path are: corruption_test, merge_helper_test, compaction_iterator_test Example of new status returns: - Key too small - `Corrupted Key: Internal Key too small. Size=5` - Corrupt key with allow_data_in_errors option set to false: `Corrupted Key: '<redacted>' seq:3, type:3` - Corrupt key with allow_data_in_errors option set to true: `Corrupted Key: '61' seq:3, type:3` Pull Request resolved: https://github.com/facebook/rocksdb/pull/7515 Reviewed By: ajkr Differential Revision: D24240264 Pulled By: ramvadiv fbshipit-source-id: bc48f5d4475ac19d7713e16df37505b31aac42e7
76 lines
2.3 KiB
C++
76 lines
2.3 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 "db/table_properties_collector.h"
|
|
|
|
#include "db/dbformat.h"
|
|
#include "util/coding.h"
|
|
#include "util/string_util.h"
|
|
|
|
namespace ROCKSDB_NAMESPACE {
|
|
|
|
namespace {
|
|
|
|
uint64_t GetUint64Property(const UserCollectedProperties& props,
|
|
const std::string& property_name,
|
|
bool* property_present) {
|
|
auto pos = props.find(property_name);
|
|
if (pos == props.end()) {
|
|
*property_present = false;
|
|
return 0;
|
|
}
|
|
Slice raw = pos->second;
|
|
uint64_t val = 0;
|
|
*property_present = true;
|
|
return GetVarint64(&raw, &val) ? val : 0;
|
|
}
|
|
|
|
} // namespace
|
|
|
|
Status UserKeyTablePropertiesCollector::InternalAdd(const Slice& key,
|
|
const Slice& value,
|
|
uint64_t file_size) {
|
|
ParsedInternalKey ikey;
|
|
Status s = ParseInternalKey(key, &ikey, false /* log_err_key */); // TODO
|
|
if (!s.ok()) {
|
|
return s;
|
|
}
|
|
|
|
return collector_->AddUserKey(ikey.user_key, value, GetEntryType(ikey.type),
|
|
ikey.sequence, file_size);
|
|
}
|
|
|
|
void UserKeyTablePropertiesCollector::BlockAdd(
|
|
uint64_t bLockRawBytes, uint64_t blockCompressedBytesFast,
|
|
uint64_t blockCompressedBytesSlow) {
|
|
return collector_->BlockAdd(bLockRawBytes, blockCompressedBytesFast,
|
|
blockCompressedBytesSlow);
|
|
}
|
|
|
|
Status UserKeyTablePropertiesCollector::Finish(
|
|
UserCollectedProperties* properties) {
|
|
return collector_->Finish(properties);
|
|
}
|
|
|
|
UserCollectedProperties
|
|
UserKeyTablePropertiesCollector::GetReadableProperties() const {
|
|
return collector_->GetReadableProperties();
|
|
}
|
|
|
|
uint64_t GetDeletedKeys(
|
|
const UserCollectedProperties& props) {
|
|
bool property_present_ignored;
|
|
return GetUint64Property(props, TablePropertiesNames::kDeletedKeys,
|
|
&property_present_ignored);
|
|
}
|
|
|
|
uint64_t GetMergeOperands(const UserCollectedProperties& props,
|
|
bool* property_present) {
|
|
return GetUint64Property(
|
|
props, TablePropertiesNames::kMergeOperands, property_present);
|
|
}
|
|
|
|
} // namespace ROCKSDB_NAMESPACE
|