diff options
author | Keith Bostic <keith@wiredtiger.com> | 2013-10-04 18:20:16 -0400 |
---|---|---|
committer | Keith Bostic <keith@wiredtiger.com> | 2013-10-04 18:20:48 -0400 |
commit | d219e4f9e89cafa5d9a0c0b25f1ed3cb390b59df (patch) | |
tree | 7954164a120efdf89c256443b4dbde64a8f54f6e /src | |
parent | ed330f93f03ee9b7e898e184763f1066c4ff9400 (diff) | |
download | mongo-d219e4f9e89cafa5d9a0c0b25f1ed3cb390b59df.tar.gz |
Fix a comment, and a little whitespace tweaking, no real change.
Diffstat (limited to 'src')
-rw-r--r-- | src/lsm/lsm_merge.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/lsm/lsm_merge.c b/src/lsm/lsm_merge.c index f28ac307994..5407f9cd57f 100644 --- a/src/lsm/lsm_merge.c +++ b/src/lsm/lsm_merge.c @@ -207,8 +207,8 @@ __wt_lsm_merge( F_SET(src, WT_CURSTD_RAW); WT_ERR(__wt_clsm_init_merge(src, start_chunk, start_id, nchunks)); - WT_WITH_SCHEMA_LOCK(session, ret = __wt_lsm_tree_setup_chunk( - session, lsm_tree, chunk)); + WT_WITH_SCHEMA_LOCK(session, + ret = __wt_lsm_tree_setup_chunk(session, lsm_tree, chunk)); WT_ERR(ret); if (create_bloom) { WT_CLEAR(buf); @@ -232,10 +232,9 @@ __wt_lsm_merge( for (insert_count = 0; (ret = src->next(src)) == 0; insert_count++) { if (insert_count % 1000 && - !F_ISSET(lsm_tree, WT_LSM_TREE_WORKING)) { - ret = EINTR; - goto err; - } + !F_ISSET(lsm_tree, WT_LSM_TREE_WORKING)) + WT_ERR(EINTR); + WT_ERR(src->get_key(src, &key)); dest->set_key(dest, &key); WT_ERR(src->get_value(src, &value)); @@ -284,7 +283,7 @@ __wt_lsm_merge( /* * Open a handle on the new chunk before application threads attempt - * to access it. Opening the pre-loads internal pages into the file + * to access it, opening it pre-loads internal pages into the file * system cache. */ cfg[1] = "checkpoint=WiredTigerCheckpoint"; |