diff options
| author | Alex Gorrod <alexander.gorrod@mongodb.com> | 2016-09-16 16:22:54 +1000 |
|---|---|---|
| committer | Alex Gorrod <alexander.gorrod@mongodb.com> | 2016-09-16 16:26:24 +1000 |
| commit | 7693fa59c4470db729d85af99fb9cc3b264fa8c8 (patch) | |
| tree | ae2747db581d28abb65251754cf735074eebafc7 /src/third_party/wiredtiger/src/btree/bt_io.c | |
| parent | 2c15ad73fb47d7697e05fb2b7972021b87a56452 (diff) | |
| download | mongo-7693fa59c4470db729d85af99fb9cc3b264fa8c8.tar.gz | |
Import wiredtiger: 5bc03723a7e77c96b1d5e45a97173654872c727a from branch mongodb-3.4
ref: deeb0f589a..5bc03723a7
for: 3.3.13
WT-2859 Improve statistics macros to not collect stats when statistics=none is set
WT-2894 Create workload that shows negative scaling when overwhelmed
WT-2900 Add ARM8 build support to WiredTiger and fix ARM CRC assembler tags
WT-2902 Enhance eviction to work better with update heavy YCSB load
WT-2905 dead code: MongoDB Coverity #99881
WT-2908 Add dry-run support to python unit-test
WT-2910 test_inmem01 can abort due to stuck cache
WT-2911 add support for gcc6
WT-2912 make --enable-strict run on the zseries test box
WT-2913 stuck cache after latest merge
WT-2914 Fix link error on OS/X for checksum_init call
WT-2916 whitespace check not working
Diffstat (limited to 'src/third_party/wiredtiger/src/btree/bt_io.c')
| -rw-r--r-- | src/third_party/wiredtiger/src/btree/bt_io.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/third_party/wiredtiger/src/btree/bt_io.c b/src/third_party/wiredtiger/src/btree/bt_io.c index 8053417f838..42c3a849a88 100644 --- a/src/third_party/wiredtiger/src/btree/bt_io.c +++ b/src/third_party/wiredtiger/src/btree/bt_io.c @@ -139,12 +139,12 @@ __wt_bt_read(WT_SESSION_IMPL *session, WT_ERR(__wt_verify_dsk(session, tmp->data, buf)); } - WT_STAT_FAST_CONN_INCR(session, cache_read); - WT_STAT_FAST_DATA_INCR(session, cache_read); + WT_STAT_CONN_INCR(session, cache_read); + WT_STAT_DATA_INCR(session, cache_read); if (F_ISSET(dsk, WT_PAGE_COMPRESSED)) - WT_STAT_FAST_DATA_INCR(session, compress_read); - WT_STAT_FAST_CONN_INCRV(session, cache_bytes_read, dsk->mem_size); - WT_STAT_FAST_DATA_INCRV(session, cache_bytes_read, dsk->mem_size); + WT_STAT_DATA_INCR(session, compress_read); + WT_STAT_CONN_INCRV(session, cache_bytes_read, dsk->mem_size); + WT_STAT_DATA_INCRV(session, cache_bytes_read, dsk->mem_size); if (0) { corrupt: if (ret == 0) @@ -234,7 +234,7 @@ __wt_bt_write(WT_SESSION_IMPL *session, WT_ITEM *buf, ip = buf; else if (buf->size <= btree->allocsize) { ip = buf; - WT_STAT_FAST_DATA_INCR(session, compress_write_too_small); + WT_STAT_DATA_INCR(session, compress_write_too_small); } else { /* Skip the header bytes of the source data. */ src = (uint8_t *)buf->mem + WT_BLOCK_COMPRESS_SKIP; @@ -283,10 +283,10 @@ __wt_bt_write(WT_SESSION_IMPL *session, WT_ITEM *buf, buf->size / btree->allocsize <= result_len / btree->allocsize) { ip = buf; - WT_STAT_FAST_DATA_INCR(session, compress_write_fail); + WT_STAT_DATA_INCR(session, compress_write_fail); } else { compressed = true; - WT_STAT_FAST_DATA_INCR(session, compress_write); + WT_STAT_DATA_INCR(session, compress_write); /* * Copy in the skipped header bytes, set the final data @@ -363,11 +363,11 @@ __wt_bt_write(WT_SESSION_IMPL *session, WT_ITEM *buf, bm->write( bm, session, ip, addr, addr_sizep, data_checksum, checkpoint_io)); - WT_STAT_FAST_CONN_INCR(session, cache_write); - WT_STAT_FAST_DATA_INCR(session, cache_write); + WT_STAT_CONN_INCR(session, cache_write); + WT_STAT_DATA_INCR(session, cache_write); S2C(session)->cache->bytes_written += dsk->mem_size; - WT_STAT_FAST_CONN_INCRV(session, cache_bytes_write, dsk->mem_size); - WT_STAT_FAST_DATA_INCRV(session, cache_bytes_write, dsk->mem_size); + WT_STAT_CONN_INCRV(session, cache_bytes_write, dsk->mem_size); + WT_STAT_DATA_INCRV(session, cache_bytes_write, dsk->mem_size); err: __wt_scr_free(session, &ctmp); __wt_scr_free(session, &etmp); |