diff options
| author | Alex Gorrod <alexander.gorrod@mongodb.com> | 2016-10-07 15:54:43 +1100 |
|---|---|---|
| committer | Alex Gorrod <alexander.gorrod@mongodb.com> | 2016-10-07 15:54:43 +1100 |
| commit | 448f5b43d249dd090da1d79b82c9ab1b742e4f38 (patch) | |
| tree | a93dfecaf6bb0c30beaca5d86f0dd2e20ceb8e76 /src/third_party/wiredtiger/src/lsm/lsm_tree.c | |
| parent | fcbbeff941d17beb1834b8f4de465ac766de941d (diff) | |
| download | mongo-448f5b43d249dd090da1d79b82c9ab1b742e4f38.tar.gz | |
Import wiredtiger: 6a31c2118cce88c68281eda2ca9ab1df915a2773 from branch mongodb-3.4
ref: fc0e7abe82..6a31c2118c
for: 3.4.0
WT-2831 Skip creating a checkpoint if there have been no changes
WT-2858 rename wtperf's CONFIG structure
WT-2895 Reduce the runtime of make check testing with disable long
WT-2907 Bug in Java ConcurrentCloseTest case
WT-2917 split wtperf's configuration into per-database and per-run parts
WT-2920 New eviction statistics
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-2950 Inserting multi-megabyte values can cause large in-memory pages
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); |