diff options
| author | Michael Cahill <michael.cahill@mongodb.com> | 2015-09-30 14:48:52 +1000 |
|---|---|---|
| committer | Michael Cahill <michael.cahill@mongodb.com> | 2015-09-30 14:48:52 +1000 |
| commit | 0e0d19dec8ab89b82f97c355f0b7ae9c19656a1d (patch) | |
| tree | 39b8826c2e9f5aea8c88ec158a674402cb293dc6 | |
| parent | 1600e916b0616a8f49341c6546386e366e8cdc36 (diff) | |
| download | mongo-0e0d19dec8ab89b82f97c355f0b7ae9c19656a1d.tar.gz | |
Backport merge fixups.
| -rw-r--r-- | src/evict/evict_file.c | 2 | ||||
| -rw-r--r-- | src/lsm/lsm_cursor.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/evict/evict_file.c b/src/evict/evict_file.c index 5e0b5b6c7ee..c5e04806062 100644 --- a/src/evict/evict_file.c +++ b/src/evict/evict_file.c @@ -80,7 +80,7 @@ __wt_evict_file(WT_SESSION_IMPL *session, int syncop) break; case WT_SYNC_DISCARD: WT_ASSERT(session, - __wt_page_can_evict(session, page, 0)); + __wt_page_can_evict(session, page, 0, NULL)); __wt_evict_page_clean_update(session, ref); break; case WT_SYNC_DISCARD_FORCE: diff --git a/src/lsm/lsm_cursor.c b/src/lsm/lsm_cursor.c index 9ed5eef6ecc..d3657d4342b 100644 --- a/src/lsm/lsm_cursor.c +++ b/src/lsm/lsm_cursor.c @@ -112,7 +112,7 @@ __clsm_enter_update(WT_CURSOR_LSM *clsm) } else { primary = clsm->cursors[clsm->nchunks - 1]; primary_chunk = clsm->primary_chunk; - WT_ASSERT(session, F_ISSET(&session->txn, TXN_HAS_ID)); + WT_ASSERT(session, F_ISSET(&session->txn, WT_TXN_HAS_ID)); have_primary = (primary != NULL && primary_chunk != NULL && (primary_chunk->switch_txn == WT_TXN_NONE || WT_TXNID_LT(session->txn.id, primary_chunk->switch_txn))); @@ -222,8 +222,8 @@ __clsm_enter(WT_CURSOR_LSM *clsm, bool reset, bool update) clsm->nupdates = 1; if (session->txn.isolation == WT_ISO_SNAPSHOT && F_ISSET(clsm, WT_CLSM_OPEN_SNAPSHOT)) { - WT_ASSERT(session, - F_ISSET(&session->txn, TXN_HAS_SNAPSHOT)); + WT_ASSERT(session, F_ISSET(&session->txn, + WT_TXN_HAS_SNAPSHOT)); snap_min = session->txn.snap_min; for (switch_txnp = &clsm->switch_txn[clsm->nchunks - 2]; @@ -1291,7 +1291,7 @@ __clsm_put(WT_SESSION_IMPL *session, WT_CURSOR_LSM *clsm, lsm_tree = clsm->lsm_tree; WT_ASSERT(session, - F_ISSET(&session->txn, TXN_HAS_ID) && + F_ISSET(&session->txn, WT_TXN_HAS_ID) && clsm->primary_chunk != NULL && (clsm->primary_chunk->switch_txn == WT_TXN_NONE || WT_TXNID_LE(session->txn.id, clsm->primary_chunk->switch_txn))); |