diff options
| author | costan <costan@google.com> | 2018-04-30 15:11:03 -0700 |
|---|---|---|
| committer | Victor Costan <pwnall@chromium.org> | 2018-04-30 16:01:39 -0700 |
| commit | 18683981505dc374ce29211c80a9552f8f2f4571 (patch) | |
| tree | 539de50e1d72a1c2df017e6f531058cc7cbb80c4 /db/db_impl.cc | |
| parent | e7840de9f3db1a5eddedfecbbbc1ff72a4c2631a (diff) | |
| download | leveldb-18683981505dc374ce29211c80a9552f8f2f4571.tar.gz | |
Clean up SnapshotImpl.
* Omit SnapshotImpl::list_ when assert() isn't on
* Make SnapshotImpl::number_ const and set it in the constructor
* Make SnapshotImpl::number_ private and access it via a getter
* Rename SnapshotImpl::number_ to SnapshotImpl::sequence_number_
* Rename SnapshotList::list_ to SnapshotList::head_
* Wrap casting from Snapshot* to SnapshotImpl* in ToSnapshotImpl()
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=194852828
Diffstat (limited to 'db/db_impl.cc')
| -rw-r--r-- | db/db_impl.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/db/db_impl.cc b/db/db_impl.cc index 02a6872..fefb883 100644 --- a/db/db_impl.cc +++ b/db/db_impl.cc @@ -906,7 +906,7 @@ Status DBImpl::DoCompactionWork(CompactionState* compact) { if (snapshots_.empty()) { compact->smallest_snapshot = versions_->LastSequence(); } else { - compact->smallest_snapshot = snapshots_.oldest()->number_; + compact->smallest_snapshot = snapshots_.oldest()->sequence_number(); } // Release mutex while we're actually doing the compaction work @@ -1121,7 +1121,8 @@ Status DBImpl::Get(const ReadOptions& options, MutexLock l(&mutex_); SequenceNumber snapshot; if (options.snapshot != nullptr) { - snapshot = reinterpret_cast<const SnapshotImpl*>(options.snapshot)->number_; + snapshot = + static_cast<const SnapshotImpl*>(options.snapshot)->sequence_number(); } else { snapshot = versions_->LastSequence(); } @@ -1168,7 +1169,7 @@ Iterator* DBImpl::NewIterator(const ReadOptions& options) { return NewDBIterator( this, user_comparator(), iter, (options.snapshot != nullptr - ? reinterpret_cast<const SnapshotImpl*>(options.snapshot)->number_ + ? static_cast<const SnapshotImpl*>(options.snapshot)->sequence_number() : latest_snapshot), seed); } @@ -1185,9 +1186,9 @@ const Snapshot* DBImpl::GetSnapshot() { return snapshots_.New(versions_->LastSequence()); } -void DBImpl::ReleaseSnapshot(const Snapshot* s) { +void DBImpl::ReleaseSnapshot(const Snapshot* snapshot) { MutexLock l(&mutex_); - snapshots_.Delete(reinterpret_cast<const SnapshotImpl*>(s)); + snapshots_.Delete(static_cast<const SnapshotImpl*>(snapshot)); } // Convenience methods |