diff options
| author | Michael Cahill <michael.cahill@wiredtiger.com> | 2014-02-28 17:11:36 +1100 |
|---|---|---|
| committer | Michael Cahill <michael.cahill@wiredtiger.com> | 2014-02-28 17:11:36 +1100 |
| commit | 2d0287ff3956123a933a0928c271ce3941a77a48 (patch) | |
| tree | e54c74484c3815aafa90df8f8d8ef94aeb8f5539 | |
| parent | f4d2c0ff304259e3d34d9dcbe59d8432c0a250f3 (diff) | |
| download | mongo-2d0287ff3956123a933a0928c271ce3941a77a48.tar.gz | |
Rename disk_txn to reflect what we're actually using it for.
| -rw-r--r-- | src/btree/rec_evict.c | 2 | ||||
| -rw-r--r-- | src/btree/rec_write.c | 2 | ||||
| -rw-r--r-- | src/include/btmem.h | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/btree/rec_evict.c b/src/btree/rec_evict.c index 0713989af58..ce6c04d1283 100644 --- a/src/btree/rec_evict.c +++ b/src/btree/rec_evict.c @@ -498,7 +498,7 @@ ckpt: WT_STAT_FAST_CONN_INCR(session, cache_eviction_checkpoint); * cache. */ if (!exclusive && mod != NULL && - !__wt_txn_visible_all(session, mod->disk_txn)) + !__wt_txn_visible_all(session, mod->rec_max_txn)) return (EBUSY); /* diff --git a/src/btree/rec_write.c b/src/btree/rec_write.c index 43b5532ad1a..dd237693465 100644 --- a/src/btree/rec_write.c +++ b/src/btree/rec_write.c @@ -4079,7 +4079,7 @@ err: __wt_scr_free(&tkey); * cache's dirty statistics. */ if (!r->upd_skipped) { - mod->disk_txn = r->max_txn; + mod->rec_max_txn = r->max_txn; if (WT_ATOMIC_CAS(mod->write_gen, r->orig_write_gen, 0)) __wt_cache_dirty_decr(session, page); diff --git a/src/include/btmem.h b/src/include/btmem.h index 77033f390ed..42d7ecfa9e2 100644 --- a/src/include/btmem.h +++ b/src/include/btmem.h @@ -197,8 +197,8 @@ struct __wt_page_modify { */ uint64_t disk_snap_min; - /* The largest transaction ID written to disk for the page. */ - uint64_t disk_txn; + /* The largest transaction ID seen on the page by reconciliation. */ + uint64_t rec_max_txn; /* The largest update transaction ID (approximate). */ uint64_t update_txn; |