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

Fix FilterBench when RTTI=0 (#6732)

Browse Source 
Summary:
The dynamic_cast in the filter benchmark causes release mode to fail due to
no-rtti.  Replace with static_cast_with_check.

Signed-off-by: Derrick Pallas <derrick@pallas.us>

Addition by peterd: Remove unnecessary 2nd template arg on all static_cast_with_check
Pull Request resolved: https://github.com/facebook/rocksdb/pull/6732

Reviewed By: ltamasi

Differential Revision: D21304260

Pulled By: pdillinger

fbshipit-source-id: 6e8eb437c4ca5a16dbbfa4053d67c4ad55f1608c
This commit is contained in:
Derrick Pallas 2020-04-29 13:06:27 -07:00 committed by Facebook GitHub Bot
parent 8086e5e294
commit 5272305437
26 changed files with 58 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
db/convenience.cc
View File

@ -14,7 +14,7 @@
namespace ROCKSDB_NAMESPACE { namespace ROCKSDB_NAMESPACE {
void CancelAllBackgroundWork(DB* db, bool wait) { void CancelAllBackgroundWork(DB* db, bool wait) {
(static_cast_with_check<DBImpl, DB>(db->GetRootDB())) (static_cast_with_check<DBImpl>(db->GetRootDB()))
->CancelAllBackgroundWork(wait); ->CancelAllBackgroundWork(wait);
} }
@ -28,7 +28,7 @@ Status DeleteFilesInRange(DB* db, ColumnFamilyHandle* column_family,
Status DeleteFilesInRanges(DB* db, ColumnFamilyHandle* column_family, Status DeleteFilesInRanges(DB* db, ColumnFamilyHandle* column_family,
const RangePtr* ranges, size_t n, const RangePtr* ranges, size_t n,
bool include_end) { bool include_end) {
return (static_cast_with_check<DBImpl, DB>(db->GetRootDB())) return (static_cast_with_check<DBImpl>(db->GetRootDB()))
->DeleteFilesInRanges(column_family, ranges, n, include_end); ->DeleteFilesInRanges(column_family, ranges, n, include_end);
} }

4
db/db_impl/db_impl.cc
View File

@ -870,9 +870,7 @@ void DBImpl::DumpStats() {
Status DBImpl::TablesRangeTombstoneSummary(ColumnFamilyHandle* column_family, Status DBImpl::TablesRangeTombstoneSummary(ColumnFamilyHandle* column_family,
int max_entries_to_print, int max_entries_to_print,
std::string* out_str) { std::string* out_str) {
auto* cfh = auto* cfh = static_cast_with_check<ColumnFamilyHandleImpl>(column_family);
static_cast_with_check<ColumnFamilyHandleImpl, ColumnFamilyHandle>(
column_family);
ColumnFamilyData* cfd = cfh->cfd(); ColumnFamilyData* cfd = cfh->cfd();
SuperVersion* super_version = cfd->GetReferencedSuperVersion(this); SuperVersion* super_version = cfd->GetReferencedSuperVersion(this);

5
db/db_impl/db_impl_compaction_flush.cc
View File

@ -2143,8 +2143,7 @@ void DBImpl::BGWorkFlush(void* arg) {
IOSTATS_SET_THREAD_POOL_ID(fta.thread_pri_); IOSTATS_SET_THREAD_POOL_ID(fta.thread_pri_);
TEST_SYNC_POINT("DBImpl::BGWorkFlush"); TEST_SYNC_POINT("DBImpl::BGWorkFlush");
static_cast_with_check<DBImpl, DB>(fta.db_)->BackgroundCallFlush( static_cast_with_check<DBImpl>(fta.db_)->BackgroundCallFlush(fta.thread_pri_);
fta.thread_pri_);
TEST_SYNC_POINT("DBImpl::BGWorkFlush:done"); TEST_SYNC_POINT("DBImpl::BGWorkFlush:done");
} }
@ -2155,7 +2154,7 @@ void DBImpl::BGWorkCompaction(void* arg) {
TEST_SYNC_POINT("DBImpl::BGWorkCompaction"); TEST_SYNC_POINT("DBImpl::BGWorkCompaction");
auto prepicked_compaction = auto prepicked_compaction =
static_cast<PrepickedCompaction*>(ca.prepicked_compaction); static_cast<PrepickedCompaction*>(ca.prepicked_compaction);
static_cast_with_check<DBImpl, DB>(ca.db)->BackgroundCallCompaction( static_cast_with_check<DBImpl>(ca.db)->BackgroundCallCompaction(
prepicked_compaction, Env::Priority::LOW); prepicked_compaction, Env::Priority::LOW);
delete prepicked_compaction; delete prepicked_compaction;
} }

3
db/table_cache.cc
View File

@ -314,8 +314,7 @@ void TableCache::CreateRowCacheKeyPrefix(const ReadOptions& options,
// Maybe we can include the whole file ifsnapshot == fd.largest_seqno. // Maybe we can include the whole file ifsnapshot == fd.largest_seqno.
if (options.snapshot != nullptr && if (options.snapshot != nullptr &&
(get_context->has_callback() || (get_context->has_callback() ||
static_cast_with_check<const SnapshotImpl, const Snapshot>( static_cast_with_check<const SnapshotImpl>(options.snapshot)
options.snapshot)
->GetSequenceNumber() <= fd.largest_seqno)) { ->GetSequenceNumber() <= fd.largest_seqno)) {
// We should consider to use options.snapshot->GetSequenceNumber() // We should consider to use options.snapshot->GetSequenceNumber()
// instead of GetInternalKeySeqno(k), which will make the code // instead of GetInternalKeySeqno(k), which will make the code

6
db/wal_manager.cc
View File

@ -334,10 +334,8 @@ Status WalManager::GetSortedWalsOfType(const std::string& path,
std::sort( std::sort(
log_files.begin(), log_files.end(), log_files.begin(), log_files.end(),
[](const std::unique_ptr<LogFile>& a, const std::unique_ptr<LogFile>& b) { [](const std::unique_ptr<LogFile>& a, const std::unique_ptr<LogFile>& b) {
LogFileImpl* a_impl = LogFileImpl* a_impl = static_cast_with_check<LogFileImpl>(a.get());
static_cast_with_check<LogFileImpl, LogFile>(a.get()); LogFileImpl* b_impl = static_cast_with_check<LogFileImpl>(b.get());
LogFileImpl* b_impl =
static_cast_with_check<LogFileImpl, LogFile>(b.get());
return *a_impl < *b_impl; return *a_impl < *b_impl;
}); });
return status; return status;

2
db/write_batch.cc
View File

@ -1281,7 +1281,7 @@ class MemTableInserter : public WriteBatch::Handler {
ignore_missing_column_families_(ignore_missing_column_families), ignore_missing_column_families_(ignore_missing_column_families),
recovering_log_number_(recovering_log_number), recovering_log_number_(recovering_log_number),
log_number_ref_(0), log_number_ref_(0),
db_(static_cast_with_check<DBImpl, DB>(db)), db_(static_cast_with_check<DBImpl>(db)),
concurrent_memtable_writes_(concurrent_memtable_writes), concurrent_memtable_writes_(concurrent_memtable_writes),
post_info_created_(false), post_info_created_(false),
has_valid_writes_(has_valid_writes), has_valid_writes_(has_valid_writes),

3
env/mock_env.cc vendored
View File

@ -701,8 +701,7 @@ Status MockEnv::LockFile(const std::string& fname, FileLock** flock) {
} }
Status MockEnv::UnlockFile(FileLock* flock) { Status MockEnv::UnlockFile(FileLock* flock) {
std::string fn = std::string fn = static_cast_with_check<MockEnvFileLock>(flock)->FileName();
static_cast_with_check<MockEnvFileLock, FileLock>(flock)->FileName();
{ {
MutexLock lock(&mutex_); MutexLock lock(&mutex_);
if (file_map_.find(fn) != file_map_.end()) { if (file_map_.find(fn) != file_map_.end()) {

3
monitoring/histogram.cc
View File

@ -251,8 +251,7 @@ void HistogramImpl::Add(uint64_t value) {
void HistogramImpl::Merge(const Histogram& other) { void HistogramImpl::Merge(const Histogram& other) {
if (strcmp(Name(), other.Name()) == 0) { if (strcmp(Name(), other.Name()) == 0) {
Merge( Merge(*static_cast_with_check<const HistogramImpl>(&other));
*static_cast_with_check<const HistogramImpl, const Histogram>(&other));
} }
} }

4
monitoring/histogram_windowing.cc
View File

@ -65,9 +65,7 @@ void HistogramWindowingImpl::Add(uint64_t value){
void HistogramWindowingImpl::Merge(const Histogram& other) { void HistogramWindowingImpl::Merge(const Histogram& other) {
if (strcmp(Name(), other.Name()) == 0) { if (strcmp(Name(), other.Name()) == 0) {
Merge( Merge(*static_cast_with_check<const HistogramWindowingImpl>(&other));
*static_cast_with_check<const HistogramWindowingImpl, const Histogram>(
&other));
} }
} }

4
options/cf_options.cc
View File

@ -413,7 +413,7 @@ std::unordered_map<std::string, OptionTypeInfo>
reinterpret_cast<std::shared_ptr<TableFactory>*>(addr); reinterpret_cast<std::shared_ptr<TableFactory>*>(addr);
BlockBasedTableOptions table_opts, base_opts; BlockBasedTableOptions table_opts, base_opts;
BlockBasedTableFactory* block_based_table_factory = BlockBasedTableFactory* block_based_table_factory =
static_cast_with_check<BlockBasedTableFactory, TableFactory>( static_cast_with_check<BlockBasedTableFactory>(
old_table_factory->get()); old_table_factory->get());
if (block_based_table_factory != nullptr) { if (block_based_table_factory != nullptr) {
base_opts = block_based_table_factory->table_options(); base_opts = block_based_table_factory->table_options();
@ -437,7 +437,7 @@ std::unordered_map<std::string, OptionTypeInfo>
reinterpret_cast<std::shared_ptr<TableFactory>*>(addr); reinterpret_cast<std::shared_ptr<TableFactory>*>(addr);
PlainTableOptions table_opts, base_opts; PlainTableOptions table_opts, base_opts;
PlainTableFactory* plain_table_factory = PlainTableFactory* plain_table_factory =
static_cast_with_check<PlainTableFactory, TableFactory>( static_cast_with_check<PlainTableFactory>(
old_table_factory->get()); old_table_factory->get());
if (plain_table_factory != nullptr) { if (plain_table_factory != nullptr) {
base_opts = plain_table_factory->table_options(); base_opts = plain_table_factory->table_options();

7
tools/db_bench_tool.cc
View File

@ -3287,10 +3287,9 @@ class Benchmark {
fprintf(stdout, "STATISTICS:\n%s\n", dbstats->ToString().c_str()); fprintf(stdout, "STATISTICS:\n%s\n", dbstats->ToString().c_str());
} }
if (FLAGS_simcache_size >= 0) { if (FLAGS_simcache_size >= 0) {
fprintf(stdout, "SIMULATOR CACHE STATISTICS:\n%s\n", fprintf(
static_cast_with_check<SimCache, Cache>(cache_.get()) stdout, "SIMULATOR CACHE STATISTICS:\n%s\n",
->ToString() static_cast_with_check<SimCache>(cache_.get())->ToString().c_str());
.c_str());
} }
#ifndef ROCKSDB_LITE #ifndef ROCKSDB_LITE

6
tools/ldb_cmd.cc
View File

@ -1748,7 +1748,7 @@ void DBDumperCommand::DoDumpCommand() {
if (max_keys == 0) if (max_keys == 0)
break; break;
if (is_db_ttl_) { if (is_db_ttl_) {
TtlIterator* it_ttl = static_cast_with_check<TtlIterator, Iterator>(iter); TtlIterator* it_ttl = static_cast_with_check<TtlIterator>(iter);
rawtime = it_ttl->ttl_timestamp(); rawtime = it_ttl->ttl_timestamp();
if (rawtime < ttl_start || rawtime >= ttl_end) { if (rawtime < ttl_start || rawtime >= ttl_end) {
continue; continue;
@ -2575,7 +2575,7 @@ void ScanCommand::DoCommand() {
it->Valid() && (!end_key_specified_ || it->key().ToString() < end_key_); it->Valid() && (!end_key_specified_ || it->key().ToString() < end_key_);
it->Next()) { it->Next()) {
if (is_db_ttl_) { if (is_db_ttl_) {
TtlIterator* it_ttl = static_cast_with_check<TtlIterator, Iterator>(it); TtlIterator* it_ttl = static_cast_with_check<TtlIterator>(it);
int rawtime = it_ttl->ttl_timestamp(); int rawtime = it_ttl->ttl_timestamp();
if (rawtime < ttl_start || rawtime >= ttl_end) { if (rawtime < ttl_start || rawtime >= ttl_end) {
continue; continue;
@ -3416,7 +3416,7 @@ void ListFileRangeDeletesCommand::DoCommand() {
return; return;
} }
DBImpl* db_impl = static_cast_with_check<DBImpl, DB>(db_->GetRootDB()); DBImpl* db_impl = static_cast_with_check<DBImpl>(db_->GetRootDB());
std::string out_str; std::string out_str;

5
util/filter_bench.cc
View File

@ -23,6 +23,7 @@ int main() {
#include "table/block_based/full_filter_block.h" #include "table/block_based/full_filter_block.h"
#include "table/block_based/mock_block_based_table.h" #include "table/block_based/mock_block_based_table.h"
#include "table/plain/plain_table_bloom.h" #include "table/plain/plain_table_bloom.h"
#include "util/cast_util.h"
#include "util/gflags_compat.h" #include "util/gflags_compat.h"
#include "util/hash.h" #include "util/hash.h"
#include "util/random.h" #include "util/random.h"
@ -131,6 +132,7 @@ using ROCKSDB_NAMESPACE::ParsedFullFilterBlock;
using ROCKSDB_NAMESPACE::PlainTableBloomV1; using ROCKSDB_NAMESPACE::PlainTableBloomV1;
using ROCKSDB_NAMESPACE::Random32; using ROCKSDB_NAMESPACE::Random32;
using ROCKSDB_NAMESPACE::Slice; using ROCKSDB_NAMESPACE::Slice;
using ROCKSDB_NAMESPACE::static_cast_with_check;
using ROCKSDB_NAMESPACE::StderrLogger; using ROCKSDB_NAMESPACE::StderrLogger;
using ROCKSDB_NAMESPACE::mock::MockBlockBasedTableTester; using ROCKSDB_NAMESPACE::mock::MockBlockBasedTableTester;
@ -378,7 +380,8 @@ void FilterBench::Go() {
info.filter_ = info.plain_table_bloom_->GetRawData(); info.filter_ = info.plain_table_bloom_->GetRawData();
} else { } else {
if (!builder) { if (!builder) {
builder.reset(&dynamic_cast<BuiltinFilterBitsBuilder &>(*GetBuilder())); builder.reset(
static_cast_with_check<BuiltinFilterBitsBuilder>(GetBuilder()));
} }
for (uint32_t i = 0; i < keys_to_add; ++i) { for (uint32_t i = 0; i < keys_to_add; ++i) {
builder->AddKey(kms_[0].Get(filter_id, i)); builder->AddKey(kms_[0].Get(filter_id, i));

2
utilities/blob_db/blob_db_impl.cc
View File

@ -209,7 +209,7 @@ Status BlobDBImpl::Open(std::vector<ColumnFamilyHandle*>* handles) {
if (!s.ok()) { if (!s.ok()) {
return s; return s;
} }
db_impl_ = static_cast_with_check<DBImpl, DB>(db_->GetRootDB()); db_impl_ = static_cast_with_check<DBImpl>(db_->GetRootDB());
// Initialize SST file <-> oldest blob file mapping if garbage collection // Initialize SST file <-> oldest blob file mapping if garbage collection
// is enabled. // is enabled.

6
utilities/transactions/optimistic_transaction.cc
View File

@ -76,7 +76,7 @@ Status OptimisticTransaction::CommitWithSerialValidate() {
// check whether this transaction is safe to be committed. // check whether this transaction is safe to be committed.
OptimisticTransactionCallback callback(this); OptimisticTransactionCallback callback(this);
DBImpl* db_impl = static_cast_with_check<DBImpl, DB>(db_->GetRootDB()); DBImpl* db_impl = static_cast_with_check<DBImpl>(db_->GetRootDB());
Status s = db_impl->WriteWithCallback( Status s = db_impl->WriteWithCallback(
write_options_, GetWriteBatch()->GetWriteBatch(), &callback); write_options_, GetWriteBatch()->GetWriteBatch(), &callback);
@ -92,7 +92,7 @@ Status OptimisticTransaction::CommitWithParallelValidate() {
auto txn_db_impl = static_cast_with_check<OptimisticTransactionDBImpl, auto txn_db_impl = static_cast_with_check<OptimisticTransactionDBImpl,
OptimisticTransactionDB>(txn_db_); OptimisticTransactionDB>(txn_db_);
assert(txn_db_impl); assert(txn_db_impl);
DBImpl* db_impl = static_cast_with_check<DBImpl, DB>(db_->GetRootDB()); DBImpl* db_impl = static_cast_with_check<DBImpl>(db_->GetRootDB());
assert(db_impl); assert(db_impl);
const size_t space = txn_db_impl->GetLockBucketsSize(); const size_t space = txn_db_impl->GetLockBucketsSize();
std::set<size_t> lk_idxes; std::set<size_t> lk_idxes;
@ -168,7 +168,7 @@ Status OptimisticTransaction::TryLock(ColumnFamilyHandle* column_family,
Status OptimisticTransaction::CheckTransactionForConflicts(DB* db) { Status OptimisticTransaction::CheckTransactionForConflicts(DB* db) {
Status result; Status result;
auto db_impl = static_cast_with_check<DBImpl, DB>(db); auto db_impl = static_cast_with_check<DBImpl>(db);
// Since we are on the write thread and do not want to block other writers, // Since we are on the write thread and do not want to block other writers,
// we will do a cache-only conflict check. This can result in TryAgain // we will do a cache-only conflict check. This can result in TryAgain

5
utilities/transactions/pessimistic_transaction.cc
View File

@ -48,9 +48,8 @@ PessimisticTransaction::PessimisticTransaction(
deadlock_detect_(false), deadlock_detect_(false),
deadlock_detect_depth_(0), deadlock_detect_depth_(0),
skip_concurrency_control_(false) { skip_concurrency_control_(false) {
txn_db_impl_ = txn_db_impl_ = static_cast_with_check<PessimisticTransactionDB>(txn_db);
static_cast_with_check<PessimisticTransactionDB, TransactionDB>(txn_db); db_impl_ = static_cast_with_check<DBImpl>(db_);
db_impl_ = static_cast_with_check<DBImpl, DB>(db_);
if (init) { if (init) {
Initialize(txn_options); Initialize(txn_options);
} }

9
utilities/transactions/pessimistic_transaction_db.cc
View File

@ -29,7 +29,7 @@ namespace ROCKSDB_NAMESPACE {
PessimisticTransactionDB::PessimisticTransactionDB( PessimisticTransactionDB::PessimisticTransactionDB(
DB* db, const TransactionDBOptions& txn_db_options) DB* db, const TransactionDBOptions& txn_db_options)
: TransactionDB(db), : TransactionDB(db),
db_impl_(static_cast_with_check<DBImpl, DB>(db)), db_impl_(static_cast_with_check<DBImpl>(db)),
txn_db_options_(txn_db_options), txn_db_options_(txn_db_options),
lock_mgr_(this, txn_db_options_.num_stripes, txn_db_options.max_num_locks, lock_mgr_(this, txn_db_options_.num_stripes, txn_db_options.max_num_locks,
txn_db_options_.max_num_deadlocks, txn_db_options_.max_num_deadlocks,
@ -60,7 +60,7 @@ PessimisticTransactionDB::PessimisticTransactionDB(
PessimisticTransactionDB::PessimisticTransactionDB( PessimisticTransactionDB::PessimisticTransactionDB(
StackableDB* db, const TransactionDBOptions& txn_db_options) StackableDB* db, const TransactionDBOptions& txn_db_options)
: TransactionDB(db), : TransactionDB(db),
db_impl_(static_cast_with_check<DBImpl, DB>(db->GetRootDB())), db_impl_(static_cast_with_check<DBImpl>(db->GetRootDB())),
txn_db_options_(txn_db_options), txn_db_options_(txn_db_options),
lock_mgr_(this, txn_db_options_.num_stripes, txn_db_options.max_num_locks, lock_mgr_(this, txn_db_options_.num_stripes, txn_db_options.max_num_locks,
txn_db_options_.max_num_deadlocks, txn_db_options_.max_num_deadlocks,
@ -113,7 +113,7 @@ Status PessimisticTransactionDB::Initialize(
Status s = EnableAutoCompaction(compaction_enabled_cf_handles); Status s = EnableAutoCompaction(compaction_enabled_cf_handles);
// create 'real' transactions from recovered shell transactions // create 'real' transactions from recovered shell transactions
auto dbimpl = static_cast_with_check<DBImpl, DB>(GetRootDB()); auto dbimpl = static_cast_with_check<DBImpl>(GetRootDB());
assert(dbimpl != nullptr); assert(dbimpl != nullptr);
auto rtrxs = dbimpl->recovered_transactions(); auto rtrxs = dbimpl->recovered_transactions();
@ -569,8 +569,7 @@ bool PessimisticTransactionDB::TryStealingExpiredTransactionLocks(
void PessimisticTransactionDB::ReinitializeTransaction( void PessimisticTransactionDB::ReinitializeTransaction(
Transaction* txn, const WriteOptions& write_options, Transaction* txn, const WriteOptions& write_options,
const TransactionOptions& txn_options) { const TransactionOptions& txn_options) {
auto txn_impl = auto txn_impl = static_cast_with_check<PessimisticTransaction>(txn);
static_cast_with_check<PessimisticTransaction, Transaction>(txn);
txn_impl->Reinitialize(this, write_options, txn_options); txn_impl->Reinitialize(this, write_options, txn_options);
} }

3
utilities/transactions/pessimistic_transaction_db.h
View File

@ -75,8 +75,7 @@ class PessimisticTransactionDB : public TransactionDB {
Transaction* txn = BeginInternalTransaction(opts); Transaction* txn = BeginInternalTransaction(opts);
txn->DisableIndexing(); txn->DisableIndexing();
auto txn_impl = auto txn_impl = static_cast_with_check<PessimisticTransaction>(txn);
static_cast_with_check<PessimisticTransaction, Transaction>(txn);
// Since commitBatch sorts the keys before locking, concurrent Write() // Since commitBatch sorts the keys before locking, concurrent Write()
// operations will not cause a deadlock. // operations will not cause a deadlock.

2
utilities/transactions/transaction_base.cc
View File

@ -22,7 +22,7 @@ namespace ROCKSDB_NAMESPACE {
TransactionBaseImpl::TransactionBaseImpl(DB* db, TransactionBaseImpl::TransactionBaseImpl(DB* db,
const WriteOptions& write_options) const WriteOptions& write_options)
: db_(db), : db_(db),
dbimpl_(static_cast_with_check<DBImpl, DB>(db)), dbimpl_(static_cast_with_check<DBImpl>(db)),
write_options_(write_options), write_options_(write_options),
cmp_(GetColumnFamilyUserComparator(db->DefaultColumnFamily())), cmp_(GetColumnFamilyUserComparator(db->DefaultColumnFamily())),
start_time_(db_->GetEnv()->NowMicros()), start_time_(db_->GetEnv()->NowMicros()),

3
utilities/transactions/transaction_lock_mgr.cc
View File

@ -166,8 +166,7 @@ TransactionLockMgr::TransactionLockMgr(
dlock_buffer_(max_num_deadlocks), dlock_buffer_(max_num_deadlocks),
mutex_factory_(mutex_factory) { mutex_factory_(mutex_factory) {
assert(txn_db); assert(txn_db);
txn_db_impl_ = txn_db_impl_ = static_cast_with_check<PessimisticTransactionDB>(txn_db);
static_cast_with_check<PessimisticTransactionDB, TransactionDB>(txn_db);
} }
TransactionLockMgr::~TransactionLockMgr() {} TransactionLockMgr::~TransactionLockMgr() {}

3
utilities/transactions/write_prepared_txn.cc
View File

@ -430,8 +430,7 @@ Status WritePreparedTxn::ValidateSnapshot(ColumnFamilyHandle* column_family,
assert(snapshot_); assert(snapshot_);
SequenceNumber min_uncommitted = SequenceNumber min_uncommitted =
static_cast_with_check<const SnapshotImpl, const Snapshot>( static_cast_with_check<const SnapshotImpl>(snapshot_.get())
snapshot_.get())
->min_uncommitted_; ->min_uncommitted_;
SequenceNumber snap_seq = snapshot_->GetSequenceNumber(); SequenceNumber snap_seq = snapshot_->GetSequenceNumber();
// tracked_at_seq is either max or the last snapshot with which this key was // tracked_at_seq is either max or the last snapshot with which this key was

17
utilities/transactions/write_prepared_txn_db.cc
View File

@ -30,7 +30,7 @@ namespace ROCKSDB_NAMESPACE {
Status WritePreparedTxnDB::Initialize( Status WritePreparedTxnDB::Initialize(
const std::vector<size_t>& compaction_enabled_cf_indices, const std::vector<size_t>& compaction_enabled_cf_indices,
const std::vector<ColumnFamilyHandle*>& handles) { const std::vector<ColumnFamilyHandle*>& handles) {
auto dbimpl = static_cast_with_check<DBImpl, DB>(GetRootDB()); auto dbimpl = static_cast_with_check<DBImpl>(GetRootDB());
assert(dbimpl != nullptr); assert(dbimpl != nullptr);
auto rtxns = dbimpl->recovered_transactions(); auto rtxns = dbimpl->recovered_transactions();
std::map<SequenceNumber, SequenceNumber> ordered_seq_cnt; std::map<SequenceNumber, SequenceNumber> ordered_seq_cnt;
@ -328,8 +328,7 @@ Iterator* WritePreparedTxnDB::NewIterator(const ReadOptions& options,
if (options.snapshot != nullptr) { if (options.snapshot != nullptr) {
snapshot_seq = options.snapshot->GetSequenceNumber(); snapshot_seq = options.snapshot->GetSequenceNumber();
min_uncommitted = min_uncommitted =
static_cast_with_check<const SnapshotImpl, const Snapshot>( static_cast_with_check<const SnapshotImpl>(options.snapshot)
options.snapshot)
->min_uncommitted_; ->min_uncommitted_;
} else { } else {
auto* snapshot = GetSnapshot(); auto* snapshot = GetSnapshot();
@ -337,8 +336,7 @@ Iterator* WritePreparedTxnDB::NewIterator(const ReadOptions& options,
// are not deleted. // are not deleted.
snapshot_seq = snapshot->GetSequenceNumber(); snapshot_seq = snapshot->GetSequenceNumber();
min_uncommitted = min_uncommitted =
static_cast_with_check<const SnapshotImpl, const Snapshot>(snapshot) static_cast_with_check<const SnapshotImpl>(snapshot)->min_uncommitted_;
->min_uncommitted_;
own_snapshot = std::make_shared<ManagedSnapshot>(db_impl_, snapshot); own_snapshot = std::make_shared<ManagedSnapshot>(db_impl_, snapshot);
} }
assert(snapshot_seq != kMaxSequenceNumber); assert(snapshot_seq != kMaxSequenceNumber);
@ -363,9 +361,9 @@ Status WritePreparedTxnDB::NewIterators(
SequenceNumber min_uncommitted = 0; SequenceNumber min_uncommitted = 0;
if (options.snapshot != nullptr) { if (options.snapshot != nullptr) {
snapshot_seq = options.snapshot->GetSequenceNumber(); snapshot_seq = options.snapshot->GetSequenceNumber();
min_uncommitted = static_cast_with_check<const SnapshotImpl, const Snapshot>( min_uncommitted =
options.snapshot) static_cast_with_check<const SnapshotImpl>(options.snapshot)
->min_uncommitted_; ->min_uncommitted_;
} else { } else {
auto* snapshot = GetSnapshot(); auto* snapshot = GetSnapshot();
// We take a snapshot to make sure that the related data in the commit map // We take a snapshot to make sure that the related data in the commit map
@ -373,8 +371,7 @@ Status WritePreparedTxnDB::NewIterators(
snapshot_seq = snapshot->GetSequenceNumber(); snapshot_seq = snapshot->GetSequenceNumber();
own_snapshot = std::make_shared<ManagedSnapshot>(db_impl_, snapshot); own_snapshot = std::make_shared<ManagedSnapshot>(db_impl_, snapshot);
min_uncommitted = min_uncommitted =
static_cast_with_check<const SnapshotImpl, const Snapshot>(snapshot) static_cast_with_check<const SnapshotImpl>(snapshot)->min_uncommitted_;
->min_uncommitted_;
} }
iterators->clear(); iterators->clear();
iterators->reserve(column_families.size()); iterators->reserve(column_families.size());

7
utilities/transactions/write_prepared_txn_db.h
View File

@ -1078,10 +1078,9 @@ SnapshotBackup WritePreparedTxnDB::AssignMinMaxSeqs(const Snapshot* snapshot,
SequenceNumber* min, SequenceNumber* min,
SequenceNumber* max) { SequenceNumber* max) {
if (snapshot != nullptr) { if (snapshot != nullptr) {
*min = static_cast_with_check<const SnapshotImpl, const Snapshot>(snapshot) *min =
->min_uncommitted_; static_cast_with_check<const SnapshotImpl>(snapshot)->min_uncommitted_;
*max = static_cast_with_check<const SnapshotImpl, const Snapshot>(snapshot) *max = static_cast_with_check<const SnapshotImpl>(snapshot)->number_;
->number_;
return kBackedByDBSnapshot; return kBackedByDBSnapshot;
} else { } else {
*min = SmallestUnCommittedSeq(); *min = SmallestUnCommittedSeq();

6
utilities/transactions/write_unprepared_txn.cc
View File

@ -847,8 +847,7 @@ Status WriteUnpreparedTxn::RollbackToSavePointInternal() {
ReadOptions roptions; ReadOptions roptions;
roptions.snapshot = top.snapshot_->snapshot(); roptions.snapshot = top.snapshot_->snapshot();
SequenceNumber min_uncommitted = SequenceNumber min_uncommitted =
static_cast_with_check<const SnapshotImpl, const Snapshot>( static_cast_with_check<const SnapshotImpl>(roptions.snapshot)
roptions.snapshot)
->min_uncommitted_; ->min_uncommitted_;
SequenceNumber snap_seq = roptions.snapshot->GetSequenceNumber(); SequenceNumber snap_seq = roptions.snapshot->GetSequenceNumber();
WriteUnpreparedTxnReadCallback callback(wupt_db_, snap_seq, min_uncommitted, WriteUnpreparedTxnReadCallback callback(wupt_db_, snap_seq, min_uncommitted,
@ -976,8 +975,7 @@ Status WriteUnpreparedTxn::ValidateSnapshot(ColumnFamilyHandle* column_family,
assert(snapshot_); assert(snapshot_);
SequenceNumber min_uncommitted = SequenceNumber min_uncommitted =
static_cast_with_check<const SnapshotImpl, const Snapshot>( static_cast_with_check<const SnapshotImpl>(snapshot_.get())
snapshot_.get())
->min_uncommitted_; ->min_uncommitted_;
SequenceNumber snap_seq = snapshot_->GetSequenceNumber(); SequenceNumber snap_seq = snapshot_->GetSequenceNumber();
// tracked_at_seq is either max or the last snapshot with which this key was // tracked_at_seq is either max or the last snapshot with which this key was

8
utilities/transactions/write_unprepared_txn_db.cc
View File

@ -193,7 +193,7 @@ Status WriteUnpreparedTxnDB::Initialize(
const std::vector<size_t>& compaction_enabled_cf_indices, const std::vector<size_t>& compaction_enabled_cf_indices,
const std::vector<ColumnFamilyHandle*>& handles) { const std::vector<ColumnFamilyHandle*>& handles) {
// TODO(lth): Reduce code duplication in this function. // TODO(lth): Reduce code duplication in this function.
auto dbimpl = static_cast_with_check<DBImpl, DB>(GetRootDB()); auto dbimpl = static_cast_with_check<DBImpl>(GetRootDB());
assert(dbimpl != nullptr); assert(dbimpl != nullptr);
db_impl_->SetSnapshotChecker(new WritePreparedSnapshotChecker(this)); db_impl_->SetSnapshotChecker(new WritePreparedSnapshotChecker(this));
@ -268,8 +268,7 @@ Status WriteUnpreparedTxnDB::Initialize(
Transaction* real_trx = BeginTransaction(w_options, t_options, nullptr); Transaction* real_trx = BeginTransaction(w_options, t_options, nullptr);
assert(real_trx); assert(real_trx);
auto wupt = auto wupt = static_cast_with_check<WriteUnpreparedTxn>(real_trx);
static_cast_with_check<WriteUnpreparedTxn, Transaction>(real_trx);
wupt->recovered_txn_ = true; wupt->recovered_txn_ = true;
real_trx->SetLogNumber(first_log_number); real_trx->SetLogNumber(first_log_number);
@ -451,8 +450,7 @@ Iterator* WriteUnpreparedTxnDB::NewIterator(const ReadOptions& options,
return nullptr; return nullptr;
} }
min_uncommitted = min_uncommitted =
static_cast_with_check<const SnapshotImpl, const Snapshot>(snapshot) static_cast_with_check<const SnapshotImpl>(snapshot)->min_uncommitted_;
->min_uncommitted_;
auto* cfd = reinterpret_cast<ColumnFamilyHandleImpl*>(column_family)->cfd(); auto* cfd = reinterpret_cast<ColumnFamilyHandleImpl*>(column_family)->cfd();
auto* state = auto* state =

12
utilities/write_batch_with_index/write_batch_with_index.cc
View File

@ -846,8 +846,7 @@ Status WriteBatchWithIndex::GetFromBatchAndDB(
Status s; Status s;
MergeContext merge_context; MergeContext merge_context;
const ImmutableDBOptions& immuable_db_options = const ImmutableDBOptions& immuable_db_options =
static_cast_with_check<DBImpl, DB>(db->GetRootDB()) static_cast_with_check<DBImpl>(db->GetRootDB())->immutable_db_options();
->immutable_db_options();
// Since the lifetime of the WriteBatch is the same as that of the transaction // Since the lifetime of the WriteBatch is the same as that of the transaction
// we cannot pin it as otherwise the returned value will not be available // we cannot pin it as otherwise the returned value will not be available
@ -887,7 +886,7 @@ Status WriteBatchWithIndex::GetFromBatchAndDB(
get_impl_options.column_family = column_family; get_impl_options.column_family = column_family;
get_impl_options.value = pinnable_val; get_impl_options.value = pinnable_val;
get_impl_options.callback = callback; get_impl_options.callback = callback;
s = static_cast_with_check<DBImpl, DB>(db->GetRootDB()) s = static_cast_with_check<DBImpl>(db->GetRootDB())
->GetImpl(read_options, key, get_impl_options); ->GetImpl(read_options, key, get_impl_options);
} }
@ -938,8 +937,7 @@ void WriteBatchWithIndex::MultiGetFromBatchAndDB(
const size_t num_keys, const Slice* keys, PinnableSlice* values, const size_t num_keys, const Slice* keys, PinnableSlice* values,
Status* statuses, bool sorted_input, ReadCallback* callback) { Status* statuses, bool sorted_input, ReadCallback* callback) {
const ImmutableDBOptions& immuable_db_options = const ImmutableDBOptions& immuable_db_options =
static_cast_with_check<DBImpl, DB>(db->GetRootDB()) static_cast_with_check<DBImpl>(db->GetRootDB())->immutable_db_options();
->immutable_db_options();
autovector<KeyContext, MultiGetContext::MAX_BATCH_SIZE> key_context; autovector<KeyContext, MultiGetContext::MAX_BATCH_SIZE> key_context;
autovector<KeyContext*, MultiGetContext::MAX_BATCH_SIZE> sorted_keys; autovector<KeyContext*, MultiGetContext::MAX_BATCH_SIZE> sorted_keys;
@ -992,9 +990,9 @@ void WriteBatchWithIndex::MultiGetFromBatchAndDB(
} }
// Did not find key in batch OR could not resolve Merges. Try DB. // Did not find key in batch OR could not resolve Merges. Try DB.
static_cast_with_check<DBImpl, DB>(db->GetRootDB()) static_cast_with_check<DBImpl>(db->GetRootDB())
->PrepareMultiGetKeys(key_context.size(), sorted_input, &sorted_keys); ->PrepareMultiGetKeys(key_context.size(), sorted_input, &sorted_keys);
static_cast_with_check<DBImpl, DB>(db->GetRootDB()) static_cast_with_check<DBImpl>(db->GetRootDB())
->MultiGetWithCallback(read_options, column_family, callback, ->MultiGetWithCallback(read_options, column_family, callback,
&sorted_keys); &sorted_keys);