Import wiredtiger-wiredtiger-2.7.0-1122-g9cf8eb2.tar.gz from wiredtiger branch mongodb-3.4

ref: 444981a..9cf8eb2

SERVER-23040  Coverity analysis defect 98151: Dereference after null check
WT-2123       Don't clear allocated memory if not required
WT-2318       Configurable thread wake up time
WT-2322       Join cursor with isolation read-uncommitted may give different results with Bloom filters
WT-2345       Evicting tiny pages creates small pages on disk
WT-2375       Add tests for collators
WT-2381       Dump utility discards table config
WT-2384       lt, le conditions for ordering cursor in join cursor
WT-2391       De-prioritize eviction from indexes
WT-2404       Add streaming pack/unpack methods to the extension API
WT-2414       Avoid extractor calls for ordering cursor in join cursor
WT-2418       Rebalance operation failing with EBUSY
WT-2426       Deadlock caused by recent changes to checkpoint handle locking
WT-2431       Join statistics documentation needed
WT-2435       __wt_evict_file_exclusive_on/off cleanups
WT-2436       lt, le conditions for ref cursor with "strategy=bloom" in join cursor
WT-2443       Getting statistic for all indexes used in join cursor
WT-2444       Broken flag test in wtperf, whitespace
WT-2447       Join cursor reads main table
WT-2448       Add no_scale flag to relevant statistics
WT-2449       Configure should check for a 64-bit build
WT-2451       Allow eviction of metadata
WT-2454       checkpoint_sync=false does *not* prevent flushes/sync to disk.
WT-2456       Update Power8 CRC32 Code
WT-2457       Dropping an LSM table can fail with EBUSY when no user ops are active
WT-2459       Allow Configure scripts to provide the --tag option for libtool when compiling on PPC
WT-2460       Checkpoint failing with WT_ROLLBACK
WT-2461       Python sweep01 test failing
WT-2463       Test that measures idle CPU usage fails under valgrind
WT-2464       Valgrind errors.
WT-2465       Coverity 1352899: Dereference before null check
WT-2466       Coverity 1352893 Buffer not null terminated
WT-2467       Coverity 1352894: Logically dead code
WT-2468       Coverity 1352896: Explicit null dereferenced
WT-2469       Coverity 1352897: Integer overflowed argument
WT-2470       Coverity 1352898: Resource leak
WT-2471       Review WiredTiger "int" printf formats
WT-2473       MSVC doesn't support PRId64
WT-2475       Have reconf script remove cached configure results
WT-2476       btree->evict_lock is being accessed after being destroyed
WT-2477       Missing define in Windows wiredtiger_config.h
WT-2478       Valgrind test failures
WT-2481       Recent changes affect LSM performance
WT-2482       Coverity 1353015, 1353016, out-of-bounds access
WT-2483       readonly02 periodically fails
WT-2484       Coverity 1345809: unchecked return value
WT-2485       Test/format failure with Floating point exception
WT-2487       Release memory in manydbs test
WT-2489       Fix compiler warnings from /test/manydbs
WT-2490       search_near() returns wrong key for column-store
WT-2492       Windows test_config04.test_config04.test_invalid_config crashes
WT-2493       Verbose lsm_manager unsupported
WT-2494       Review calls to __wt_free, plus minor bug in an error path.
WT-2495       Missing memory initialization leads to crash on Windows
WT-2496       Testing revealed error unable to read root page
WT-2497       Enhance test/format to save a copy of backup
WT-2498       LSM tree drop hangs when a user cursor is open
WT-2499       LSM shutdown race causes segfault
WT-2501       Dropping a just opened LSM tree isn't safe
WT-2502       Memory leak in locking handles for checkpoint
WT-2503       Build warning in lsm_tree.c
WT-2506       Using an uninitialised value

1 files changed, 8 insertions, 5 deletions

diff --git a/src/third_party/wiredtiger/src/lsm/lsm_merge.c b/src/third_party/wiredtiger/src/lsm/lsm_merge.c
index 29325066da7..6d907284546 100644
--- a/src/third_party/wiredtiger/src/lsm/lsm_merge.c
+++ b/src/third_party/wiredtiger/src/lsm/lsm_merge.c
@@ -60,10 +60,11 @@ __lsm_merge_aggressive_update(WT_SESSION_IMPL *session, WT_LSM_TREE *lsm_tree)
 {
 	struct timespec now;
 	uint64_t msec_since_last_merge, msec_to_create_merge;
-	u_int new_aggressive;
+	uint32_t new_aggressive;
 
 	new_aggressive = 0;
 
+	WT_ASSERT(session, lsm_tree->merge_min != 0);
 	/*
 	 * If the tree is open read-only or we are compacting, be very
 	 * aggressive. Otherwise, we can spend a long time waiting for merges
@@ -124,8 +125,9 @@ __lsm_merge_aggressive_update(WT_SESSION_IMPL *session, WT_LSM_TREE *lsm_tree)
 
 	if (new_aggressive > lsm_tree->merge_aggressiveness) {
 		WT_RET(__wt_verbose(session, WT_VERB_LSM,
-		    "LSM merge %s got aggressive (old %u new %u), "
-		    "merge_min %d, %u / %" PRIu64,
+		    "LSM merge %s got aggressive "
+		    "(old %" PRIu32 " new %" PRIu32 "), "
+		    "merge_min %u, %" PRIu64 " / %" PRIu64,
 		    lsm_tree->name, lsm_tree->merge_aggressiveness,
 		    new_aggressive, lsm_tree->merge_min,
 		    msec_since_last_merge, lsm_tree->chunk_fill_ms));
@@ -410,7 +412,8 @@ __wt_lsm_merge(WT_SESSION_IMPL *session, WT_LSM_TREE *lsm_tree, u_int id)
 		    start_chunk, end_chunk, dest_id, record_count, generation));
 		for (verb = start_chunk; verb <= end_chunk; verb++)
 			WT_ERR(__wt_verbose(session, WT_VERB_LSM,
-			    "Merging %s: Chunk[%u] id %u, gen: %" PRIu32
+			    "Merging %s: Chunk[%u] id %" PRIu32
+			    ", gen: %" PRIu32
 			    ", size: %" PRIu64 ", records: %" PRIu64,
 			    lsm_tree->name, verb, lsm_tree->chunk[verb]->id,
 			    lsm_tree->chunk[verb]->generation,
@@ -460,7 +463,7 @@ __wt_lsm_merge(WT_SESSION_IMPL *session, WT_LSM_TREE *lsm_tree, u_int id)
 #define	LSM_MERGE_CHECK_INTERVAL	WT_THOUSAND
 	for (insert_count = 0; (ret = src->next(src)) == 0; insert_count++) {
 		if (insert_count % LSM_MERGE_CHECK_INTERVAL == 0) {
-			if (!F_ISSET(lsm_tree, WT_LSM_TREE_ACTIVE))
+			if (!lsm_tree->active)
 				WT_ERR(EINTR);
 
 			WT_STAT_FAST_CONN_INCRV(session,