diff options
author | Alex Gorrod <alexander.gorrod@mongodb.com> | 2016-10-26 11:52:07 +1100 |
---|---|---|
committer | Alex Gorrod <alexander.gorrod@mongodb.com> | 2016-10-26 11:52:07 +1100 |
commit | ebbb4eb0b091fa185b06a060d24b68eb6761ba4a (patch) | |
tree | c42aefac8438be5e9c15ea34f6e56063204762d4 /src/third_party/wiredtiger/src/lsm/lsm_tree.c | |
parent | 87909c906cd911464c48015919b5d846e2b4f4e4 (diff) | |
download | mongo-ebbb4eb0b091fa185b06a060d24b68eb6761ba4a.tar.gz |
Import wiredtiger: b11ed312cedb905dec49dd2c9c262fabf64d13cd from branch mongodb-3.2r3.2.10
ref: 9cf2f89d6d..b11ed312ce
for: 3.2.11
WT-1592 Dump detailed cache information via statistics
WT-2403 Enhance random cursor implementation for LSM trees
WT-2831 Skip creating a checkpoint if there have been no changes
WT-2858 rename wtperf's CONFIG structure
WT-2880 Add support for Zstandard compression
WT-2895 Reduce the runtime of make check testing with disable long
WT-2904 Fix a bug where the reported checkpoint size could be many times data size
WT-2907 Bug in Java ConcurrentCloseTest case
WT-2917 split wtperf's configuration into per-database and per-run parts
WT-2920 Add statistic tracking application thread cache maintenance time
WT-2931 Configure default in-memory dirty cache usage lower
WT-2932 Allow applications to selectively ignore cache limit with in-memory configuration
WT-2933 Fix a race between named snapshots and checkpoints
WT-2937 test_inmem01 aborts due to stuck cache
WT-2938 Assembly files should end in .sx, not .S
WT-2941 Improve test/format to use faster key-generation functions
WT-2942 verbose strings don't need newline
WT-2946 dist/s_docs incompatible with OS X Xcode installation
WT-2948 simplify error handling by making epoch time return never fail
WT-2949 Add an option to wtperf to not close connection on shutdown
WT-2950 Inserting multi-megabyte values can cause large in-memory pages
WT-2954 Inserting multi-megabyte values can cause large in-memory pages
WT-2955 Add statistics tracking the amount of time threads spend waiting for high level locks
WT-2956 utility tests -h option is always overridden by the default setup
WT-2959 Ensure WT_SESSION_IMPL is never used before it's initialized
WT-2963 Race setting max_entries during eviction
WT-2965 test_wt2323_join_visibility can hang on OSX
WT-2974 lint
WT-2976 Add a statistic tracking how long application threads spend doing I/O
WT-2977 Csuite LSM Random test can occasionally fail
WT-2985 Race during checkpoint can cause a core dump
WT-2987 Fix a bug where opening a cursor on an incomplete table drops core
WT-2988 __wt_epoch potentially returns garbage values.
Diffstat (limited to 'src/third_party/wiredtiger/src/lsm/lsm_tree.c')
-rw-r--r-- | src/third_party/wiredtiger/src/lsm/lsm_tree.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/third_party/wiredtiger/src/lsm/lsm_tree.c b/src/third_party/wiredtiger/src/lsm/lsm_tree.c index db9fd581110..0054dcd1583 100644 --- a/src/third_party/wiredtiger/src/lsm/lsm_tree.c +++ b/src/third_party/wiredtiger/src/lsm/lsm_tree.c @@ -265,7 +265,7 @@ __wt_lsm_tree_setup_chunk( WT_SESSION_IMPL *session, WT_LSM_TREE *lsm_tree, WT_LSM_CHUNK *chunk) { WT_ASSERT(session, F_ISSET(session, WT_SESSION_LOCKED_SCHEMA)); - WT_RET(__wt_epoch(session, &chunk->create_ts)); + __wt_epoch(session, &chunk->create_ts); WT_RET(__wt_lsm_tree_chunk_name( session, lsm_tree, chunk->id, &chunk->uri)); @@ -496,7 +496,7 @@ __lsm_tree_open(WT_SESSION_IMPL *session, lsm_tree->queue_ref = 0; /* Set a flush timestamp as a baseline. */ - WT_ERR(__wt_epoch(session, &lsm_tree->last_flush_ts)); + __wt_epoch(session, &lsm_tree->last_flush_ts); /* Now the tree is setup, make it visible to others. */ TAILQ_INSERT_HEAD(&S2C(session)->lsmqh, lsm_tree, q); @@ -1139,7 +1139,7 @@ __wt_lsm_compact(WT_SESSION_IMPL *session, const char *name, bool *skipp) return (0); } - WT_ERR(__wt_seconds(session, &begin)); + __wt_seconds(session, &begin); /* * Compacting has two distinct phases. @@ -1267,7 +1267,7 @@ __wt_lsm_compact(WT_SESSION_IMPL *session, const char *name, bool *skipp) break; } __wt_sleep(1, 0); - WT_ERR(__wt_seconds(session, &end)); + __wt_seconds(session, &end); if (session->compact->max_time > 0 && session->compact->max_time < (uint64_t)(end - begin)) { WT_ERR(ETIMEDOUT); |