mirrors/scylladb
1
0
Fork 0
mirror of https://github.com/scylladb/scylladb.git synced 2026-05-12 19:02:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

lsa: Mark region::merge() as noexcept

Browse Source 
It seems to satisfy this, and row_cache::do_update() will rely on it to simplify
error handling.

Message-Id: <1504023113-30374-1-git-send-email-tgrabiec@scylladb.com>
This commit is contained in:
Tomasz Grabiec
2017-08-29 18:11:52 +02:00
committed by Avi Kivity
parent 8fa35d6ddf
commit 5d2f2bc90b
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
utils/logalloc.cc
View File

@@ -1373,7 +1373,7 @@ public:
// Merges another region into this region. The other region is made
// to refer to this region.
// Doesn't invalidate references to allocated objects.
void merge(region_impl& other) {
void merge(region_impl& other) noexcept {
compaction_lock dct1(*this);
compaction_lock dct2(other);
degroup_temporarily dgt1(this);
@@ -1614,7 +1614,7 @@ region_group* region::group() {
return _impl->group();
}
void region::merge(region& other) {
void region::merge(region& other) noexcept {
if (_impl != other._impl) {
_impl->merge(*other._impl);
other._impl = _impl;

2
utils/logalloc.hh
View File

@@ -566,7 +566,7 @@ public:
// Merges another region into this region. The other region is left empty.
// Doesn't invalidate references to allocated objects.
void merge(region& other);
void merge(region& other) noexcept;
// Compacts everything. Mainly for testing.
// Invalidates references to allocated objects.