diff options
| author | Michael Cahill <michael.cahill@mongodb.com> | 2015-08-04 15:25:13 +1000 |
|---|---|---|
| committer | Michael Cahill <michael.cahill@mongodb.com> | 2015-08-04 15:25:13 +1000 |
| commit | 6e67cf586e68d7bb0d7369afb0fbf2f9e8d72f84 (patch) | |
| tree | 427dbd2b2c05ca51f34bb90615036d7cdeda5b6b /src/btree | |
| parent | 000ff74c23e153a3802cbf04523e72a08f00e3e3 (diff) | |
| download | mongo-6e67cf586e68d7bb0d7369afb0fbf2f9e8d72f84.tar.gz | |
Cleanup, fix LSM cursor assertion order.
Diffstat (limited to 'src/btree')
| -rw-r--r-- | src/btree/bt_debug.c | 4 | ||||
| -rw-r--r-- | src/btree/bt_discard.c | 2 | ||||
| -rw-r--r-- | src/btree/bt_split.c | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/btree/bt_debug.c b/src/btree/bt_debug.c index e16a45890f6..041398d4e43 100644 --- a/src/btree/bt_debug.c +++ b/src/btree/bt_debug.c @@ -634,8 +634,8 @@ __debug_page_metadata(WT_DBG *ds, WT_PAGE *page) __dmsg(ds, ", evict-lru"); if (F_ISSET_ATOMIC(page, WT_PAGE_SCANNING)) __dmsg(ds, ", scanning"); - if (F_ISSET_ATOMIC(page, WT_PAGE_SPLITTING)) - __dmsg(ds, ", splitting"); + if (F_ISSET_ATOMIC(page, WT_PAGE_SPLIT_LOCKED)) + __dmsg(ds, ", split locked"); if (mod != NULL) switch (F_ISSET(mod, WT_PM_REC_MASK)) { diff --git a/src/btree/bt_discard.c b/src/btree/bt_discard.c index 8816c1e913c..a05c6217338 100644 --- a/src/btree/bt_discard.c +++ b/src/btree/bt_discard.c @@ -56,7 +56,7 @@ __wt_page_out(WT_SESSION_IMPL *session, WT_PAGE **pagep) */ WT_ASSERT(session, !__wt_page_is_modified(page)); WT_ASSERT(session, !F_ISSET_ATOMIC(page, WT_PAGE_EVICT_LRU)); - WT_ASSERT(session, !F_ISSET_ATOMIC(page, WT_PAGE_SPLITTING)); + WT_ASSERT(session, !F_ISSET_ATOMIC(page, WT_PAGE_SPLIT_LOCKED)); #ifdef HAVE_DIAGNOSTIC { diff --git a/src/btree/bt_split.c b/src/btree/bt_split.c index 9477f31ffda..acef71f1d94 100644 --- a/src/btree/bt_split.c +++ b/src/btree/bt_split.c @@ -825,11 +825,11 @@ __split_parent(WT_SESSION_IMPL *session, WT_REF *ref, */ for (;;) { parent = ref->home; - F_CAS_ATOMIC(parent, WT_PAGE_SPLITTING, ret); + F_CAS_ATOMIC(parent, WT_PAGE_SPLIT_LOCKED, ret); if (ret == 0) { if (parent == ref->home) break; - F_CLR_ATOMIC(parent, WT_PAGE_SPLITTING); + F_CLR_ATOMIC(parent, WT_PAGE_SPLIT_LOCKED); continue; } __wt_yield(); @@ -1037,7 +1037,7 @@ err: if (!complete) if (next_ref->state == WT_REF_SPLIT) next_ref->state = WT_REF_DELETED; } - F_CLR_ATOMIC(parent, WT_PAGE_SPLITTING); + F_CLR_ATOMIC(parent, WT_PAGE_SPLIT_LOCKED); if (hazard) WT_TRET(__wt_hazard_clear(session, parent)); |