diff options
| author | Michael Cahill <michael.cahill@mongodb.com> | 2016-03-22 13:16:47 +1100 |
|---|---|---|
| committer | Michael Cahill <michael.cahill@mongodb.com> | 2016-03-22 13:16:47 +1100 |
| commit | 80341eae7116416f3da689fc28d0ce6a357d59c3 (patch) | |
| tree | cbecadf6e468ad68e2cbb2b66c45c8d59f5451dc | |
| parent | a060ab97aed904e3fa49a0351c4100c18063097b (diff) | |
| download | mongo-80341eae7116416f3da689fc28d0ce6a357d59c3.tar.gz | |
WT-2501 Fix assertions to use new active field.
| -rw-r--r-- | src/lsm/lsm_tree.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lsm/lsm_tree.c b/src/lsm/lsm_tree.c index 7fb3cfc0e95..5ede47c0c43 100644 --- a/src/lsm/lsm_tree.c +++ b/src/lsm/lsm_tree.c @@ -27,7 +27,7 @@ __lsm_tree_discard(WT_SESSION_IMPL *session, WT_LSM_TREE *lsm_tree, bool final) WT_UNUSED(final); /* Only used in diagnostic builds */ - WT_ASSERT(session, !F_ISSET(lsm_tree, WT_LSM_TREE_ACTIVE)); + WT_ASSERT(session, !lsm_tree->active); /* * The work unit queue should be empty, but it's worth checking * since work units use a different locking scheme to regular tree @@ -866,7 +866,7 @@ __wt_lsm_tree_drop( WT_WITH_HANDLE_LIST_LOCK(session, ret = __wt_lsm_tree_get(session, name, true, &lsm_tree)); WT_RET(ret); - WT_ASSERT(session, !F_ISSET(lsm_tree, WT_LSM_TREE_ACTIVE)); + WT_ASSERT(session, !lsm_tree->active); /* Prevent any new opens. */ WT_ERR(__wt_lsm_tree_writelock(session, lsm_tree)); @@ -895,7 +895,7 @@ __wt_lsm_tree_drop( WT_ERR(__wt_lsm_tree_writeunlock(session, lsm_tree)); ret = __wt_metadata_remove(session, name); - WT_ASSERT(session, !F_ISSET(lsm_tree, WT_LSM_TREE_ACTIVE)); + WT_ASSERT(session, !lsm_tree->active); err: if (locked) WT_TRET(__wt_lsm_tree_writeunlock(session, lsm_tree)); WT_WITH_HANDLE_LIST_LOCK(session, |