diff options
| author | Ramon Fernandez <ramon@mongodb.com> | 2016-11-07 17:02:46 -0500 |
|---|---|---|
| committer | Ramon Fernandez <ramon@mongodb.com> | 2016-11-07 17:02:46 -0500 |
| commit | 7c626977cf052314d09648d1061e07c44e964264 (patch) | |
| tree | 645b63e4b6cd43879c66b22a85a3b93f7c168923 /src/third_party/wiredtiger/src/include/stat.h | |
| parent | 415100327abaf0e2265f86d30640bc3a1ae2a372 (diff) | |
| download | mongo-7c626977cf052314d09648d1061e07c44e964264.tar.gz | |
Import wiredtiger: 2e2d5fe23badac038944bdc6639eb62d77136f1a from branch mongodb-3.2
ref: b11ed312ce..2e2d5fe23b
for: 3.2.11
SERVER-26753 Minor speed regression (13%) and 'choppy' performance in 3.4 vs 3.2
WT-2415 Add option for join cursors to return false positives from a Bloom filter
WT-2945 Occasional hang running reconfigure fuzz test
WT-2947 test suite populate functions need refactoring
WT-2953 Test format failure - stuck cache with 1/42MB dirty
WT-2961 Add a version drop-down to the web version of the docs
WT-2964 WTPERF parallel-pop-btree hung in populate phase
WT-2968 backup cursor opens every file
WT-2971 Add documentation for raw-compression to the tune_compression page in WT docs
WT-2975 Reduce the memory allocated for statistics
WT-2991 Coverity issue 1365198
WT-2998 Add error messages to error returns that might be confusing.
WT-2999 Memory leak in join WT_CURSOR with custom extractor
WT-3001 WT_EXTENSION_API references are named inconsistently.
WT-3003 log generation should not auto generate the record and op types
WT-3005 Add top-level .gitignore file.
WT-3007 Remove duplicated word in comment
WT-3008 Run wtperf stress testing against all maintained branches
WT-3009 Test format hung/aborted with small cache (sub 10mB)
Diffstat (limited to 'src/third_party/wiredtiger/src/include/stat.h')
| -rw-r--r-- | src/third_party/wiredtiger/src/include/stat.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/third_party/wiredtiger/src/include/stat.h b/src/third_party/wiredtiger/src/include/stat.h index d0b0b60585a..e53414fc0c9 100644 --- a/src/third_party/wiredtiger/src/include/stat.h +++ b/src/third_party/wiredtiger/src/include/stat.h @@ -225,21 +225,24 @@ __wt_stats_clear(void *stats_arg, int slot) * necessary until everything is converted to using data-source handles. */ #define WT_STAT_DATA_DECRV(session, fld, value) do { \ - if ((session)->dhandle != NULL) \ + if ((session)->dhandle != NULL && \ + (session)->dhandle->stat_array != NULL) \ WT_STAT_DECRV( \ session, (session)->dhandle->stats, fld, value); \ } while (0) #define WT_STAT_DATA_DECR(session, fld) \ WT_STAT_DATA_DECRV(session, fld, 1) #define WT_STAT_DATA_INCRV(session, fld, value) do { \ - if ((session)->dhandle != NULL) \ + if ((session)->dhandle != NULL && \ + (session)->dhandle->stat_array != NULL) \ WT_STAT_INCRV( \ session, (session)->dhandle->stats, fld, value); \ } while (0) #define WT_STAT_DATA_INCR(session, fld) \ WT_STAT_DATA_INCRV(session, fld, 1) #define WT_STAT_DATA_SET(session, fld, value) do { \ - if ((session)->dhandle != NULL) \ + if ((session)->dhandle != NULL && \ + (session)->dhandle->stat_array != NULL) \ WT_STAT_SET( \ session, (session)->dhandle->stats, fld, value); \ } while (0) |