eaaf1a6f05
Summary: Since the number of range deletions are reported in TableProperties, it is confusing to not report the number of merge operands and point deletions as top-level properties; they are accessible through the public API, but since they are not the "main" properties, they do not appear in aggregated table properties, or the string representation of table properties. This change promotes those two property keys to `rocksdb/table_properties.h`, adds corresponding uint64 members for them, deprecates the old access methods `GetDeletedKeys()` and `GetMergeOperands()` (though they are still usable for now), and removes `InternalKeyPropertiesCollector`. The property key strings are the same as before this change, so this should be able to read DBs written from older versions (though I haven't tested this yet). Pull Request resolved: https://github.com/facebook/rocksdb/pull/4594 Differential Revision: D12826893 Pulled By: abhimadan fbshipit-source-id: 9e4e4fbdc5b0da161c89582566d184101ba8eb68
68 lines
2.0 KiB
C++
68 lines
2.0 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 {
|
|
|
|
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;
|
|
if (!ParseInternalKey(key, &ikey)) {
|
|
return Status::InvalidArgument("Invalid internal key");
|
|
}
|
|
|
|
return collector_->AddUserKey(ikey.user_key, value, GetEntryType(ikey.type),
|
|
ikey.sequence, file_size);
|
|
}
|
|
|
|
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
|