Import wiredtiger: 63b8cf2e0b786296f5b99c363e604a3348299c06 from branch mongodb-4.2

ref: c91b804126..63b8cf2e0b
for: 4.1.3

WT-3735       Add a workgen workload that generates a lot of page splits
WT-3894       Timestamp queue implementation and statistics improvements
WT-4104       Fix test/format failure during comparing data content with berkeley db.
WT-4144       Fix rollback_to_stable with lookaside history
WT-4176       Expose a WT_SESSION.query_timestamp method
WT-4211       Add automated test for long running prepared transactions
WT-4212       Update lookaside schema to handle prepared transactions
WT-4216       Use separate counters for page_swap yield and sleep
WT-4233       Change log corruption errors to warnings and truncate log
WT-4239       Don't allow checkpoints to perform insert-splits in the tree
WT-4241       GNU-stack section should never be conditionally compiled out
WT-4248       Fix checkpoints in schema_abort for slow machines
WT-4249       Attempt to discard dirty page during verify operation.
WT-4251       Prepared updates cannot be discarded
WT-4252       Btree debug functions can leak scratch buffers on error.
WT-4253       Btree debug function to do blind reads doesn't handle row-store internal pages
WT-4256       Loosen check during rollback_to_stable
WT-4257       Don't assume timestamps from lookaside are aligned in memory
WT-4262       Lock deleted children in eviction of internal pages
WT-4263       Use the right tree when copying a key for a lookaside write
WT-4264       Compaction can race with page modifications

1 files changed, 6 insertions, 4 deletions

diff --git a/src/third_party/wiredtiger/test/suite/test_timestamp04.py b/src/third_party/wiredtiger/test/suite/test_timestamp04.py
index 83ed4e904a6..77a55a447b0 100644
--- a/src/third_party/wiredtiger/test/suite/test_timestamp04.py
+++ b/src/third_party/wiredtiger/test/suite/test_timestamp04.py
@@ -70,8 +70,8 @@ class test_timestamp04(wttest.WiredTigerTestCase, suite_subprocess):
         if missing == False:
             actual = dict((k, v) for k, v in cur if v != 0)
             if actual != expected:
-                print "missing: ", sorted(set(expected) - set(actual))
-                print "extras: ", sorted(set(actual) - set(expected))
+                print "missing: ", sorted(set(expected.items()) - set(actual.items()))
+                print "extras: ", sorted(set(actual.items()) - set(expected.items()))
             self.assertTrue(actual == expected)
 
         # Search for the expected items as well as iterating.
@@ -167,7 +167,8 @@ class test_timestamp04(wttest.WiredTigerTestCase, suite_subprocess):
         self.conn.rollback_to_stable()
         stat_cursor = self.session.open_cursor('statistics:', None, None)
         calls = stat_cursor[stat.conn.txn_rollback_to_stable][2]
-        upd_aborted = stat_cursor[stat.conn.txn_rollback_upd_aborted][2]
+        upd_aborted = (stat_cursor[stat.conn.txn_rollback_upd_aborted][2] +
+            stat_cursor[stat.conn.txn_rollback_las_removed][2])
         stat_cursor.close()
         self.assertEqual(calls, 1)
         self.assertTrue(upd_aborted >= key_range/2)
@@ -237,7 +238,8 @@ class test_timestamp04(wttest.WiredTigerTestCase, suite_subprocess):
         self.conn.rollback_to_stable()
         stat_cursor = self.session.open_cursor('statistics:', None, None)
         calls = stat_cursor[stat.conn.txn_rollback_to_stable][2]
-        upd_aborted = stat_cursor[stat.conn.txn_rollback_upd_aborted][2]
+        upd_aborted = (stat_cursor[stat.conn.txn_rollback_upd_aborted][2] +
+            stat_cursor[stat.conn.txn_rollback_las_removed][2])
         stat_cursor.close()
         self.assertEqual(calls, 2)
         #