bahman/scylla
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

mvcc: partition_snapshot: Introduce migrate()

Browse Source 
Snapshots which outlive the memtable will need to have their
_region and _cleaner references updated.

The snapshot can be destroyed after the memtable when it is queud in
the mutation_cleaner.
This commit is contained in:
Tomasz Grabiec
2018-12-27 17:42:11 +01:00
parent 67f9afbd1a
commit 20f5d5d1a1
2 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
partition_version.cc
View File

@@ -171,11 +171,11 @@ tombstone partition_entry::partition_tombstone() const {
}
partition_snapshot::~partition_snapshot() {
with_allocator(_region.allocator(), [this] {
with_allocator(region().allocator(), [this] {
if (_version && _version.is_unique_owner()) {
auto v = &*_version;
_version = {};
remove_or_mark_as_unique_owner(v, &_cleaner);
remove_or_mark_as_unique_owner(v, _cleaner);
} else if (_entry) {
_entry->_snapshot = nullptr;
}
@@ -199,7 +199,7 @@ stop_iteration partition_snapshot::merge_partition_versions() {
_version = partition_version_ref(*current);
}
while (auto prev = current->prev()) {
_region.allocator().invalidate_references();
region().allocator().invalidate_references();
if (current->partition().apply_monotonically(*schema(), std::move(prev->partition()), _tracker, is_preemptible::yes) == stop_iteration::no) {
return stop_iteration::no;
}

19
partition_version.hh
View File

@@ -299,8 +299,8 @@ private:
partition_version_ref _version;
partition_entry* _entry;
phase_type _phase;
logalloc::region& _region;
mutation_cleaner& _cleaner;
logalloc::region* _region;
mutation_cleaner* _cleaner;
cache_tracker* _tracker;
boost::intrusive::slist_member_hook<> _cleaner_hook;
friend class partition_entry;
@@ -312,7 +312,7 @@ public:
partition_entry* entry,
cache_tracker* tracker, // non-null for evictable snapshots
phase_type phase = default_phase)
: _schema(std::move(s)), _entry(entry), _phase(phase), _region(region), _cleaner(cleaner), _tracker(tracker) { }
: _schema(std::move(s)), _entry(entry), _phase(phase), _region(&region), _cleaner(&cleaner), _tracker(tracker) { }
partition_snapshot(const partition_snapshot&) = delete;
partition_snapshot(partition_snapshot&&) = delete;
partition_snapshot& operator=(const partition_snapshot&) = delete;
@@ -344,12 +344,19 @@ public:
// to the latest version.
stop_iteration slide_to_oldest() noexcept;
// Must be called after snapshot's original region is merged into a different region
// before the original region is destroyed, unless the snapshot is destroyed earlier.
void migrate(logalloc::region* region, mutation_cleaner* cleaner) noexcept {
_region = region;
_cleaner = cleaner;
}
~partition_snapshot();
partition_version_ref& version();
change_mark get_change_mark() {
return {_region.reclaim_counter(), version_count()};
return {_region->reclaim_counter(), version_count()};
}
const partition_version_ref& version() const;
@@ -365,9 +372,9 @@ public:
}
const schema_ptr& schema() const { return _schema; }
logalloc::region& region() const { return _region; }
logalloc::region& region() const { return *_region; }
cache_tracker* tracker() const { return _tracker; }
mutation_cleaner& cleaner() { return _cleaner; }
mutation_cleaner& cleaner() { return *_cleaner; }
tombstone partition_tombstone() const;
::static_row static_row(bool digest_requested) const;