summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLuke Chen <luke.chen@mongodb.com>2018-01-05 22:07:41 +1100
committerLuke Chen <luke.chen@mongodb.com>2018-01-05 22:07:41 +1100
commitbd9ed5bbe07754221ad014dceefc0ebdb0ecab32 (patch)
tree622a3cc94249954a7bf0757231c40792c9ef5378 /src
parent2158ea8d6c84c9a68b50f76c9dd23b8a193b65f8 (diff)
downloadmongo-bd9ed5bbe07754221ad014dceefc0ebdb0ecab32.tar.gz
Import wiredtiger: 9e5044823185feffa71e56a6593cfb92e0741a41 from branch mongodb-3.8
ref: 1a29eac4dc..9e50448231 for: 3.7.1 WT-2705 High throughput cache bound many threaded workloads can experience long latencies WT-3725 Add statistics to locks around timestamp structures WT-3750 Fast-path fs_directory_list of a single file. WT-3768 Lookaside optimization: birthmarks WT-3769 Fix a bug in reverse cursor walks with particular delete patterns and prefix compression enabled WT-3779 Add support for string formats with WT_CURSOR::modify WT-3800 test_wt2834_join_bloom_fix hang WT-3806 Make sure rdtsc values move forward in time WT-3807 clang static analysis updates WT-3810 wt_rdtsc calibration needs to be longer and verify validity WT-3812 debugging page output should handle complex key/value items. WT-3816 Enable prefix compression on the lookaside table WT-3819 clang static analysis improvements WT-3820 Add a WT_SESSION.breakpoint method for Python debugging. WT-3822 Update WiredTiger copyrights to 2018 WT-3824 tsc_nsec_ratio can compute to zero and cause divide by zero bug
Diffstat (limited to 'src')
-rw-r--r--src/third_party/wiredtiger/LICENSE2
-rw-r--r--src/third_party/wiredtiger/api/leveldb/leveldb_wt.h2
-rwxr-xr-xsrc/third_party/wiredtiger/bench/workgen/runner/example_simple.py2
-rw-r--r--src/third_party/wiredtiger/bench/workgen/runner/example_txn.py2
-rw-r--r--src/third_party/wiredtiger/bench/workgen/runner/insert_test.py2
-rw-r--r--src/third_party/wiredtiger/bench/workgen/runner/maintain_low_dirty_cache.py2
-rw-r--r--src/third_party/wiredtiger/bench/workgen/runner/multi_btree_heavy_stress.py2
-rw-r--r--src/third_party/wiredtiger/bench/workgen/runner/runner/__init__.py2
-rw-r--r--src/third_party/wiredtiger/bench/workgen/runner/runner/core.py2
-rw-r--r--src/third_party/wiredtiger/bench/workgen/runner/runner/latency.py2
-rw-r--r--src/third_party/wiredtiger/bench/workgen/runner/small_btree.py2
-rw-r--r--src/third_party/wiredtiger/bench/workgen/runner/small_btree_reopen.py2
-rw-r--r--src/third_party/wiredtiger/bench/workgen/setup.py2
-rw-r--r--src/third_party/wiredtiger/bench/workgen/workgen.cxx2
-rw-r--r--src/third_party/wiredtiger/bench/workgen/workgen.h2
-rw-r--r--src/third_party/wiredtiger/bench/workgen/workgen.swig2
-rw-r--r--src/third_party/wiredtiger/bench/workgen/workgen/__init__.py2
-rw-r--r--src/third_party/wiredtiger/bench/workgen/workgen_func.c2
-rw-r--r--src/third_party/wiredtiger/bench/workgen/workgen_func.h2
-rw-r--r--src/third_party/wiredtiger/bench/workgen/workgen_int.h2
-rw-r--r--src/third_party/wiredtiger/bench/workgen/workgen_time.h2
-rw-r--r--src/third_party/wiredtiger/bench/workgen/wtperf.py2
-rw-r--r--src/third_party/wiredtiger/bench/wtperf/config.c2
-rw-r--r--src/third_party/wiredtiger/bench/wtperf/config_opt.h2
-rw-r--r--src/third_party/wiredtiger/bench/wtperf/idle_table_cycle.c2
-rw-r--r--src/third_party/wiredtiger/bench/wtperf/misc.c2
-rwxr-xr-xsrc/third_party/wiredtiger/bench/wtperf/runners/get_ckpt.py2
-rw-r--r--src/third_party/wiredtiger/bench/wtperf/track.c2
-rw-r--r--src/third_party/wiredtiger/bench/wtperf/wtperf.c2
-rw-r--r--src/third_party/wiredtiger/bench/wtperf/wtperf.h2
-rw-r--r--src/third_party/wiredtiger/bench/wtperf/wtperf_opt.i2
-rw-r--r--src/third_party/wiredtiger/bench/wtperf/wtperf_throttle.c2
-rw-r--r--src/third_party/wiredtiger/bench/wtperf/wtperf_truncate.c2
-rw-r--r--src/third_party/wiredtiger/dist/api_data.py2
-rwxr-xr-xsrc/third_party/wiredtiger/dist/s_c_test_create2
-rw-r--r--src/third_party/wiredtiger/dist/s_clang-scan50
-rw-r--r--src/third_party/wiredtiger/dist/s_clang-tidy84
-rwxr-xr-xsrc/third_party/wiredtiger/dist/s_copyright3
-rw-r--r--src/third_party/wiredtiger/dist/s_define.list7
-rw-r--r--src/third_party/wiredtiger/dist/s_funcs.list1
-rwxr-xr-xsrc/third_party/wiredtiger/dist/s_stat12
-rw-r--r--src/third_party/wiredtiger/dist/s_string.ok1
-rwxr-xr-xsrc/third_party/wiredtiger/dist/s_void1
-rw-r--r--src/third_party/wiredtiger/dist/stat_data.py65
-rw-r--r--src/third_party/wiredtiger/examples/c/ex_access.c2
-rw-r--r--src/third_party/wiredtiger/examples/c/ex_all.c2
-rw-r--r--src/third_party/wiredtiger/examples/c/ex_async.c2
-rw-r--r--src/third_party/wiredtiger/examples/c/ex_backup.c2
-rw-r--r--src/third_party/wiredtiger/examples/c/ex_call_center.c2
-rw-r--r--src/third_party/wiredtiger/examples/c/ex_config_parse.c2
-rw-r--r--src/third_party/wiredtiger/examples/c/ex_cursor.c2
-rw-r--r--src/third_party/wiredtiger/examples/c/ex_data_source.c2
-rw-r--r--src/third_party/wiredtiger/examples/c/ex_encrypt.c2
-rw-r--r--src/third_party/wiredtiger/examples/c/ex_event_handler.c2
-rw-r--r--src/third_party/wiredtiger/examples/c/ex_extending.c2
-rw-r--r--src/third_party/wiredtiger/examples/c/ex_extractor.c2
-rw-r--r--src/third_party/wiredtiger/examples/c/ex_file_system.c2
-rw-r--r--src/third_party/wiredtiger/examples/c/ex_hello.c2
-rw-r--r--src/third_party/wiredtiger/examples/c/ex_log.c2
-rw-r--r--src/third_party/wiredtiger/examples/c/ex_pack.c2
-rw-r--r--src/third_party/wiredtiger/examples/c/ex_process.c2
-rw-r--r--src/third_party/wiredtiger/examples/c/ex_schema.c2
-rw-r--r--src/third_party/wiredtiger/examples/c/ex_smoke.c2
-rw-r--r--src/third_party/wiredtiger/examples/c/ex_stat.c2
-rw-r--r--src/third_party/wiredtiger/examples/c/ex_sync.c2
-rw-r--r--src/third_party/wiredtiger/examples/c/ex_thread.c2
-rw-r--r--src/third_party/wiredtiger/examples/java/com/wiredtiger/examples/ex_access.java2
-rw-r--r--src/third_party/wiredtiger/examples/java/com/wiredtiger/examples/ex_all.java2
-rw-r--r--src/third_party/wiredtiger/examples/java/com/wiredtiger/examples/ex_async.java2
-rw-r--r--src/third_party/wiredtiger/examples/java/com/wiredtiger/examples/ex_call_center.java2
-rw-r--r--src/third_party/wiredtiger/examples/java/com/wiredtiger/examples/ex_cursor.java2
-rw-r--r--src/third_party/wiredtiger/examples/java/com/wiredtiger/examples/ex_log.java2
-rw-r--r--src/third_party/wiredtiger/examples/java/com/wiredtiger/examples/ex_schema.java2
-rw-r--r--src/third_party/wiredtiger/examples/java/com/wiredtiger/examples/ex_stat.java2
-rw-r--r--src/third_party/wiredtiger/examples/java/com/wiredtiger/examples/ex_thread.java2
-rwxr-xr-xsrc/third_party/wiredtiger/examples/python/ex_access.py2
-rwxr-xr-xsrc/third_party/wiredtiger/examples/python/ex_stat.py2
-rw-r--r--src/third_party/wiredtiger/ext/collators/reverse/reverse_collator.c2
-rw-r--r--src/third_party/wiredtiger/ext/collators/revint/revint_collator.c2
-rw-r--r--src/third_party/wiredtiger/ext/compressors/lz4/lz4_compress.c2
-rw-r--r--src/third_party/wiredtiger/ext/compressors/nop/nop_compress.c2
-rw-r--r--src/third_party/wiredtiger/ext/compressors/snappy/snappy_compress.c2
-rw-r--r--src/third_party/wiredtiger/ext/compressors/zlib/zlib_compress.c2
-rw-r--r--src/third_party/wiredtiger/ext/compressors/zstd/zstd_compress.c2
-rw-r--r--src/third_party/wiredtiger/ext/datasources/helium/helium.c2
-rw-r--r--src/third_party/wiredtiger/ext/encryptors/nop/nop_encrypt.c2
-rw-r--r--src/third_party/wiredtiger/ext/encryptors/rotn/rotn_encrypt.c2
-rw-r--r--src/third_party/wiredtiger/ext/extractors/csv/csv_extractor.c2
-rw-r--r--src/third_party/wiredtiger/ext/test/fail_fs/fail_fs.c2
-rw-r--r--src/third_party/wiredtiger/ext/test/kvs_bdb/kvs_bdb.c2
-rw-r--r--src/third_party/wiredtiger/import.data2
-rw-r--r--src/third_party/wiredtiger/lang/java/java_doc.i1
-rw-r--r--src/third_party/wiredtiger/lang/java/src/com/wiredtiger/db/AsyncCallback.java2
-rw-r--r--src/third_party/wiredtiger/lang/java/src/com/wiredtiger/db/PackFormatInputStream.java2
-rw-r--r--src/third_party/wiredtiger/lang/java/src/com/wiredtiger/db/PackInputStream.java2
-rw-r--r--src/third_party/wiredtiger/lang/java/src/com/wiredtiger/db/PackOutputStream.java2
-rw-r--r--src/third_party/wiredtiger/lang/java/src/com/wiredtiger/db/PackUtil.java2
-rw-r--r--src/third_party/wiredtiger/lang/java/src/com/wiredtiger/db/WiredTigerException.java2
-rw-r--r--src/third_party/wiredtiger/lang/java/src/com/wiredtiger/db/WiredTigerPackingException.java2
-rw-r--r--src/third_party/wiredtiger/lang/java/src/com/wiredtiger/db/WiredTigerPanicException.java2
-rw-r--r--src/third_party/wiredtiger/lang/java/src/com/wiredtiger/db/WiredTigerRollbackException.java2
-rw-r--r--src/third_party/wiredtiger/lang/java/wiredtiger.i2
-rw-r--r--src/third_party/wiredtiger/lang/python/setup.py2
-rw-r--r--src/third_party/wiredtiger/lang/python/setup_pip.py2
-rw-r--r--src/third_party/wiredtiger/lang/python/wiredtiger.i2
-rw-r--r--src/third_party/wiredtiger/lang/python/wiredtiger/fpacking.py2
-rw-r--r--src/third_party/wiredtiger/lang/python/wiredtiger/intpacking.py2
-rw-r--r--src/third_party/wiredtiger/lang/python/wiredtiger/packing.py2
-rw-r--r--src/third_party/wiredtiger/lang/python/wiredtiger/pip_init.py2
-rw-r--r--src/third_party/wiredtiger/src/async/async_api.c2
-rw-r--r--src/third_party/wiredtiger/src/async/async_op.c2
-rw-r--r--src/third_party/wiredtiger/src/async/async_worker.c2
-rw-r--r--src/third_party/wiredtiger/src/block/block_addr.c2
-rw-r--r--src/third_party/wiredtiger/src/block/block_ckpt.c2
-rw-r--r--src/third_party/wiredtiger/src/block/block_compact.c2
-rw-r--r--src/third_party/wiredtiger/src/block/block_ext.c2
-rw-r--r--src/third_party/wiredtiger/src/block/block_map.c2
-rw-r--r--src/third_party/wiredtiger/src/block/block_mgr.c2
-rw-r--r--src/third_party/wiredtiger/src/block/block_open.c2
-rw-r--r--src/third_party/wiredtiger/src/block/block_read.c2
-rw-r--r--src/third_party/wiredtiger/src/block/block_session.c2
-rw-r--r--src/third_party/wiredtiger/src/block/block_slvg.c2
-rw-r--r--src/third_party/wiredtiger/src/block/block_vrfy.c2
-rw-r--r--src/third_party/wiredtiger/src/block/block_write.c2
-rw-r--r--src/third_party/wiredtiger/src/bloom/bloom.c2
-rw-r--r--src/third_party/wiredtiger/src/btree/bt_compact.c2
-rw-r--r--src/third_party/wiredtiger/src/btree/bt_curnext.c29
-rw-r--r--src/third_party/wiredtiger/src/btree/bt_curprev.c22
-rw-r--r--src/third_party/wiredtiger/src/btree/bt_cursor.c169
-rw-r--r--src/third_party/wiredtiger/src/btree/bt_debug.c111
-rw-r--r--src/third_party/wiredtiger/src/btree/bt_delete.c4
-rw-r--r--src/third_party/wiredtiger/src/btree/bt_discard.c2
-rw-r--r--src/third_party/wiredtiger/src/btree/bt_handle.c2
-rw-r--r--src/third_party/wiredtiger/src/btree/bt_huffman.c2
-rw-r--r--src/third_party/wiredtiger/src/btree/bt_io.c5
-rw-r--r--src/third_party/wiredtiger/src/btree/bt_misc.c2
-rw-r--r--src/third_party/wiredtiger/src/btree/bt_ovfl.c2
-rw-r--r--src/third_party/wiredtiger/src/btree/bt_page.c2
-rw-r--r--src/third_party/wiredtiger/src/btree/bt_random.c2
-rw-r--r--src/third_party/wiredtiger/src/btree/bt_read.c5
-rw-r--r--src/third_party/wiredtiger/src/btree/bt_rebalance.c2
-rw-r--r--src/third_party/wiredtiger/src/btree/bt_ret.c34
-rw-r--r--src/third_party/wiredtiger/src/btree/bt_slvg.c2
-rw-r--r--src/third_party/wiredtiger/src/btree/bt_split.c10
-rw-r--r--src/third_party/wiredtiger/src/btree/bt_stat.c40
-rw-r--r--src/third_party/wiredtiger/src/btree/bt_sync.c4
-rw-r--r--src/third_party/wiredtiger/src/btree/bt_upgrade.c2
-rw-r--r--src/third_party/wiredtiger/src/btree/bt_vrfy.c2
-rw-r--r--src/third_party/wiredtiger/src/btree/bt_vrfy_dsk.c2
-rw-r--r--src/third_party/wiredtiger/src/btree/bt_walk.c3
-rw-r--r--src/third_party/wiredtiger/src/btree/col_modify.c10
-rw-r--r--src/third_party/wiredtiger/src/btree/col_srch.c2
-rw-r--r--src/third_party/wiredtiger/src/btree/row_key.c2
-rw-r--r--src/third_party/wiredtiger/src/btree/row_modify.c12
-rw-r--r--src/third_party/wiredtiger/src/btree/row_srch.c2
-rw-r--r--src/third_party/wiredtiger/src/cache/cache_las.c37
-rw-r--r--src/third_party/wiredtiger/src/checksum/arm64/crc32-arm64.c2
-rw-r--r--src/third_party/wiredtiger/src/checksum/software/checksum.c2
-rw-r--r--src/third_party/wiredtiger/src/checksum/x86/crc32-x86.c2
-rw-r--r--src/third_party/wiredtiger/src/config/config.c2
-rw-r--r--src/third_party/wiredtiger/src/config/config_api.c12
-rw-r--r--src/third_party/wiredtiger/src/config/config_check.c2
-rw-r--r--src/third_party/wiredtiger/src/config/config_collapse.c2
-rw-r--r--src/third_party/wiredtiger/src/config/config_ext.c2
-rw-r--r--src/third_party/wiredtiger/src/config/config_upgrade.c2
-rw-r--r--src/third_party/wiredtiger/src/conn/api_version.c2
-rw-r--r--src/third_party/wiredtiger/src/conn/conn_api.c52
-rw-r--r--src/third_party/wiredtiger/src/conn/conn_cache.c2
-rw-r--r--src/third_party/wiredtiger/src/conn/conn_cache_pool.c4
-rw-r--r--src/third_party/wiredtiger/src/conn/conn_ckpt.c2
-rw-r--r--src/third_party/wiredtiger/src/conn/conn_dhandle.c2
-rw-r--r--src/third_party/wiredtiger/src/conn/conn_handle.c2
-rw-r--r--src/third_party/wiredtiger/src/conn/conn_log.c5
-rw-r--r--src/third_party/wiredtiger/src/conn/conn_open.c2
-rw-r--r--src/third_party/wiredtiger/src/conn/conn_reconfig.c7
-rw-r--r--src/third_party/wiredtiger/src/conn/conn_stat.c5
-rw-r--r--src/third_party/wiredtiger/src/conn/conn_sweep.c2
-rw-r--r--src/third_party/wiredtiger/src/cursor/cur_backup.c2
-rw-r--r--src/third_party/wiredtiger/src/cursor/cur_bulk.c2
-rw-r--r--src/third_party/wiredtiger/src/cursor/cur_config.c2
-rw-r--r--src/third_party/wiredtiger/src/cursor/cur_ds.c2
-rw-r--r--src/third_party/wiredtiger/src/cursor/cur_dump.c2
-rw-r--r--src/third_party/wiredtiger/src/cursor/cur_file.c69
-rw-r--r--src/third_party/wiredtiger/src/cursor/cur_index.c2
-rw-r--r--src/third_party/wiredtiger/src/cursor/cur_join.c2
-rw-r--r--src/third_party/wiredtiger/src/cursor/cur_json.c27
-rw-r--r--src/third_party/wiredtiger/src/cursor/cur_log.c2
-rw-r--r--src/third_party/wiredtiger/src/cursor/cur_metadata.c2
-rw-r--r--src/third_party/wiredtiger/src/cursor/cur_stat.c2
-rw-r--r--src/third_party/wiredtiger/src/cursor/cur_std.c15
-rw-r--r--src/third_party/wiredtiger/src/cursor/cur_table.c4
-rwxr-xr-xsrc/third_party/wiredtiger/src/docs/build-javadoc.sh2
-rw-r--r--src/third_party/wiredtiger/src/docs/error-handling.dox7
-rw-r--r--src/third_party/wiredtiger/src/docs/style/footer.html4
-rwxr-xr-xsrc/third_party/wiredtiger/src/docs/tools/doxfilter.py2
-rwxr-xr-xsrc/third_party/wiredtiger/src/docs/tools/fixlinks.py2
-rw-r--r--src/third_party/wiredtiger/src/evict/evict_file.c2
-rw-r--r--src/third_party/wiredtiger/src/evict/evict_lru.c19
-rw-r--r--src/third_party/wiredtiger/src/evict/evict_page.c8
-rw-r--r--src/third_party/wiredtiger/src/evict/evict_stat.c2
-rw-r--r--src/third_party/wiredtiger/src/include/api.h2
-rw-r--r--src/third_party/wiredtiger/src/include/async.h2
-rw-r--r--src/third_party/wiredtiger/src/include/bitstring.i2
-rw-r--r--src/third_party/wiredtiger/src/include/block.h2
-rw-r--r--src/third_party/wiredtiger/src/include/bloom.h2
-rw-r--r--src/third_party/wiredtiger/src/include/btmem.h15
-rw-r--r--src/third_party/wiredtiger/src/include/btree.h2
-rw-r--r--src/third_party/wiredtiger/src/include/btree.i4
-rw-r--r--src/third_party/wiredtiger/src/include/btree_cmp.i2
-rw-r--r--src/third_party/wiredtiger/src/include/buf.i2
-rw-r--r--src/third_party/wiredtiger/src/include/cache.h2
-rw-r--r--src/third_party/wiredtiger/src/include/cache.i2
-rw-r--r--src/third_party/wiredtiger/src/include/cell.i2
-rw-r--r--src/third_party/wiredtiger/src/include/column.i2
-rw-r--r--src/third_party/wiredtiger/src/include/compact.h2
-rw-r--r--src/third_party/wiredtiger/src/include/config.h2
-rw-r--r--src/third_party/wiredtiger/src/include/connection.h6
-rw-r--r--src/third_party/wiredtiger/src/include/ctype.i2
-rw-r--r--src/third_party/wiredtiger/src/include/cursor.h2
-rw-r--r--src/third_party/wiredtiger/src/include/cursor.i2
-rw-r--r--src/third_party/wiredtiger/src/include/dhandle.h8
-rw-r--r--src/third_party/wiredtiger/src/include/dlh.h2
-rw-r--r--src/third_party/wiredtiger/src/include/error.h2
-rw-r--r--src/third_party/wiredtiger/src/include/extern.h34
-rw-r--r--src/third_party/wiredtiger/src/include/extern_posix.h1
-rw-r--r--src/third_party/wiredtiger/src/include/extern_win.h1
-rw-r--r--src/third_party/wiredtiger/src/include/gcc.h89
-rw-r--r--src/third_party/wiredtiger/src/include/hardware.h2
-rw-r--r--src/third_party/wiredtiger/src/include/intpack.i2
-rw-r--r--src/third_party/wiredtiger/src/include/lint.h12
-rw-r--r--src/third_party/wiredtiger/src/include/log.h2
-rw-r--r--src/third_party/wiredtiger/src/include/log.i2
-rw-r--r--src/third_party/wiredtiger/src/include/lsm.h2
-rw-r--r--src/third_party/wiredtiger/src/include/meta.h2
-rw-r--r--src/third_party/wiredtiger/src/include/misc.h4
-rw-r--r--src/third_party/wiredtiger/src/include/misc.i18
-rw-r--r--src/third_party/wiredtiger/src/include/msvc.h2
-rw-r--r--src/third_party/wiredtiger/src/include/mutex.h2
-rw-r--r--src/third_party/wiredtiger/src/include/mutex.i8
-rw-r--r--src/third_party/wiredtiger/src/include/optrack.h6
-rw-r--r--src/third_party/wiredtiger/src/include/os.h18
-rw-r--r--src/third_party/wiredtiger/src/include/os_fhandle.i19
-rw-r--r--src/third_party/wiredtiger/src/include/os_fs.i33
-rw-r--r--src/third_party/wiredtiger/src/include/os_fstream.i2
-rw-r--r--src/third_party/wiredtiger/src/include/os_windows.h2
-rw-r--r--src/third_party/wiredtiger/src/include/packing.i58
-rw-r--r--src/third_party/wiredtiger/src/include/posix.h2
-rw-r--r--src/third_party/wiredtiger/src/include/schema.h2
-rw-r--r--src/third_party/wiredtiger/src/include/serial.i2
-rw-r--r--src/third_party/wiredtiger/src/include/session.h2
-rw-r--r--src/third_party/wiredtiger/src/include/stat.h103
-rw-r--r--src/third_party/wiredtiger/src/include/swap.h2
-rw-r--r--src/third_party/wiredtiger/src/include/thread_group.h2
-rw-r--r--src/third_party/wiredtiger/src/include/txn.h2
-rw-r--r--src/third_party/wiredtiger/src/include/txn.i22
-rw-r--r--src/third_party/wiredtiger/src/include/verify_build.h2
-rw-r--r--src/third_party/wiredtiger/src/include/wiredtiger.in483
-rw-r--r--src/third_party/wiredtiger/src/include/wiredtiger_ext.h2
-rw-r--r--src/third_party/wiredtiger/src/include/wt_internal.h3
-rw-r--r--src/third_party/wiredtiger/src/log/log.c53
-rw-r--r--src/third_party/wiredtiger/src/log/log_slot.c9
-rw-r--r--src/third_party/wiredtiger/src/log/log_sys.c2
-rw-r--r--src/third_party/wiredtiger/src/lsm/lsm_cursor.c5
-rw-r--r--src/third_party/wiredtiger/src/lsm/lsm_cursor_bulk.c2
-rw-r--r--src/third_party/wiredtiger/src/lsm/lsm_manager.c2
-rw-r--r--src/third_party/wiredtiger/src/lsm/lsm_merge.c2
-rw-r--r--src/third_party/wiredtiger/src/lsm/lsm_meta.c16
-rw-r--r--src/third_party/wiredtiger/src/lsm/lsm_stat.c2
-rw-r--r--src/third_party/wiredtiger/src/lsm/lsm_tree.c21
-rw-r--r--src/third_party/wiredtiger/src/lsm/lsm_work_unit.c8
-rw-r--r--src/third_party/wiredtiger/src/lsm/lsm_worker.c2
-rw-r--r--src/third_party/wiredtiger/src/meta/meta_apply.c2
-rw-r--r--src/third_party/wiredtiger/src/meta/meta_ckpt.c2
-rw-r--r--src/third_party/wiredtiger/src/meta/meta_ext.c2
-rw-r--r--src/third_party/wiredtiger/src/meta/meta_table.c2
-rw-r--r--src/third_party/wiredtiger/src/meta/meta_track.c2
-rw-r--r--src/third_party/wiredtiger/src/meta/meta_turtle.c2
-rw-r--r--src/third_party/wiredtiger/src/optrack/optrack.c16
-rw-r--r--src/third_party/wiredtiger/src/os_common/filename.c2
-rw-r--r--src/third_party/wiredtiger/src/os_common/os_abort.c2
-rw-r--r--src/third_party/wiredtiger/src/os_common/os_alloc.c2
-rw-r--r--src/third_party/wiredtiger/src/os_common/os_errno.c2
-rw-r--r--src/third_party/wiredtiger/src/os_common/os_fhandle.c2
-rw-r--r--src/third_party/wiredtiger/src/os_common/os_fs_inmemory.c2
-rw-r--r--src/third_party/wiredtiger/src/os_common/os_fstream.c2
-rw-r--r--src/third_party/wiredtiger/src/os_common/os_fstream_stdio.c2
-rw-r--r--src/third_party/wiredtiger/src/os_common/os_getopt.c2
-rw-r--r--src/third_party/wiredtiger/src/os_common/os_strtouq.c2
-rw-r--r--src/third_party/wiredtiger/src/os_posix/os_dir.c39
-rw-r--r--src/third_party/wiredtiger/src/os_posix/os_dlopen.c2
-rw-r--r--src/third_party/wiredtiger/src/os_posix/os_fallocate.c2
-rw-r--r--src/third_party/wiredtiger/src/os_posix/os_fs.c4
-rw-r--r--src/third_party/wiredtiger/src/os_posix/os_getenv.c2
-rw-r--r--src/third_party/wiredtiger/src/os_posix/os_map.c2
-rw-r--r--src/third_party/wiredtiger/src/os_posix/os_mtx_cond.c2
-rw-r--r--src/third_party/wiredtiger/src/os_posix/os_once.c2
-rw-r--r--src/third_party/wiredtiger/src/os_posix/os_pagesize.c2
-rw-r--r--src/third_party/wiredtiger/src/os_posix/os_path.c2
-rw-r--r--src/third_party/wiredtiger/src/os_posix/os_priv.c2
-rw-r--r--src/third_party/wiredtiger/src/os_posix/os_setvbuf.c2
-rw-r--r--src/third_party/wiredtiger/src/os_posix/os_sleep.c2
-rw-r--r--src/third_party/wiredtiger/src/os_posix/os_snprintf.c2
-rw-r--r--src/third_party/wiredtiger/src/os_posix/os_thread.c2
-rw-r--r--src/third_party/wiredtiger/src/os_posix/os_time.c2
-rw-r--r--src/third_party/wiredtiger/src/os_posix/os_yield.c2
-rw-r--r--src/third_party/wiredtiger/src/os_win/os_dir.c38
-rw-r--r--src/third_party/wiredtiger/src/os_win/os_dlopen.c2
-rw-r--r--src/third_party/wiredtiger/src/os_win/os_fs.c3
-rw-r--r--src/third_party/wiredtiger/src/os_win/os_getenv.c2
-rw-r--r--src/third_party/wiredtiger/src/os_win/os_map.c2
-rw-r--r--src/third_party/wiredtiger/src/os_win/os_mtx_cond.c2
-rw-r--r--src/third_party/wiredtiger/src/os_win/os_once.c2
-rw-r--r--src/third_party/wiredtiger/src/os_win/os_pagesize.c2
-rw-r--r--src/third_party/wiredtiger/src/os_win/os_path.c2
-rw-r--r--src/third_party/wiredtiger/src/os_win/os_priv.c2
-rw-r--r--src/third_party/wiredtiger/src/os_win/os_setvbuf.c2
-rw-r--r--src/third_party/wiredtiger/src/os_win/os_sleep.c2
-rw-r--r--src/third_party/wiredtiger/src/os_win/os_snprintf.c2
-rw-r--r--src/third_party/wiredtiger/src/os_win/os_thread.c2
-rw-r--r--src/third_party/wiredtiger/src/os_win/os_time.c2
-rw-r--r--src/third_party/wiredtiger/src/os_win/os_utf8.c2
-rw-r--r--src/third_party/wiredtiger/src/os_win/os_winerr.c2
-rw-r--r--src/third_party/wiredtiger/src/os_win/os_yield.c2
-rw-r--r--src/third_party/wiredtiger/src/packing/pack_api.c32
-rw-r--r--src/third_party/wiredtiger/src/packing/pack_impl.c18
-rw-r--r--src/third_party/wiredtiger/src/packing/pack_stream.c10
-rw-r--r--src/third_party/wiredtiger/src/reconcile/rec_track.c2
-rw-r--r--src/third_party/wiredtiger/src/reconcile/rec_write.c181
-rw-r--r--src/third_party/wiredtiger/src/schema/schema_alter.c2
-rw-r--r--src/third_party/wiredtiger/src/schema/schema_create.c2
-rw-r--r--src/third_party/wiredtiger/src/schema/schema_drop.c2
-rw-r--r--src/third_party/wiredtiger/src/schema/schema_list.c2
-rw-r--r--src/third_party/wiredtiger/src/schema/schema_open.c2
-rw-r--r--src/third_party/wiredtiger/src/schema/schema_plan.c4
-rw-r--r--src/third_party/wiredtiger/src/schema/schema_project.c12
-rw-r--r--src/third_party/wiredtiger/src/schema/schema_rename.c2
-rw-r--r--src/third_party/wiredtiger/src/schema/schema_stat.c2
-rw-r--r--src/third_party/wiredtiger/src/schema/schema_truncate.c2
-rw-r--r--src/third_party/wiredtiger/src/schema/schema_util.c2
-rw-r--r--src/third_party/wiredtiger/src/schema/schema_worker.c2
-rw-r--r--src/third_party/wiredtiger/src/session/session_api.c48
-rw-r--r--src/third_party/wiredtiger/src/session/session_compact.c2
-rw-r--r--src/third_party/wiredtiger/src/session/session_dhandle.c2
-rw-r--r--src/third_party/wiredtiger/src/session/session_salvage.c2
-rw-r--r--src/third_party/wiredtiger/src/support/cond_auto.c2
-rw-r--r--src/third_party/wiredtiger/src/support/crypto.c2
-rw-r--r--src/third_party/wiredtiger/src/support/err.c2
-rw-r--r--src/third_party/wiredtiger/src/support/generation.c2
-rw-r--r--src/third_party/wiredtiger/src/support/global.c86
-rw-r--r--src/third_party/wiredtiger/src/support/hash_city.c2
-rw-r--r--src/third_party/wiredtiger/src/support/hash_fnv.c2
-rw-r--r--src/third_party/wiredtiger/src/support/hazard.c2
-rw-r--r--src/third_party/wiredtiger/src/support/hex.c2
-rw-r--r--src/third_party/wiredtiger/src/support/huffman.c2
-rw-r--r--src/third_party/wiredtiger/src/support/modify.c39
-rw-r--r--src/third_party/wiredtiger/src/support/mtx_rw.c14
-rw-r--r--src/third_party/wiredtiger/src/support/pow.c2
-rw-r--r--src/third_party/wiredtiger/src/support/rand.c2
-rw-r--r--src/third_party/wiredtiger/src/support/scratch.c89
-rw-r--r--src/third_party/wiredtiger/src/support/stat.c212
-rw-r--r--src/third_party/wiredtiger/src/support/thread_group.c2
-rw-r--r--src/third_party/wiredtiger/src/support/time.c30
-rw-r--r--src/third_party/wiredtiger/src/txn/txn.c13
-rw-r--r--src/third_party/wiredtiger/src/txn/txn_ckpt.c13
-rw-r--r--src/third_party/wiredtiger/src/txn/txn_ext.c2
-rw-r--r--src/third_party/wiredtiger/src/txn/txn_log.c22
-rw-r--r--src/third_party/wiredtiger/src/txn/txn_nsnap.c2
-rw-r--r--src/third_party/wiredtiger/src/txn/txn_recover.c8
-rw-r--r--src/third_party/wiredtiger/src/txn/txn_rollback_to_stable.c6
-rw-r--r--src/third_party/wiredtiger/src/txn/txn_timestamp.c39
-rw-r--r--src/third_party/wiredtiger/src/utilities/util.h4
-rw-r--r--src/third_party/wiredtiger/src/utilities/util_alter.c2
-rw-r--r--src/third_party/wiredtiger/src/utilities/util_backup.c62
-rw-r--r--src/third_party/wiredtiger/src/utilities/util_compact.c2
-rw-r--r--src/third_party/wiredtiger/src/utilities/util_cpyright.c4
-rw-r--r--src/third_party/wiredtiger/src/utilities/util_create.c2
-rw-r--r--src/third_party/wiredtiger/src/utilities/util_downgrade.c3
-rw-r--r--src/third_party/wiredtiger/src/utilities/util_drop.c2
-rw-r--r--src/third_party/wiredtiger/src/utilities/util_dump.c38
-rw-r--r--src/third_party/wiredtiger/src/utilities/util_dump.h2
-rw-r--r--src/third_party/wiredtiger/src/utilities/util_list.c2
-rw-r--r--src/third_party/wiredtiger/src/utilities/util_load.c2
-rw-r--r--src/third_party/wiredtiger/src/utilities/util_load.h2
-rw-r--r--src/third_party/wiredtiger/src/utilities/util_load_json.c11
-rw-r--r--src/third_party/wiredtiger/src/utilities/util_loadtext.c2
-rw-r--r--src/third_party/wiredtiger/src/utilities/util_main.c2
-rw-r--r--src/third_party/wiredtiger/src/utilities/util_misc.c30
-rw-r--r--src/third_party/wiredtiger/src/utilities/util_printlog.c3
-rw-r--r--src/third_party/wiredtiger/src/utilities/util_read.c4
-rw-r--r--src/third_party/wiredtiger/src/utilities/util_rebalance.c2
-rw-r--r--src/third_party/wiredtiger/src/utilities/util_rename.c2
-rw-r--r--src/third_party/wiredtiger/src/utilities/util_salvage.c2
-rw-r--r--src/third_party/wiredtiger/src/utilities/util_stat.c2
-rw-r--r--src/third_party/wiredtiger/src/utilities/util_truncate.c2
-rw-r--r--src/third_party/wiredtiger/src/utilities/util_upgrade.c2
-rw-r--r--src/third_party/wiredtiger/src/utilities/util_verbose.c2
-rw-r--r--src/third_party/wiredtiger/src/utilities/util_verify.c2
-rw-r--r--src/third_party/wiredtiger/src/utilities/util_write.c4
-rw-r--r--src/third_party/wiredtiger/test/bloom/test_bloom.c2
-rw-r--r--src/third_party/wiredtiger/test/checkpoint/checkpointer.c2
-rw-r--r--src/third_party/wiredtiger/test/checkpoint/test_checkpoint.c2
-rw-r--r--src/third_party/wiredtiger/test/checkpoint/test_checkpoint.h2
-rw-r--r--src/third_party/wiredtiger/test/checkpoint/workers.c2
-rw-r--r--src/third_party/wiredtiger/test/csuite/random_abort/main.c2
-rw-r--r--src/third_party/wiredtiger/test/csuite/rwlock/main.c2
-rw-r--r--src/third_party/wiredtiger/test/csuite/scope/main.c2
-rw-r--r--src/third_party/wiredtiger/test/csuite/timestamp_abort/main.c2
-rw-r--r--src/third_party/wiredtiger/test/csuite/truncated_log/main.c2
-rw-r--r--src/third_party/wiredtiger/test/csuite/wt1965_col_efficiency/main.c2
-rw-r--r--src/third_party/wiredtiger/test/csuite/wt2246_col_append/main.c2
-rw-r--r--src/third_party/wiredtiger/test/csuite/wt2323_join_visibility/main.c2
-rw-r--r--src/third_party/wiredtiger/test/csuite/wt2403_lsm_workload/main.c2
-rw-r--r--src/third_party/wiredtiger/test/csuite/wt2447_join_main_table/main.c2
-rw-r--r--src/third_party/wiredtiger/test/csuite/wt2535_insert_race/main.c2
-rw-r--r--src/third_party/wiredtiger/test/csuite/wt2592_join_schema/main.c2
-rw-r--r--src/third_party/wiredtiger/test/csuite/wt2695_checksum/main.c2
-rw-r--r--src/third_party/wiredtiger/test/csuite/wt2719_reconfig/main.c2
-rw-r--r--src/third_party/wiredtiger/test/csuite/wt2834_join_bloom_fix/main.c16
-rw-r--r--src/third_party/wiredtiger/test/csuite/wt2853_perf/main.c27
-rw-r--r--src/third_party/wiredtiger/test/csuite/wt2909_checkpoint_integrity/main.c2
-rw-r--r--src/third_party/wiredtiger/test/csuite/wt2999_join_extractor/main.c2
-rw-r--r--src/third_party/wiredtiger/test/csuite/wt3120_filesys/main.c2
-rw-r--r--src/third_party/wiredtiger/test/csuite/wt3135_search_near_collator/main.c2
-rw-r--r--src/third_party/wiredtiger/test/csuite/wt3184_dup_index_collator/main.c2
-rw-r--r--src/third_party/wiredtiger/test/csuite/wt3338_partial_update/main.c24
-rw-r--r--src/third_party/wiredtiger/test/csuite/wt3363_checkpoint_op_races/main.c2
-rw-r--r--src/third_party/wiredtiger/test/cursor_order/cursor_order.c2
-rw-r--r--src/third_party/wiredtiger/test/cursor_order/cursor_order.h2
-rw-r--r--src/third_party/wiredtiger/test/cursor_order/cursor_order_file.c2
-rw-r--r--src/third_party/wiredtiger/test/cursor_order/cursor_order_ops.c2
-rw-r--r--src/third_party/wiredtiger/test/fops/file.c2
-rw-r--r--src/third_party/wiredtiger/test/fops/fops.c2
-rw-r--r--src/third_party/wiredtiger/test/fops/t.c2
-rw-r--r--src/third_party/wiredtiger/test/fops/thread.h2
-rw-r--r--src/third_party/wiredtiger/test/format/backup.c2
-rw-r--r--src/third_party/wiredtiger/test/format/bdb.c2
-rw-r--r--src/third_party/wiredtiger/test/format/bulk.c2
-rw-r--r--src/third_party/wiredtiger/test/format/compact.c2
-rw-r--r--src/third_party/wiredtiger/test/format/config.c2
-rw-r--r--src/third_party/wiredtiger/test/format/config.h2
-rw-r--r--src/third_party/wiredtiger/test/format/format.h2
-rw-r--r--src/third_party/wiredtiger/test/format/lrt.c2
-rw-r--r--src/third_party/wiredtiger/test/format/ops.c2
-rw-r--r--src/third_party/wiredtiger/test/format/rebalance.c2
-rw-r--r--src/third_party/wiredtiger/test/format/salvage.c2
-rw-r--r--src/third_party/wiredtiger/test/format/t.c2
-rw-r--r--src/third_party/wiredtiger/test/format/util.c2
-rw-r--r--src/third_party/wiredtiger/test/format/wts.c2
-rw-r--r--src/third_party/wiredtiger/test/huge/huge.c2
-rw-r--r--src/third_party/wiredtiger/test/java/com/wiredtiger/test/AsyncTest.java2
-rw-r--r--src/third_party/wiredtiger/test/java/com/wiredtiger/test/AutoCloseTest.java2
-rw-r--r--src/third_party/wiredtiger/test/java/com/wiredtiger/test/BackupCursorTest.java2
-rw-r--r--src/third_party/wiredtiger/test/java/com/wiredtiger/test/ConcurrentCloseTest.java2
-rw-r--r--src/third_party/wiredtiger/test/java/com/wiredtiger/test/ConfigTest.java2
-rw-r--r--src/third_party/wiredtiger/test/java/com/wiredtiger/test/CursorTest.java2
-rw-r--r--src/third_party/wiredtiger/test/java/com/wiredtiger/test/CursorTest02.java2
-rw-r--r--src/third_party/wiredtiger/test/java/com/wiredtiger/test/CursorTest03.java2
-rw-r--r--src/third_party/wiredtiger/test/java/com/wiredtiger/test/ExceptionTest.java2
-rw-r--r--src/third_party/wiredtiger/test/java/com/wiredtiger/test/PackTest.java2
-rw-r--r--src/third_party/wiredtiger/test/java/com/wiredtiger/test/PackTest02.java2
-rw-r--r--src/third_party/wiredtiger/test/java/com/wiredtiger/test/PackTest03.java2
-rw-r--r--src/third_party/wiredtiger/test/java/com/wiredtiger/test/WiredTigerSuite.java2
-rw-r--r--src/third_party/wiredtiger/test/manydbs/manydbs.c2
-rw-r--r--src/third_party/wiredtiger/test/packing/intpack-test.c2
-rw-r--r--src/third_party/wiredtiger/test/packing/intpack-test2.c2
-rw-r--r--src/third_party/wiredtiger/test/packing/intpack-test3.c2
-rw-r--r--src/third_party/wiredtiger/test/packing/packing-test.c2
-rw-r--r--src/third_party/wiredtiger/test/readonly/readonly.c2
-rw-r--r--src/third_party/wiredtiger/test/salvage/salvage.c2
-rw-r--r--src/third_party/wiredtiger/test/suite/helper.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/run.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/suite_random.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/suite_subprocess.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_alter01.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_alter02.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_assert01.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_assert02.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_assert03.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_async01.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_async02.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_async03.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_autoclose.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_backup01.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_backup02.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_backup03.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_backup04.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_backup05.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_backup06.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_backup07.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_base01.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_base02.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_base03.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_base04.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_base05.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_baseconfig.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_bug001.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_bug003.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_bug004.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_bug005.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_bug006.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_bug007.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_bug008.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_bug009.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_bug010.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_bug011.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_bug012.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_bug013.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_bug014.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_bug015.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_bug016.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_bug017.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_bug018.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_bulk01.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_bulk02.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_checkpoint01.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_checkpoint02.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_colgap.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_collator.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_compact01.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_compact02.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_compat01.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_compress01.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_config01.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_config02.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_config03.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_config04.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_config05.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_config06.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_cursor01.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_cursor02.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_cursor03.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_cursor04.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_cursor05.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_cursor06.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_cursor07.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_cursor08.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_cursor09.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_cursor10.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_cursor11.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_cursor12.py32
-rw-r--r--src/third_party/wiredtiger/test/suite/test_cursor_compare.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_cursor_pin.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_cursor_random.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_cursor_random02.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_cursor_tracker.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_debug_info.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_drop.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_drop02.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_drop_create.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_dump.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_dupc.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_durability01.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_empty.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_encrypt01.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_encrypt02.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_encrypt03.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_encrypt04.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_encrypt05.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_encrypt06.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_encrypt07.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_env01.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_excl.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_hazard.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_home.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_huffman01.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_huffman02.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_index01.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_index02.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_index03.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_inmem01.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_inmem02.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_intpack.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_join01.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_join02.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_join03.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_join04.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_join05.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_join06.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_join07.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_join08.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_join09.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_jsondump01.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_jsondump02.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_las.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_lsm01.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_lsm02.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_lsm03.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_lsm04.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_metadata_cursor01.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_nsnap01.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_nsnap02.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_nsnap03.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_nsnap04.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_overwrite.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_pack.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_readonly01.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_readonly02.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_readonly03.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_rebalance.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_reconfig01.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_reconfig02.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_reconfig03.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_reconfig04.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_rename.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_reserve.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_salvage.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_schema01.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_schema02.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_schema03.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_schema04.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_schema05.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_schema06.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_schema07.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_shared_cache01.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_shared_cache02.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_split.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_stat01.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_stat02.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_stat03.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_stat04.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_stat05.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_stat06.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_stat_log01.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_stat_log02.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_sweep01.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_sweep02.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_sweep03.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_timestamp01.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_timestamp02.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_timestamp03.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_timestamp04.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_timestamp05.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_timestamp06.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_timestamp07.py12
-rw-r--r--src/third_party/wiredtiger/test/suite/test_timestamp08.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_timestamp09.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_truncate01.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_truncate02.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_truncate03.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_txn01.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_txn02.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_txn03.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_txn04.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_txn05.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_txn06.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_txn07.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_txn08.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_txn09.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_txn10.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_txn11.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_txn12.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_txn13.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_txn14.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_txn15.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_txn16.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_txn17.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_txn18.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_unicode01.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_upgrade.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_util01.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_util02.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_util03.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_util04.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_util07.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_util08.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_util09.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_util11.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_util12.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_util13.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_util14.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_util15.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_util16.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_util17.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_verify.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_version.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/wtdataset.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/wtscenario.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/wttest.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/wtthread.py2
-rw-r--r--src/third_party/wiredtiger/test/syscall/syscall.py2
-rw-r--r--src/third_party/wiredtiger/test/syscall/wt2336_base/base.run2
-rw-r--r--src/third_party/wiredtiger/test/syscall/wt2336_base/main.c2
-rw-r--r--src/third_party/wiredtiger/test/thread/file.c2
-rw-r--r--src/third_party/wiredtiger/test/thread/rw.c2
-rw-r--r--src/third_party/wiredtiger/test/thread/stats.c2
-rw-r--r--src/third_party/wiredtiger/test/thread/t.c2
-rw-r--r--src/third_party/wiredtiger/test/thread/thread.h2
-rw-r--r--src/third_party/wiredtiger/test/utility/misc.c21
-rw-r--r--src/third_party/wiredtiger/test/utility/parse_opts.c10
-rw-r--r--src/third_party/wiredtiger/test/utility/test_util.h4
-rw-r--r--src/third_party/wiredtiger/test/utility/thread.c2
-rw-r--r--src/third_party/wiredtiger/test/windows/windows_shim.c2
-rw-r--r--src/third_party/wiredtiger/test/windows/windows_shim.h2
-rw-r--r--src/third_party/wiredtiger/test/wtperf/test_conf_dump.py2
-rw-r--r--src/third_party/wiredtiger/tools/wt_ckpt_decode.py2
-rwxr-xr-xsrc/third_party/wiredtiger/tools/wt_optrack_decode.py2
696 files changed, 2820 insertions, 1656 deletions
diff --git a/src/third_party/wiredtiger/LICENSE b/src/third_party/wiredtiger/LICENSE
index 8abd469a7b1..50389d6f4df 100644
--- a/src/third_party/wiredtiger/LICENSE
+++ b/src/third_party/wiredtiger/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2014-2017 MongoDB, Inc.
+Copyright (c) 2014-2018 MongoDB, Inc.
Copyright (c) 2008-2014 WiredTiger, Inc.
All rights reserved.
diff --git a/src/third_party/wiredtiger/api/leveldb/leveldb_wt.h b/src/third_party/wiredtiger/api/leveldb/leveldb_wt.h
index b167e03192e..529e85acdca 100644
--- a/src/third_party/wiredtiger/api/leveldb/leveldb_wt.h
+++ b/src/third_party/wiredtiger/api/leveldb/leveldb_wt.h
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/bench/workgen/runner/example_simple.py b/src/third_party/wiredtiger/bench/workgen/runner/example_simple.py
index 626f7ca64a5..d33029cea1b 100755
--- a/src/third_party/wiredtiger/bench/workgen/runner/example_simple.py
+++ b/src/third_party/wiredtiger/bench/workgen/runner/example_simple.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/bench/workgen/runner/example_txn.py b/src/third_party/wiredtiger/bench/workgen/runner/example_txn.py
index 1b22dc10aba..43c3caadf8c 100644
--- a/src/third_party/wiredtiger/bench/workgen/runner/example_txn.py
+++ b/src/third_party/wiredtiger/bench/workgen/runner/example_txn.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/bench/workgen/runner/insert_test.py b/src/third_party/wiredtiger/bench/workgen/runner/insert_test.py
index 8380c6ba3eb..220292db3ed 100644
--- a/src/third_party/wiredtiger/bench/workgen/runner/insert_test.py
+++ b/src/third_party/wiredtiger/bench/workgen/runner/insert_test.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/bench/workgen/runner/maintain_low_dirty_cache.py b/src/third_party/wiredtiger/bench/workgen/runner/maintain_low_dirty_cache.py
index 695dcc86087..15ed46ec3c9 100644
--- a/src/third_party/wiredtiger/bench/workgen/runner/maintain_low_dirty_cache.py
+++ b/src/third_party/wiredtiger/bench/workgen/runner/maintain_low_dirty_cache.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/bench/workgen/runner/multi_btree_heavy_stress.py b/src/third_party/wiredtiger/bench/workgen/runner/multi_btree_heavy_stress.py
index 94dacfc4311..4d4f6ab818e 100644
--- a/src/third_party/wiredtiger/bench/workgen/runner/multi_btree_heavy_stress.py
+++ b/src/third_party/wiredtiger/bench/workgen/runner/multi_btree_heavy_stress.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/bench/workgen/runner/runner/__init__.py b/src/third_party/wiredtiger/bench/workgen/runner/runner/__init__.py
index 2d60e1522f5..7e73117af42 100644
--- a/src/third_party/wiredtiger/bench/workgen/runner/runner/__init__.py
+++ b/src/third_party/wiredtiger/bench/workgen/runner/runner/__init__.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/bench/workgen/runner/runner/core.py b/src/third_party/wiredtiger/bench/workgen/runner/runner/core.py
index a8977d9593e..bd4bcd6dbe8 100644
--- a/src/third_party/wiredtiger/bench/workgen/runner/runner/core.py
+++ b/src/third_party/wiredtiger/bench/workgen/runner/runner/core.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/bench/workgen/runner/runner/latency.py b/src/third_party/wiredtiger/bench/workgen/runner/runner/latency.py
index 8eaa10693a9..0274ce9b917 100644
--- a/src/third_party/wiredtiger/bench/workgen/runner/runner/latency.py
+++ b/src/third_party/wiredtiger/bench/workgen/runner/runner/latency.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/bench/workgen/runner/small_btree.py b/src/third_party/wiredtiger/bench/workgen/runner/small_btree.py
index 2bcc0188f30..2cc3065cb2b 100644
--- a/src/third_party/wiredtiger/bench/workgen/runner/small_btree.py
+++ b/src/third_party/wiredtiger/bench/workgen/runner/small_btree.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/bench/workgen/runner/small_btree_reopen.py b/src/third_party/wiredtiger/bench/workgen/runner/small_btree_reopen.py
index 252dd02aae9..62e6a861200 100644
--- a/src/third_party/wiredtiger/bench/workgen/runner/small_btree_reopen.py
+++ b/src/third_party/wiredtiger/bench/workgen/runner/small_btree_reopen.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/bench/workgen/setup.py b/src/third_party/wiredtiger/bench/workgen/setup.py
index 9fb5fa7b73a..439b9c474fe 100644
--- a/src/third_party/wiredtiger/bench/workgen/setup.py
+++ b/src/third_party/wiredtiger/bench/workgen/setup.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/bench/workgen/workgen.cxx b/src/third_party/wiredtiger/bench/workgen/workgen.cxx
index 31e21e6f6c9..f89356b836a 100644
--- a/src/third_party/wiredtiger/bench/workgen/workgen.cxx
+++ b/src/third_party/wiredtiger/bench/workgen/workgen.cxx
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/bench/workgen/workgen.h b/src/third_party/wiredtiger/bench/workgen/workgen.h
index 2a116e1c89e..dc15ab06bf8 100644
--- a/src/third_party/wiredtiger/bench/workgen/workgen.h
+++ b/src/third_party/wiredtiger/bench/workgen/workgen.h
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/bench/workgen/workgen.swig b/src/third_party/wiredtiger/bench/workgen/workgen.swig
index a33705f4350..61baae44493 100644
--- a/src/third_party/wiredtiger/bench/workgen/workgen.swig
+++ b/src/third_party/wiredtiger/bench/workgen/workgen.swig
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/bench/workgen/workgen/__init__.py b/src/third_party/wiredtiger/bench/workgen/workgen/__init__.py
index ff665bf9398..516485e400c 100644
--- a/src/third_party/wiredtiger/bench/workgen/workgen/__init__.py
+++ b/src/third_party/wiredtiger/bench/workgen/workgen/__init__.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/bench/workgen/workgen_func.c b/src/third_party/wiredtiger/bench/workgen/workgen_func.c
index 5ce2146a8e4..b23e9e99a3b 100644
--- a/src/third_party/wiredtiger/bench/workgen/workgen_func.c
+++ b/src/third_party/wiredtiger/bench/workgen/workgen_func.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/bench/workgen/workgen_func.h b/src/third_party/wiredtiger/bench/workgen/workgen_func.h
index ec7ecf0a504..949c8474a2a 100644
--- a/src/third_party/wiredtiger/bench/workgen/workgen_func.h
+++ b/src/third_party/wiredtiger/bench/workgen/workgen_func.h
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/bench/workgen/workgen_int.h b/src/third_party/wiredtiger/bench/workgen/workgen_int.h
index c7a5a7121e9..33a8a8f492f 100644
--- a/src/third_party/wiredtiger/bench/workgen/workgen_int.h
+++ b/src/third_party/wiredtiger/bench/workgen/workgen_int.h
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/bench/workgen/workgen_time.h b/src/third_party/wiredtiger/bench/workgen/workgen_time.h
index f33eb64d9c9..c1a0a2906dd 100644
--- a/src/third_party/wiredtiger/bench/workgen/workgen_time.h
+++ b/src/third_party/wiredtiger/bench/workgen/workgen_time.h
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/bench/workgen/wtperf.py b/src/third_party/wiredtiger/bench/workgen/wtperf.py
index 2837be6d064..9da8c37fd3a 100644
--- a/src/third_party/wiredtiger/bench/workgen/wtperf.py
+++ b/src/third_party/wiredtiger/bench/workgen/wtperf.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/bench/wtperf/config.c b/src/third_party/wiredtiger/bench/wtperf/config.c
index 1a4f46f5c37..d93baeed2f6 100644
--- a/src/third_party/wiredtiger/bench/wtperf/config.c
+++ b/src/third_party/wiredtiger/bench/wtperf/config.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/bench/wtperf/config_opt.h b/src/third_party/wiredtiger/bench/wtperf/config_opt.h
index 68bcd3e45f1..d61046fb828 100644
--- a/src/third_party/wiredtiger/bench/wtperf/config_opt.h
+++ b/src/third_party/wiredtiger/bench/wtperf/config_opt.h
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/bench/wtperf/idle_table_cycle.c b/src/third_party/wiredtiger/bench/wtperf/idle_table_cycle.c
index d0baa786ba9..f84e9ddaed5 100644
--- a/src/third_party/wiredtiger/bench/wtperf/idle_table_cycle.c
+++ b/src/third_party/wiredtiger/bench/wtperf/idle_table_cycle.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/bench/wtperf/misc.c b/src/third_party/wiredtiger/bench/wtperf/misc.c
index da48c600589..295948fd6b7 100644
--- a/src/third_party/wiredtiger/bench/wtperf/misc.c
+++ b/src/third_party/wiredtiger/bench/wtperf/misc.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/bench/wtperf/runners/get_ckpt.py b/src/third_party/wiredtiger/bench/wtperf/runners/get_ckpt.py
index da188ad47d4..2b52e066954 100755
--- a/src/third_party/wiredtiger/bench/wtperf/runners/get_ckpt.py
+++ b/src/third_party/wiredtiger/bench/wtperf/runners/get_ckpt.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/bench/wtperf/track.c b/src/third_party/wiredtiger/bench/wtperf/track.c
index 13ca85aabfd..798ee5d2144 100644
--- a/src/third_party/wiredtiger/bench/wtperf/track.c
+++ b/src/third_party/wiredtiger/bench/wtperf/track.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/bench/wtperf/wtperf.c b/src/third_party/wiredtiger/bench/wtperf/wtperf.c
index 9e18df9a0e3..4adb3db3c6c 100644
--- a/src/third_party/wiredtiger/bench/wtperf/wtperf.c
+++ b/src/third_party/wiredtiger/bench/wtperf/wtperf.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/bench/wtperf/wtperf.h b/src/third_party/wiredtiger/bench/wtperf/wtperf.h
index b17d082ddcf..7fb370e0b5c 100644
--- a/src/third_party/wiredtiger/bench/wtperf/wtperf.h
+++ b/src/third_party/wiredtiger/bench/wtperf/wtperf.h
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/bench/wtperf/wtperf_opt.i b/src/third_party/wiredtiger/bench/wtperf/wtperf_opt.i
index 10aebf36b01..24f114abcb6 100644
--- a/src/third_party/wiredtiger/bench/wtperf/wtperf_opt.i
+++ b/src/third_party/wiredtiger/bench/wtperf/wtperf_opt.i
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/bench/wtperf/wtperf_throttle.c b/src/third_party/wiredtiger/bench/wtperf/wtperf_throttle.c
index 75dad09ed50..008516168ad 100644
--- a/src/third_party/wiredtiger/bench/wtperf/wtperf_throttle.c
+++ b/src/third_party/wiredtiger/bench/wtperf/wtperf_throttle.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/bench/wtperf/wtperf_truncate.c b/src/third_party/wiredtiger/bench/wtperf/wtperf_truncate.c
index 5b794009afb..1f910b9a3a4 100644
--- a/src/third_party/wiredtiger/bench/wtperf/wtperf_truncate.c
+++ b/src/third_party/wiredtiger/bench/wtperf/wtperf_truncate.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/dist/api_data.py b/src/third_party/wiredtiger/dist/api_data.py
index ac4e80aedcf..c0afe3ae041 100644
--- a/src/third_party/wiredtiger/dist/api_data.py
+++ b/src/third_party/wiredtiger/dist/api_data.py
@@ -550,7 +550,7 @@ connection_runtime_config = [
Maintain database statistics, which may impact performance.
Choosing "all" maintains all statistics regardless of cost,
"fast" maintains a subset of statistics that are relatively
- inexpensive, "none" turns off all statistics. The "clear"
+ inexpensive, "none" turns off all statistics. The "clear"
configuration resets statistics after they are gathered,
where appropriate (for example, a cache size statistic is
not cleared, while the count of cursor insert operations will
diff --git a/src/third_party/wiredtiger/dist/s_c_test_create b/src/third_party/wiredtiger/dist/s_c_test_create
index 1d379664e75..66d1e24ec87 100755
--- a/src/third_party/wiredtiger/dist/s_c_test_create
+++ b/src/third_party/wiredtiger/dist/s_c_test_create
@@ -35,7 +35,7 @@ mkdir $CSUITE_DIRECTORY/$TEST_NAME
(cat <<EOF
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/dist/s_clang-scan b/src/third_party/wiredtiger/dist/s_clang-scan
new file mode 100644
index 00000000000..33d6f3e7d9e
--- /dev/null
+++ b/src/third_party/wiredtiger/dist/s_clang-scan
@@ -0,0 +1,50 @@
+#! /bin/sh
+
+t=__wt.$$
+trap 'rm -rf $t /tmp/scan-build-*' 0 1 2 3 13 15
+
+# Installation of the clang development package isn't standard, list a
+# couple of the places we're using.
+export PATH=$PATH:/usr/local/clang50/bin:/usr/local/llvm-devel/bin
+
+# Remove old reports.
+rm -rf /tmp/scan-build-*
+
+# Find the top-level WiredTiger directory and move to there.
+p="$PWD"
+while test "$p" != "/" ; do
+ if test -d "$p/build_posix"; then
+ break;
+ fi
+ p=`dirname $p`
+done
+test "$p" != "/" || {
+ echo "$0: cannot find the WiredTiger top-level directory"
+ exit 1
+}
+
+cd $p || exit 1
+echo "$0: running scan-build in $p..."
+
+sh autogen.sh > /dev/null || exit 1
+
+args="--use-cc=clang40 -no-failure-reports"
+args="$args -disable-checker core.NullDereference"
+scan-build $args ./configure 'CFLAGS=-g -Wall' \
+ --disable-shared --enable-diagnostic --enable-strict > /dev/null
+scan-build $args make -j 8 wt 2>&1 > $t
+
+make -j 8 distclean > /dev/null
+
+grep 'No bugs found' $t > /dev/null || {
+ echo "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-="
+ echo 'unexpected scan-build output'
+ echo "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-="
+ sed -e '/^--- /d' \
+ -e '/^\/bin\/sh /d' \
+ -e '/^depbase=/d' \
+ -e '/^libtool: /d' < $t
+ exit 1
+}
+
+exit 0
diff --git a/src/third_party/wiredtiger/dist/s_clang-tidy b/src/third_party/wiredtiger/dist/s_clang-tidy
new file mode 100644
index 00000000000..209d6f7d5d5
--- /dev/null
+++ b/src/third_party/wiredtiger/dist/s_clang-tidy
@@ -0,0 +1,84 @@
+#! /bin/sh
+
+t=__wt.$$
+trap 'rm -rf $t' 0 1 2 3 13 15
+
+# Installation of the clang development package isn't standard, list a
+# couple of the places we're using.
+export PATH=$PATH:/usr/local/clang50/bin:/usr/local/llvm-devel/bin
+
+# Remove old reports.
+rm -rf /tmp/scan-build-*
+
+# Find the top-level WiredTiger directory and move to there.
+p="$PWD"
+while test "$p" != "/" ; do
+ if test -d "$p/build_posix"; then
+ break;
+ fi
+ p=`dirname $p`
+done
+test "$p" != "/" || {
+ echo "$0: cannot find the WiredTiger top-level directory"
+ exit 1
+}
+
+cd $p || exit 1
+echo "$0: running clang-tidy in $p..."
+
+sh autogen.sh > /dev/null || exit 1
+
+./configure --enable-diagnostic --enable-strict > /dev/null
+
+# We need a custom wiredtiger_config.h, clang-tidy doesn't know where to
+# find the x86intrin.h include file.
+echo '!!!!'
+echo 'Modifying wiredtiger_config.h'
+echo '!!!!'
+cp wiredtiger_config.h $t
+sed '/HAVE_X86INTRIN_H/d' < $t > wiredtiger_config.h
+
+# XXX
+# clang-tidy doesn't like verify_build at the moment.
+echo '!!!!'
+echo 'Modifying src/include/verify_build.h'
+echo '!!!!'
+echo '#define WT_STATIC_ASSERT(a)' > src/include/verify_build.h
+
+def="-D_GNU_SOURCE"
+inc="-I. -Isrc/include"
+
+args="-checks=*"
+args="$args,-android-cloexec-fopen"
+args="$args,-clang-analyzer-core.NullDereference"
+args="$args,-clang-analyzer-optin.performance.Padding"
+args="$args,-google-readability-braces-around-statements"
+args="$args,-hicpp-braces-around-statements"
+args="$args,-hicpp-no-assembler"
+args="$args,-hicpp-signed-bitwise"
+args="$args,-llvm-header-guard"
+args="$args,-llvm-include-order"
+args="$args,-readability-braces-around-statements"
+args="$args,-readability-inconsistent-declaration-parameter-name"
+args="$args,-readability-named-parameter"
+args="$args,-readability-non-const-parameter"
+
+# clang-tidy gets unhappy if we toss the whole tree at it, so run
+# through a file at a time.
+# Only specify -header once.
+(
+clang-tidy src/btree/bt_compact.c \
+ "-header-filter=.*" "$args" -- $def $inc 2>&1
+for i in src/[a-np-z]*/*.c src/os_posix/*.c; do
+ clang-tidy $i "$args" -- $def $inc 2>&1
+done
+) > $t
+
+echo "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-="
+echo 'clang-tidy output'
+echo "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-="
+sed -e '/ warnings generated/d' \
+ -e '/Suppressed.*warnings/d' \
+ -e '/Use -header-filter/d' < $t
+
+exit 0
diff --git a/src/third_party/wiredtiger/dist/s_copyright b/src/third_party/wiredtiger/dist/s_copyright
index 4a93be73fb6..170dba3efff 100755
--- a/src/third_party/wiredtiger/dist/s_copyright
+++ b/src/third_party/wiredtiger/dist/s_copyright
@@ -110,7 +110,8 @@ fi
-o -name '*.cxx' \
-o -name '*.in' \
-o -name '*.java' \
- -o -name '*.py' |
+ -o -name '*.py' \
+ -o -name '*.swig' |
sed -e '/Makefile.in/d' \
-e '/^build_posix\//d' \
-e '/api\/leveldb\/basho\//d' \
diff --git a/src/third_party/wiredtiger/dist/s_define.list b/src/third_party/wiredtiger/dist/s_define.list
index 5a5af9dd5d7..16f06da383c 100644
--- a/src/third_party/wiredtiger/dist/s_define.list
+++ b/src/third_party/wiredtiger/dist/s_define.list
@@ -13,6 +13,7 @@ TXN_API_END
WIN32_LEAN_AND_MEAN
WT_ALIGN_CHECK
WT_ATOMIC_CAS
+WT_ATOMIC_CAS_FUNC
WT_ATOMIC_FUNC
WT_BLOCK_DESC_SIZE
WT_BLOCK_HEADER_SIZE
@@ -22,8 +23,6 @@ WT_CACHE_LINE_PAD_END
WT_CONN_CHECK_PANIC
WT_DEADLOCK
WT_DEBUG_BYTE
-WT_SINGLE_THREAD_CHECK_START
-WT_SINGLE_THREAD_CHECK_STOP
WT_ERR_ERROR_OK
WT_EXT_FOREACH_OFF
WT_HANDLE_CLOSED
@@ -47,6 +46,8 @@ WT_SESSION_LOCKED_CHECKPOINT
WT_SESSION_LOCKED_TABLE_READ
WT_SESSION_LOCKED_TABLE_WRITE
WT_SESSION_LOCKED_TURTLE
+WT_SINGLE_THREAD_CHECK_START
+WT_SINGLE_THREAD_CHECK_STOP
WT_SIZE_CHECK
WT_STATS_FIELD_TO_OFFSET
WT_STATS_SLOT_ID
@@ -62,11 +63,11 @@ WT_STAT_INCRV_ATOMIC_BASE
WT_STAT_INCRV_BASE
WT_STAT_WRITE
WT_TIMEDIFF_US
-WT_TSCDIFF_NS
WT_TRACK_OP
WT_TRACK_OP_END
WT_TRACK_OP_INIT
WT_TRET_ERROR_OK
+WT_TSCDIFF_NS
WT_UPDATE_SIZE
WT_WITH_LOCK_NOWAIT
WT_WITH_LOCK_WAIT
diff --git a/src/third_party/wiredtiger/dist/s_funcs.list b/src/third_party/wiredtiger/dist/s_funcs.list
index 42eacf9c068..a7653e5b497 100644
--- a/src/third_party/wiredtiger/dist/s_funcs.list
+++ b/src/third_party/wiredtiger/dist/s_funcs.list
@@ -27,6 +27,7 @@ __wt_log_scan
__wt_nlpo2
__wt_nlpo2_round
__wt_print_huffman_code
+__wt_session_breakpoint
__wt_stat_join_aggregate
__wt_stat_join_clear_all
__wt_stream_set_no_buffer
diff --git a/src/third_party/wiredtiger/dist/s_stat b/src/third_party/wiredtiger/dist/s_stat
index cf9303e5f95..32cf16fd3d4 100755
--- a/src/third_party/wiredtiger/dist/s_stat
+++ b/src/third_party/wiredtiger/dist/s_stat
@@ -25,6 +25,10 @@ cat << UNUSED_STAT_FIELDS
lock_checkpoint_count
lock_checkpoint_wait_application
lock_checkpoint_wait_internal
+lock_commit_timestamp_read_count
+lock_commit_timestamp_wait_application
+lock_commit_timestamp_wait_internal
+lock_commit_timestamp_write_count
lock_dhandle_read_count
lock_dhandle_wait_application
lock_dhandle_wait_internal
@@ -32,6 +36,10 @@ lock_dhandle_write_count
lock_metadata_count
lock_metadata_wait_application
lock_metadata_wait_internal
+lock_read_timestamp_read_count
+lock_read_timestamp_wait_application
+lock_read_timestamp_wait_internal
+lock_read_timestamp_write_count
lock_schema_count
lock_schema_wait_application
lock_schema_wait_internal
@@ -39,6 +47,10 @@ lock_table_read_count
lock_table_wait_application
lock_table_wait_internal
lock_table_write_count
+lock_txn_global_read_count
+lock_txn_global_wait_application
+lock_txn_global_wait_internal
+lock_txn_global_write_count
UNUSED_STAT_FIELDS
echo "$search"
diff --git a/src/third_party/wiredtiger/dist/s_string.ok b/src/third_party/wiredtiger/dist/s_string.ok
index 80f6bdca186..1f025013fe7 100644
--- a/src/third_party/wiredtiger/dist/s_string.ok
+++ b/src/third_party/wiredtiger/dist/s_string.ok
@@ -996,6 +996,7 @@ nsnap
nul
nullptr
nuls
+num
numSymbols
numbare
offpage
diff --git a/src/third_party/wiredtiger/dist/s_void b/src/third_party/wiredtiger/dist/s_void
index 78a3340e3bf..4a0e73e1c0d 100755
--- a/src/third_party/wiredtiger/dist/s_void
+++ b/src/third_party/wiredtiger/dist/s_void
@@ -64,6 +64,7 @@ func_ok()
-e '/int __wt_lsm_manager_pop_entry$/d' \
-e '/int __wt_once$/d' \
-e '/int __wt_posix_directory_list_free$/d' \
+ -e '/int __wt_session_breakpoint$/d' \
-e '/int __wt_spin_init$/d' \
-e '/int __wt_spin_trylock$/d' \
-e '/int __wt_stat_connection_desc$/d' \
diff --git a/src/third_party/wiredtiger/dist/stat_data.py b/src/third_party/wiredtiger/dist/stat_data.py
index bbb581e904e..9c828f66cef 100644
--- a/src/third_party/wiredtiger/dist/stat_data.py
+++ b/src/third_party/wiredtiger/dist/stat_data.py
@@ -84,6 +84,10 @@ class LSMStat(Stat):
prefix = 'LSM'
def __init__(self, name, desc, flags=''):
Stat.__init__(self, name, LSMStat.prefix, desc, flags)
+class PerfHistStat(Stat):
+ prefix = 'perf'
+ def __init__(self, name, desc, flags=''):
+ Stat.__init__(self, name, PerfHistStat.prefix, desc, flags)
class RecStat(Stat):
prefix = 'reconciliation'
def __init__(self, name, desc, flags=''):
@@ -128,6 +132,7 @@ groups['memory'] = [
groups['system'] = [
ConnStat.prefix,
DhandleStat.prefix,
+ PerfHistStat.prefix,
SessionStat.prefix,
ThreadStat.prefix
]
@@ -309,6 +314,10 @@ connection_stats = [
LockStat('lock_checkpoint_count', 'checkpoint lock acquisitions'),
LockStat('lock_checkpoint_wait_application', 'checkpoint lock application thread wait time (usecs)'),
LockStat('lock_checkpoint_wait_internal', 'checkpoint lock internal thread wait time (usecs)'),
+ LockStat('lock_commit_timestamp_read_count', 'commit timestamp queue read lock acquisitions'),
+ LockStat('lock_commit_timestamp_wait_application', 'commit timestamp queue lock application thread time waiting for the dhandle lock (usecs)'),
+ LockStat('lock_commit_timestamp_wait_internal', 'commit timestamp queue lock internal thread time waiting for the dhandle lock (usecs)'),
+ LockStat('lock_commit_timestamp_write_count', 'commit timestamp queue write lock acquisitions'),
LockStat('lock_dhandle_read_count', 'dhandle read lock acquisitions'),
LockStat('lock_dhandle_wait_application', 'dhandle lock application thread time waiting for the dhandle lock (usecs)'),
LockStat('lock_dhandle_wait_internal', 'dhandle lock internal thread time waiting for the dhandle lock (usecs)'),
@@ -316,6 +325,10 @@ connection_stats = [
LockStat('lock_metadata_count', 'metadata lock acquisitions'),
LockStat('lock_metadata_wait_application', 'metadata lock application thread wait time (usecs)'),
LockStat('lock_metadata_wait_internal', 'metadata lock internal thread wait time (usecs)'),
+ LockStat('lock_read_timestamp_read_count', 'read timestamp queue read lock acquisitions'),
+ LockStat('lock_read_timestamp_wait_application', 'read timestamp queue lock application thread time waiting for the dhandle lock (usecs)'),
+ LockStat('lock_read_timestamp_wait_internal', 'read timestamp queue lock internal thread time waiting for the dhandle lock (usecs)'),
+ LockStat('lock_read_timestamp_write_count', 'read timestamp queue write lock acquisitions'),
LockStat('lock_schema_count', 'schema lock acquisitions'),
LockStat('lock_schema_wait_application', 'schema lock application thread wait time (usecs)'),
LockStat('lock_schema_wait_internal', 'schema lock internal thread wait time (usecs)'),
@@ -323,6 +336,10 @@ connection_stats = [
LockStat('lock_table_wait_application', 'table lock application thread time waiting for the table lock (usecs)'),
LockStat('lock_table_wait_internal', 'table lock internal thread time waiting for the table lock (usecs)'),
LockStat('lock_table_write_count', 'table write lock acquisitions'),
+ LockStat('lock_txn_global_read_count', 'txn global read lock acquisitions'),
+ LockStat('lock_txn_global_wait_application', 'txn global lock application thread time waiting for the dhandle lock (usecs)'),
+ LockStat('lock_txn_global_wait_internal', 'txn global lock internal thread time waiting for the dhandle lock (usecs)'),
+ LockStat('lock_txn_global_write_count', 'txn global write lock acquisitions'),
##########################################
# Logging statistics
@@ -389,6 +406,32 @@ connection_stats = [
LSMStat('lsm_work_units_done', 'tree maintenance operations executed'),
##########################################
+ # Performance Histogram Stats
+ ##########################################
+ PerfHistStat('perf_hist_fsread_latency_gt1000', 'file system read latency histogram (bucket 6) - 1000ms+'),
+ PerfHistStat('perf_hist_fsread_latency_lt50', 'file system read latency histogram (bucket 1) - 10-49ms'),
+ PerfHistStat('perf_hist_fsread_latency_lt100', 'file system read latency histogram (bucket 2) - 50-99ms'),
+ PerfHistStat('perf_hist_fsread_latency_lt250', 'file system read latency histogram (bucket 3) - 100-249ms'),
+ PerfHistStat('perf_hist_fsread_latency_lt500', 'file system read latency histogram (bucket 4) - 250-499ms'),
+ PerfHistStat('perf_hist_fsread_latency_lt1000', 'file system read latency histogram (bucket 5) - 500-999ms'),
+ PerfHistStat('perf_hist_fswrite_latency_gt1000', 'file system write latency histogram (bucket 6) - 1000ms+'),
+ PerfHistStat('perf_hist_fswrite_latency_lt50', 'file system write latency histogram (bucket 1) - 10-49ms'),
+ PerfHistStat('perf_hist_fswrite_latency_lt100', 'file system write latency histogram (bucket 2) - 50-99ms'),
+ PerfHistStat('perf_hist_fswrite_latency_lt250', 'file system write latency histogram (bucket 3) - 100-249ms'),
+ PerfHistStat('perf_hist_fswrite_latency_lt500', 'file system write latency histogram (bucket 4) - 250-499ms'),
+ PerfHistStat('perf_hist_fswrite_latency_lt1000', 'file system write latency histogram (bucket 5) - 500-999ms'),
+ PerfHistStat('perf_hist_opread_latency_gt10000', 'operation read latency histogram (bucket 5) - 10000us+'),
+ PerfHistStat('perf_hist_opread_latency_lt250', 'operation read latency histogram (bucket 1) - 100-249us'),
+ PerfHistStat('perf_hist_opread_latency_lt500', 'operation read latency histogram (bucket 2) - 250-499us'),
+ PerfHistStat('perf_hist_opread_latency_lt1000', 'operation read latency histogram (bucket 3) - 500-999us'),
+ PerfHistStat('perf_hist_opread_latency_lt10000', 'operation read latency histogram (bucket 4) - 1000-9999us'),
+ PerfHistStat('perf_hist_opwrite_latency_gt10000', 'operation write latency histogram (bucket 5) - 10000us+'),
+ PerfHistStat('perf_hist_opwrite_latency_lt250', 'operation write latency histogram (bucket 1) - 100-249us'),
+ PerfHistStat('perf_hist_opwrite_latency_lt500', 'operation write latency histogram (bucket 2) - 250-499us'),
+ PerfHistStat('perf_hist_opwrite_latency_lt1000', 'operation write latency histogram (bucket 3) - 500-999us'),
+ PerfHistStat('perf_hist_opwrite_latency_lt10000', 'operation write latency histogram (bucket 4) - 1000-9999us'),
+
+##########################################
# Reconciliation statistics
##########################################
RecStat('rec_page_delete', 'pages deleted'),
@@ -447,19 +490,29 @@ connection_stats = [
TxnStat('txn_checkpoint_time_recent', 'transaction checkpoint most recent time (msecs)', 'no_clear,no_scale'),
TxnStat('txn_checkpoint_time_total', 'transaction checkpoint total time (msecs)', 'no_clear,no_scale'),
TxnStat('txn_commit', 'transactions committed'),
- TxnStat('txn_commit_queue_head', 'transactions commit timestamp queue inserts to head'),
- TxnStat('txn_commit_queue_inserts', 'transactions commit timestamp queue inserts total'),
- TxnStat('txn_commit_queue_len', 'transactions commit timestamp queue length'),
+ TxnStat('txn_commit_queue_empty', 'commit timestamp queue insert to empty'),
+ TxnStat('txn_commit_queue_head', 'commit timestamp queue inserts to head'),
+ TxnStat('txn_commit_queue_inserts', 'commit timestamp queue inserts total'),
+ TxnStat('txn_commit_queue_len', 'commit timestamp queue length'),
TxnStat('txn_fail_cache', 'transaction failures due to cache overflow'),
TxnStat('txn_pinned_checkpoint_range', 'transaction range of IDs currently pinned by a checkpoint', 'no_clear,no_scale'),
TxnStat('txn_pinned_range', 'transaction range of IDs currently pinned', 'no_clear,no_scale'),
TxnStat('txn_pinned_snapshot_range', 'transaction range of IDs currently pinned by named snapshots', 'no_clear,no_scale'),
TxnStat('txn_pinned_timestamp', 'transaction range of timestamps currently pinned', 'no_clear,no_scale'),
TxnStat('txn_pinned_timestamp_oldest', 'transaction range of timestamps pinned by the oldest timestamp', 'no_clear,no_scale'),
- TxnStat('txn_read_queue_head', 'transactions read timestamp queue inserts to head'),
- TxnStat('txn_read_queue_inserts', 'transactions read timestamp queue inserts total'),
- TxnStat('txn_read_queue_len', 'transactions read timestamp queue length'),
+ TxnStat('txn_query_ts', 'query timestamp calls'),
+ TxnStat('txn_read_queue_empty', 'read timestamp queue insert to empty'),
+ TxnStat('txn_read_queue_head', 'read timestamp queue inserts to head'),
+ TxnStat('txn_read_queue_inserts', 'read timestamp queue inserts total'),
+ TxnStat('txn_read_queue_len', 'read timestamp queue length'),
TxnStat('txn_rollback', 'transactions rolled back'),
+ TxnStat('txn_set_ts', 'set timestamp calls'),
+ TxnStat('txn_set_ts_commit', 'set timestamp commit calls'),
+ TxnStat('txn_set_ts_commit_upd', 'set timestamp commit updates'),
+ TxnStat('txn_set_ts_oldest', 'set timestamp oldest calls'),
+ TxnStat('txn_set_ts_oldest_upd', 'set timestamp oldest updates'),
+ TxnStat('txn_set_ts_stable', 'set timestamp stable calls'),
+ TxnStat('txn_set_ts_stable_upd', 'set timestamp stable updates'),
TxnStat('txn_snapshots_created', 'number of named snapshots created'),
TxnStat('txn_snapshots_dropped', 'number of named snapshots dropped'),
TxnStat('txn_sync', 'transaction sync calls'),
diff --git a/src/third_party/wiredtiger/examples/c/ex_access.c b/src/third_party/wiredtiger/examples/c/ex_access.c
index df8b0b499df..4ea06e1fad8 100644
--- a/src/third_party/wiredtiger/examples/c/ex_access.c
+++ b/src/third_party/wiredtiger/examples/c/ex_access.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/examples/c/ex_all.c b/src/third_party/wiredtiger/examples/c/ex_all.c
index dcd9dd406df..7091a0a76d6 100644
--- a/src/third_party/wiredtiger/examples/c/ex_all.c
+++ b/src/third_party/wiredtiger/examples/c/ex_all.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/examples/c/ex_async.c b/src/third_party/wiredtiger/examples/c/ex_async.c
index 3c7f5f55cd8..4367a757d25 100644
--- a/src/third_party/wiredtiger/examples/c/ex_async.c
+++ b/src/third_party/wiredtiger/examples/c/ex_async.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/examples/c/ex_backup.c b/src/third_party/wiredtiger/examples/c/ex_backup.c
index bf40d7573d8..18c34dbe4cc 100644
--- a/src/third_party/wiredtiger/examples/c/ex_backup.c
+++ b/src/third_party/wiredtiger/examples/c/ex_backup.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/examples/c/ex_call_center.c b/src/third_party/wiredtiger/examples/c/ex_call_center.c
index e4e4ab0b9cf..79a0239850f 100644
--- a/src/third_party/wiredtiger/examples/c/ex_call_center.c
+++ b/src/third_party/wiredtiger/examples/c/ex_call_center.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/examples/c/ex_config_parse.c b/src/third_party/wiredtiger/examples/c/ex_config_parse.c
index 8d418ffa186..a46740fd170 100644
--- a/src/third_party/wiredtiger/examples/c/ex_config_parse.c
+++ b/src/third_party/wiredtiger/examples/c/ex_config_parse.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/examples/c/ex_cursor.c b/src/third_party/wiredtiger/examples/c/ex_cursor.c
index 3a8700fb83c..54cee6be750 100644
--- a/src/third_party/wiredtiger/examples/c/ex_cursor.c
+++ b/src/third_party/wiredtiger/examples/c/ex_cursor.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/examples/c/ex_data_source.c b/src/third_party/wiredtiger/examples/c/ex_data_source.c
index f6311adffa6..1a0b9f7f39a 100644
--- a/src/third_party/wiredtiger/examples/c/ex_data_source.c
+++ b/src/third_party/wiredtiger/examples/c/ex_data_source.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/examples/c/ex_encrypt.c b/src/third_party/wiredtiger/examples/c/ex_encrypt.c
index 3fdfa9a6d33..ed5112409f4 100644
--- a/src/third_party/wiredtiger/examples/c/ex_encrypt.c
+++ b/src/third_party/wiredtiger/examples/c/ex_encrypt.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/examples/c/ex_event_handler.c b/src/third_party/wiredtiger/examples/c/ex_event_handler.c
index d9ac4851bf7..1354a764927 100644
--- a/src/third_party/wiredtiger/examples/c/ex_event_handler.c
+++ b/src/third_party/wiredtiger/examples/c/ex_event_handler.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/examples/c/ex_extending.c b/src/third_party/wiredtiger/examples/c/ex_extending.c
index 7a845c1f6ad..9271f49a469 100644
--- a/src/third_party/wiredtiger/examples/c/ex_extending.c
+++ b/src/third_party/wiredtiger/examples/c/ex_extending.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/examples/c/ex_extractor.c b/src/third_party/wiredtiger/examples/c/ex_extractor.c
index 245d279ca4b..66e6066ad68 100644
--- a/src/third_party/wiredtiger/examples/c/ex_extractor.c
+++ b/src/third_party/wiredtiger/examples/c/ex_extractor.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/examples/c/ex_file_system.c b/src/third_party/wiredtiger/examples/c/ex_file_system.c
index 27807f452e6..f8c4e29007c 100644
--- a/src/third_party/wiredtiger/examples/c/ex_file_system.c
+++ b/src/third_party/wiredtiger/examples/c/ex_file_system.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/examples/c/ex_hello.c b/src/third_party/wiredtiger/examples/c/ex_hello.c
index fe21ff8057f..b5a88648b03 100644
--- a/src/third_party/wiredtiger/examples/c/ex_hello.c
+++ b/src/third_party/wiredtiger/examples/c/ex_hello.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/examples/c/ex_log.c b/src/third_party/wiredtiger/examples/c/ex_log.c
index 1912ffca8a6..77d6709f0db 100644
--- a/src/third_party/wiredtiger/examples/c/ex_log.c
+++ b/src/third_party/wiredtiger/examples/c/ex_log.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/examples/c/ex_pack.c b/src/third_party/wiredtiger/examples/c/ex_pack.c
index 98cd1510b92..c2bf4bc9a8b 100644
--- a/src/third_party/wiredtiger/examples/c/ex_pack.c
+++ b/src/third_party/wiredtiger/examples/c/ex_pack.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/examples/c/ex_process.c b/src/third_party/wiredtiger/examples/c/ex_process.c
index 06a62d10d39..70c5dd2713a 100644
--- a/src/third_party/wiredtiger/examples/c/ex_process.c
+++ b/src/third_party/wiredtiger/examples/c/ex_process.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/examples/c/ex_schema.c b/src/third_party/wiredtiger/examples/c/ex_schema.c
index f2ebd118104..28776aca668 100644
--- a/src/third_party/wiredtiger/examples/c/ex_schema.c
+++ b/src/third_party/wiredtiger/examples/c/ex_schema.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/examples/c/ex_smoke.c b/src/third_party/wiredtiger/examples/c/ex_smoke.c
index ab4e085d2f0..2091073c2f4 100644
--- a/src/third_party/wiredtiger/examples/c/ex_smoke.c
+++ b/src/third_party/wiredtiger/examples/c/ex_smoke.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/examples/c/ex_stat.c b/src/third_party/wiredtiger/examples/c/ex_stat.c
index 992f335c25e..bc13197038a 100644
--- a/src/third_party/wiredtiger/examples/c/ex_stat.c
+++ b/src/third_party/wiredtiger/examples/c/ex_stat.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/examples/c/ex_sync.c b/src/third_party/wiredtiger/examples/c/ex_sync.c
index 975ba3b928c..bc897126852 100644
--- a/src/third_party/wiredtiger/examples/c/ex_sync.c
+++ b/src/third_party/wiredtiger/examples/c/ex_sync.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/examples/c/ex_thread.c b/src/third_party/wiredtiger/examples/c/ex_thread.c
index fe14d67e44b..f709707bffc 100644
--- a/src/third_party/wiredtiger/examples/c/ex_thread.c
+++ b/src/third_party/wiredtiger/examples/c/ex_thread.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/examples/java/com/wiredtiger/examples/ex_access.java b/src/third_party/wiredtiger/examples/java/com/wiredtiger/examples/ex_access.java
index ed96ebce7d7..b9de70705da 100644
--- a/src/third_party/wiredtiger/examples/java/com/wiredtiger/examples/ex_access.java
+++ b/src/third_party/wiredtiger/examples/java/com/wiredtiger/examples/ex_access.java
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/examples/java/com/wiredtiger/examples/ex_all.java b/src/third_party/wiredtiger/examples/java/com/wiredtiger/examples/ex_all.java
index ff7d371fabd..6649e14bd05 100644
--- a/src/third_party/wiredtiger/examples/java/com/wiredtiger/examples/ex_all.java
+++ b/src/third_party/wiredtiger/examples/java/com/wiredtiger/examples/ex_all.java
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/examples/java/com/wiredtiger/examples/ex_async.java b/src/third_party/wiredtiger/examples/java/com/wiredtiger/examples/ex_async.java
index 92054464747..e9c1fb25271 100644
--- a/src/third_party/wiredtiger/examples/java/com/wiredtiger/examples/ex_async.java
+++ b/src/third_party/wiredtiger/examples/java/com/wiredtiger/examples/ex_async.java
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/examples/java/com/wiredtiger/examples/ex_call_center.java b/src/third_party/wiredtiger/examples/java/com/wiredtiger/examples/ex_call_center.java
index 921c7f9f57c..25efce8a319 100644
--- a/src/third_party/wiredtiger/examples/java/com/wiredtiger/examples/ex_call_center.java
+++ b/src/third_party/wiredtiger/examples/java/com/wiredtiger/examples/ex_call_center.java
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/examples/java/com/wiredtiger/examples/ex_cursor.java b/src/third_party/wiredtiger/examples/java/com/wiredtiger/examples/ex_cursor.java
index 4a57f3c35da..04e15b76f3e 100644
--- a/src/third_party/wiredtiger/examples/java/com/wiredtiger/examples/ex_cursor.java
+++ b/src/third_party/wiredtiger/examples/java/com/wiredtiger/examples/ex_cursor.java
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/examples/java/com/wiredtiger/examples/ex_log.java b/src/third_party/wiredtiger/examples/java/com/wiredtiger/examples/ex_log.java
index 5a76c43b13c..2d414c56776 100644
--- a/src/third_party/wiredtiger/examples/java/com/wiredtiger/examples/ex_log.java
+++ b/src/third_party/wiredtiger/examples/java/com/wiredtiger/examples/ex_log.java
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/examples/java/com/wiredtiger/examples/ex_schema.java b/src/third_party/wiredtiger/examples/java/com/wiredtiger/examples/ex_schema.java
index b7aa64f0c68..9f6ec90ec7a 100644
--- a/src/third_party/wiredtiger/examples/java/com/wiredtiger/examples/ex_schema.java
+++ b/src/third_party/wiredtiger/examples/java/com/wiredtiger/examples/ex_schema.java
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/examples/java/com/wiredtiger/examples/ex_stat.java b/src/third_party/wiredtiger/examples/java/com/wiredtiger/examples/ex_stat.java
index 799f0396756..9e7cc723bab 100644
--- a/src/third_party/wiredtiger/examples/java/com/wiredtiger/examples/ex_stat.java
+++ b/src/third_party/wiredtiger/examples/java/com/wiredtiger/examples/ex_stat.java
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/examples/java/com/wiredtiger/examples/ex_thread.java b/src/third_party/wiredtiger/examples/java/com/wiredtiger/examples/ex_thread.java
index 2476b3a4d41..49de7193f84 100644
--- a/src/third_party/wiredtiger/examples/java/com/wiredtiger/examples/ex_thread.java
+++ b/src/third_party/wiredtiger/examples/java/com/wiredtiger/examples/ex_thread.java
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/examples/python/ex_access.py b/src/third_party/wiredtiger/examples/python/ex_access.py
index 58ba64607e2..06140b9e0a5 100755
--- a/src/third_party/wiredtiger/examples/python/ex_access.py
+++ b/src/third_party/wiredtiger/examples/python/ex_access.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/examples/python/ex_stat.py b/src/third_party/wiredtiger/examples/python/ex_stat.py
index cd99c4f388b..6b009a727ca 100755
--- a/src/third_party/wiredtiger/examples/python/ex_stat.py
+++ b/src/third_party/wiredtiger/examples/python/ex_stat.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/ext/collators/reverse/reverse_collator.c b/src/third_party/wiredtiger/ext/collators/reverse/reverse_collator.c
index 3a589613427..2ad4e0fd27f 100644
--- a/src/third_party/wiredtiger/ext/collators/reverse/reverse_collator.c
+++ b/src/third_party/wiredtiger/ext/collators/reverse/reverse_collator.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/ext/collators/revint/revint_collator.c b/src/third_party/wiredtiger/ext/collators/revint/revint_collator.c
index 9952e922077..00c8bf93acb 100644
--- a/src/third_party/wiredtiger/ext/collators/revint/revint_collator.c
+++ b/src/third_party/wiredtiger/ext/collators/revint/revint_collator.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/ext/compressors/lz4/lz4_compress.c b/src/third_party/wiredtiger/ext/compressors/lz4/lz4_compress.c
index 279f0be6c36..1f32ff910d6 100644
--- a/src/third_party/wiredtiger/ext/compressors/lz4/lz4_compress.c
+++ b/src/third_party/wiredtiger/ext/compressors/lz4/lz4_compress.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/ext/compressors/nop/nop_compress.c b/src/third_party/wiredtiger/ext/compressors/nop/nop_compress.c
index 7cdb67c6bf2..f739ffa4777 100644
--- a/src/third_party/wiredtiger/ext/compressors/nop/nop_compress.c
+++ b/src/third_party/wiredtiger/ext/compressors/nop/nop_compress.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/ext/compressors/snappy/snappy_compress.c b/src/third_party/wiredtiger/ext/compressors/snappy/snappy_compress.c
index a86de5c3803..26aa3082bc0 100644
--- a/src/third_party/wiredtiger/ext/compressors/snappy/snappy_compress.c
+++ b/src/third_party/wiredtiger/ext/compressors/snappy/snappy_compress.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/ext/compressors/zlib/zlib_compress.c b/src/third_party/wiredtiger/ext/compressors/zlib/zlib_compress.c
index 3263b84bfaa..5ae54a25163 100644
--- a/src/third_party/wiredtiger/ext/compressors/zlib/zlib_compress.c
+++ b/src/third_party/wiredtiger/ext/compressors/zlib/zlib_compress.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/ext/compressors/zstd/zstd_compress.c b/src/third_party/wiredtiger/ext/compressors/zstd/zstd_compress.c
index d2ebaf20c4e..4f80694b0d1 100644
--- a/src/third_party/wiredtiger/ext/compressors/zstd/zstd_compress.c
+++ b/src/third_party/wiredtiger/ext/compressors/zstd/zstd_compress.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/ext/datasources/helium/helium.c b/src/third_party/wiredtiger/ext/datasources/helium/helium.c
index 4197c85bdd9..0cf9e979e9b 100644
--- a/src/third_party/wiredtiger/ext/datasources/helium/helium.c
+++ b/src/third_party/wiredtiger/ext/datasources/helium/helium.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/ext/encryptors/nop/nop_encrypt.c b/src/third_party/wiredtiger/ext/encryptors/nop/nop_encrypt.c
index 3bc0f0f1c71..0d04e51e395 100644
--- a/src/third_party/wiredtiger/ext/encryptors/nop/nop_encrypt.c
+++ b/src/third_party/wiredtiger/ext/encryptors/nop/nop_encrypt.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/ext/encryptors/rotn/rotn_encrypt.c b/src/third_party/wiredtiger/ext/encryptors/rotn/rotn_encrypt.c
index 5ffc8fcc1a3..f1e26eeaa23 100644
--- a/src/third_party/wiredtiger/ext/encryptors/rotn/rotn_encrypt.c
+++ b/src/third_party/wiredtiger/ext/encryptors/rotn/rotn_encrypt.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/ext/extractors/csv/csv_extractor.c b/src/third_party/wiredtiger/ext/extractors/csv/csv_extractor.c
index 9866e1d5b34..6ce64e240fe 100644
--- a/src/third_party/wiredtiger/ext/extractors/csv/csv_extractor.c
+++ b/src/third_party/wiredtiger/ext/extractors/csv/csv_extractor.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/ext/test/fail_fs/fail_fs.c b/src/third_party/wiredtiger/ext/test/fail_fs/fail_fs.c
index fd01ec66c68..bde1bfc48bf 100644
--- a/src/third_party/wiredtiger/ext/test/fail_fs/fail_fs.c
+++ b/src/third_party/wiredtiger/ext/test/fail_fs/fail_fs.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/ext/test/kvs_bdb/kvs_bdb.c b/src/third_party/wiredtiger/ext/test/kvs_bdb/kvs_bdb.c
index 9cf8b78b4c0..0a897c3fdeb 100644
--- a/src/third_party/wiredtiger/ext/test/kvs_bdb/kvs_bdb.c
+++ b/src/third_party/wiredtiger/ext/test/kvs_bdb/kvs_bdb.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data
index 4a6c00611e6..1800088ef2a 100644
--- a/src/third_party/wiredtiger/import.data
+++ b/src/third_party/wiredtiger/import.data
@@ -1,5 +1,5 @@
{
- "commit": "1a29eac4dc8cf82de437292da546e3f4039268a4",
+ "commit": "9e5044823185feffa71e56a6593cfb92e0741a41",
"github": "wiredtiger/wiredtiger.git",
"vendor": "wiredtiger",
"branch": "mongodb-3.8"
diff --git a/src/third_party/wiredtiger/lang/java/java_doc.i b/src/third_party/wiredtiger/lang/java/java_doc.i
index 28990234e59..768f06e4ec1 100644
--- a/src/third_party/wiredtiger/lang/java/java_doc.i
+++ b/src/third_party/wiredtiger/lang/java/java_doc.i
@@ -54,6 +54,7 @@ COPYDOC(__wt_session, WT_SESSION, checkpoint)
COPYDOC(__wt_session, WT_SESSION, snapshot)
COPYDOC(__wt_session, WT_SESSION, transaction_pinned_range)
COPYDOC(__wt_session, WT_SESSION, transaction_sync)
+COPYDOC(__wt_session, WT_SESSION, breakpoint)
COPYDOC(__wt_connection, WT_CONNECTION, async_flush)
COPYDOC(__wt_connection, WT_CONNECTION, async_new_op)
COPYDOC(__wt_connection, WT_CONNECTION, close)
diff --git a/src/third_party/wiredtiger/lang/java/src/com/wiredtiger/db/AsyncCallback.java b/src/third_party/wiredtiger/lang/java/src/com/wiredtiger/db/AsyncCallback.java
index b272d611255..52fd4dc5f06 100644
--- a/src/third_party/wiredtiger/lang/java/src/com/wiredtiger/db/AsyncCallback.java
+++ b/src/third_party/wiredtiger/lang/java/src/com/wiredtiger/db/AsyncCallback.java
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/lang/java/src/com/wiredtiger/db/PackFormatInputStream.java b/src/third_party/wiredtiger/lang/java/src/com/wiredtiger/db/PackFormatInputStream.java
index 5cf52a067b8..0579782d012 100644
--- a/src/third_party/wiredtiger/lang/java/src/com/wiredtiger/db/PackFormatInputStream.java
+++ b/src/third_party/wiredtiger/lang/java/src/com/wiredtiger/db/PackFormatInputStream.java
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/lang/java/src/com/wiredtiger/db/PackInputStream.java b/src/third_party/wiredtiger/lang/java/src/com/wiredtiger/db/PackInputStream.java
index 013f9601edb..7ada7ce6843 100644
--- a/src/third_party/wiredtiger/lang/java/src/com/wiredtiger/db/PackInputStream.java
+++ b/src/third_party/wiredtiger/lang/java/src/com/wiredtiger/db/PackInputStream.java
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/lang/java/src/com/wiredtiger/db/PackOutputStream.java b/src/third_party/wiredtiger/lang/java/src/com/wiredtiger/db/PackOutputStream.java
index 9af63db83c9..e5ab774878a 100644
--- a/src/third_party/wiredtiger/lang/java/src/com/wiredtiger/db/PackOutputStream.java
+++ b/src/third_party/wiredtiger/lang/java/src/com/wiredtiger/db/PackOutputStream.java
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/lang/java/src/com/wiredtiger/db/PackUtil.java b/src/third_party/wiredtiger/lang/java/src/com/wiredtiger/db/PackUtil.java
index 43b627cbf15..b5daaf7cbde 100644
--- a/src/third_party/wiredtiger/lang/java/src/com/wiredtiger/db/PackUtil.java
+++ b/src/third_party/wiredtiger/lang/java/src/com/wiredtiger/db/PackUtil.java
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/lang/java/src/com/wiredtiger/db/WiredTigerException.java b/src/third_party/wiredtiger/lang/java/src/com/wiredtiger/db/WiredTigerException.java
index 233e1598c5d..a93a829c62e 100644
--- a/src/third_party/wiredtiger/lang/java/src/com/wiredtiger/db/WiredTigerException.java
+++ b/src/third_party/wiredtiger/lang/java/src/com/wiredtiger/db/WiredTigerException.java
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/lang/java/src/com/wiredtiger/db/WiredTigerPackingException.java b/src/third_party/wiredtiger/lang/java/src/com/wiredtiger/db/WiredTigerPackingException.java
index 73d279f9e85..245acc86240 100644
--- a/src/third_party/wiredtiger/lang/java/src/com/wiredtiger/db/WiredTigerPackingException.java
+++ b/src/third_party/wiredtiger/lang/java/src/com/wiredtiger/db/WiredTigerPackingException.java
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/lang/java/src/com/wiredtiger/db/WiredTigerPanicException.java b/src/third_party/wiredtiger/lang/java/src/com/wiredtiger/db/WiredTigerPanicException.java
index 4d82ad3d5df..8baf6eea283 100644
--- a/src/third_party/wiredtiger/lang/java/src/com/wiredtiger/db/WiredTigerPanicException.java
+++ b/src/third_party/wiredtiger/lang/java/src/com/wiredtiger/db/WiredTigerPanicException.java
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/lang/java/src/com/wiredtiger/db/WiredTigerRollbackException.java b/src/third_party/wiredtiger/lang/java/src/com/wiredtiger/db/WiredTigerRollbackException.java
index 84c7e0803a3..b322c2a2608 100644
--- a/src/third_party/wiredtiger/lang/java/src/com/wiredtiger/db/WiredTigerRollbackException.java
+++ b/src/third_party/wiredtiger/lang/java/src/com/wiredtiger/db/WiredTigerRollbackException.java
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/lang/java/wiredtiger.i b/src/third_party/wiredtiger/lang/java/wiredtiger.i
index 4c22a0af43b..dfac0e9ec8d 100644
--- a/src/third_party/wiredtiger/lang/java/wiredtiger.i
+++ b/src/third_party/wiredtiger/lang/java/wiredtiger.i
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/lang/python/setup.py b/src/third_party/wiredtiger/lang/python/setup.py
index c88b268fcff..2f86785d511 100644
--- a/src/third_party/wiredtiger/lang/python/setup.py
+++ b/src/third_party/wiredtiger/lang/python/setup.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/lang/python/setup_pip.py b/src/third_party/wiredtiger/lang/python/setup_pip.py
index 2ddca407e6b..9aa263c8ac9 100644
--- a/src/third_party/wiredtiger/lang/python/setup_pip.py
+++ b/src/third_party/wiredtiger/lang/python/setup_pip.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/lang/python/wiredtiger.i b/src/third_party/wiredtiger/lang/python/wiredtiger.i
index 3571b885ec2..0c95be87c1b 100644
--- a/src/third_party/wiredtiger/lang/python/wiredtiger.i
+++ b/src/third_party/wiredtiger/lang/python/wiredtiger.i
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/lang/python/wiredtiger/fpacking.py b/src/third_party/wiredtiger/lang/python/wiredtiger/fpacking.py
index 8ae4c1cf99f..a8be044e748 100644
--- a/src/third_party/wiredtiger/lang/python/wiredtiger/fpacking.py
+++ b/src/third_party/wiredtiger/lang/python/wiredtiger/fpacking.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/lang/python/wiredtiger/intpacking.py b/src/third_party/wiredtiger/lang/python/wiredtiger/intpacking.py
index ed1f00ceb37..c8ee61a37a8 100644
--- a/src/third_party/wiredtiger/lang/python/wiredtiger/intpacking.py
+++ b/src/third_party/wiredtiger/lang/python/wiredtiger/intpacking.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/lang/python/wiredtiger/packing.py b/src/third_party/wiredtiger/lang/python/wiredtiger/packing.py
index fb674538b76..604b437995b 100644
--- a/src/third_party/wiredtiger/lang/python/wiredtiger/packing.py
+++ b/src/third_party/wiredtiger/lang/python/wiredtiger/packing.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/lang/python/wiredtiger/pip_init.py b/src/third_party/wiredtiger/lang/python/wiredtiger/pip_init.py
index 71c35fabd57..593c41da357 100644
--- a/src/third_party/wiredtiger/lang/python/wiredtiger/pip_init.py
+++ b/src/third_party/wiredtiger/lang/python/wiredtiger/pip_init.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/src/async/async_api.c b/src/third_party/wiredtiger/src/async/async_api.c
index 0152238456d..db755db198a 100644
--- a/src/third_party/wiredtiger/src/async/async_api.c
+++ b/src/third_party/wiredtiger/src/async/async_api.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/async/async_op.c b/src/third_party/wiredtiger/src/async/async_op.c
index dc8a3cdf348..13b2f9ba64f 100644
--- a/src/third_party/wiredtiger/src/async/async_op.c
+++ b/src/third_party/wiredtiger/src/async/async_op.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/async/async_worker.c b/src/third_party/wiredtiger/src/async/async_worker.c
index 48961da9e42..6dfddced8e7 100644
--- a/src/third_party/wiredtiger/src/async/async_worker.c
+++ b/src/third_party/wiredtiger/src/async/async_worker.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/block/block_addr.c b/src/third_party/wiredtiger/src/block/block_addr.c
index 6a016776175..2ead0e229bc 100644
--- a/src/third_party/wiredtiger/src/block/block_addr.c
+++ b/src/third_party/wiredtiger/src/block/block_addr.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/block/block_ckpt.c b/src/third_party/wiredtiger/src/block/block_ckpt.c
index a7088e31c60..55df1527e98 100644
--- a/src/third_party/wiredtiger/src/block/block_ckpt.c
+++ b/src/third_party/wiredtiger/src/block/block_ckpt.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/block/block_compact.c b/src/third_party/wiredtiger/src/block/block_compact.c
index fa74f1dbb3d..9c85250d8bd 100644
--- a/src/third_party/wiredtiger/src/block/block_compact.c
+++ b/src/third_party/wiredtiger/src/block/block_compact.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/block/block_ext.c b/src/third_party/wiredtiger/src/block/block_ext.c
index c8d8bc3032f..3995fdb4c94 100644
--- a/src/third_party/wiredtiger/src/block/block_ext.c
+++ b/src/third_party/wiredtiger/src/block/block_ext.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/block/block_map.c b/src/third_party/wiredtiger/src/block/block_map.c
index 847f2393043..5973693fc2d 100644
--- a/src/third_party/wiredtiger/src/block/block_map.c
+++ b/src/third_party/wiredtiger/src/block/block_map.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/block/block_mgr.c b/src/third_party/wiredtiger/src/block/block_mgr.c
index a2a3fd922a8..a2790863961 100644
--- a/src/third_party/wiredtiger/src/block/block_mgr.c
+++ b/src/third_party/wiredtiger/src/block/block_mgr.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/block/block_open.c b/src/third_party/wiredtiger/src/block/block_open.c
index 5f2ab947acb..7c7e0e5c525 100644
--- a/src/third_party/wiredtiger/src/block/block_open.c
+++ b/src/third_party/wiredtiger/src/block/block_open.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/block/block_read.c b/src/third_party/wiredtiger/src/block/block_read.c
index 86b0cad13db..cd419566e40 100644
--- a/src/third_party/wiredtiger/src/block/block_read.c
+++ b/src/third_party/wiredtiger/src/block/block_read.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/block/block_session.c b/src/third_party/wiredtiger/src/block/block_session.c
index 7f757e16e17..a439e1724b1 100644
--- a/src/third_party/wiredtiger/src/block/block_session.c
+++ b/src/third_party/wiredtiger/src/block/block_session.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/block/block_slvg.c b/src/third_party/wiredtiger/src/block/block_slvg.c
index ece8eccf8e1..82a5d6f414d 100644
--- a/src/third_party/wiredtiger/src/block/block_slvg.c
+++ b/src/third_party/wiredtiger/src/block/block_slvg.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/block/block_vrfy.c b/src/third_party/wiredtiger/src/block/block_vrfy.c
index 0d8c952721d..98791131a9c 100644
--- a/src/third_party/wiredtiger/src/block/block_vrfy.c
+++ b/src/third_party/wiredtiger/src/block/block_vrfy.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/block/block_write.c b/src/third_party/wiredtiger/src/block/block_write.c
index 4344cb8497d..db9141a654f 100644
--- a/src/third_party/wiredtiger/src/block/block_write.c
+++ b/src/third_party/wiredtiger/src/block/block_write.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/bloom/bloom.c b/src/third_party/wiredtiger/src/bloom/bloom.c
index 6f4050b3eb6..edc68169365 100644
--- a/src/third_party/wiredtiger/src/bloom/bloom.c
+++ b/src/third_party/wiredtiger/src/bloom/bloom.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/btree/bt_compact.c b/src/third_party/wiredtiger/src/btree/bt_compact.c
index 63015312232..0a11f40d6d4 100644
--- a/src/third_party/wiredtiger/src/btree/bt_compact.c
+++ b/src/third_party/wiredtiger/src/btree/bt_compact.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/btree/bt_curnext.c b/src/third_party/wiredtiger/src/btree/bt_curnext.c
index a5fb19a20e7..6737af9996b 100644
--- a/src/third_party/wiredtiger/src/btree/bt_curnext.c
+++ b/src/third_party/wiredtiger/src/btree/bt_curnext.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
@@ -136,8 +136,9 @@ new_page: if (cbt->ins == NULL)
__cursor_set_recno(cbt, WT_INSERT_RECNO(cbt->ins));
if ((upd = __wt_txn_read(session, cbt->ins->upd)) == NULL)
continue;
- if (upd->type == WT_UPDATE_DELETED) {
- if (__wt_txn_upd_visible_all(session, upd))
+ if (upd->type == WT_UPDATE_TOMBSTONE) {
+ if (upd->txnid != WT_TXN_NONE &&
+ __wt_txn_upd_visible_all(session, upd))
++cbt->page_deleted_count;
continue;
}
@@ -195,8 +196,9 @@ new_page: /* Find the matching WT_COL slot. */
upd = cbt->ins == NULL ?
NULL : __wt_txn_read(session, cbt->ins->upd);
if (upd != NULL) {
- if (upd->type == WT_UPDATE_DELETED) {
- if (__wt_txn_upd_visible_all(session, upd))
+ if (upd->type == WT_UPDATE_TOMBSTONE) {
+ if (upd->txnid != WT_TXN_NONE &&
+ __wt_txn_upd_visible_all(session, upd))
++cbt->page_deleted_count;
continue;
}
@@ -311,8 +313,9 @@ __cursor_row_next(WT_CURSOR_BTREE *cbt, bool newpage)
new_insert: if ((ins = cbt->ins) != NULL) {
if ((upd = __wt_txn_read(session, ins->upd)) == NULL)
continue;
- if (upd->type == WT_UPDATE_DELETED) {
- if (__wt_txn_upd_visible_all(session, upd))
+ if (upd->type == WT_UPDATE_TOMBSTONE) {
+ if (upd->txnid != WT_TXN_NONE &&
+ __wt_txn_upd_visible_all(session, upd))
++cbt->page_deleted_count;
continue;
}
@@ -342,8 +345,9 @@ new_insert: if ((ins = cbt->ins) != NULL) {
cbt->slot = cbt->row_iteration_slot / 2 - 1;
rip = &page->pg_row[cbt->slot];
upd = __wt_txn_read(session, WT_ROW_UPDATE(page, rip));
- if (upd != NULL && upd->type == WT_UPDATE_DELETED) {
- if (__wt_txn_upd_visible_all(session, upd))
+ if (upd != NULL && upd->type == WT_UPDATE_TOMBSTONE) {
+ if (upd->txnid != WT_TXN_NONE &&
+ __wt_txn_upd_visible_all(session, upd))
++cbt->page_deleted_count;
continue;
}
@@ -417,9 +421,10 @@ __cursor_key_order_check_row(
WT_PANIC_ERR(session, EINVAL,
"WT_CURSOR.%s out-of-order returns: returned key %s then key %s",
next ? "next" : "prev",
- __wt_buf_set_printable(
- session, cbt->lastkey->data, cbt->lastkey->size, a),
- __wt_buf_set_printable(session, key->data, key->size, b));
+ __wt_buf_set_printable_format(session,
+ cbt->lastkey->data, cbt->lastkey->size, btree->key_format, a),
+ __wt_buf_set_printable_format(session,
+ key->data, key->size, btree->key_format, b));
err: __wt_scr_free(session, &a);
__wt_scr_free(session, &b);
diff --git a/src/third_party/wiredtiger/src/btree/bt_curprev.c b/src/third_party/wiredtiger/src/btree/bt_curprev.c
index 50a755f1431..068a9915ab9 100644
--- a/src/third_party/wiredtiger/src/btree/bt_curprev.c
+++ b/src/third_party/wiredtiger/src/btree/bt_curprev.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
@@ -282,8 +282,9 @@ new_page: if (cbt->ins == NULL)
__cursor_set_recno(cbt, WT_INSERT_RECNO(cbt->ins));
if ((upd = __wt_txn_read(session, cbt->ins->upd)) == NULL)
continue;
- if (upd->type == WT_UPDATE_DELETED) {
- if (__wt_txn_upd_visible_all(session, upd))
+ if (upd->type == WT_UPDATE_TOMBSTONE) {
+ if (upd->txnid != WT_TXN_NONE &&
+ __wt_txn_upd_visible_all(session, upd))
++cbt->page_deleted_count;
continue;
}
@@ -342,8 +343,9 @@ new_page: if (cbt->recno < cbt->ref->ref_recno)
upd = cbt->ins == NULL ?
NULL : __wt_txn_read(session, cbt->ins->upd);
if (upd != NULL) {
- if (upd->type == WT_UPDATE_DELETED) {
- if (__wt_txn_upd_visible_all(session, upd))
+ if (upd->type == WT_UPDATE_TOMBSTONE) {
+ if (upd->txnid != WT_TXN_NONE &&
+ __wt_txn_upd_visible_all(session, upd))
++cbt->page_deleted_count;
continue;
}
@@ -468,8 +470,9 @@ __cursor_row_prev(WT_CURSOR_BTREE *cbt, bool newpage)
new_insert: if ((ins = cbt->ins) != NULL) {
if ((upd = __wt_txn_read(session, ins->upd)) == NULL)
continue;
- if (upd->type == WT_UPDATE_DELETED) {
- if (__wt_txn_upd_visible_all(session, upd))
+ if (upd->type == WT_UPDATE_TOMBSTONE) {
+ if (upd->txnid != WT_TXN_NONE &&
+ __wt_txn_upd_visible_all(session, upd))
++cbt->page_deleted_count;
continue;
}
@@ -501,8 +504,9 @@ new_insert: if ((ins = cbt->ins) != NULL) {
cbt->slot = cbt->row_iteration_slot / 2 - 1;
rip = &page->pg_row[cbt->slot];
upd = __wt_txn_read(session, WT_ROW_UPDATE(page, rip));
- if (upd != NULL && upd->type == WT_UPDATE_DELETED) {
- if (__wt_txn_upd_visible_all(session, upd))
+ if (upd != NULL && upd->type == WT_UPDATE_TOMBSTONE) {
+ if (upd->txnid != WT_TXN_NONE &&
+ __wt_txn_upd_visible_all(session, upd))
++cbt->page_deleted_count;
continue;
}
diff --git a/src/third_party/wiredtiger/src/btree/bt_cursor.c b/src/third_party/wiredtiger/src/btree/bt_cursor.c
index e5d5e64194f..a329e09a0c2 100644
--- a/src/third_party/wiredtiger/src/btree/bt_cursor.c
+++ b/src/third_party/wiredtiger/src/btree/bt_cursor.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
@@ -55,15 +55,38 @@ __cursor_state_restore(WT_CURSOR *cursor, WT_CURFILE_STATE *state)
* Return if we have a page pinned.
*/
static inline bool
-__cursor_page_pinned(WT_CURSOR_BTREE *cbt, bool eviction_ok)
+__cursor_page_pinned(WT_CURSOR_BTREE *cbt)
{
+ WT_CURSOR *cursor;
+
+ cursor = &cbt->iface;
+
+ /*
+ * Check the page active flag, asserting the page reference with any
+ * external key.
+ */
+ if (!F_ISSET(cbt, WT_CBT_ACTIVE)) {
+ WT_ASSERT((WT_SESSION_IMPL *)cursor->session,
+ cbt->ref == NULL && !F_ISSET(cursor, WT_CURSTD_KEY_INT));
+ return (false);
+ }
+
+ /*
+ * Check if the key references the page. When returning from search,
+ * the page is active and the key is internal. After the application
+ * sets a key, the key is external, and the page is useless.
+ */
+ if (!F_ISSET(cursor, WT_CURSTD_KEY_INT))
+ return (false);
+
/*
- * Optionally fail the page-pinned test when the page is flagged for
- * forced eviction (so we periodically release pages grown too large).
- * The test is optional as not all callers can release pinned pages.
+ * Fail if the page is flagged for forced eviction (so we periodically
+ * release pages grown too large).
*/
- return (F_ISSET(cbt, WT_CBT_ACTIVE) &&
- (!eviction_ok || cbt->ref->page->read_gen != WT_READGEN_OLDEST));
+ if (cbt->ref->page->read_gen == WT_READGEN_OLDEST)
+ return (false);
+
+ return (true);
}
/*
@@ -146,7 +169,7 @@ __cursor_disable_bulk(WT_SESSION_IMPL *session, WT_BTREE *btree)
* __cursor_fix_implicit --
* Return if search went past the end of the tree.
*/
-static inline int
+static inline bool
__cursor_fix_implicit(WT_BTREE *btree, WT_CURSOR_BTREE *cbt)
{
/*
@@ -229,7 +252,7 @@ __wt_cursor_valid(WT_CURSOR_BTREE *cbt, WT_UPDATE **updp)
*/
if (cbt->ins != NULL &&
(upd = __wt_txn_read(session, cbt->ins->upd)) != NULL) {
- if (upd->type == WT_UPDATE_DELETED)
+ if (upd->type == WT_UPDATE_TOMBSTONE)
return (false);
if (updp != NULL)
*updp = upd;
@@ -302,7 +325,7 @@ __wt_cursor_valid(WT_CURSOR_BTREE *cbt, WT_UPDATE **updp)
page->modify->mod_row_update != NULL &&
(upd = __wt_txn_read(session,
page->modify->mod_row_update[cbt->slot])) != NULL) {
- if (upd->type == WT_UPDATE_DELETED)
+ if (upd->type == WT_UPDATE_TOMBSTONE)
return (false);
if (updp != NULL)
*updp = upd;
@@ -468,7 +491,7 @@ __wt_btcur_search(WT_CURSOR_BTREE *cbt)
* from the root.
*/
valid = false;
- if (__cursor_page_pinned(cbt, true)) {
+ if (__cursor_page_pinned(cbt)) {
__wt_txn_cursor_op(session);
WT_ERR(btree->type == BTREE_ROW ?
@@ -565,7 +588,7 @@ __wt_btcur_search_near(WT_CURSOR_BTREE *cbt, int *exactp)
* existing record.
*/
valid = false;
- if (btree->type == BTREE_ROW && __cursor_page_pinned(cbt, true)) {
+ if (btree->type == BTREE_ROW && __cursor_page_pinned(cbt)) {
__wt_txn_cursor_op(session);
WT_ERR(__cursor_row_search(session, cbt, cbt->ref, true));
@@ -691,14 +714,12 @@ __wt_btcur_insert(WT_CURSOR_BTREE *cbt)
/*
* If inserting with overwrite configured, and positioned to an on-page
- * key, the update doesn't require another search. The cursor won't be
- * positioned on a page with an external key set, but be sure. Cursors
- * configured for append aren't included, regardless of whether or not
- * they meet all other criteria.
+ * key, the update doesn't require another search. Cursors configured
+ * for append aren't included, regardless of whether or not they meet
+ * all other criteria.
*/
- if (__cursor_page_pinned(cbt, true) &&
- F_ISSET_ALL(cursor, WT_CURSTD_KEY_INT | WT_CURSTD_OVERWRITE) &&
- !append_key) {
+ if (__cursor_page_pinned(cbt) &&
+ F_ISSET(cursor, WT_CURSTD_OVERWRITE) && !append_key) {
WT_ERR(__wt_txn_autocommit_check(session));
/*
* The cursor position may not be exact (the cursor's comparison
@@ -771,7 +792,7 @@ retry: WT_ERR(__cursor_func_init(cbt, true));
WT_ERR(__cursor_col_modify(session, cbt, WT_UPDATE_STANDARD));
if (append_key)
- cbt->iface.recno = cbt->recno;
+ cursor->recno = cbt->recno;
}
err: if (ret == WT_RESTART) {
@@ -784,7 +805,7 @@ done: /* Insert doesn't maintain a position across calls, clear resources. */
if (ret == 0) {
F_CLR(cursor, WT_CURSTD_KEY_SET | WT_CURSTD_VALUE_SET);
if (append_key)
- F_SET(cursor, WT_CURSTD_KEY_INT);
+ F_SET(cursor, WT_CURSTD_KEY_EXT);
}
WT_TRET(__cursor_reset(cbt));
if (ret != 0)
@@ -884,12 +905,12 @@ err: if (ret == WT_RESTART) {
int
__wt_btcur_remove(WT_CURSOR_BTREE *cbt)
{
+ enum { NO_POSITION, POSITIONED, SEARCH_POSITION } positioned;
WT_BTREE *btree;
WT_CURFILE_STATE state;
WT_CURSOR *cursor;
WT_DECL_RET;
WT_SESSION_IMPL *session;
- bool positioned;
btree = cbt->btree;
cursor = &cbt->iface;
@@ -902,8 +923,27 @@ __wt_btcur_remove(WT_CURSOR_BTREE *cbt)
/*
* WT_CURSOR.remove has a unique semantic, the cursor stays positioned
* if it starts positioned, otherwise clear the cursor on completion.
+ *
+ * However, if we unpin the page (because the page is in WT_REF_LIMBO or
+ * it was selected for forcible eviction), and every item on the page is
+ * deleted, eviction can delete the page and our subsequent search will
+ * re-instantiate an empty page for us, with no key/value pairs. Cursor
+ * remove will search that page and return not-found, which is OK unless
+ * cursor-overwrite is configured (which causes cursor remove to return
+ * success even if there's no item to delete). In that case, we're
+ * supposed to return a positioned cursor, but there's nothing to which
+ * we can position, and we'll fail attempting to point the cursor at the
+ * key on the page to satisfy the positioned requirement.
+ *
+ * Do the best we can: If we start with a positioned cursor, and we let
+ * go of our pinned page, reset our state to use the search position,
+ * that is, use a successful search to return to a "positioned" state.
+ * If we start with a positioned cursor, let go of our pinned page, and
+ * the search fails, leave the cursor's key set so the cursor appears
+ * positioned to the application.
*/
- positioned = F_ISSET(cursor, WT_CURSTD_KEY_INT);
+ positioned =
+ F_ISSET(cursor, WT_CURSTD_KEY_INT) ? POSITIONED : NO_POSITION;
/* Save the cursor state. */
__cursor_state_save(cursor, &state);
@@ -912,9 +952,7 @@ __wt_btcur_remove(WT_CURSOR_BTREE *cbt)
* If remove positioned to an on-page key, the remove doesn't require
* another search. We don't care about the "overwrite" configuration
* because regardless of the overwrite setting, any existing record is
- * removed, and the record must exist with a positioned cursor. The
- * cursor won't be positioned on a page with an external key set, but
- * be sure.
+ * removed, and the record must exist with a positioned cursor.
*
* There's trickiness in the page-pinned check. By definition a remove
* operation leaves a cursor positioned if it's initially positioned.
@@ -929,8 +967,7 @@ __wt_btcur_remove(WT_CURSOR_BTREE *cbt)
* that's all a positioned cursor implies), but it's probably safer to
* avoid page eviction entirely in the positioned case.
*/
- if (__cursor_page_pinned(cbt, !positioned) &&
- F_ISSET(cursor, WT_CURSTD_KEY_INT)) {
+ if (__cursor_page_pinned(cbt)) {
WT_ERR(__wt_txn_autocommit_check(session));
/*
@@ -940,8 +977,8 @@ __wt_btcur_remove(WT_CURSOR_BTREE *cbt)
*/
cbt->compare = 0;
ret = btree->type == BTREE_ROW ?
- __cursor_row_modify(session, cbt, WT_UPDATE_DELETED) :
- __cursor_col_modify(session, cbt, WT_UPDATE_DELETED);
+ __cursor_row_modify(session, cbt, WT_UPDATE_TOMBSTONE) :
+ __cursor_col_modify(session, cbt, WT_UPDATE_TOMBSTONE);
if (ret == 0)
goto done;
@@ -959,6 +996,9 @@ __wt_btcur_remove(WT_CURSOR_BTREE *cbt)
goto err;
}
+ if (positioned == POSITIONED)
+ positioned = SEARCH_POSITION;
+
/*
* The pinned page goes away if we do a search, get a local copy of any
* pinned key and discard any value (remove discards any previous
@@ -980,7 +1020,7 @@ retry: WT_ERR(__cursor_func_init(cbt, true));
if (cbt->compare != 0 || !__wt_cursor_valid(cbt, NULL))
WT_ERR(WT_NOTFOUND);
- ret = __cursor_row_modify(session, cbt, WT_UPDATE_DELETED);
+ ret = __cursor_row_modify(session, cbt, WT_UPDATE_TOMBSTONE);
} else {
WT_ERR(__cursor_col_search(session, cbt, NULL));
@@ -1008,7 +1048,7 @@ retry: WT_ERR(__cursor_func_init(cbt, true));
cbt->recno = cursor->recno;
} else
ret = __cursor_col_modify(
- session, cbt, WT_UPDATE_DELETED);
+ session, cbt, WT_UPDATE_TOMBSTONE);
}
err: if (ret == WT_RESTART) {
@@ -1024,19 +1064,37 @@ err: if (ret == WT_RESTART) {
if (F_ISSET(cursor, WT_CURSTD_OVERWRITE) && ret == WT_NOTFOUND)
ret = 0;
-done: /*
- * If the cursor was positioned, it stays positioned, point the cursor
- * at an internal copy of the key. Otherwise, there's no position or
- * key/value.
- */
- if (ret == 0)
- F_CLR(cursor, WT_CURSTD_KEY_SET | WT_CURSTD_VALUE_SET);
- if (ret == 0 && positioned)
- WT_TRET(__wt_key_return(session, cbt));
- else
+done: if (ret == 0) {
+ F_CLR(cursor, WT_CURSTD_VALUE_SET);
+ switch (positioned) {
+ case NO_POSITION:
+ /*
+ * Never positioned and we leave it that way, clear any
+ * key and reset the cursor.
+ */
+ F_CLR(cursor, WT_CURSTD_KEY_SET);
+ WT_TRET(__cursor_reset(cbt));
+ break;
+ case POSITIONED:
+ /*
+ * Positioned and we used the pinned page, leave the key
+ * alone, whatever it is.
+ */
+ break;
+ case SEARCH_POSITION:
+ /*
+ * Positioned and we did a search anyway, get a key to
+ * return.
+ */
+ WT_TRET(__wt_key_return(session, cbt));
+ break;
+ }
+ }
+
+ if (ret != 0) {
WT_TRET(__cursor_reset(cbt));
- if (ret != 0)
__cursor_state_restore(cursor, &state);
+ }
return (ret);
}
@@ -1068,12 +1126,9 @@ __btcur_update(WT_CURSOR_BTREE *cbt, WT_ITEM *value, u_int modify_type)
* If update positioned to an on-page key, the update doesn't require
* another search. We don't care about the "overwrite" configuration
* because regardless of the overwrite setting, any existing record is
- * updated, and the record must exist with a positioned cursor. The
- * cursor won't be positioned on a page with an external key set, but
- * be sure.
+ * updated, and the record must exist with a positioned cursor.
*/
- if (__cursor_page_pinned(cbt, true) &&
- F_ISSET(cursor, WT_CURSTD_KEY_INT)) {
+ if (__cursor_page_pinned(cbt)) {
WT_ERR(__wt_txn_autocommit_check(session));
/*
@@ -1168,20 +1223,21 @@ done: if (ret == 0)
WT_TRET(__cursor_kv_return(
session, cbt, cbt->modify_update));
break;
- case WT_UPDATE_RESERVED:
+ case WT_UPDATE_RESERVE:
/*
* WT_CURSOR.reserve doesn't return any value.
*/
F_CLR(cursor, WT_CURSTD_VALUE_SET);
/* FALLTHROUGH */
- case WT_UPDATE_MODIFIED:
+ case WT_UPDATE_MODIFY:
/*
* WT_CURSOR.modify has already created the return value
* and our job is to leave it untouched.
*/
WT_TRET(__wt_key_return(session, cbt));
break;
- case WT_UPDATE_DELETED:
+ case WT_UPDATE_BIRTHMARK:
+ case WT_UPDATE_TOMBSTONE:
default:
WT_TRET(__wt_illegal_value(session, NULL));
break;
@@ -1268,8 +1324,7 @@ __wt_btcur_modify(WT_CURSOR_BTREE *cbt, WT_MODIFY *entries, int nentries)
WT_ERR(__wt_btcur_search(cbt));
orig = cursor->value.size;
- WT_ERR(__wt_modify_apply_api(
- session, &cursor->value, entries, nentries));
+ WT_ERR(__wt_modify_apply_api(session, cursor, entries, nentries));
new = cursor->value.size;
WT_ERR(__cursor_size_chk(session, &cursor->value));
if (new > orig)
@@ -1290,7 +1345,7 @@ __wt_btcur_modify(WT_CURSOR_BTREE *cbt, WT_MODIFY *entries, int nentries)
ret = __btcur_update(cbt, &cursor->value, WT_UPDATE_STANDARD);
else if ((ret =
__wt_modify_pack(session, &modify, entries, nentries)) == 0)
- ret = __btcur_update(cbt, modify, WT_UPDATE_MODIFIED);
+ ret = __btcur_update(cbt, modify, WT_UPDATE_MODIFY);
if (overwrite)
F_SET(cursor, WT_CURSTD_OVERWRITE);
@@ -1330,7 +1385,7 @@ __wt_btcur_reserve(WT_CURSOR_BTREE *cbt)
/* WT_CURSOR.reserve is update-without-overwrite and a special value. */
overwrite = F_ISSET(cursor, WT_CURSTD_OVERWRITE);
F_CLR(cursor, WT_CURSTD_OVERWRITE);
- ret = __btcur_update(cbt, &cursor->value, WT_UPDATE_RESERVED);
+ ret = __btcur_update(cbt, &cursor->value, WT_UPDATE_RESERVE);
if (overwrite)
F_SET(cursor, WT_CURSTD_OVERWRITE);
return (ret);
@@ -1510,7 +1565,7 @@ retry: WT_RET(__wt_btcur_search(start));
F_MASK((WT_CURSOR *)start, WT_CURSTD_KEY_SET) == WT_CURSTD_KEY_INT);
for (;;) {
- if ((ret = rmfunc(session, start, WT_UPDATE_DELETED)) != 0)
+ if ((ret = rmfunc(session, start, WT_UPDATE_TOMBSTONE)) != 0)
break;
if (stop != NULL && __cursor_equals(start, stop))
@@ -1568,7 +1623,7 @@ retry: WT_RET(__wt_btcur_search(start));
for (;;) {
value = (const uint8_t *)start->iface.value.data;
if (*value != 0 &&
- (ret = rmfunc(session, start, WT_UPDATE_DELETED)) != 0)
+ (ret = rmfunc(session, start, WT_UPDATE_TOMBSTONE)) != 0)
break;
if (stop != NULL && __cursor_equals(start, stop))
diff --git a/src/third_party/wiredtiger/src/btree/bt_debug.c b/src/third_party/wiredtiger/src/btree/bt_debug.c
index 97dd15b963b..325aec853e5 100644
--- a/src/third_party/wiredtiger/src/btree/bt_debug.c
+++ b/src/third_party/wiredtiger/src/btree/bt_debug.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
@@ -16,9 +16,6 @@ typedef struct __wt_dbg WT_DBG;
struct __wt_dbg {
WT_SESSION_IMPL *session; /* Enclosing session */
- bool integer_key; /* Integer key formats */
- bool unsigned_key;
-
/*
* When using the standard event handlers, the debugging output has to
* do its own message handling because its output isn't line-oriented.
@@ -29,6 +26,9 @@ struct __wt_dbg {
int (*f)(WT_DBG *, const char *, ...) /* Function to write */
WT_GCC_FUNC_DECL_ATTRIBUTE((format (printf, 2, 3)));
+ const char *key_format;
+ const char *value_format;
+
WT_ITEM *tmp; /* Temporary space */
};
@@ -124,25 +124,24 @@ __debug_item(WT_DBG *ds, const char *tag, const void *data_arg, size_t size)
static int
__debug_item_key(WT_DBG *ds, const char *tag, const void *data_arg, size_t size)
{
- uint64_t ukey;
- int64_t ikey;
- const uint8_t *p;
-
- if (ds->integer_key) {
- p = data_arg;
- WT_RET(__wt_vunpack_int(&p, 0, &ikey));
- WT_RET(ds->f(ds, "\t%s%s{%" PRId64 "}\n",
- tag == NULL ? "" : tag, tag == NULL ? "" : " ", ikey));
- return (0);
- }
- if (ds->unsigned_key) {
- p = data_arg;
- WT_RET(__wt_vunpack_uint(&p, 0, &ukey));
- WT_RET(ds->f(ds, "\t%s%s{%" PRIu64 "}\n",
- tag == NULL ? "" : tag, tag == NULL ? "" : " ", ukey));
- return (0);
- }
- return (__debug_item(ds, tag, data_arg, size));
+ return (ds->f(ds, "\t%s%s{%s}\n",
+ tag == NULL ? "" : tag, tag == NULL ? "" : " ",
+ __wt_buf_set_printable_format(
+ ds->session, data_arg, size, ds->key_format, ds->tmp)));
+}
+
+/*
+ * __debug_item_value --
+ * Dump a single data/size value item, with an optional tag.
+ */
+static int
+__debug_item_value(
+ WT_DBG *ds, const char *tag, const void *data_arg, size_t size)
+{
+ return (ds->f(ds, "\t%s%s{%s}\n",
+ tag == NULL ? "" : tag, tag == NULL ? "" : " ",
+ __wt_buf_set_printable_format(
+ ds->session, data_arg, size, ds->value_format, ds->tmp)));
}
/*
@@ -247,12 +246,8 @@ __debug_config(WT_SESSION_IMPL *session, WT_DBG *ds, const char *ofile)
}
btree = S2BT_SAFE(session);
- ds->integer_key = btree != NULL &&
- strchr("hilq", btree->key_format[0]) != NULL &&
- btree->key_format[1] == '\0';
- ds->unsigned_key = btree != NULL &&
- strchr("HILQr", btree->key_format[0]) != NULL &&
- btree->key_format[1] == '\0';
+ ds->key_format = btree->key_format;
+ ds->value_format = btree->value_format;
return (0);
}
@@ -1064,11 +1059,11 @@ __debug_row_skip(WT_DBG *ds, WT_INSERT_HEAD *head)
}
/*
- * __debug_modified --
- * Dump a modified update.
+ * __debug_modify --
+ * Dump a modify update.
*/
static int
-__debug_modified(WT_DBG *ds, WT_UPDATE *upd)
+__debug_modify(WT_DBG *ds, WT_UPDATE *upd)
{
size_t nentries, data_size, offset, size;
const size_t *p;
@@ -1103,16 +1098,19 @@ __debug_update(WT_DBG *ds, WT_UPDATE *upd, bool hexbyte)
{
for (; upd != NULL; upd = upd->next) {
switch (upd->type) {
- case WT_UPDATE_DELETED:
- WT_RET(ds->f(ds, "\tvalue {deleted}\n"));
+ case WT_UPDATE_INVALID:
+ WT_RET(ds->f(ds, "\tvalue {invalid}\n"));
+ break;
+ case WT_UPDATE_BIRTHMARK:
+ WT_RET(ds->f(ds, "\tvalue {birthmark}\n"));
break;
- case WT_UPDATE_MODIFIED:
- WT_RET(ds->f(ds, "\tvalue {modified: "));
- WT_RET(__debug_modified(ds, upd));
+ case WT_UPDATE_MODIFY:
+ WT_RET(ds->f(ds, "\tvalue {modify: "));
+ WT_RET(__debug_modify(ds, upd));
WT_RET(ds->f(ds, "}\n"));
break;
- case WT_UPDATE_RESERVED:
- WT_RET(ds->f(ds, "\tvalue {reserved}\n"));
+ case WT_UPDATE_RESERVE:
+ WT_RET(ds->f(ds, "\tvalue {reserve}\n"));
break;
case WT_UPDATE_STANDARD:
if (hexbyte) {
@@ -1120,9 +1118,12 @@ __debug_update(WT_DBG *ds, WT_UPDATE *upd, bool hexbyte)
WT_RET(__debug_hex_byte(ds, *upd->data));
WT_RET(ds->f(ds, "}\n"));
} else
- WT_RET(__debug_item(ds,
+ WT_RET(__debug_item_value(ds,
"value", upd->data, upd->size));
break;
+ case WT_UPDATE_TOMBSTONE:
+ WT_RET(ds->f(ds, "\tvalue {tombstone}\n"));
+ break;
}
if (upd->txnid == WT_TXN_ABORTED)
WT_RET(ds->f(ds, "\t" "txn aborted"));
@@ -1288,10 +1289,8 @@ __debug_cell_data(WT_DBG *ds,
* Column-store references to deleted cells return a NULL cell
* reference.
*/
- if (unpack == NULL) {
- WT_RET(__debug_item(ds, tag, "deleted", strlen("deleted")));
- return (0);
- }
+ if (unpack == NULL)
+ return (__debug_item(ds, tag, "deleted", strlen("deleted")));
switch (unpack->raw) {
case WT_CELL_ADDR_DEL:
@@ -1302,28 +1301,32 @@ __debug_cell_data(WT_DBG *ds,
case WT_CELL_KEY_OVFL_RM:
case WT_CELL_VALUE_OVFL_RM:
p = __wt_cell_type_string(unpack->raw);
- WT_RET(__debug_item(ds, tag, p, strlen(p)));
- break;
+ return (__debug_item(ds, tag, p, strlen(p)));
+ }
+
+ WT_RET(__wt_scr_alloc(session, 256, &buf));
+ WT_ERR(page == NULL ?
+ __wt_dsk_cell_data_ref(session, page_type, unpack, buf) :
+ __wt_page_cell_data_ref(session, page, unpack, buf));
+
+ switch (unpack->raw) {
case WT_CELL_KEY:
case WT_CELL_KEY_OVFL:
case WT_CELL_KEY_PFX:
case WT_CELL_KEY_SHORT:
case WT_CELL_KEY_SHORT_PFX:
+ WT_ERR(__debug_item_key(ds, tag, buf->data, buf->size));
+ break;
case WT_CELL_VALUE:
case WT_CELL_VALUE_COPY:
case WT_CELL_VALUE_OVFL:
case WT_CELL_VALUE_SHORT:
- WT_RET(__wt_scr_alloc(session, 256, &buf));
- ret = page == NULL ?
- __wt_dsk_cell_data_ref(session, page_type, unpack, buf) :
- __wt_page_cell_data_ref(session, page, unpack, buf);
- if (ret == 0)
- WT_RET(__debug_item(ds, tag, buf->data, buf->size));
- __wt_scr_free(session, &buf);
+ WT_ERR(__debug_item_value(ds, tag, buf->data, buf->size));
break;
- WT_ILLEGAL_VALUE(session);
+ WT_ILLEGAL_VALUE_ERR(session);
}
+err: __wt_scr_free(session, &buf);
return (ret);
}
#endif
diff --git a/src/third_party/wiredtiger/src/btree/bt_delete.c b/src/third_party/wiredtiger/src/btree/bt_delete.c
index 20e592d12bc..ed55491ab38 100644
--- a/src/third_party/wiredtiger/src/btree/bt_delete.c
+++ b/src/third_party/wiredtiger/src/btree/bt_delete.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
@@ -341,7 +341,7 @@ __wt_delete_page_instantiate(WT_SESSION_IMPL *session, WT_REF *ref)
*/
for (i = 0, size = 0; i < page->entries; ++i) {
WT_ERR(__wt_calloc_one(session, &upd));
- upd->type = WT_UPDATE_DELETED;
+ upd->type = WT_UPDATE_TOMBSTONE;
if (page_del == NULL)
upd->txnid = WT_TXN_NONE; /* Globally visible */
diff --git a/src/third_party/wiredtiger/src/btree/bt_discard.c b/src/third_party/wiredtiger/src/btree/bt_discard.c
index 1aae991a407..2ba1c9734b9 100644
--- a/src/third_party/wiredtiger/src/btree/bt_discard.c
+++ b/src/third_party/wiredtiger/src/btree/bt_discard.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/btree/bt_handle.c b/src/third_party/wiredtiger/src/btree/bt_handle.c
index 304a583c6a7..396c5f66539 100644
--- a/src/third_party/wiredtiger/src/btree/bt_handle.c
+++ b/src/third_party/wiredtiger/src/btree/bt_handle.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/btree/bt_huffman.c b/src/third_party/wiredtiger/src/btree/bt_huffman.c
index 7e3b2582097..6d8ea284ab5 100644
--- a/src/third_party/wiredtiger/src/btree/bt_huffman.c
+++ b/src/third_party/wiredtiger/src/btree/bt_huffman.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/btree/bt_io.c b/src/third_party/wiredtiger/src/btree/bt_io.c
index f8d0074879c..3e636ad922d 100644
--- a/src/third_party/wiredtiger/src/btree/bt_io.c
+++ b/src/third_party/wiredtiger/src/btree/bt_io.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
@@ -354,6 +354,7 @@ __wt_bt_write(WT_SESSION_IMPL *session, WT_ITEM *buf,
* configured.
*/
data_checksum = true; /* -Werror=maybe-uninitialized */
+ WT_NOT_READ(data_checksum);
switch (btree->checksum) {
case CKSUM_ON:
data_checksum = true;
@@ -380,7 +381,7 @@ __wt_bt_write(WT_SESSION_IMPL *session, WT_ITEM *buf,
time_stop = __wt_rdtsc(session);
WT_STAT_CONN_INCR(session, cache_write_app_count);
WT_STAT_CONN_INCRV(session, cache_write_app_time,
- WT_TSCDIFF_US(session, time_stop, time_start));
+ WT_TSCDIFF_US(time_stop, time_start));
}
WT_STAT_CONN_INCR(session, cache_write);
diff --git a/src/third_party/wiredtiger/src/btree/bt_misc.c b/src/third_party/wiredtiger/src/btree/bt_misc.c
index 04b607082d1..b1d5a8b0782 100644
--- a/src/third_party/wiredtiger/src/btree/bt_misc.c
+++ b/src/third_party/wiredtiger/src/btree/bt_misc.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/btree/bt_ovfl.c b/src/third_party/wiredtiger/src/btree/bt_ovfl.c
index d65073a398f..ce0ee706923 100644
--- a/src/third_party/wiredtiger/src/btree/bt_ovfl.c
+++ b/src/third_party/wiredtiger/src/btree/bt_ovfl.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/btree/bt_page.c b/src/third_party/wiredtiger/src/btree/bt_page.c
index e2d4fa01fa7..8219ee0d7ed 100644
--- a/src/third_party/wiredtiger/src/btree/bt_page.c
+++ b/src/third_party/wiredtiger/src/btree/bt_page.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/btree/bt_random.c b/src/third_party/wiredtiger/src/btree/bt_random.c
index 268b040bd6e..fd2a2ac7190 100644
--- a/src/third_party/wiredtiger/src/btree/bt_random.c
+++ b/src/third_party/wiredtiger/src/btree/bt_random.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/btree/bt_read.c b/src/third_party/wiredtiger/src/btree/bt_read.c
index 5dfcbf6249c..a98983746e4 100644
--- a/src/third_party/wiredtiger/src/btree/bt_read.c
+++ b/src/third_party/wiredtiger/src/btree/bt_read.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
@@ -386,7 +386,7 @@ __page_read(WT_SESSION_IMPL *session, WT_REF *ref, uint32_t flags)
time_stop = __wt_rdtsc(session);
WT_STAT_CONN_INCR(session, cache_read_app_count);
WT_STAT_CONN_INCRV(session, cache_read_app_time,
- WT_TSCDIFF_US(session, time_stop, time_start));
+ WT_TSCDIFF_US(time_stop, time_start));
}
/*
@@ -680,6 +680,7 @@ read: /*
/* If forced eviction fails, stall. */
if (ret == EBUSY) {
ret = 0;
+ WT_NOT_READ(ret);
WT_STAT_CONN_INCR(session,
page_forcible_evict_blocked);
stalled = true;
diff --git a/src/third_party/wiredtiger/src/btree/bt_rebalance.c b/src/third_party/wiredtiger/src/btree/bt_rebalance.c
index c6d9253b2d3..ed23d8de215 100644
--- a/src/third_party/wiredtiger/src/btree/bt_rebalance.c
+++ b/src/third_party/wiredtiger/src/btree/bt_rebalance.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/btree/bt_ret.c b/src/third_party/wiredtiger/src/btree/bt_ret.c
index b24a4e1db45..d1fc684e208 100644
--- a/src/third_party/wiredtiger/src/btree/bt_ret.c
+++ b/src/third_party/wiredtiger/src/btree/bt_ret.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
@@ -49,7 +49,7 @@ __key_return(WT_SESSION_IMPL *session, WT_CURSOR_BTREE *cbt)
* itself because our caller might do another search in
* this table using the key we return, and we'd corrupt
* the search key during any subsequent search that used
- * the temporary buffer.
+ * the temporary buffer).
*/
tmp = cbt->row_key;
cbt->row_key = cbt->tmp;
@@ -150,6 +150,7 @@ __wt_value_return_upd(WT_SESSION_IMPL *session,
WT_UPDATE **listp, *list[WT_MODIFY_ARRAY_SIZE];
size_t allocated_bytes;
u_int i;
+ bool skipped_birthmark;
cursor = &cbt->iface;
allocated_bytes = 0;
@@ -166,21 +167,33 @@ __wt_value_return_upd(WT_SESSION_IMPL *session,
cursor->value.size = upd->size;
return (0);
}
- WT_ASSERT(session, upd->type == WT_UPDATE_MODIFIED);
+ WT_ASSERT(session, upd->type == WT_UPDATE_MODIFY);
/*
* Find a complete update that's visible to us, tracking modifications
* that are visible to us.
*/
- for (i = 0, listp = list; upd != NULL; upd = upd->next) {
- if (upd->txnid == WT_TXN_ABORTED ||
- (!ignore_visibility && !__wt_txn_upd_visible(session, upd)))
+ for (i = 0, listp = list, skipped_birthmark = false;
+ upd != NULL;
+ upd = upd->next) {
+ if (upd->txnid == WT_TXN_ABORTED)
continue;
+ if (!ignore_visibility && !__wt_txn_upd_visible(session, upd)) {
+ if (upd->type == WT_UPDATE_BIRTHMARK)
+ skipped_birthmark = true;
+ continue;
+ }
+
+ if (upd->type == WT_UPDATE_BIRTHMARK) {
+ upd = NULL;
+ break;
+ }
+
if (WT_UPDATE_DATA_VALUE(upd))
break;
- if (upd->type == WT_UPDATE_MODIFIED) {
+ if (upd->type == WT_UPDATE_MODIFY) {
/*
* Update lists are expected to be short, but it's not
* guaranteed. There's sufficient room on the stack to
@@ -203,7 +216,7 @@ __wt_value_return_upd(WT_SESSION_IMPL *session,
* If we hit the end of the chain, roll forward from the update item we
* found, otherwise, from the original page's value.
*/
- if (upd == NULL) {
+ if (upd == NULL && !skipped_birthmark) {
/*
* Callers of this function set the cursor slot to an impossible
* value to check we're not trying to return on-page values when
@@ -215,15 +228,14 @@ __wt_value_return_upd(WT_SESSION_IMPL *session,
WT_ASSERT(session, cbt->slot != UINT32_MAX);
WT_ERR(__value_return(session, cbt));
- } else if (upd->type == WT_UPDATE_DELETED)
+ } else if (upd->type == WT_UPDATE_TOMBSTONE || skipped_birthmark)
WT_ERR(__wt_buf_set(session, &cursor->value, "", 0));
else
WT_ERR(__wt_buf_set(session,
&cursor->value, upd->data, upd->size));
while (i > 0)
- WT_ERR(__wt_modify_apply(
- session, &cursor->value, listp[--i]->data));
+ WT_ERR(__wt_modify_apply(session, cursor, listp[--i]->data));
err: if (allocated_bytes != 0)
__wt_free(session, listp);
diff --git a/src/third_party/wiredtiger/src/btree/bt_slvg.c b/src/third_party/wiredtiger/src/btree/bt_slvg.c
index 462ee4ec52c..ebb01bf818a 100644
--- a/src/third_party/wiredtiger/src/btree/bt_slvg.c
+++ b/src/third_party/wiredtiger/src/btree/bt_slvg.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/btree/bt_split.c b/src/third_party/wiredtiger/src/btree/bt_split.c
index bf7ea54adb0..2719481aa86 100644
--- a/src/third_party/wiredtiger/src/btree/bt_split.c
+++ b/src/third_party/wiredtiger/src/btree/bt_split.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
@@ -720,6 +720,7 @@ __split_parent(WT_SESSION_IMPL *session, WT_REF *ref, WT_REF **ref_new,
/* Start making real changes to the tree, errors are fatal. */
complete = WT_ERR_PANIC;
+ WT_NOT_READ(complete);
/* Encourage a race */
__page_split_timing_stress(session,
@@ -1476,6 +1477,12 @@ __split_multi_inmem(
WT_ERR(__wt_row_search(
session, key, ref, &cbt, true, true));
+ /*
+ * Birthmarks should only be applied to on-page values.
+ */
+ WT_ASSERT(session, cbt.compare == 0 ||
+ upd->type != WT_UPDATE_BIRTHMARK);
+
/* Apply the modification. */
WT_ERR(__wt_row_modify(session,
&cbt, key, NULL, upd, WT_UPDATE_INVALID, true));
@@ -2260,6 +2267,7 @@ __wt_split_rewrite(WT_SESSION_IMPL *session, WT_REF *ref, WT_MULTI *multi)
/* Swap the new page into place. */
ref->page = new->page;
+
WT_PUBLISH(ref->state, WT_REF_MEM);
__wt_free(session, new);
diff --git a/src/third_party/wiredtiger/src/btree/bt_stat.c b/src/third_party/wiredtiger/src/btree/bt_stat.c
index 9be476b87c6..c00b2bfda39 100644
--- a/src/third_party/wiredtiger/src/btree/bt_stat.c
+++ b/src/third_party/wiredtiger/src/btree/bt_stat.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
@@ -179,20 +179,20 @@ __stat_page_col_var(
*/
WT_SKIP_FOREACH(ins, WT_COL_UPDATE(page, cip)) {
switch (ins->upd->type) {
- case WT_UPDATE_DELETED:
- if (!orig_deleted) {
- ++deleted_cnt;
- --entry_cnt;
- }
- break;
- case WT_UPDATE_MODIFIED:
+ case WT_UPDATE_MODIFY:
case WT_UPDATE_STANDARD:
if (orig_deleted) {
--deleted_cnt;
++entry_cnt;
}
break;
- case WT_UPDATE_RESERVED:
+ case WT_UPDATE_RESERVE:
+ break;
+ case WT_UPDATE_TOMBSTONE:
+ if (!orig_deleted) {
+ ++deleted_cnt;
+ --entry_cnt;
+ }
break;
}
}
@@ -201,14 +201,14 @@ __stat_page_col_var(
/* Walk any append list. */
WT_SKIP_FOREACH(ins, WT_COL_APPEND(page))
switch (ins->upd->type) {
- case WT_UPDATE_DELETED:
- ++deleted_cnt;
- break;
- case WT_UPDATE_MODIFIED:
+ case WT_UPDATE_MODIFY:
case WT_UPDATE_STANDARD:
++entry_cnt;
break;
- case WT_UPDATE_RESERVED:
+ case WT_UPDATE_RESERVE:
+ break;
+ case WT_UPDATE_TOMBSTONE:
+ ++deleted_cnt;
break;
}
@@ -277,8 +277,8 @@ __stat_page_row_leaf(
* key on the page.
*/
WT_SKIP_FOREACH(ins, WT_ROW_INSERT_SMALLEST(page))
- if (ins->upd->type != WT_UPDATE_DELETED &&
- ins->upd->type != WT_UPDATE_RESERVED)
+ if (ins->upd->type != WT_UPDATE_RESERVE &&
+ ins->upd->type != WT_UPDATE_TOMBSTONE)
++entry_cnt;
/*
@@ -288,8 +288,8 @@ __stat_page_row_leaf(
WT_ROW_FOREACH(page, rip, i) {
upd = WT_ROW_UPDATE(page, rip);
if (upd == NULL ||
- (upd->type != WT_UPDATE_DELETED &&
- upd->type != WT_UPDATE_RESERVED))
+ (upd->type != WT_UPDATE_RESERVE &&
+ upd->type != WT_UPDATE_TOMBSTONE))
++entry_cnt;
if (upd == NULL && (cell =
__wt_row_leaf_value_cell(page, rip, NULL)) != NULL &&
@@ -298,8 +298,8 @@ __stat_page_row_leaf(
/* Walk K/V pairs inserted after the on-page K/V pair. */
WT_SKIP_FOREACH(ins, WT_ROW_INSERT(page, rip))
- if (ins->upd->type != WT_UPDATE_DELETED &&
- ins->upd->type != WT_UPDATE_RESERVED)
+ if (ins->upd->type != WT_UPDATE_RESERVE &&
+ ins->upd->type != WT_UPDATE_TOMBSTONE)
++entry_cnt;
}
diff --git a/src/third_party/wiredtiger/src/btree/bt_sync.c b/src/third_party/wiredtiger/src/btree/bt_sync.c
index d1258cef13e..423b569f0b7 100644
--- a/src/third_party/wiredtiger/src/btree/bt_sync.c
+++ b/src/third_party/wiredtiger/src/btree/bt_sync.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
@@ -338,7 +338,7 @@ __sync_file(WT_SESSION_IMPL *session, WT_CACHE_OP syncop)
syncop == WT_SYNC_WRITE_LEAVES ?
"WRITE_LEAVES" : "CHECKPOINT",
leaf_pages, leaf_bytes, internal_pages, internal_bytes,
- WT_TSCDIFF_MS(session, time_stop, time_start));
+ WT_TSCDIFF_MS(time_stop, time_start));
}
err: /* On error, clear any left-over tree walk. */
diff --git a/src/third_party/wiredtiger/src/btree/bt_upgrade.c b/src/third_party/wiredtiger/src/btree/bt_upgrade.c
index a7fe3283218..6c50a294893 100644
--- a/src/third_party/wiredtiger/src/btree/bt_upgrade.c
+++ b/src/third_party/wiredtiger/src/btree/bt_upgrade.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/btree/bt_vrfy.c b/src/third_party/wiredtiger/src/btree/bt_vrfy.c
index c3b5d926a8f..c10a9256769 100644
--- a/src/third_party/wiredtiger/src/btree/bt_vrfy.c
+++ b/src/third_party/wiredtiger/src/btree/bt_vrfy.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/btree/bt_vrfy_dsk.c b/src/third_party/wiredtiger/src/btree/bt_vrfy_dsk.c
index de80f207621..aae50ed636c 100644
--- a/src/third_party/wiredtiger/src/btree/bt_vrfy_dsk.c
+++ b/src/third_party/wiredtiger/src/btree/bt_vrfy_dsk.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/btree/bt_walk.c b/src/third_party/wiredtiger/src/btree/bt_walk.c
index b68c6b9c5c6..3d5e9a3540f 100644
--- a/src/third_party/wiredtiger/src/btree/bt_walk.c
+++ b/src/third_party/wiredtiger/src/btree/bt_walk.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
@@ -516,6 +516,7 @@ restart: /*
*/
if (ret == WT_NOTFOUND) {
ret = 0;
+ WT_NOT_READ(ret);
break;
}
diff --git a/src/third_party/wiredtiger/src/btree/col_modify.c b/src/third_party/wiredtiger/src/btree/col_modify.c
index a51428dc62b..79fc06b7312 100644
--- a/src/third_party/wiredtiger/src/btree/col_modify.c
+++ b/src/third_party/wiredtiger/src/btree/col_modify.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
@@ -39,13 +39,13 @@ __wt_col_modify(WT_SESSION_IMPL *session, WT_CURSOR_BTREE *cbt,
append = logged = false;
if (upd_arg == NULL) {
- if (modify_type == WT_UPDATE_DELETED ||
- modify_type == WT_UPDATE_RESERVED) {
+ if (modify_type == WT_UPDATE_RESERVE ||
+ modify_type == WT_UPDATE_TOMBSTONE) {
/*
* Fixed-size column-store doesn't have on-page deleted
* values, it's a nul byte.
*/
- if (modify_type == WT_UPDATE_DELETED &&
+ if (modify_type == WT_UPDATE_TOMBSTONE &&
btree->type == BTREE_COL_FIX) {
modify_type = WT_UPDATE_STANDARD;
value = &col_fix_remove;
@@ -200,7 +200,7 @@ __wt_col_modify(WT_SESSION_IMPL *session, WT_CURSOR_BTREE *cbt,
}
/* If the update was successful, add it to the in-memory log. */
- if (logged && modify_type != WT_UPDATE_RESERVED)
+ if (logged && modify_type != WT_UPDATE_RESERVE)
WT_ERR(__wt_txn_log_op(session, cbt));
if (0) {
diff --git a/src/third_party/wiredtiger/src/btree/col_srch.c b/src/third_party/wiredtiger/src/btree/col_srch.c
index 10bc3894a0d..5c0e066647a 100644
--- a/src/third_party/wiredtiger/src/btree/col_srch.c
+++ b/src/third_party/wiredtiger/src/btree/col_srch.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/btree/row_key.c b/src/third_party/wiredtiger/src/btree/row_key.c
index a016568898f..ca8e2418857 100644
--- a/src/third_party/wiredtiger/src/btree/row_key.c
+++ b/src/third_party/wiredtiger/src/btree/row_key.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/btree/row_modify.c b/src/third_party/wiredtiger/src/btree/row_modify.c
index a2aaeb7673f..e3b9e492d78 100644
--- a/src/third_party/wiredtiger/src/btree/row_modify.c
+++ b/src/third_party/wiredtiger/src/btree/row_modify.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
@@ -202,7 +202,7 @@ __wt_row_modify(WT_SESSION_IMPL *session, WT_CURSOR_BTREE *cbt,
&ins, ins_size, skipdepth, exclusive));
}
- if (logged && modify_type != WT_UPDATE_RESERVED)
+ if (logged && modify_type != WT_UPDATE_RESERVE)
WT_ERR(__wt_txn_log_op(session, cbt));
if (0) {
@@ -273,8 +273,9 @@ __wt_update_alloc(WT_SESSION_IMPL *session, const WT_ITEM *value,
* Allocate the WT_UPDATE structure and room for the value, then copy
* the value into place.
*/
- if (modify_type == WT_UPDATE_DELETED ||
- modify_type == WT_UPDATE_RESERVED)
+ if (modify_type == WT_UPDATE_BIRTHMARK ||
+ modify_type == WT_UPDATE_RESERVE ||
+ modify_type == WT_UPDATE_TOMBSTONE)
WT_RET(__wt_calloc(session, 1, WT_UPDATE_SIZE, &upd));
else {
WT_RET(__wt_calloc(
@@ -321,7 +322,8 @@ __wt_update_obsolete_check(
continue;
if (!__wt_txn_upd_visible_all(session, upd))
first = NULL;
- else if (first == NULL && WT_UPDATE_DATA_VALUE(upd))
+ else if (first == NULL && (WT_UPDATE_DATA_VALUE(upd) ||
+ upd->type == WT_UPDATE_BIRTHMARK))
first = upd;
}
diff --git a/src/third_party/wiredtiger/src/btree/row_srch.c b/src/third_party/wiredtiger/src/btree/row_srch.c
index 68299a396ba..e75b307812c 100644
--- a/src/third_party/wiredtiger/src/btree/row_srch.c
+++ b/src/third_party/wiredtiger/src/btree/row_srch.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/cache/cache_las.c b/src/third_party/wiredtiger/src/cache/cache_las.c
index cdab377039e..dc7ea1b7438 100644
--- a/src/third_party/wiredtiger/src/cache/cache_las.c
+++ b/src/third_party/wiredtiger/src/cache/cache_las.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
@@ -490,18 +490,16 @@ __wt_las_insert_block(WT_SESSION_IMPL *session, WT_CURSOR *cursor,
continue;
switch (upd->type) {
- case WT_UPDATE_DELETED:
- las_value.size = 0;
- break;
- case WT_UPDATE_MODIFIED:
+ case WT_UPDATE_MODIFY:
case WT_UPDATE_STANDARD:
las_value.data = upd->data;
las_value.size = upd->size;
break;
- case WT_UPDATE_RESERVED:
- WT_ASSERT(session,
- upd->type != WT_UPDATE_RESERVED);
- continue;
+ case WT_UPDATE_BIRTHMARK:
+ case WT_UPDATE_TOMBSTONE:
+ las_value.size = 0;
+ break;
+ WT_ILLEGAL_VALUE_ERR(session);
}
cursor->set_key(cursor,
@@ -511,8 +509,25 @@ __wt_las_insert_block(WT_SESSION_IMPL *session, WT_CURSOR *cursor,
las_timestamp.data = &upd->timestamp;
las_timestamp.size = WT_TIMESTAMP_SIZE;
#endif
- cursor->set_value(cursor,
- upd->txnid, &las_timestamp, upd->type, &las_value);
+ /*
+ * If saving a non-zero length value on the page, save a
+ * birthmark instead of duplicating it in the lookaside
+ * table. (We check the length because row-store doesn't
+ * write zero-length data items.)
+ */
+ if (multi->page_las.las_skew_newest &&
+ upd == list->onpage_upd &&
+ upd->size > 0 &&
+ (upd->type == WT_UPDATE_STANDARD ||
+ upd->type == WT_UPDATE_MODIFY)) {
+ las_value.size = 0;
+ cursor->set_value(cursor,
+ upd->txnid, &las_timestamp,
+ WT_UPDATE_BIRTHMARK, &las_value);
+ } else
+ cursor->set_value(cursor,
+ upd->txnid, &las_timestamp,
+ upd->type, &las_value);
/*
* Using update looks a little strange because the keys
diff --git a/src/third_party/wiredtiger/src/checksum/arm64/crc32-arm64.c b/src/third_party/wiredtiger/src/checksum/arm64/crc32-arm64.c
index 4316ee3d14e..d0c989fd757 100644
--- a/src/third_party/wiredtiger/src/checksum/arm64/crc32-arm64.c
+++ b/src/third_party/wiredtiger/src/checksum/arm64/crc32-arm64.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/src/checksum/software/checksum.c b/src/third_party/wiredtiger/src/checksum/software/checksum.c
index a880d38894c..1228c9a0ce1 100644
--- a/src/third_party/wiredtiger/src/checksum/software/checksum.c
+++ b/src/third_party/wiredtiger/src/checksum/software/checksum.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/src/checksum/x86/crc32-x86.c b/src/third_party/wiredtiger/src/checksum/x86/crc32-x86.c
index 1c2c08fa1c1..8de987d4fc9 100644
--- a/src/third_party/wiredtiger/src/checksum/x86/crc32-x86.c
+++ b/src/third_party/wiredtiger/src/checksum/x86/crc32-x86.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/src/config/config.c b/src/third_party/wiredtiger/src/config/config.c
index d48c39de6b5..53f62daa5fb 100644
--- a/src/third_party/wiredtiger/src/config/config.c
+++ b/src/third_party/wiredtiger/src/config/config.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/config/config_api.c b/src/third_party/wiredtiger/src/config/config_api.c
index 3b37732f49b..a9993cb1e11 100644
--- a/src/third_party/wiredtiger/src/config/config_api.c
+++ b/src/third_party/wiredtiger/src/config/config_api.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
@@ -97,7 +97,7 @@ wiredtiger_config_parser_open(WT_SESSION *wt_session,
*/
int
wiredtiger_config_validate(WT_SESSION *wt_session,
- WT_EVENT_HANDLER *handler, const char *name, const char *config)
+ WT_EVENT_HANDLER *event_handler, const char *name, const char *config)
{
const WT_CONFIG_ENTRY *ep, **epp;
WT_CONNECTION_IMPL *conn, dummy_conn;
@@ -108,9 +108,9 @@ wiredtiger_config_validate(WT_SESSION *wt_session,
/*
* It's a logic error to specify both a session and an event handler.
*/
- if (session != NULL && handler != NULL)
+ if (session != NULL && event_handler != NULL)
WT_RET_MSG(session, EINVAL,
- "wiredtiger_config_validate error handler ignored when "
+ "wiredtiger_config_validate event handler ignored when "
"a session also specified");
/*
@@ -118,13 +118,13 @@ wiredtiger_config_validate(WT_SESSION *wt_session,
* a fake session/connection pair and configure the event handler.
*/
conn = NULL;
- if (session == NULL && handler != NULL) {
+ if (session == NULL && event_handler != NULL) {
WT_CLEAR(dummy_conn);
conn = &dummy_conn;
session = conn->default_session = &conn->dummy_session;
session->iface.connection = &conn->iface;
session->name = "wiredtiger_config_validate";
- __wt_event_handler_set(session, handler);
+ __wt_event_handler_set(session, event_handler);
}
if (session != NULL)
conn = S2C(session);
diff --git a/src/third_party/wiredtiger/src/config/config_check.c b/src/third_party/wiredtiger/src/config/config_check.c
index 8038ae89413..d4d11c5a02e 100644
--- a/src/third_party/wiredtiger/src/config/config_check.c
+++ b/src/third_party/wiredtiger/src/config/config_check.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/config/config_collapse.c b/src/third_party/wiredtiger/src/config/config_collapse.c
index 155b700f2dd..26636873902 100644
--- a/src/third_party/wiredtiger/src/config/config_collapse.c
+++ b/src/third_party/wiredtiger/src/config/config_collapse.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/config/config_ext.c b/src/third_party/wiredtiger/src/config/config_ext.c
index 82e5a3f1788..0992e305e9c 100644
--- a/src/third_party/wiredtiger/src/config/config_ext.c
+++ b/src/third_party/wiredtiger/src/config/config_ext.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/config/config_upgrade.c b/src/third_party/wiredtiger/src/config/config_upgrade.c
index 5f2770b1691..8b8c2919d24 100644
--- a/src/third_party/wiredtiger/src/config/config_upgrade.c
+++ b/src/third_party/wiredtiger/src/config/config_upgrade.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/conn/api_version.c b/src/third_party/wiredtiger/src/conn/api_version.c
index c4f3d978c1e..45f67dffc98 100644
--- a/src/third_party/wiredtiger/src/conn/api_version.c
+++ b/src/third_party/wiredtiger/src/conn/api_version.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/conn/conn_api.c b/src/third_party/wiredtiger/src/conn/conn_api.c
index 5727399c301..d9f93e8bdce 100644
--- a/src/third_party/wiredtiger/src/conn/conn_api.c
+++ b/src/third_party/wiredtiger/src/conn/conn_api.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
@@ -1286,35 +1286,6 @@ err: API_END_RET(session, ret);
}
/*
- * __conn_calibrate_ticks --
- * Calibrate a ratio from rdtsc ticks to nanoseconds.
- */
-static void
-__conn_calibrate_ticks(WT_SESSION_IMPL *session)
-{
-#if (defined __i386) || (defined __amd64)
- struct timespec start, stop;
- uint64_t diff_nsec, diff_tsc, tsc_start, tsc_stop;
- volatile uint64_t i;
-
- __wt_epoch(session, &start);
- tsc_start = __wt_rdtsc(session);
- /*
- * This needs to be CPU intensive and large enough.
- */
- for (i = 0; i < WT_MILLION; i++)
- ;
- tsc_stop = __wt_rdtsc(session);
- __wt_epoch(session, &stop);
- diff_nsec = WT_TIMEDIFF_NS(stop, start);
- diff_tsc = tsc_stop - tsc_start;
- S2C(session)->tsc_nsec_ratio = (double)diff_tsc/(double)diff_nsec;
-#else
- S2C(session)->tsc_nsec_ratio = 1.0;
-#endif
-}
-
-/*
* __conn_config_append --
* Append an entry to a config stack.
*/
@@ -2259,6 +2230,16 @@ __conn_chk_file_system(WT_SESSION_IMPL *session, bool readonly)
}
WT_CONN_SET_FILE_SYSTEM_REQ(fs_size);
+ /*
+ * The lower-level API for returning the first matching entry was added
+ * later and not documented because it's an optimization for high-end
+ * filesystems doing logging, specifically pre-allocating log files.
+ * Check for the API and fall back to the standard API if not available.
+ */
+ if (conn->file_system->fs_directory_list_single == NULL)
+ conn->file_system->fs_directory_list_single =
+ conn->file_system->fs_directory_list;
+
return (0);
}
@@ -2305,7 +2286,7 @@ wiredtiger_dummy_session_init(
*/
int
wiredtiger_open(const char *home, WT_EVENT_HANDLER *event_handler,
- const char *config, WT_CONNECTION **wt_connp)
+ const char *config, WT_CONNECTION **connectionp)
{
static const WT_CONNECTION stdc = {
__conn_async_flush,
@@ -2353,7 +2334,7 @@ wiredtiger_open(const char *home, WT_EVENT_HANDLER *event_handler,
const char *cfg[] = {
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL };
- *wt_connp = NULL;
+ *connectionp = NULL;
conn = NULL;
session = NULL;
@@ -2682,11 +2663,6 @@ wiredtiger_open(const char *home, WT_EVENT_HANDLER *event_handler,
WT_ERR(__conn_write_base_config(session, cfg));
/*
- * Calibrate the ratio of rdtsc ticks to nanoseconds.
- */
- __conn_calibrate_ticks(session);
-
- /*
* Check on the turtle and metadata files, creating them if necessary
* (which avoids application threads racing to create the metadata file
* later). Once the metadata file exists, get a reference to it in
@@ -2703,7 +2679,7 @@ wiredtiger_open(const char *home, WT_EVENT_HANDLER *event_handler,
WT_ERR(__wt_connection_workers(session, cfg));
WT_STATIC_ASSERT(offsetof(WT_CONNECTION_IMPL, iface) == 0);
- *wt_connp = &conn->iface;
+ *connectionp = &conn->iface;
err: /* Discard the scratch buffers. */
__wt_scr_free(session, &encbuf);
diff --git a/src/third_party/wiredtiger/src/conn/conn_cache.c b/src/third_party/wiredtiger/src/conn/conn_cache.c
index a7a9b8e2729..4f9f160ae3f 100644
--- a/src/third_party/wiredtiger/src/conn/conn_cache.c
+++ b/src/third_party/wiredtiger/src/conn/conn_cache.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/conn/conn_cache_pool.c b/src/third_party/wiredtiger/src/conn/conn_cache_pool.c
index ade63b00af6..eefb50902f4 100644
--- a/src/third_party/wiredtiger/src/conn/conn_cache_pool.c
+++ b/src/third_party/wiredtiger/src/conn/conn_cache_pool.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
@@ -304,6 +304,7 @@ __wt_conn_cache_pool_destroy(WT_SESSION_IMPL *session)
conn = S2C(session);
cache = conn->cache;
cp_locked = found = false;
+ WT_NOT_READ(cp_locked);
cp = __wt_process.cache_pool;
if (!F_ISSET(conn, WT_CONN_CACHE_POOL))
@@ -338,6 +339,7 @@ __wt_conn_cache_pool_destroy(WT_SESSION_IMPL *session)
*/
__wt_spin_unlock(session, &cp->cache_pool_lock);
cp_locked = false;
+ WT_NOT_READ(cp_locked);
FLD_CLR(cache->pool_flags, WT_CACHE_POOL_RUN);
__wt_cond_signal(session, cp->cache_pool_cond);
diff --git a/src/third_party/wiredtiger/src/conn/conn_ckpt.c b/src/third_party/wiredtiger/src/conn/conn_ckpt.c
index a47524af2d7..d302a59c928 100644
--- a/src/third_party/wiredtiger/src/conn/conn_ckpt.c
+++ b/src/third_party/wiredtiger/src/conn/conn_ckpt.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/conn/conn_dhandle.c b/src/third_party/wiredtiger/src/conn/conn_dhandle.c
index 3cf075e52f8..d7355bffa59 100644
--- a/src/third_party/wiredtiger/src/conn/conn_dhandle.c
+++ b/src/third_party/wiredtiger/src/conn/conn_dhandle.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/conn/conn_handle.c b/src/third_party/wiredtiger/src/conn/conn_handle.c
index 42ae866b329..42b8510cbd3 100644
--- a/src/third_party/wiredtiger/src/conn/conn_handle.c
+++ b/src/third_party/wiredtiger/src/conn/conn_handle.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/conn/conn_log.c b/src/third_party/wiredtiger/src/conn/conn_log.c
index c0bada4f827..7dea0a3fe4b 100644
--- a/src/third_party/wiredtiger/src/conn/conn_log.c
+++ b/src/third_party/wiredtiger/src/conn/conn_log.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
@@ -599,6 +599,7 @@ __log_file_server(void *arg)
WT_ERR(__wt_fsync(session, log->log_fh, true));
__wt_spin_lock(session, &log->log_sync_lock);
locked = true;
+ WT_NOT_READ(locked);
/*
* The sync LSN could have advanced while we
* were writing to disk.
@@ -952,7 +953,7 @@ __log_server(void *arg)
__wt_cond_auto_wait_signal(
session, conn->log_cond, did_work, NULL, &signalled);
time_stop = __wt_rdtsc(session);
- timediff = WT_TSCDIFF_MS(session, time_stop, time_start);
+ timediff = WT_TSCDIFF_MS(time_stop, time_start);
}
if (0) {
diff --git a/src/third_party/wiredtiger/src/conn/conn_open.c b/src/third_party/wiredtiger/src/conn/conn_open.c
index 7b40822f681..a2856843354 100644
--- a/src/third_party/wiredtiger/src/conn/conn_open.c
+++ b/src/third_party/wiredtiger/src/conn/conn_open.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/conn/conn_reconfig.c b/src/third_party/wiredtiger/src/conn/conn_reconfig.c
index 2cadc9b78d4..294812ff4d0 100644
--- a/src/third_party/wiredtiger/src/conn/conn_reconfig.c
+++ b/src/third_party/wiredtiger/src/conn/conn_reconfig.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
@@ -87,12 +87,13 @@ __wt_conn_optrack_setup(WT_SESSION_IMPL *session,
F_CLR(conn, WT_CONN_OPTRACK);
}
return (0);
- } else if (F_ISSET(conn, WT_CONN_READONLY))
+ }
+ if (F_ISSET(conn, WT_CONN_READONLY))
/* Operation tracking isn't supported in read-only mode */
WT_RET_MSG(session, EINVAL,
"Operation tracking is incompatible with read only "
"configuration.");
- else if (F_ISSET(conn, WT_CONN_OPTRACK))
+ if (F_ISSET(conn, WT_CONN_OPTRACK))
/* Already enabled, nothing else to do */
return (0);
diff --git a/src/third_party/wiredtiger/src/conn/conn_stat.c b/src/third_party/wiredtiger/src/conn/conn_stat.c
index 815390acfac..e27de84254e 100644
--- a/src/third_party/wiredtiger/src/conn/conn_stat.c
+++ b/src/third_party/wiredtiger/src/conn/conn_stat.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
@@ -520,7 +520,8 @@ __statlog_log_one(WT_SESSION_IMPL *session, WT_ITEM *path, WT_ITEM *tmp)
path == NULL || strcmp(tmp->mem, path->mem) != 0) {
WT_RET(__wt_fclose(session, &conn->stat_fs));
if (path != NULL)
- (void)strcpy(path->mem, tmp->mem);
+ WT_RET(
+ __wt_buf_set(session, path, tmp->data, tmp->size));
WT_RET(__wt_fopen(session, tmp->mem,
WT_FS_OPEN_CREATE | WT_FS_OPEN_FIXED, WT_STREAM_APPEND,
&log_stream));
diff --git a/src/third_party/wiredtiger/src/conn/conn_sweep.c b/src/third_party/wiredtiger/src/conn/conn_sweep.c
index 06e441a3037..4d2267d176b 100644
--- a/src/third_party/wiredtiger/src/conn/conn_sweep.c
+++ b/src/third_party/wiredtiger/src/conn/conn_sweep.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/cursor/cur_backup.c b/src/third_party/wiredtiger/src/cursor/cur_backup.c
index ecb0e02929f..679d1474f8a 100644
--- a/src/third_party/wiredtiger/src/cursor/cur_backup.c
+++ b/src/third_party/wiredtiger/src/cursor/cur_backup.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/cursor/cur_bulk.c b/src/third_party/wiredtiger/src/cursor/cur_bulk.c
index 56bcbb741f7..4c181bd9458 100644
--- a/src/third_party/wiredtiger/src/cursor/cur_bulk.c
+++ b/src/third_party/wiredtiger/src/cursor/cur_bulk.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/cursor/cur_config.c b/src/third_party/wiredtiger/src/cursor/cur_config.c
index 6c198315e33..a7b7b2bf979 100644
--- a/src/third_party/wiredtiger/src/cursor/cur_config.c
+++ b/src/third_party/wiredtiger/src/cursor/cur_config.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/cursor/cur_ds.c b/src/third_party/wiredtiger/src/cursor/cur_ds.c
index 9bd90fad5f5..bd0dcd02eef 100644
--- a/src/third_party/wiredtiger/src/cursor/cur_ds.c
+++ b/src/third_party/wiredtiger/src/cursor/cur_ds.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/cursor/cur_dump.c b/src/third_party/wiredtiger/src/cursor/cur_dump.c
index 740d7ecc819..a15bf2ae642 100644
--- a/src/third_party/wiredtiger/src/cursor/cur_dump.c
+++ b/src/third_party/wiredtiger/src/cursor/cur_dump.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/cursor/cur_file.c b/src/third_party/wiredtiger/src/cursor/cur_file.c
index 22ba6d1dee1..5f68ad3883e 100644
--- a/src/third_party/wiredtiger/src/cursor/cur_file.c
+++ b/src/third_party/wiredtiger/src/cursor/cur_file.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
@@ -9,6 +9,13 @@
#include "wt_internal.h"
/*
+ * Define functions that increment histogram statistics for cursor read and
+ * write operations latency.
+ */
+WT_STAT_USECS_HIST_INCR_FUNC(opread, perf_hist_opread_latency, 100)
+WT_STAT_USECS_HIST_INCR_FUNC(opwrite, perf_hist_opwrite_latency, 100)
+
+/*
* __curfile_compare --
* WT_CURSOR->compare method for the btree cursor type.
*/
@@ -90,6 +97,7 @@ __curfile_next(WT_CURSOR *cursor)
/* Next maintains a position, key and value. */
WT_ASSERT(session,
+ F_ISSET(cbt, WT_CBT_ACTIVE) &&
F_MASK(cursor, WT_CURSTD_KEY_SET) == WT_CURSTD_KEY_INT &&
F_MASK(cursor, WT_CURSTD_VALUE_SET) == WT_CURSTD_VALUE_INT);
@@ -115,6 +123,7 @@ __wt_curfile_next_random(WT_CURSOR *cursor)
/* Next-random maintains a position, key and value. */
WT_ASSERT(session,
+ F_ISSET(cbt, WT_CBT_ACTIVE) &&
F_MASK(cursor, WT_CURSTD_KEY_SET) == WT_CURSTD_KEY_INT &&
F_MASK(cursor, WT_CURSTD_VALUE_SET) == WT_CURSTD_VALUE_INT);
@@ -139,6 +148,7 @@ __curfile_prev(WT_CURSOR *cursor)
/* Prev maintains a position, key and value. */
WT_ASSERT(session,
+ F_ISSET(cbt, WT_CBT_ACTIVE) &&
F_MASK(cursor, WT_CURSTD_KEY_SET) == WT_CURSTD_KEY_INT &&
F_MASK(cursor, WT_CURSTD_VALUE_SET) == WT_CURSTD_VALUE_INT);
@@ -163,6 +173,7 @@ __curfile_reset(WT_CURSOR *cursor)
/* Reset maintains no position, key or value. */
WT_ASSERT(session,
+ !F_ISSET(cbt, WT_CBT_ACTIVE) &&
F_MASK(cursor, WT_CURSTD_KEY_SET) == 0 &&
F_MASK(cursor, WT_CURSTD_VALUE_SET) == 0);
@@ -179,15 +190,21 @@ __curfile_search(WT_CURSOR *cursor)
WT_CURSOR_BTREE *cbt;
WT_DECL_RET;
WT_SESSION_IMPL *session;
+ uint64_t time_start, time_stop;
cbt = (WT_CURSOR_BTREE *)cursor;
CURSOR_API_CALL(cursor, session, search, cbt->btree);
WT_ERR(__cursor_checkkey(cursor));
+ time_start = __wt_rdtsc(session);
WT_ERR(__wt_btcur_search(cbt));
+ time_stop = __wt_rdtsc(session);
+ __wt_stat_usecs_hist_incr_opread(session,
+ WT_TSCDIFF_US(time_stop, time_start));
/* Search maintains a position, key and value. */
WT_ASSERT(session,
+ F_ISSET(cbt, WT_CBT_ACTIVE) &&
F_MASK(cursor, WT_CURSTD_KEY_SET) == WT_CURSTD_KEY_INT &&
F_MASK(cursor, WT_CURSTD_VALUE_SET) == WT_CURSTD_VALUE_INT);
@@ -204,15 +221,21 @@ __curfile_search_near(WT_CURSOR *cursor, int *exact)
WT_CURSOR_BTREE *cbt;
WT_DECL_RET;
WT_SESSION_IMPL *session;
+ uint64_t time_start, time_stop;
cbt = (WT_CURSOR_BTREE *)cursor;
CURSOR_API_CALL(cursor, session, search_near, cbt->btree);
WT_ERR(__cursor_checkkey(cursor));
+ time_start = __wt_rdtsc(session);
WT_ERR(__wt_btcur_search_near(cbt, exact));
+ time_stop = __wt_rdtsc(session);
+ __wt_stat_usecs_hist_incr_opread(session,
+ WT_TSCDIFF_US(time_stop, time_start));
/* Search-near maintains a position, key and value. */
WT_ASSERT(session,
+ F_ISSET(cbt, WT_CBT_ACTIVE) &&
F_MASK(cursor, WT_CURSTD_KEY_SET) == WT_CURSTD_KEY_INT &&
F_MASK(cursor, WT_CURSTD_VALUE_SET) == WT_CURSTD_VALUE_INT);
@@ -229,6 +252,7 @@ __curfile_insert(WT_CURSOR *cursor)
WT_CURSOR_BTREE *cbt;
WT_DECL_RET;
WT_SESSION_IMPL *session;
+ uint64_t time_start, time_stop;
cbt = (WT_CURSOR_BTREE *)cursor;
CURSOR_UPDATE_API_CALL_BTREE(cursor, session, insert, cbt->btree);
@@ -237,17 +261,23 @@ __curfile_insert(WT_CURSOR *cursor)
WT_ERR(__cursor_checkkey(cursor));
WT_ERR(__cursor_checkvalue(cursor));
+ time_start = __wt_rdtsc(session);
WT_ERR(__wt_btcur_insert(cbt));
+ time_stop = __wt_rdtsc(session);
+ __wt_stat_usecs_hist_incr_opwrite(session,
+ WT_TSCDIFF_US(time_stop, time_start));
/*
* Insert maintains no position, key or value (except for column-store
* appends, where we are returning a key).
*/
WT_ASSERT(session,
- (F_ISSET(cursor, WT_CURSTD_APPEND) &&
- F_MASK(cursor, WT_CURSTD_KEY_SET) == WT_CURSTD_KEY_INT) ||
+ !F_ISSET(cbt, WT_CBT_ACTIVE) &&
+ ((F_ISSET(cursor, WT_CURSTD_APPEND) &&
+ F_MASK(cursor, WT_CURSTD_KEY_SET) == WT_CURSTD_KEY_EXT) ||
(!F_ISSET(cursor, WT_CURSTD_APPEND) &&
- F_MASK(cursor, WT_CURSTD_KEY_SET) == 0));
+ F_MASK(cursor, WT_CURSTD_KEY_SET) == 0)));
+ WT_ASSERT(session, F_MASK(cursor, WT_CURSTD_VALUE_SET) == 0);
err: CURSOR_UPDATE_API_END(session, ret);
return (ret);
@@ -307,6 +337,7 @@ __curfile_modify(WT_CURSOR *cursor, WT_MODIFY *entries, int nentries)
* always an internal value.
*/
WT_ASSERT(session,
+ F_ISSET(cbt, WT_CBT_ACTIVE) &&
F_MASK(cursor, WT_CURSTD_KEY_SET) == WT_CURSTD_KEY_INT);
WT_ASSERT(session, F_MASK(cursor, WT_CURSTD_VALUE_SET) != 0);
@@ -324,16 +355,22 @@ __curfile_update(WT_CURSOR *cursor)
WT_CURSOR_BTREE *cbt;
WT_DECL_RET;
WT_SESSION_IMPL *session;
+ uint64_t time_start, time_stop;
cbt = (WT_CURSOR_BTREE *)cursor;
CURSOR_UPDATE_API_CALL_BTREE(cursor, session, update, cbt->btree);
WT_ERR(__cursor_checkkey(cursor));
WT_ERR(__cursor_checkvalue(cursor));
+ time_start = __wt_rdtsc(session);
WT_ERR(__wt_btcur_update(cbt));
+ time_stop = __wt_rdtsc(session);
+ __wt_stat_usecs_hist_incr_opwrite(session,
+ WT_TSCDIFF_US(time_stop, time_start));
/* Update maintains a position, key and value. */
WT_ASSERT(session,
+ F_ISSET(cbt, WT_CBT_ACTIVE) &&
F_MASK(cursor, WT_CURSTD_KEY_SET) == WT_CURSTD_KEY_INT &&
F_MASK(cursor, WT_CURSTD_VALUE_SET) == WT_CURSTD_VALUE_INT);
@@ -351,22 +388,24 @@ __curfile_remove(WT_CURSOR *cursor)
WT_CURSOR_BTREE *cbt;
WT_DECL_RET;
WT_SESSION_IMPL *session;
+ uint64_t time_start, time_stop;
cbt = (WT_CURSOR_BTREE *)cursor;
CURSOR_REMOVE_API_CALL(cursor, session, cbt->btree);
WT_ERR(__cursor_checkkey(cursor));
+ time_start = __wt_rdtsc(session);
WT_ERR(__wt_btcur_remove(cbt));
+ time_stop = __wt_rdtsc(session);
+ __wt_stat_usecs_hist_incr_opwrite(session,
+ WT_TSCDIFF_US(time_stop, time_start));
/*
* Remove with a search-key is fire-and-forget, no position and no key.
- * Remove starting from a position maintains the position and a key.
- * We don't know which it was at this layer, so can only assert the key
- * is not set at all, or internal. There's never a value.
+ * Remove starting from a position maintains the position and a key,
+ * but the key can end up being internal, external, or not set, there's
+ * nothing to assert. There's never a value.
*/
- WT_ASSERT(session,
- F_MASK(cursor, WT_CURSTD_KEY_SET) == 0 ||
- F_MASK(cursor, WT_CURSTD_KEY_SET) == WT_CURSTD_KEY_INT);
WT_ASSERT(session, F_MASK(cursor, WT_CURSTD_VALUE_SET) == 0);
err: CURSOR_UPDATE_API_END(session, ret);
@@ -398,6 +437,7 @@ __curfile_reserve(WT_CURSOR *cursor)
* each successful reserve operation.
*/
WT_ASSERT(session,
+ F_ISSET(cbt, WT_CBT_ACTIVE) &&
F_MASK(cursor, WT_CURSTD_KEY_SET) == WT_CURSTD_KEY_INT);
WT_ASSERT(session, F_MASK(cursor, WT_CURSTD_VALUE_SET) == 0);
@@ -554,11 +594,12 @@ __curfile_create(WT_SESSION_IMPL *session,
__wt_btcur_open(cbt);
/*
- * WT_CURSOR.modify supported on 'u' value formats, but the fast-path
- * through the btree code requires log file format changes, it's not
- * available in all versions.
+ * WT_CURSOR.modify supported on 'S' and 'u' value formats, but the
+ * fast-path through the btree code requires log file format changes,
+ * it's not available in all versions.
*/
- if (WT_STREQ(cursor->value_format, "u") &&
+ if ((WT_STREQ(cursor->value_format, "S") ||
+ WT_STREQ(cursor->value_format, "u")) &&
S2C(session)->compat_major >= WT_LOG_V2)
cursor->modify = __curfile_modify;
diff --git a/src/third_party/wiredtiger/src/cursor/cur_index.c b/src/third_party/wiredtiger/src/cursor/cur_index.c
index 6b1ef6312e8..eb82effe702 100644
--- a/src/third_party/wiredtiger/src/cursor/cur_index.c
+++ b/src/third_party/wiredtiger/src/cursor/cur_index.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/cursor/cur_join.c b/src/third_party/wiredtiger/src/cursor/cur_join.c
index bcd3943122d..699774809f5 100644
--- a/src/third_party/wiredtiger/src/cursor/cur_join.c
+++ b/src/third_party/wiredtiger/src/cursor/cur_join.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/cursor/cur_json.c b/src/third_party/wiredtiger/src/cursor/cur_json.c
index 2b46dc39622..87f8899d9c8 100644
--- a/src/third_party/wiredtiger/src/cursor/cur_json.c
+++ b/src/third_party/wiredtiger/src/cursor/cur_json.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
@@ -204,14 +204,13 @@ __json_struct_size(WT_SESSION_IMPL *session, const void *buffer,
WT_RET(
__json_unpack_put(session, &pv, NULL, 0, &name, &result));
}
- if (ret == WT_NOTFOUND)
- ret = 0;
+ WT_RET_NOTFOUND_OK(ret);
/* Be paranoid - __pack_write should never overflow. */
WT_ASSERT(session, p <= end);
*presult = result;
- return (ret);
+ return (0);
}
/*
@@ -258,15 +257,14 @@ __json_struct_unpackv(WT_SESSION_IMPL *session,
jbuf += jsize;
jbufsize -= jsize;
}
- if (ret == WT_NOTFOUND)
- ret = 0;
+ WT_RET_NOTFOUND_OK(ret);
/* Be paranoid - __unpack_read should never overflow. */
WT_ASSERT(session, p <= end);
WT_ASSERT(session, jbufsize == 1);
- return (ret);
+ return (0);
}
/*
@@ -754,13 +752,11 @@ __json_pack_struct(WT_SESSION_IMPL *session, void *buffer, size_t size,
WT_RET(__pack_write(session, &pv, &p, (size_t)(end - p)));
multi = true;
}
+ WT_RET_NOTFOUND_OK(ret);
/* Be paranoid - __pack_write should never overflow. */
WT_ASSERT(session, p <= end);
- if (ret != WT_NOTFOUND)
- return (ret);
-
return (0);
}
@@ -778,16 +774,17 @@ __json_pack_size(
{
WT_CONFIG_ITEM name;
WT_DECL_PACK_VALUE(pv);
+ WT_DECL_RET;
WT_PACK pack;
WT_PACK_NAME packname;
- size_t toksize, total;
+ size_t toksize, v;
const char *tokstart;
bool multi;
__pack_name_init(session, names, iskey, &packname);
multi = false;
WT_RET(__pack_init(session, &pack, fmt));
- for (total = 0; __pack_next(&pack, &pv) == 0;) {
+ for (*sizep = 0; (ret = __pack_next(&pack, &pv)) == 0;) {
if (multi)
JSON_EXPECT_TOKEN(session, jstr, ',');
JSON_EXPECT_TOKEN_GET(session, jstr, 's', tokstart, toksize);
@@ -799,13 +796,15 @@ __json_pack_size(
iskey ? "key" : "value", (int)name.len, name.str);
JSON_EXPECT_TOKEN(session, jstr, ':');
WT_PACK_JSON_GET(session, pv, jstr);
- total += __pack_size(session, &pv);
+ WT_RET(__pack_size(session, &pv, &v));
+ *sizep += v;
multi = true;
}
+ WT_RET_NOTFOUND_OK(ret);
+
/* check end of string */
JSON_EXPECT_TOKEN(session, jstr, 0);
- *sizep = total;
return (0);
}
diff --git a/src/third_party/wiredtiger/src/cursor/cur_log.c b/src/third_party/wiredtiger/src/cursor/cur_log.c
index bcfac1bfe3e..8f664f4c2cd 100644
--- a/src/third_party/wiredtiger/src/cursor/cur_log.c
+++ b/src/third_party/wiredtiger/src/cursor/cur_log.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/cursor/cur_metadata.c b/src/third_party/wiredtiger/src/cursor/cur_metadata.c
index d9aeed1fccd..2536de8c455 100644
--- a/src/third_party/wiredtiger/src/cursor/cur_metadata.c
+++ b/src/third_party/wiredtiger/src/cursor/cur_metadata.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/cursor/cur_stat.c b/src/third_party/wiredtiger/src/cursor/cur_stat.c
index f6228b9c853..39921e11edc 100644
--- a/src/third_party/wiredtiger/src/cursor/cur_stat.c
+++ b/src/third_party/wiredtiger/src/cursor/cur_stat.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/cursor/cur_std.c b/src/third_party/wiredtiger/src/cursor/cur_std.c
index 6027b1ecdd6..d7b23be75d6 100644
--- a/src/third_party/wiredtiger/src/cursor/cur_std.c
+++ b/src/third_party/wiredtiger/src/cursor/cur_std.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
@@ -104,7 +104,8 @@ __wt_cursor_modify_notsup(WT_CURSOR *cursor, WT_MODIFY *entries, int nentries)
if (cursor->value_format != NULL && strlen(cursor->value_format) != 0) {
session = (WT_SESSION_IMPL *)cursor->session;
WT_RET_MSG(session, ENOTSUP,
- "WT_CURSOR.modify only supported for 'u' value formats");
+ "WT_CURSOR.modify only supported for 'S' and 'u' value "
+ "formats");
}
return (__wt_cursor_notsup(cursor));
}
@@ -633,8 +634,7 @@ __cursor_modify(WT_CURSOR *cursor, WT_MODIFY *entries, int nentries)
/* Get the current value, apply the modifications. */
WT_ERR(cursor->search(cursor));
- WT_ERR(__wt_modify_apply_api(
- session, &cursor->value, entries, nentries));
+ WT_ERR(__wt_modify_apply_api(session, cursor, entries, nentries));
/* We know both key and value are set, "overwrite" doesn't matter. */
ret = cursor->update(cursor);
@@ -821,10 +821,11 @@ __wt_cursor_init(WT_CURSOR *cursor,
F_SET(cursor, WT_CURSTD_RAW);
/*
- * WT_CURSOR.modify supported on 'u' value formats, but may have been
- * already initialized (file cursors have a faster implementation).
+ * WT_CURSOR.modify supported on 'S' and 'u' value formats, but may have
+ * been already initialized (file cursors have a faster implementation).
*/
- if (WT_STREQ(cursor->value_format, "u") &&
+ if ((WT_STREQ(cursor->value_format, "S") ||
+ WT_STREQ(cursor->value_format, "u")) &&
cursor->modify == __wt_cursor_modify_notsup)
cursor->modify = __cursor_modify;
diff --git a/src/third_party/wiredtiger/src/cursor/cur_table.c b/src/third_party/wiredtiger/src/cursor/cur_table.c
index 429f75208f2..ab2382946bd 100644
--- a/src/third_party/wiredtiger/src/cursor/cur_table.c
+++ b/src/third_party/wiredtiger/src/cursor/cur_table.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
@@ -547,7 +547,7 @@ __curtable_insert(WT_CURSOR *cursor)
*/
F_CLR(primary, WT_CURSTD_KEY_SET | WT_CURSTD_VALUE_SET);
if (F_ISSET(primary, WT_CURSTD_APPEND))
- F_SET(primary, WT_CURSTD_KEY_INT);
+ F_SET(primary, WT_CURSTD_KEY_EXT);
err: CURSOR_UPDATE_API_END(session, ret);
return (ret);
diff --git a/src/third_party/wiredtiger/src/docs/build-javadoc.sh b/src/third_party/wiredtiger/src/docs/build-javadoc.sh
index 69cb1186467..29dce173261 100755
--- a/src/third_party/wiredtiger/src/docs/build-javadoc.sh
+++ b/src/third_party/wiredtiger/src/docs/build-javadoc.sh
@@ -8,5 +8,5 @@ CLASSPATH=$THRIFT_HOME/libthrift.jar:$SLF4J_JAR javadoc -public -d $DOCS/java \
-stylesheetfile $DOCS/style/javadoc.css \
-use -link http://java.sun.com/j2se/1.5.0/docs/api/ \
-header '<b>WiredTiger API</b><br><font size="-1"> version '$WT_VERSION'</font>' \
- -windowtitle 'WiredTiger Java API' -bottom '<font size=1>Copyright (c) 2008-2017 MongoDB, Inc. All rights reserved.</font>' \
+ -windowtitle 'WiredTiger Java API' -bottom '<font size=1>Copyright (c) 2008-2018 MongoDB, Inc. All rights reserved.</font>' \
com.wiredtiger com.wiredtiger.util
diff --git a/src/third_party/wiredtiger/src/docs/error-handling.dox b/src/third_party/wiredtiger/src/docs/error-handling.dox
index 7b7c0cd03d5..8e866b8c123 100644
--- a/src/third_party/wiredtiger/src/docs/error-handling.dox
+++ b/src/third_party/wiredtiger/src/docs/error-handling.dox
@@ -87,10 +87,11 @@ standard API.
Note that ::wiredtiger_strerror is not thread-safe.
@m_if{c}
-@section error_handling_event Error handling using the WT_EVENT_HANDLER
+@section event_message_handling Message handling using the WT_EVENT_HANDLER
-Specific error handling can be configured by passing an implementation
-of WT_EVENT_HANDLER to ::wiredtiger_open or WT_CONNECTION::open_session.
+Specific error and other message handling can be configured by passing an
+implementation of WT_EVENT_HANDLER to ::wiredtiger_open or
+WT_CONNECTION::open_session.
For example, both informational and error messages might be passed to an
application-specific logging function that added a timestamp and logged
diff --git a/src/third_party/wiredtiger/src/docs/style/footer.html b/src/third_party/wiredtiger/src/docs/style/footer.html
index 12d25422f89..755affdbb7d 100644
--- a/src/third_party/wiredtiger/src/docs/style/footer.html
+++ b/src/third_party/wiredtiger/src/docs/style/footer.html
@@ -3,13 +3,13 @@
<div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
<ul>
$navpath
- <li class="footer">Copyright (c) 2008-2017 MongoDB, Inc. All rights reserved. Contact <a href="mailto:info@wiredtiger.com">info@wiredtiger.com</a> for more information.</li>
+ <li class="footer">Copyright (c) 2008-2018 MongoDB, Inc. All rights reserved. Contact <a href="mailto:info@wiredtiger.com">info@wiredtiger.com</a> for more information.</li>
</ul>
</div>
<!--END GENERATE_TREEVIEW-->
<!--BEGIN !GENERATE_TREEVIEW-->
<hr class="footer"/><address class="footer"><small>
-Copyright (c) 2008-2017 MongoDB, Inc. All rights reserved. Contact <a href="mailto:info@wiredtiger.com">info@wiredtiger.com</a> for more information.
+Copyright (c) 2008-2018 MongoDB, Inc. All rights reserved. Contact <a href="mailto:info@wiredtiger.com">info@wiredtiger.com</a> for more information.
</small></address>
<!--END !GENERATE_TREEVIEW-->
</body>
diff --git a/src/third_party/wiredtiger/src/docs/tools/doxfilter.py b/src/third_party/wiredtiger/src/docs/tools/doxfilter.py
index 301142269c3..3a9f0f6836a 100755
--- a/src/third_party/wiredtiger/src/docs/tools/doxfilter.py
+++ b/src/third_party/wiredtiger/src/docs/tools/doxfilter.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/src/docs/tools/fixlinks.py b/src/third_party/wiredtiger/src/docs/tools/fixlinks.py
index 1887665d5be..009c1a5aa30 100755
--- a/src/third_party/wiredtiger/src/docs/tools/fixlinks.py
+++ b/src/third_party/wiredtiger/src/docs/tools/fixlinks.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/src/evict/evict_file.c b/src/third_party/wiredtiger/src/evict/evict_file.c
index 13e2823d234..f2b632ca06d 100644
--- a/src/third_party/wiredtiger/src/evict/evict_file.c
+++ b/src/third_party/wiredtiger/src/evict/evict_file.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/evict/evict_lru.c b/src/third_party/wiredtiger/src/evict/evict_lru.c
index 03f11f29b01..9e46f24ca7f 100644
--- a/src/third_party/wiredtiger/src/evict/evict_lru.c
+++ b/src/third_party/wiredtiger/src/evict/evict_lru.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
@@ -663,11 +663,11 @@ __evict_pass(WT_SESSION_IMPL *session)
conn = S2C(session);
cache = conn->cache;
txn_global = &conn->txn_global;
+ time_prev = 0; /* [-Wconditional-uninitialized] */
/* Track whether pages are being evicted and progress is made. */
eviction_progress = cache->eviction_progress;
prev_oldest_id = txn_global->oldest_id;
- time_now = time_prev = 0;
/* Evict pages from the cache. */
for (loop = 0; cache->pass_intr == 0; loop++) {
@@ -741,7 +741,7 @@ __evict_pass(WT_SESSION_IMPL *session)
* transactions and writing updates to the lookaside table.
*/
if (eviction_progress == cache->eviction_progress) {
- if (WT_TSCDIFF_MS(session, time_now, time_prev) >= 20 &&
+ if (WT_TSCDIFF_MS(time_now, time_prev) >= 20 &&
F_ISSET(cache, WT_CACHE_EVICT_CLEAN_HARD |
WT_CACHE_EVICT_DIRTY_HARD)) {
if (cache->evict_aggressive_score < 100)
@@ -781,12 +781,11 @@ __evict_pass(WT_SESSION_IMPL *session)
__wt_verbose(session, WT_VERB_EVICTSERVER,
"%s", "unable to reach eviction goal");
break;
- } else {
- if (cache->evict_aggressive_score > 0)
- --cache->evict_aggressive_score;
- loop = 0;
- eviction_progress = cache->eviction_progress;
}
+ if (cache->evict_aggressive_score > 0)
+ --cache->evict_aggressive_score;
+ loop = 0;
+ eviction_progress = cache->eviction_progress;
}
return (0);
}
@@ -2313,7 +2312,7 @@ __evict_page(WT_SESSION_IMPL *session, bool is_server)
time_stop = __wt_rdtsc(session);
WT_STAT_CONN_INCRV(session,
application_evict_time,
- WT_TSCDIFF_US(session, time_stop, time_start));
+ WT_TSCDIFF_US(time_stop, time_start));
}
WT_TRACK_OP_END(session);
return (ret);
@@ -2429,7 +2428,7 @@ err: if (timer) {
time_stop = __wt_rdtsc(session);
WT_STAT_CONN_INCRV(session,
application_cache_time,
- WT_TSCDIFF_US(session, time_stop, time_start));
+ WT_TSCDIFF_US(time_stop, time_start));
}
done: WT_TRACK_OP_END(session);
diff --git a/src/third_party/wiredtiger/src/evict/evict_page.c b/src/third_party/wiredtiger/src/evict/evict_page.c
index 269fbaeaac8..70c5d6d02da 100644
--- a/src/third_party/wiredtiger/src/evict/evict_page.c
+++ b/src/third_party/wiredtiger/src/evict/evict_page.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
@@ -88,7 +88,7 @@ __wt_page_release_evict(WT_SESSION_IMPL *session, WT_REF *ref)
if (too_big) {
WT_STAT_CONN_INCR(session, cache_eviction_force);
WT_STAT_CONN_INCRV(session, cache_eviction_force_time,
- WT_TSCDIFF_US(session, time_stop, time_start));
+ WT_TSCDIFF_US(time_stop, time_start));
} else {
/*
* If the page isn't too big, we are evicting it because
@@ -98,12 +98,12 @@ __wt_page_release_evict(WT_SESSION_IMPL *session, WT_REF *ref)
WT_STAT_CONN_INCR(session, cache_eviction_force_delete);
WT_STAT_CONN_INCRV(session,
cache_eviction_force_delete_time,
- WT_TSCDIFF_US(session, time_stop, time_start));
+ WT_TSCDIFF_US(time_stop, time_start));
}
} else {
WT_STAT_CONN_INCR(session, cache_eviction_force_fail);
WT_STAT_CONN_INCRV(session, cache_eviction_force_fail_time,
- WT_TSCDIFF_US(session, time_stop, time_start));
+ WT_TSCDIFF_US(time_stop, time_start));
}
(void)__wt_atomic_subv32(&btree->evict_busy, 1);
diff --git a/src/third_party/wiredtiger/src/evict/evict_stat.c b/src/third_party/wiredtiger/src/evict/evict_stat.c
index b8878f1ce2f..4fcef60a04d 100644
--- a/src/third_party/wiredtiger/src/evict/evict_stat.c
+++ b/src/third_party/wiredtiger/src/evict/evict_stat.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/include/api.h b/src/third_party/wiredtiger/src/include/api.h
index 43b4f733a3d..a4416f139a0 100644
--- a/src/third_party/wiredtiger/src/include/api.h
+++ b/src/third_party/wiredtiger/src/include/api.h
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/include/async.h b/src/third_party/wiredtiger/src/include/async.h
index 53a7d982ba5..769aa4cfeec 100644
--- a/src/third_party/wiredtiger/src/include/async.h
+++ b/src/third_party/wiredtiger/src/include/async.h
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/include/bitstring.i b/src/third_party/wiredtiger/src/include/bitstring.i
index 237b4b98afe..d45ef25c86b 100644
--- a/src/third_party/wiredtiger/src/include/bitstring.i
+++ b/src/third_party/wiredtiger/src/include/bitstring.i
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/src/include/block.h b/src/third_party/wiredtiger/src/include/block.h
index bf99b4babc8..01a7617789a 100644
--- a/src/third_party/wiredtiger/src/include/block.h
+++ b/src/third_party/wiredtiger/src/include/block.h
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/include/bloom.h b/src/third_party/wiredtiger/src/include/bloom.h
index a0efc0bf1fa..6fe8cb2c1d0 100644
--- a/src/third_party/wiredtiger/src/include/bloom.h
+++ b/src/third_party/wiredtiger/src/include/bloom.h
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/include/btmem.h b/src/third_party/wiredtiger/src/include/btmem.h
index d2a7e376273..39aac8730c4 100644
--- a/src/third_party/wiredtiger/src/include/btmem.h
+++ b/src/third_party/wiredtiger/src/include/btmem.h
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
@@ -224,7 +224,8 @@ struct __wt_ovfl_reuse {
"key_format=" WT_UNCHECKED_STRING(QIQu) \
",value_format=" WT_UNCHECKED_STRING(QuBu) \
",block_compressor=" WT_LOOKASIDE_COMPRESSOR \
- ",leaf_value_max=64MB"
+ ",leaf_value_max=64MB" \
+ ",prefix_compression=true"
/*
* WT_PAGE_LOOKASIDE --
@@ -974,15 +975,17 @@ struct __wt_update {
uint32_t size; /* data length */
#define WT_UPDATE_INVALID 0 /* diagnostic check */
-#define WT_UPDATE_DELETED 1 /* deleted */
-#define WT_UPDATE_MODIFIED 2 /* partial-update modify value */
-#define WT_UPDATE_RESERVED 3 /* reserved */
+#define WT_UPDATE_BIRTHMARK 1 /* transaction for on-page value */
+#define WT_UPDATE_MODIFY 2 /* partial-update modify value */
+#define WT_UPDATE_RESERVE 3 /* reserved */
#define WT_UPDATE_STANDARD 4 /* complete value */
+#define WT_UPDATE_TOMBSTONE 5 /* deleted */
uint8_t type; /* type (one byte to conserve memory) */
/* If the update includes a complete value. */
#define WT_UPDATE_DATA_VALUE(upd) \
- ((upd)->type == WT_UPDATE_STANDARD || (upd)->type == WT_UPDATE_DELETED)
+ ((upd)->type == WT_UPDATE_STANDARD || \
+ (upd)->type == WT_UPDATE_TOMBSTONE)
#if WT_TIMESTAMP_SIZE != 8
WT_DECL_TIMESTAMP(timestamp) /* unaligned uint8_t array timestamp */
diff --git a/src/third_party/wiredtiger/src/include/btree.h b/src/third_party/wiredtiger/src/include/btree.h
index afbe2434e4c..e3fd6d5e66d 100644
--- a/src/third_party/wiredtiger/src/include/btree.h
+++ b/src/third_party/wiredtiger/src/include/btree.h
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/include/btree.i b/src/third_party/wiredtiger/src/include/btree.i
index 5d51f2cf796..fe9c81f42b2 100644
--- a/src/third_party/wiredtiger/src/include/btree.i
+++ b/src/third_party/wiredtiger/src/include/btree.i
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
@@ -1236,7 +1236,7 @@ __wt_leaf_page_can_split(WT_SESSION_IMPL *session, WT_PAGE *page)
* size, split as soon as there are 5 items on the page.
*/
#define WT_MAX_SPLIT_COUNT 5
- if (page->memory_footprint > btree->maxleafpage * 2) {
+ if (page->memory_footprint > (size_t)btree->maxleafpage * 2) {
for (count = 0, ins = ins_head->head[0];
ins != NULL;
ins = ins->next[0]) {
diff --git a/src/third_party/wiredtiger/src/include/btree_cmp.i b/src/third_party/wiredtiger/src/include/btree_cmp.i
index 9efbf8f618f..8f8e0e83717 100644
--- a/src/third_party/wiredtiger/src/include/btree_cmp.i
+++ b/src/third_party/wiredtiger/src/include/btree_cmp.i
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/include/buf.i b/src/third_party/wiredtiger/src/include/buf.i
index 8ff52f86ced..e4b9dcb2c79 100644
--- a/src/third_party/wiredtiger/src/include/buf.i
+++ b/src/third_party/wiredtiger/src/include/buf.i
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/include/cache.h b/src/third_party/wiredtiger/src/include/cache.h
index 28e906f373e..eea0b977515 100644
--- a/src/third_party/wiredtiger/src/include/cache.h
+++ b/src/third_party/wiredtiger/src/include/cache.h
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/include/cache.i b/src/third_party/wiredtiger/src/include/cache.i
index 00f45dcd44f..57376bb2fde 100644
--- a/src/third_party/wiredtiger/src/include/cache.i
+++ b/src/third_party/wiredtiger/src/include/cache.i
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/include/cell.i b/src/third_party/wiredtiger/src/include/cell.i
index 6ea7d5d68d2..644222ad569 100644
--- a/src/third_party/wiredtiger/src/include/cell.i
+++ b/src/third_party/wiredtiger/src/include/cell.i
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/include/column.i b/src/third_party/wiredtiger/src/include/column.i
index c95d338f980..6212cda19f3 100644
--- a/src/third_party/wiredtiger/src/include/column.i
+++ b/src/third_party/wiredtiger/src/include/column.i
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/include/compact.h b/src/third_party/wiredtiger/src/include/compact.h
index d74090c286c..67386a25852 100644
--- a/src/third_party/wiredtiger/src/include/compact.h
+++ b/src/third_party/wiredtiger/src/include/compact.h
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/include/config.h b/src/third_party/wiredtiger/src/include/config.h
index 3698290f21b..4764ce0fd9f 100644
--- a/src/third_party/wiredtiger/src/include/config.h
+++ b/src/third_party/wiredtiger/src/include/config.h
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/include/connection.h b/src/third_party/wiredtiger/src/include/connection.h
index 012c50e5f5f..aef6b2d6777 100644
--- a/src/third_party/wiredtiger/src/include/connection.h
+++ b/src/third_party/wiredtiger/src/include/connection.h
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
@@ -25,6 +25,9 @@ struct __wt_process {
/* Locked: connection queue */
TAILQ_HEAD(__wt_connection_impl_qh, __wt_connection_impl) connqh;
WT_CACHE_POOL *cache_pool;
+#define WT_TSC_DEFAULT_RATIO 1.0
+ double tsc_nsec_ratio; /* rdtsc ticks to nanoseconds */
+ bool use_epochtime; /* use expensive time */
/* Checksum function */
#define __wt_checksum(chunk, len) __wt_process.checksum(chunk, len)
@@ -403,7 +406,6 @@ struct __wt_connection_impl {
bool mmap; /* mmap configuration */
int page_size; /* OS page size for mmap alignment */
- double tsc_nsec_ratio; /* rdtsc ticks to nanoseconds */
/* AUTOMATIC FLAG VALUE GENERATION START */
#define WT_VERB_API 0x000000001u
diff --git a/src/third_party/wiredtiger/src/include/ctype.i b/src/third_party/wiredtiger/src/include/ctype.i
index 3855ae653a5..e69facdb251 100644
--- a/src/third_party/wiredtiger/src/include/ctype.i
+++ b/src/third_party/wiredtiger/src/include/ctype.i
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/include/cursor.h b/src/third_party/wiredtiger/src/include/cursor.h
index 1d3d44148a3..31dec1d24f6 100644
--- a/src/third_party/wiredtiger/src/include/cursor.h
+++ b/src/third_party/wiredtiger/src/include/cursor.h
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/include/cursor.i b/src/third_party/wiredtiger/src/include/cursor.i
index ceef5061075..a4e986c4325 100644
--- a/src/third_party/wiredtiger/src/include/cursor.i
+++ b/src/third_party/wiredtiger/src/include/cursor.i
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/include/dhandle.h b/src/third_party/wiredtiger/src/include/dhandle.h
index 12a64ed83c3..a18881d8ea9 100644
--- a/src/third_party/wiredtiger/src/include/dhandle.h
+++ b/src/third_party/wiredtiger/src/include/dhandle.h
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
@@ -48,11 +48,11 @@
if ((dhandle) == NULL) \
(dhandle) = TAILQ_FIRST(head); \
else { \
- WT_DHANDLE_RELEASE(dhandle); \
- (dhandle) = TAILQ_NEXT(dhandle, field); \
+ WT_DHANDLE_RELEASE(dhandle); \
+ (dhandle) = TAILQ_NEXT(dhandle, field); \
} \
if ((dhandle) != NULL) \
- WT_DHANDLE_ACQUIRE(dhandle); \
+ WT_DHANDLE_ACQUIRE(dhandle); \
} while (0)
/*
diff --git a/src/third_party/wiredtiger/src/include/dlh.h b/src/third_party/wiredtiger/src/include/dlh.h
index d02523b03d1..a5fcaf17355 100644
--- a/src/third_party/wiredtiger/src/include/dlh.h
+++ b/src/third_party/wiredtiger/src/include/dlh.h
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/include/error.h b/src/third_party/wiredtiger/src/include/error.h
index af7209f1ad1..a4ef4757ec9 100644
--- a/src/third_party/wiredtiger/src/include/error.h
+++ b/src/third_party/wiredtiger/src/include/error.h
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/include/extern.h b/src/third_party/wiredtiger/src/include/extern.h
index b45a0d9e43f..c80e686ead5 100644
--- a/src/third_party/wiredtiger/src/include/extern.h
+++ b/src/third_party/wiredtiger/src/include/extern.h
@@ -377,7 +377,7 @@ extern int __wt_verbose_dump_cache(WT_SESSION_IMPL *session) WT_GCC_FUNC_DECL_AT
extern int __wt_page_release_evict(WT_SESSION_IMPL *session, WT_REF *ref) WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result));
extern int __wt_evict(WT_SESSION_IMPL *session, WT_REF *ref, bool closing) WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result));
extern void __wt_curstat_cache_walk(WT_SESSION_IMPL *session);
-extern int __wt_log_printf(WT_SESSION_IMPL *session, const char *fmt, ...) WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result));
+extern int __wt_log_printf(WT_SESSION_IMPL *session, const char *format, ...) WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result));
extern void __wt_log_ckpt(WT_SESSION_IMPL *session, WT_LSN *ckp_lsn);
extern int __wt_log_flush_lsn(WT_SESSION_IMPL *session, WT_LSN *lsn, bool start) WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result));
extern void __wt_log_background(WT_SESSION_IMPL *session, WT_LSN *lsn);
@@ -533,7 +533,6 @@ extern int __wt_turtle_update(WT_SESSION_IMPL *session, const char *key, const c
extern void __wt_optrack_record_funcid( WT_SESSION_IMPL *session, const char *func, uint16_t *func_idp);
extern int __wt_optrack_open_file(WT_SESSION_IMPL *session) WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result));
extern size_t __wt_optrack_flush_buffer(WT_SESSION_IMPL *s);
-extern uint64_t __wt_optrack_get_expensive_timestamp(WT_SESSION_IMPL *session);
extern int __wt_filename(WT_SESSION_IMPL *session, const char *name, char **path) WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result));
extern int __wt_nfilename( WT_SESSION_IMPL *session, const char *name, size_t namelen, char **path) WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result));
extern int __wt_filename_construct(WT_SESSION_IMPL *session, const char *path, const char *file_prefix, uintmax_t id_1, uint32_t id_2, WT_ITEM *buf) WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result));
@@ -560,14 +559,14 @@ extern int __wt_fopen(WT_SESSION_IMPL *session, const char *name, uint32_t open_
extern void __wt_os_stdio(WT_SESSION_IMPL *session);
extern int __wt_getopt( const char *progname, int nargc, char *const *nargv, const char *ostr) WT_GCC_FUNC_DECL_ATTRIBUTE((visibility("default"))) WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result));
extern uint64_t __wt_strtouq(const char *nptr, char **endptr, int base) WT_GCC_FUNC_DECL_ATTRIBUTE((visibility("default")));
-extern int __wt_ext_struct_pack(WT_EXTENSION_API *wt_api, WT_SESSION *wt_session, void *buffer, size_t size, const char *fmt, ...) WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result));
-extern int __wt_ext_struct_size(WT_EXTENSION_API *wt_api, WT_SESSION *wt_session, size_t *sizep, const char *fmt, ...) WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result));
-extern int __wt_ext_struct_unpack(WT_EXTENSION_API *wt_api, WT_SESSION *wt_session, const void *buffer, size_t size, const char *fmt, ...) WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result));
+extern int __wt_ext_struct_pack(WT_EXTENSION_API *wt_api, WT_SESSION *wt_session, void *buffer, size_t len, const char *fmt, ...) WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result));
+extern int __wt_ext_struct_size(WT_EXTENSION_API *wt_api, WT_SESSION *wt_session, size_t *lenp, const char *fmt, ...) WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result));
+extern int __wt_ext_struct_unpack(WT_EXTENSION_API *wt_api, WT_SESSION *wt_session, const void *buffer, size_t len, const char *fmt, ...) WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result));
extern int __wt_struct_check(WT_SESSION_IMPL *session, const char *fmt, size_t len, bool *fixedp, uint32_t *fixed_lenp) WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result));
extern int __wt_struct_confchk(WT_SESSION_IMPL *session, WT_CONFIG_ITEM *v) WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result));
-extern int __wt_struct_size(WT_SESSION_IMPL *session, size_t *sizep, const char *fmt, ...) WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result));
-extern int __wt_struct_pack(WT_SESSION_IMPL *session, void *buffer, size_t size, const char *fmt, ...) WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result));
-extern int __wt_struct_unpack(WT_SESSION_IMPL *session, const void *buffer, size_t size, const char *fmt, ...) WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result));
+extern int __wt_struct_size(WT_SESSION_IMPL *session, size_t *lenp, const char *fmt, ...) WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result));
+extern int __wt_struct_pack(WT_SESSION_IMPL *session, void *buffer, size_t len, const char *fmt, ...) WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result));
+extern int __wt_struct_unpack(WT_SESSION_IMPL *session, const void *buffer, size_t len, const char *fmt, ...) WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result));
extern int __wt_struct_repack(WT_SESSION_IMPL *session, const char *infmt, const char *outfmt, const WT_ITEM *inbuf, WT_ITEM *outbuf) WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result));
extern int __wt_ext_pack_start(WT_EXTENSION_API *wt_api, WT_SESSION *wt_session, const char *format, void *buffer, size_t size, WT_PACK_STREAM **psp) WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result));
extern int __wt_ext_unpack_start(WT_EXTENSION_API *wt_api, WT_SESSION *wt_session, const char *format, const void *buffer, size_t size, WT_PACK_STREAM **psp) WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result));
@@ -644,6 +643,7 @@ extern int __wt_open_cursor(WT_SESSION_IMPL *session, const char *uri, WT_CURSOR
extern int __wt_session_create( WT_SESSION_IMPL *session, const char *uri, const char *config) WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result));
extern int __wt_session_range_truncate(WT_SESSION_IMPL *session, const char *uri, WT_CURSOR *start, WT_CURSOR *stop) WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result));
extern const char *__wt_session_strerror(WT_SESSION *wt_session, int error);
+extern int __wt_session_breakpoint(WT_SESSION *wt_session) WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result));
extern int __wt_open_session(WT_CONNECTION_IMPL *conn, WT_EVENT_HANDLER *event_handler, const char *config, bool open_metadata, WT_SESSION_IMPL **sessionp) WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result));
extern int __wt_open_internal_session(WT_CONNECTION_IMPL *conn, const char *name, bool open_metadata, uint32_t session_flags, WT_SESSION_IMPL **sessionp) WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result));
extern int __wt_session_compact_check_timeout(WT_SESSION_IMPL *session) WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result));
@@ -700,7 +700,6 @@ extern void __wt_stash_discard(WT_SESSION_IMPL *session);
extern int __wt_stash_add(WT_SESSION_IMPL *session, int which, uint64_t generation, void *p, size_t len) WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result));
extern void __wt_stash_discard_all(WT_SESSION_IMPL *session_safe, WT_SESSION_IMPL *session);
extern int __wt_library_init(void) WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result));
-extern void __wt_breakpoint(void);
extern uint64_t __wt_hash_city64(const void *s, size_t len);
extern uint64_t __wt_hash_fnv64(const void *string, size_t len);
extern int
@@ -726,8 +725,8 @@ extern void __wt_print_huffman_code(void *huffman_arg, uint16_t symbol);
extern int __wt_huffman_encode(WT_SESSION_IMPL *session, void *huffman_arg, const uint8_t *from_arg, size_t from_len, WT_ITEM *to_buf) WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result));
extern int __wt_huffman_decode(WT_SESSION_IMPL *session, void *huffman_arg, const uint8_t *from_arg, size_t from_len, WT_ITEM *to_buf) WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result));
extern int __wt_modify_pack(WT_SESSION_IMPL *session, WT_ITEM **modifyp, WT_MODIFY *entries, int nentries) WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result));
-extern int __wt_modify_apply_api( WT_SESSION_IMPL *session, WT_ITEM *value, WT_MODIFY *entries, int nentries) WT_GCC_FUNC_DECL_ATTRIBUTE((visibility("default"))) WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result));
-extern int __wt_modify_apply(WT_SESSION_IMPL *session, WT_ITEM *value, const void *modify) WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result));
+extern int __wt_modify_apply_api(WT_SESSION_IMPL *session, WT_CURSOR *cursor, WT_MODIFY *entries, int nentries) WT_GCC_FUNC_DECL_ATTRIBUTE((visibility("default"))) WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result));
+extern int __wt_modify_apply( WT_SESSION_IMPL *session, WT_CURSOR *cursor, const void *modify) WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result));
extern int __wt_rwlock_init(WT_SESSION_IMPL *session, WT_RWLOCK *l) WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result));
extern void __wt_rwlock_destroy(WT_SESSION_IMPL *session, WT_RWLOCK *l);
extern int __wt_try_readlock(WT_SESSION_IMPL *session, WT_RWLOCK *l) WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result));
@@ -745,17 +744,19 @@ extern uint32_t __wt_rduppo2(uint32_t n, uint32_t po2);
extern void __wt_random_init(WT_RAND_STATE volatile *rnd_state) WT_GCC_FUNC_DECL_ATTRIBUTE((visibility("default")));
extern void __wt_random_init_seed( WT_SESSION_IMPL *session, WT_RAND_STATE volatile *rnd_state) WT_GCC_FUNC_DECL_ATTRIBUTE((visibility("default")));
extern uint32_t __wt_random(WT_RAND_STATE volatile *rnd_state) WT_GCC_FUNC_DECL_ATTRIBUTE((visibility("default")));
-extern int __wt_buf_grow_worker(WT_SESSION_IMPL *session, WT_ITEM *buf, size_t size) WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result));
-extern int __wt_buf_fmt(WT_SESSION_IMPL *session, WT_ITEM *buf, const char *fmt, ...) WT_GCC_FUNC_DECL_ATTRIBUTE((format (printf, 3, 4))) WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result));
-extern int __wt_buf_catfmt(WT_SESSION_IMPL *session, WT_ITEM *buf, const char *fmt, ...) WT_GCC_FUNC_DECL_ATTRIBUTE((format (printf, 3, 4))) WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result));
+extern int __wt_buf_grow_worker(WT_SESSION_IMPL *session, WT_ITEM *buf, size_t size) WT_GCC_FUNC_DECL_ATTRIBUTE((visibility("default"))) WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result));
+extern int __wt_buf_fmt(WT_SESSION_IMPL *session, WT_ITEM *buf, const char *fmt, ...) WT_GCC_FUNC_DECL_ATTRIBUTE((format (printf, 3, 4))) WT_GCC_FUNC_DECL_ATTRIBUTE((visibility("default"))) WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result));
+extern int __wt_buf_catfmt(WT_SESSION_IMPL *session, WT_ITEM *buf, const char *fmt, ...) WT_GCC_FUNC_DECL_ATTRIBUTE((format (printf, 3, 4))) WT_GCC_FUNC_DECL_ATTRIBUTE((visibility("default"))) WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result));
extern const char *__wt_buf_set_printable( WT_SESSION_IMPL *session, const void *p, size_t size, WT_ITEM *buf);
+extern const char *__wt_buf_set_printable_format(WT_SESSION_IMPL *session, const void *buffer, size_t size, const char *format, WT_ITEM *buf);
extern const char *__wt_buf_set_size( WT_SESSION_IMPL *session, uint64_t size, bool exact, WT_ITEM *buf);
extern int
__wt_scr_alloc_func(WT_SESSION_IMPL *session, size_t size, WT_ITEM **scratchp
#ifdef HAVE_DIAGNOSTIC
, const char *file, int line
#endif
- );
+ )
+ WT_GCC_FUNC_DECL_ATTRIBUTE((visibility("default")));
extern void __wt_scr_discard(WT_SESSION_IMPL *session);
extern void *__wt_ext_scr_alloc( WT_EXTENSION_API *wt_api, WT_SESSION *wt_session, size_t size);
extern void __wt_ext_scr_free(WT_EXTENSION_API *wt_api, WT_SESSION *wt_session, void *p);
@@ -786,7 +787,8 @@ extern void __wt_thread_group_start_one( WT_SESSION_IMPL *session, WT_THREAD_GRO
extern void __wt_thread_group_stop_one(WT_SESSION_IMPL *session, WT_THREAD_GROUP *group);
extern void __wt_epoch(WT_SESSION_IMPL *session, struct timespec *tsp) WT_GCC_FUNC_DECL_ATTRIBUTE((visibility("default")));
extern void __wt_seconds(WT_SESSION_IMPL *session, time_t *timep);
-extern uint64_t __wt_tsc_to_nsec(WT_SESSION_IMPL *session, uint64_t tsc_diff);
+extern uint64_t __wt_tsc_to_nsec(uint64_t end, uint64_t begin);
+extern uint64_t __wt_tsc_get_expensive_timestamp(WT_SESSION_IMPL *session);
extern void __wt_txn_release_snapshot(WT_SESSION_IMPL *session);
extern void __wt_txn_get_snapshot(WT_SESSION_IMPL *session);
extern int __wt_txn_update_oldest(WT_SESSION_IMPL *session, uint32_t flags) WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result));
diff --git a/src/third_party/wiredtiger/src/include/extern_posix.h b/src/third_party/wiredtiger/src/include/extern_posix.h
index 38e645a997d..d4119fdb07a 100644
--- a/src/third_party/wiredtiger/src/include/extern_posix.h
+++ b/src/third_party/wiredtiger/src/include/extern_posix.h
@@ -1,6 +1,7 @@
/* DO NOT EDIT: automatically built by dist/s_prototypes. */
extern int __wt_posix_directory_list(WT_FILE_SYSTEM *file_system, WT_SESSION *wt_session, const char *directory, const char *prefix, char ***dirlistp, uint32_t *countp) WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result));
+extern int __wt_posix_directory_list_single(WT_FILE_SYSTEM *file_system, WT_SESSION *wt_session, const char *directory, const char *prefix, char ***dirlistp, uint32_t *countp) WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result));
extern int __wt_posix_directory_list_free(WT_FILE_SYSTEM *file_system, WT_SESSION *wt_session, char **dirlist, uint32_t count) WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result));
extern int __wt_dlopen(WT_SESSION_IMPL *session, const char *path, WT_DLH **dlhp) WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result));
extern int __wt_dlsym(WT_SESSION_IMPL *session, WT_DLH *dlh, const char *name, bool fail, void *sym_ret) WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result));
diff --git a/src/third_party/wiredtiger/src/include/extern_win.h b/src/third_party/wiredtiger/src/include/extern_win.h
index 4d8d479f0b9..bb5329127f5 100644
--- a/src/third_party/wiredtiger/src/include/extern_win.h
+++ b/src/third_party/wiredtiger/src/include/extern_win.h
@@ -1,6 +1,7 @@
/* DO NOT EDIT: automatically built by dist/s_prototypes. */
extern int __wt_win_directory_list(WT_FILE_SYSTEM *file_system, WT_SESSION *wt_session, const char *directory, const char *prefix, char ***dirlistp, uint32_t *countp) WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result));
+extern int __wt_win_directory_list_single(WT_FILE_SYSTEM *file_system, WT_SESSION *wt_session, const char *directory, const char *prefix, char ***dirlistp, uint32_t *countp) WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result));
extern int __wt_win_directory_list_free(WT_FILE_SYSTEM *file_system, WT_SESSION *wt_session, char **dirlist, uint32_t count) WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result));
extern int __wt_dlopen(WT_SESSION_IMPL *session, const char *path, WT_DLH **dlhp) WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result));
extern int __wt_dlsym(WT_SESSION_IMPL *session, WT_DLH *dlh, const char *name, bool fail, void *sym_ret) WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result));
diff --git a/src/third_party/wiredtiger/src/include/gcc.h b/src/third_party/wiredtiger/src/include/gcc.h
index 043d9b44356..deae5bf06a9 100644
--- a/src/third_party/wiredtiger/src/include/gcc.h
+++ b/src/third_party/wiredtiger/src/include/gcc.h
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
@@ -94,61 +94,76 @@
* with some versions of clang. See http://llvm.org/bugs/show_bug.cgi?id=21499
* for details.
*/
-#define WT_ATOMIC_CAS(ptr, oldval, newval) \
- (__sync_val_compare_and_swap(ptr, oldval, newval) == oldval)
+#define WT_ATOMIC_CAS(ptr, old, new) \
+ (__sync_val_compare_and_swap(ptr, old, new) == (old))
#else
-#define WT_ATOMIC_CAS(ptr, oldval, newval) \
- __sync_bool_compare_and_swap(ptr, oldval, newval)
+#define WT_ATOMIC_CAS(ptr, old, new) \
+ __sync_bool_compare_and_swap(ptr, old, new)
#endif
+#define WT_ATOMIC_CAS_FUNC(name, vp_arg, old_arg, new_arg) \
+static inline bool \
+__wt_atomic_cas##name(vp_arg, old_arg, new_arg) \
+{ \
+ return (WT_ATOMIC_CAS(vp, old, new)); \
+}
+WT_ATOMIC_CAS_FUNC(8, uint8_t *vp, uint8_t old, uint8_t new)
+WT_ATOMIC_CAS_FUNC(16, uint16_t *vp, uint16_t old, uint16_t new)
+WT_ATOMIC_CAS_FUNC(32, uint32_t *vp, uint32_t old, uint32_t new)
+WT_ATOMIC_CAS_FUNC(v32, \
+ volatile uint32_t *vp, volatile uint32_t old, volatile uint32_t new)
+WT_ATOMIC_CAS_FUNC(i32, int32_t *vp, int32_t old, int32_t new)
+WT_ATOMIC_CAS_FUNC(iv32, \
+ volatile int32_t *vp, volatile int32_t old, volatile int32_t new)
+WT_ATOMIC_CAS_FUNC(64, uint64_t *vp, uint64_t old, uint64_t new)
+WT_ATOMIC_CAS_FUNC(v64, \
+ volatile uint64_t *vp, volatile uint64_t old, volatile uint64_t new)
+WT_ATOMIC_CAS_FUNC(i64, int64_t *vp, int64_t old, int64_t new)
+WT_ATOMIC_CAS_FUNC(iv64, \
+ volatile int64_t *vp, volatile int64_t old, volatile int64_t new)
+WT_ATOMIC_CAS_FUNC(size, size_t *vp, size_t old, size_t new)
-#define WT_ATOMIC_FUNC(name, ret, type) \
+/*
+ * __wt_atomic_cas_ptr --
+ * Pointer compare and swap.
+ */
+static inline bool
+__wt_atomic_cas_ptr(void *vp, void *old, void *new)
+{
+ return (WT_ATOMIC_CAS((void **)vp, old, new));
+}
+
+#define WT_ATOMIC_FUNC(name, ret, vp_arg, v_arg) \
static inline ret \
-__wt_atomic_add##name(type *vp, type v) \
+__wt_atomic_add##name(vp_arg, v_arg) \
{ \
return (__sync_add_and_fetch(vp, v)); \
} \
static inline ret \
-__wt_atomic_fetch_add##name(type *vp, type v) \
+__wt_atomic_fetch_add##name(vp_arg, v_arg) \
{ \
return (__sync_fetch_and_add(vp, v)); \
} \
static inline ret \
-__wt_atomic_store##name(type *vp, type v) \
+__wt_atomic_store##name(vp_arg, v_arg) \
{ \
return (__sync_lock_test_and_set(vp, v)); \
} \
static inline ret \
-__wt_atomic_sub##name(type *vp, type v) \
+__wt_atomic_sub##name(vp_arg, v_arg) \
{ \
return (__sync_sub_and_fetch(vp, v)); \
-} \
-static inline bool \
-__wt_atomic_cas##name(type *vp, type old, type new) \
-{ \
- return (WT_ATOMIC_CAS(vp, old, new)); \
-}
-
-WT_ATOMIC_FUNC(8, uint8_t, uint8_t)
-WT_ATOMIC_FUNC(16, uint16_t, uint16_t)
-WT_ATOMIC_FUNC(32, uint32_t, uint32_t)
-WT_ATOMIC_FUNC(v32, uint32_t, volatile uint32_t)
-WT_ATOMIC_FUNC(i32, int32_t, int32_t)
-WT_ATOMIC_FUNC(iv32, int32_t, volatile int32_t)
-WT_ATOMIC_FUNC(64, uint64_t, uint64_t)
-WT_ATOMIC_FUNC(v64, uint64_t, volatile uint64_t)
-WT_ATOMIC_FUNC(i64, int64_t, int64_t)
-WT_ATOMIC_FUNC(iv64, int64_t, volatile int64_t)
-WT_ATOMIC_FUNC(size, size_t, size_t)
-
-/*
- * __wt_atomic_cas_ptr --
- * Pointer compare and swap.
- */
-static inline bool
-__wt_atomic_cas_ptr(void *vp, void *old, void *new)
-{
- return (WT_ATOMIC_CAS((void **)vp, old, new));
}
+WT_ATOMIC_FUNC(8, uint8_t, uint8_t *vp, uint8_t v)
+WT_ATOMIC_FUNC(16, uint16_t, uint16_t *vp, uint16_t v)
+WT_ATOMIC_FUNC(32, uint32_t, uint32_t *vp, uint32_t v)
+WT_ATOMIC_FUNC(v32, uint32_t, volatile uint32_t *vp, volatile uint32_t v)
+WT_ATOMIC_FUNC(i32, int32_t, int32_t *vp, int32_t v)
+WT_ATOMIC_FUNC(iv32, int32_t, volatile int32_t *vp, volatile int32_t v)
+WT_ATOMIC_FUNC(64, uint64_t, uint64_t *vp, uint64_t v)
+WT_ATOMIC_FUNC(v64, uint64_t, volatile uint64_t *vp, volatile uint64_t v)
+WT_ATOMIC_FUNC(i64, int64_t, int64_t *vp, int64_t v)
+WT_ATOMIC_FUNC(iv64, int64_t, volatile int64_t *vp, volatile int64_t v)
+WT_ATOMIC_FUNC(size, size_t, size_t *vp, size_t v)
/* Compile read-write barrier */
#define WT_BARRIER() __asm__ volatile("" ::: "memory")
diff --git a/src/third_party/wiredtiger/src/include/hardware.h b/src/third_party/wiredtiger/src/include/hardware.h
index 3ff198be3c7..073348cf69c 100644
--- a/src/third_party/wiredtiger/src/include/hardware.h
+++ b/src/third_party/wiredtiger/src/include/hardware.h
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/include/intpack.i b/src/third_party/wiredtiger/src/include/intpack.i
index 9cc6acc2d7e..aa50baa2f5f 100644
--- a/src/third_party/wiredtiger/src/include/intpack.i
+++ b/src/third_party/wiredtiger/src/include/intpack.i
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/include/lint.h b/src/third_party/wiredtiger/src/include/lint.h
index c02e25592c0..c2884c1b3e0 100644
--- a/src/third_party/wiredtiger/src/include/lint.h
+++ b/src/third_party/wiredtiger/src/include/lint.h
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
@@ -84,8 +84,8 @@ __wt_atomic_cas_ptr(void *vp, void *orig, void *new) {
return (false);
}
-static inline void WT_BARRIER(void) { }
-static inline void WT_FULL_BARRIER(void) { }
-static inline void WT_PAUSE(void) { }
-static inline void WT_READ_BARRIER(void) { }
-static inline void WT_WRITE_BARRIER(void) { }
+static inline void WT_BARRIER(void) {}
+static inline void WT_FULL_BARRIER(void) {}
+static inline void WT_PAUSE(void) {}
+static inline void WT_READ_BARRIER(void) {}
+static inline void WT_WRITE_BARRIER(void) {}
diff --git a/src/third_party/wiredtiger/src/include/log.h b/src/third_party/wiredtiger/src/include/log.h
index e0e7bc599bc..aa3f0164454 100644
--- a/src/third_party/wiredtiger/src/include/log.h
+++ b/src/third_party/wiredtiger/src/include/log.h
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/include/log.i b/src/third_party/wiredtiger/src/include/log.i
index 8c7e5dc65e8..3151ca4ff86 100644
--- a/src/third_party/wiredtiger/src/include/log.i
+++ b/src/third_party/wiredtiger/src/include/log.i
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/include/lsm.h b/src/third_party/wiredtiger/src/include/lsm.h
index 2ab16364b09..3102f1754cf 100644
--- a/src/third_party/wiredtiger/src/include/lsm.h
+++ b/src/third_party/wiredtiger/src/include/lsm.h
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/include/meta.h b/src/third_party/wiredtiger/src/include/meta.h
index 2e8ffdded75..e64e06d08f8 100644
--- a/src/third_party/wiredtiger/src/include/meta.h
+++ b/src/third_party/wiredtiger/src/include/meta.h
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/include/misc.h b/src/third_party/wiredtiger/src/include/misc.h
index 356ef73dec7..0ddeb046353 100644
--- a/src/third_party/wiredtiger/src/include/misc.h
+++ b/src/third_party/wiredtiger/src/include/misc.h
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
@@ -11,6 +11,7 @@
* and unused function return values.
*/
#define WT_UNUSED(var) (void)(var)
+#define WT_NOT_READ(var) (void)(var)
#define WT_IGNORE_RET(call) do { \
int __ignored_ret; \
__ignored_ret = (call); \
@@ -139,7 +140,6 @@
#define F_CLR(p, mask) FLD_CLR((p)->flags, mask)
#define F_ISSET(p, mask) FLD_ISSET((p)->flags, mask)
-#define F_ISSET_ALL(p, mask) (FLD_MASK((p)->flags, mask) == (mask))
#define F_MASK(p, mask) FLD_MASK((p)->flags, mask)
#define F_SET(p, mask) FLD_SET((p)->flags, mask)
diff --git a/src/third_party/wiredtiger/src/include/misc.i b/src/third_party/wiredtiger/src/include/misc.i
index f40f2ac0fa9..2cca416d20f 100644
--- a/src/third_party/wiredtiger/src/include/misc.i
+++ b/src/third_party/wiredtiger/src/include/misc.i
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
@@ -35,22 +35,24 @@ __wt_hex(int c)
*/
static inline uint64_t
__wt_rdtsc(WT_SESSION_IMPL *session) {
-#if (defined __i386)
+ if (__wt_process.use_epochtime)
+ return (__wt_tsc_get_expensive_timestamp(session));
+#if defined (__i386)
+ {
uint64_t x;
- WT_UNUSED(session);
-
__asm__ volatile ("rdtsc" : "=A" (x));
return (x);
-#elif (defined __amd64)
+ }
+#elif defined (__amd64)
+ {
uint64_t a, d;
- WT_UNUSED(session);
-
__asm__ volatile ("rdtsc" : "=a" (a), "=d" (d));
return ((d << 32) | a);
+ }
#else
- return (__wt_optrack_get_expensive_timestamp(session));
+ return (__wt_tsc_get_expensive_timestamp(session));
#endif
}
diff --git a/src/third_party/wiredtiger/src/include/msvc.h b/src/third_party/wiredtiger/src/include/msvc.h
index d9bbd2d505b..3194e536b9b 100644
--- a/src/third_party/wiredtiger/src/include/msvc.h
+++ b/src/third_party/wiredtiger/src/include/msvc.h
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/include/mutex.h b/src/third_party/wiredtiger/src/include/mutex.h
index 7aeb6160f43..2a3fc7448f8 100644
--- a/src/third_party/wiredtiger/src/include/mutex.h
+++ b/src/third_party/wiredtiger/src/include/mutex.h
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/include/mutex.i b/src/third_party/wiredtiger/src/include/mutex.i
index 1d9fea9efb4..fa07e6b7d4f 100644
--- a/src/third_party/wiredtiger/src/include/mutex.i
+++ b/src/third_party/wiredtiger/src/include/mutex.i
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
@@ -304,12 +304,10 @@ __wt_spin_lock_track(WT_SESSION_IMPL *session, WT_SPINLOCK *t)
stats[session->stat_bucket][t->stat_count_off]++;
if (F_ISSET(session, WT_SESSION_INTERNAL))
stats[session->stat_bucket][t->stat_int_usecs_off] +=
- (int64_t)WT_TSCDIFF_US(
- session, time_stop, time_start);
+ (int64_t)WT_TSCDIFF_US(time_stop, time_start);
else
stats[session->stat_bucket][t->stat_app_usecs_off] +=
- (int64_t)WT_TSCDIFF_US(
- session, time_stop, time_start);
+ (int64_t)WT_TSCDIFF_US(time_stop, time_start);
} else
__wt_spin_lock(session, t);
}
diff --git a/src/third_party/wiredtiger/src/include/optrack.h b/src/third_party/wiredtiger/src/include/optrack.h
index 6c3d57deea6..9c9720bb3cc 100644
--- a/src/third_party/wiredtiger/src/include/optrack.h
+++ b/src/third_party/wiredtiger/src/include/optrack.h
@@ -1,13 +1,13 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
*/
-#define WT_OPTRACK_MAXRECS 16384
-#define WT_OPTRACK_BUFSIZE WT_OPTRACK_MAXRECS * sizeof(WT_OPTRACK_RECORD)
+#define WT_OPTRACK_MAXRECS (16384)
+#define WT_OPTRACK_BUFSIZE (WT_OPTRACK_MAXRECS * sizeof(WT_OPTRACK_RECORD))
#define WT_OPTRACK_VERSION 1
/*
diff --git a/src/third_party/wiredtiger/src/include/os.h b/src/third_party/wiredtiger/src/include/os.h
index 9f5f35344ba..a3f1420d72b 100644
--- a/src/third_party/wiredtiger/src/include/os.h
+++ b/src/third_party/wiredtiger/src/include/os.h
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
@@ -65,14 +65,14 @@
#define WT_TIMEDIFF_SEC(end, begin) \
(WT_TIMEDIFF_NS((end), (begin)) / WT_BILLION)
-#define WT_TSCDIFF_NS(s, end, begin) \
- (__wt_tsc_to_nsec((s), (uint64_t)(end) - (uint64_t)(begin)))
-#define WT_TSCDIFF_US(s, end, begin) \
- (WT_TSCDIFF_NS((s), (end), (begin)) / WT_THOUSAND)
-#define WT_TSCDIFF_MS(s, end, begin) \
- (WT_TSCDIFF_NS((s), (end), (begin)) / WT_MILLION)
-#define WT_TSCDIFF_SEC(s, end, begin) \
- (WT_TSCDIFF_NS((s), (end), (begin)) / WT_BILLION)
+#define WT_TSCDIFF_NS(end, begin) \
+ (__wt_tsc_to_nsec(end, begin))
+#define WT_TSCDIFF_US(end, begin) \
+ (WT_TSCDIFF_NS(end, begin) / WT_THOUSAND)
+#define WT_TSCDIFF_MS(end, begin) \
+ (WT_TSCDIFF_NS(end, begin) / WT_MILLION)
+#define WT_TSCDIFF_SEC(end, begin) \
+ (WT_TSCDIFF_NS(end, begin) / WT_BILLION)
#define WT_TIMECMP(t1, t2) \
((t1).tv_sec < (t2).tv_sec ? -1 : \
diff --git a/src/third_party/wiredtiger/src/include/os_fhandle.i b/src/third_party/wiredtiger/src/include/os_fhandle.i
index e5177e64b57..5685b0f46dc 100644
--- a/src/third_party/wiredtiger/src/include/os_fhandle.i
+++ b/src/third_party/wiredtiger/src/include/os_fhandle.i
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
@@ -7,6 +7,13 @@
*/
/*
+ * Define functions that increment histogram statistics for filesystem
+ * operations latency.
+ */
+WT_STAT_MSECS_HIST_INCR_FUNC(fsread, perf_hist_fsread_latency, 10)
+WT_STAT_MSECS_HIST_INCR_FUNC(fswrite, perf_hist_fswrite_latency, 10)
+
+/*
* __wt_fsync --
* POSIX fsync.
*/
@@ -94,6 +101,7 @@ __wt_read(
WT_SESSION_IMPL *session, WT_FH *fh, wt_off_t offset, size_t len, void *buf)
{
WT_DECL_RET;
+ uint64_t time_start, time_stop;
__wt_verbose(session, WT_VERB_HANDLEOPS,
"%s: handle-read: %" WT_SIZET_FMT " at %" PRIuMAX,
@@ -101,10 +109,14 @@ __wt_read(
WT_STAT_CONN_INCR_ATOMIC(session, thread_read_active);
WT_STAT_CONN_INCR(session, read_io);
+ time_start = __wt_rdtsc(session);
ret = fh->handle->fh_read(
fh->handle, (WT_SESSION *)session, offset, len, buf);
+ time_stop = __wt_rdtsc(session);
+ __wt_stat_msecs_hist_incr_fsread(session,
+ WT_TSCDIFF_MS(time_stop, time_start));
WT_STAT_CONN_DECR_ATOMIC(session, thread_read_active);
return (ret);
}
@@ -157,6 +169,7 @@ __wt_write(WT_SESSION_IMPL *session,
WT_FH *fh, wt_off_t offset, size_t len, const void *buf)
{
WT_DECL_RET;
+ uint64_t time_start, time_stop;
WT_ASSERT(session, !F_ISSET(S2C(session), WT_CONN_READONLY) ||
WT_STRING_MATCH(fh->name,
@@ -175,10 +188,14 @@ __wt_write(WT_SESSION_IMPL *session,
WT_STAT_CONN_INCR(session, write_io);
WT_STAT_CONN_INCR_ATOMIC(session, thread_write_active);
+ time_start = __wt_rdtsc(session);
ret = fh->handle->fh_write(
fh->handle, (WT_SESSION *)session, offset, len, buf);
+ time_stop = __wt_rdtsc(session);
+ __wt_stat_msecs_hist_incr_fswrite(session,
+ WT_TSCDIFF_MS(time_stop, time_start));
WT_STAT_CONN_DECR_ATOMIC(session, thread_write_active);
return (ret);
}
diff --git a/src/third_party/wiredtiger/src/include/os_fs.i b/src/third_party/wiredtiger/src/include/os_fs.i
index c81d3f5dec6..ecd7ca802a9 100644
--- a/src/third_party/wiredtiger/src/include/os_fs.i
+++ b/src/third_party/wiredtiger/src/include/os_fs.i
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
@@ -38,6 +38,37 @@ __wt_fs_directory_list(WT_SESSION_IMPL *session,
}
/*
+ * __wt_fs_directory_list_single --
+ * Return a single matching file from a directory.
+ */
+static inline int
+__wt_fs_directory_list_single(WT_SESSION_IMPL *session,
+ const char *dir, const char *prefix, char ***dirlistp, u_int *countp)
+{
+ WT_DECL_RET;
+ WT_FILE_SYSTEM *file_system;
+ WT_SESSION *wt_session;
+ char *path;
+
+ *dirlistp = NULL;
+ *countp = 0;
+
+ __wt_verbose(session, WT_VERB_FILEOPS,
+ "%s: directory-list-single: prefix %s",
+ dir, prefix == NULL ? "all" : prefix);
+
+ WT_RET(__wt_filename(session, dir, &path));
+
+ file_system = S2C(session)->file_system;
+ wt_session = (WT_SESSION *)session;
+ ret = file_system->fs_directory_list_single(
+ file_system, wt_session, path, prefix, dirlistp, countp);
+
+ __wt_free(session, path);
+ return (ret);
+}
+
+/*
* __wt_fs_directory_list_free --
* Free memory allocated by __wt_fs_directory_list.
*/
diff --git a/src/third_party/wiredtiger/src/include/os_fstream.i b/src/third_party/wiredtiger/src/include/os_fstream.i
index 1561274b388..09ce37b7058 100644
--- a/src/third_party/wiredtiger/src/include/os_fstream.i
+++ b/src/third_party/wiredtiger/src/include/os_fstream.i
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/include/os_windows.h b/src/third_party/wiredtiger/src/include/os_windows.h
index ea54d00af1f..f5e270a4954 100644
--- a/src/third_party/wiredtiger/src/include/os_windows.h
+++ b/src/third_party/wiredtiger/src/include/os_windows.h
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/include/packing.i b/src/third_party/wiredtiger/src/include/packing.i
index d5181738fbd..34a1bb62edb 100644
--- a/src/third_party/wiredtiger/src/include/packing.i
+++ b/src/third_party/wiredtiger/src/include/packing.i
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
@@ -253,14 +253,15 @@ next: if (pack->cur == pack->end)
* __pack_size --
* Get the size of a packed value.
*/
-static inline size_t
-__pack_size(WT_SESSION_IMPL *session, WT_PACK_VALUE *pv)
+static inline int
+__pack_size(WT_SESSION_IMPL *session, WT_PACK_VALUE *pv, size_t *vp)
{
size_t s, pad;
switch (pv->type) {
case 'x':
- return (pv->size);
+ *vp = pv->size;
+ return (0);
case 'j':
case 'J':
case 'K':
@@ -276,7 +277,8 @@ __pack_size(WT_SESSION_IMPL *session, WT_PACK_VALUE *pv)
WT_ASSERT(session, len >= 0);
s = (size_t)len + (pv->type == 'K' ? 0 : 1);
}
- return (s);
+ *vp = s;
+ return (0);
case 's':
case 'S':
if (pv->type == 's' || pv->havesize) {
@@ -284,7 +286,8 @@ __pack_size(WT_SESSION_IMPL *session, WT_PACK_VALUE *pv)
WT_ASSERT(session, s != 0);
} else
s = strlen(pv->u.s) + 1;
- return (s);
+ *vp = s;
+ return (0);
case 'U':
case 'u':
s = pv->u.item.size;
@@ -295,28 +298,33 @@ __pack_size(WT_SESSION_IMPL *session, WT_PACK_VALUE *pv)
pad = pv->size - s;
if (pv->type == 'U')
s += __wt_vsize_uint(s + pad);
- return (s + pad);
+ *vp = s + pad;
+ return (0);
case 'b':
case 'B':
case 't':
- return (1);
+ *vp = 1;
+ return (0);
case 'h':
case 'i':
case 'l':
case 'q':
- return (__wt_vsize_int(pv->u.i));
+ *vp = __wt_vsize_int(pv->u.i);
+ return (0);
case 'H':
case 'I':
case 'L':
case 'Q':
case 'r':
- return (__wt_vsize_uint(pv->u.u));
+ *vp = __wt_vsize_uint(pv->u.u);
+ return (0);
case 'R':
- return (sizeof(uint64_t));
+ *vp = sizeof(uint64_t);
+ return (0);
}
- __wt_err(session, EINVAL, "unknown pack-value type: %c", (int)pv->type);
- return ((size_t)-1);
+ WT_RET_MSG(
+ session, EINVAL, "unknown pack-value type: %c", (int)pv->type);
}
/*
@@ -635,13 +643,11 @@ __wt_struct_packv(WT_SESSION_IMPL *session,
WT_PACK_GET(session, pv, ap);
WT_RET(__pack_write(session, &pv, &p, (size_t)(end - p)));
}
+ WT_RET_NOTFOUND_OK(ret);
/* Be paranoid - __pack_write should never overflow. */
WT_ASSERT(session, p <= end);
- if (ret != WT_NOTFOUND)
- return (ret);
-
return (0);
}
@@ -654,22 +660,26 @@ __wt_struct_sizev(
WT_SESSION_IMPL *session, size_t *sizep, const char *fmt, va_list ap)
{
WT_DECL_PACK_VALUE(pv);
+ WT_DECL_RET;
WT_PACK pack;
- size_t total;
+ size_t v;
+
+ *sizep = 0;
if (fmt[0] != '\0' && fmt[1] == '\0') {
pv.type = fmt[0];
WT_PACK_GET(session, pv, ap);
- *sizep = __pack_size(session, &pv);
- return (0);
+ return (__pack_size(session, &pv, sizep));
}
WT_RET(__pack_init(session, &pack, fmt));
- for (total = 0; __pack_next(&pack, &pv) == 0;) {
+ while ((ret = __pack_next(&pack, &pv)) == 0) {
WT_PACK_GET(session, pv, ap);
- total += __pack_size(session, &pv);
+ WT_RET(__pack_size(session, &pv, &v));
+ *sizep += v;
}
- *sizep = total;
+ WT_RET_NOTFOUND_OK(ret);
+
return (0);
}
@@ -701,13 +711,11 @@ __wt_struct_unpackv(WT_SESSION_IMPL *session,
WT_RET(__unpack_read(session, &pv, &p, (size_t)(end - p)));
WT_UNPACK_PUT(session, pv, ap);
}
+ WT_RET_NOTFOUND_OK(ret);
/* Be paranoid - __pack_write should never overflow. */
WT_ASSERT(session, p <= end);
- if (ret != WT_NOTFOUND)
- return (ret);
-
return (0);
}
diff --git a/src/third_party/wiredtiger/src/include/posix.h b/src/third_party/wiredtiger/src/include/posix.h
index 23a4d178e98..0b4bf919327 100644
--- a/src/third_party/wiredtiger/src/include/posix.h
+++ b/src/third_party/wiredtiger/src/include/posix.h
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/include/schema.h b/src/third_party/wiredtiger/src/include/schema.h
index 746e83ee358..3a60b0f9c67 100644
--- a/src/third_party/wiredtiger/src/include/schema.h
+++ b/src/third_party/wiredtiger/src/include/schema.h
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/include/serial.i b/src/third_party/wiredtiger/src/include/serial.i
index d471ebb399c..5590c68618b 100644
--- a/src/third_party/wiredtiger/src/include/serial.i
+++ b/src/third_party/wiredtiger/src/include/serial.i
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/include/session.h b/src/third_party/wiredtiger/src/include/session.h
index 269ca281ed2..0f3b2488e9f 100644
--- a/src/third_party/wiredtiger/src/include/session.h
+++ b/src/third_party/wiredtiger/src/include/session.h
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/include/stat.h b/src/third_party/wiredtiger/src/include/stat.h
index b27ac3df3b4..0a902f36b39 100644
--- a/src/third_party/wiredtiger/src/include/stat.h
+++ b/src/third_party/wiredtiger/src/include/stat.h
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
@@ -259,6 +259,51 @@ __wt_stats_clear(void *stats_arg, int slot)
} while (0)
/*
+ * Construct histogram increment functions to put the passed value into the
+ * right bucket. Bucket ranges, represented by various statistics, depend upon
+ * whether the passed value is in milliseconds or microseconds. Also values
+ * less than a given minimum are ignored and not put in any bucket. This floor
+ * value keeps us from having an excessively large smallest values.
+ */
+#define WT_STAT_MSECS_HIST_INCR_FUNC(name, stat, min_val) \
+static inline void \
+__wt_stat_msecs_hist_incr_##name(WT_SESSION_IMPL *session, uint64_t msecs) \
+{ \
+ if (msecs < (min_val)) \
+ return; \
+ if (msecs < 50) \
+ WT_STAT_CONN_INCR(session, stat##_lt50); \
+ else if (msecs < 100) \
+ WT_STAT_CONN_INCR(session, stat##_lt100); \
+ else if (msecs < 250) \
+ WT_STAT_CONN_INCR(session, stat##_lt250); \
+ else if (msecs < 500) \
+ WT_STAT_CONN_INCR(session, stat##_lt500); \
+ else if (msecs < 1000) \
+ WT_STAT_CONN_INCR(session, stat##_lt1000); \
+ else \
+ WT_STAT_CONN_INCR(session, stat##_gt1000); \
+}
+
+#define WT_STAT_USECS_HIST_INCR_FUNC(name, stat, min_val) \
+static inline void \
+__wt_stat_usecs_hist_incr_##name(WT_SESSION_IMPL *session, uint64_t usecs) \
+{ \
+ if (usecs < (min_val)) \
+ return; \
+ if (usecs < 250) \
+ WT_STAT_CONN_INCR(session, stat##_lt250); \
+ else if (usecs < 500) \
+ WT_STAT_CONN_INCR(session, stat##_lt500); \
+ else if (usecs < 1000) \
+ WT_STAT_CONN_INCR(session, stat##_lt1000); \
+ else if (usecs < 10000) \
+ WT_STAT_CONN_INCR(session, stat##_lt10000); \
+ else \
+ WT_STAT_CONN_INCR(session, stat##_gt10000); \
+}
+
+/*
* DO NOT EDIT: automatically built by dist/stat.py.
*/
/* Statistics section: BEGIN */
@@ -424,6 +469,10 @@ struct __wt_connection_stats {
int64_t lock_checkpoint_count;
int64_t lock_checkpoint_wait_application;
int64_t lock_checkpoint_wait_internal;
+ int64_t lock_commit_timestamp_wait_application;
+ int64_t lock_commit_timestamp_wait_internal;
+ int64_t lock_commit_timestamp_read_count;
+ int64_t lock_commit_timestamp_write_count;
int64_t lock_dhandle_wait_application;
int64_t lock_dhandle_wait_internal;
int64_t lock_dhandle_read_count;
@@ -431,6 +480,10 @@ struct __wt_connection_stats {
int64_t lock_metadata_count;
int64_t lock_metadata_wait_application;
int64_t lock_metadata_wait_internal;
+ int64_t lock_read_timestamp_wait_application;
+ int64_t lock_read_timestamp_wait_internal;
+ int64_t lock_read_timestamp_read_count;
+ int64_t lock_read_timestamp_write_count;
int64_t lock_schema_count;
int64_t lock_schema_wait_application;
int64_t lock_schema_wait_internal;
@@ -438,6 +491,10 @@ struct __wt_connection_stats {
int64_t lock_table_wait_internal;
int64_t lock_table_read_count;
int64_t lock_table_write_count;
+ int64_t lock_txn_global_wait_application;
+ int64_t lock_txn_global_wait_internal;
+ int64_t lock_txn_global_read_count;
+ int64_t lock_txn_global_write_count;
int64_t log_slot_switch_busy;
int64_t log_force_ckpt_sleep;
int64_t log_bytes_payload;
@@ -484,6 +541,28 @@ struct __wt_connection_stats {
int64_t log_compress_len;
int64_t log_slot_coalesced;
int64_t log_close_yields;
+ int64_t perf_hist_fsread_latency_lt50;
+ int64_t perf_hist_fsread_latency_lt100;
+ int64_t perf_hist_fsread_latency_lt250;
+ int64_t perf_hist_fsread_latency_lt500;
+ int64_t perf_hist_fsread_latency_lt1000;
+ int64_t perf_hist_fsread_latency_gt1000;
+ int64_t perf_hist_fswrite_latency_lt50;
+ int64_t perf_hist_fswrite_latency_lt100;
+ int64_t perf_hist_fswrite_latency_lt250;
+ int64_t perf_hist_fswrite_latency_lt500;
+ int64_t perf_hist_fswrite_latency_lt1000;
+ int64_t perf_hist_fswrite_latency_gt1000;
+ int64_t perf_hist_opread_latency_lt250;
+ int64_t perf_hist_opread_latency_lt500;
+ int64_t perf_hist_opread_latency_lt1000;
+ int64_t perf_hist_opread_latency_lt10000;
+ int64_t perf_hist_opread_latency_gt10000;
+ int64_t perf_hist_opwrite_latency_lt250;
+ int64_t perf_hist_opwrite_latency_lt500;
+ int64_t perf_hist_opwrite_latency_lt1000;
+ int64_t perf_hist_opwrite_latency_lt10000;
+ int64_t perf_hist_opwrite_latency_gt10000;
int64_t rec_page_delete_fast;
int64_t rec_pages;
int64_t rec_pages_eviction;
@@ -529,8 +608,24 @@ struct __wt_connection_stats {
int64_t page_del_rollback_blocked;
int64_t child_modify_blocked_page;
int64_t tree_descend_blocked;
+ int64_t txn_commit_queue_empty;
+ int64_t txn_commit_queue_head;
+ int64_t txn_commit_queue_inserts;
+ int64_t txn_commit_queue_len;
int64_t txn_snapshots_created;
int64_t txn_snapshots_dropped;
+ int64_t txn_query_ts;
+ int64_t txn_read_queue_empty;
+ int64_t txn_read_queue_head;
+ int64_t txn_read_queue_inserts;
+ int64_t txn_read_queue_len;
+ int64_t txn_set_ts;
+ int64_t txn_set_ts_commit;
+ int64_t txn_set_ts_commit_upd;
+ int64_t txn_set_ts_oldest;
+ int64_t txn_set_ts_oldest_upd;
+ int64_t txn_set_ts_stable;
+ int64_t txn_set_ts_stable_upd;
int64_t txn_begin;
int64_t txn_checkpoint_running;
int64_t txn_checkpoint_generation;
@@ -551,13 +646,7 @@ struct __wt_connection_stats {
int64_t txn_pinned_timestamp;
int64_t txn_pinned_timestamp_oldest;
int64_t txn_sync;
- int64_t txn_commit_queue_head;
- int64_t txn_commit_queue_inserts;
- int64_t txn_commit_queue_len;
int64_t txn_commit;
- int64_t txn_read_queue_head;
- int64_t txn_read_queue_inserts;
- int64_t txn_read_queue_len;
int64_t txn_rollback;
int64_t txn_update_conflict;
};
diff --git a/src/third_party/wiredtiger/src/include/swap.h b/src/third_party/wiredtiger/src/include/swap.h
index bd28296e668..ab690430550 100644
--- a/src/third_party/wiredtiger/src/include/swap.h
+++ b/src/third_party/wiredtiger/src/include/swap.h
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/include/thread_group.h b/src/third_party/wiredtiger/src/include/thread_group.h
index feab58f13d5..5b856e3a59c 100644
--- a/src/third_party/wiredtiger/src/include/thread_group.h
+++ b/src/third_party/wiredtiger/src/include/thread_group.h
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/include/txn.h b/src/third_party/wiredtiger/src/include/txn.h
index ba5897e98f6..327c2cd8caa 100644
--- a/src/third_party/wiredtiger/src/include/txn.h
+++ b/src/third_party/wiredtiger/src/include/txn.h
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/include/txn.i b/src/third_party/wiredtiger/src/include/txn.i
index 1683ce8fbe2..360a6cf1edb 100644
--- a/src/third_party/wiredtiger/src/include/txn.i
+++ b/src/third_party/wiredtiger/src/include/txn.i
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
@@ -494,13 +494,25 @@ __wt_txn_upd_visible(WT_SESSION_IMPL *session, WT_UPDATE *upd)
static inline WT_UPDATE *
__wt_txn_read(WT_SESSION_IMPL *session, WT_UPDATE *upd)
{
- /* Skip reserved place-holders, they're never visible. */
- for (; upd != NULL; upd = upd->next)
- if (upd->type != WT_UPDATE_RESERVED &&
+ static WT_UPDATE tombstone = {
+ .txnid = WT_TXN_NONE, .type = WT_UPDATE_TOMBSTONE
+ };
+ bool skipped_birthmark;
+
+ for (skipped_birthmark = false; upd != NULL; upd = upd->next) {
+ /* Skip reserved place-holders, they're never visible. */
+ if (upd->type != WT_UPDATE_RESERVE &&
__wt_txn_upd_visible(session, upd))
break;
+ /* An invisible birthmark is equivalent to a tombstone. */
+ if (upd->type == WT_UPDATE_BIRTHMARK)
+ skipped_birthmark = true;
+ }
+
+ if (upd == NULL && skipped_birthmark)
+ upd = &tombstone;
- return (upd);
+ return (upd == NULL || upd->type == WT_UPDATE_BIRTHMARK ? NULL : upd);
}
/*
diff --git a/src/third_party/wiredtiger/src/include/verify_build.h b/src/third_party/wiredtiger/src/include/verify_build.h
index 3973f786a90..8071efe4432 100644
--- a/src/third_party/wiredtiger/src/include/verify_build.h
+++ b/src/third_party/wiredtiger/src/include/verify_build.h
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/include/wiredtiger.in b/src/third_party/wiredtiger/src/include/wiredtiger.in
index 69ef8af0650..edee21b5ca7 100644
--- a/src/third_party/wiredtiger/src/include/wiredtiger.in
+++ b/src/third_party/wiredtiger/src/include/wiredtiger.in
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
@@ -151,8 +151,11 @@ struct __wt_modify {
/*!
* The zero-based byte offset in the value where the new data is placed.
*
- * If the offset is past the end of the value, nul bytes are appended to
- * the value up to the specified offset.
+ * If the offset is past the end of the value, padding bytes are
+ * appended to the value up to the specified offset. If the value is a
+ * string (value format \c S), the padding byte is a space. If the value
+ * is a raw byte array accessed using a WT_ITEM structure (value format
+ * \c u), the padding byte is a nul.
*/
size_t offset;
@@ -485,11 +488,12 @@ struct __wt_cursor {
* Both the key and value must be set and the record must already exist;
* the record will be updated.
*
- * Modification structures are applied in order, and later modifications
- * can update earlier modifications.
+ * Modifications are specified in WT_MODIFY structures. Modifications
+ * are applied in order and later modifications can update earlier ones.
*
- * The modify method is only supported on raw byte arrays accessed using
- * a WT_ITEM structure, that is, a format type of \c u.
+ * The modify method is only supported on strings (value format type
+ * \c S), or raw byte arrays accessed using a WT_ITEM structure (value
+ * format type \c u).
*
* Calling the WT_CURSOR::modify method outside of snapshot isolation
* can lead to unexpected results. While \c read-committed isolation
@@ -1520,10 +1524,10 @@ struct __wt_session {
* called).
*
* @param session the session handle
- * @param fmt a printf format specifier
+ * @param format a printf format specifier
* @errors
*/
- int __F(log_printf)(WT_SESSION *session, const char *fmt, ...);
+ int __F(log_printf)(WT_SESSION *session, const char *format, ...);
/*!
* Rebalance a table or file, see @ref rebalance.
@@ -1924,6 +1928,19 @@ struct __wt_session {
*/
int __F(transaction_sync)(WT_SESSION *session, const char *config);
/*! @} */
+
+#ifndef DOXYGEN
+ /*!
+ * Call into the library.
+ *
+ * This method is used for breakpoints and to set other configuration
+ * when debugging layers not directly supporting those features.
+ *
+ * @param session the session handle
+ * @errors
+ */
+ int __F(breakpoint)(WT_SESSION *session);
+#endif
};
/*!
@@ -2295,8 +2312,8 @@ struct __wt_connection {
* @snippet ex_all.c Open a session
*
* @param connection the connection handle
- * @param errhandler An error handler. If <code>NULL</code>, the
- * connection's error handler is used. See @ref error_handling_event
+ * @param event_handler An event handler. If <code>NULL</code>, the
+ * connection's event handler is used. See @ref event_message_handling
* for more information.
* @configstart{WT_CONNECTION.open_session, see dist/api_data.py}
* @config{ignore_cache_size, when set\, operations performed by this
@@ -2313,7 +2330,7 @@ struct __wt_connection {
* @errors
*/
int __F(open_session)(WT_CONNECTION *connection,
- WT_EVENT_HANDLER *errhandler, const char *config,
+ WT_EVENT_HANDLER *event_handler, const char *config,
WT_SESSION **sessionp);
/*! @} */
@@ -2585,9 +2602,9 @@ struct __wt_connection {
*
* @param home The path to the database home directory. See @ref home
* for more information.
- * @param errhandler An error handler. If <code>NULL</code>, a builtin error
- * handler is installed that writes error messages to stderr. See
- * @ref error_handling_event for more information.
+ * @param event_handler An event handler. If <code>NULL</code>, a default
+ * event handler is installed that writes error messages to stderr. See
+ * @ref event_message_handling for more information.
* @configstart{wiredtiger_open, see dist/api_data.py}
* @config{async = (, asynchronous operations configuration options., a set of
* related configuration options defined below.}
@@ -2907,7 +2924,7 @@ struct __wt_connection {
* @errors
*/
int wiredtiger_open(const char *home,
- WT_EVENT_HANDLER *errhandler, const char *config,
+ WT_EVENT_HANDLER *event_handler, const char *config,
WT_CONNECTION **connectionp) WT_ATTRIBUTE_LIBRARY_VISIBLE;
/*!
@@ -2955,14 +2972,15 @@ struct __wt_async_callback {
struct __wt_event_handler {
/*!
* Callback to handle error messages; by default, error messages are
- * written to the stderr stream. See @ref error_handling.
+ * written to the stderr stream. See @ref event_message_handling for
+ * more information.
*
* Errors that require the application to exit and restart will have
* their \c error value set to \c WT_PANIC. The application can exit
- * immediately when \c WT_PANIC is passed to an error handler, there
+ * immediately when \c WT_PANIC is passed to an event handler, there
* is no reason to return into WiredTiger.
*
- * Error handler returns are not ignored: if the handler returns
+ * Event handler returns are not ignored: if the handler returns
* non-zero, the error may cause the WiredTiger function posting the
* event to fail, and may even cause operation or library failure.
*
@@ -2979,7 +2997,8 @@ struct __wt_event_handler {
/*!
* Callback to handle informational messages; by default, informational
- * messages are written to the stdout stream. See @ref error_handling.
+ * messages are written to the stdout stream. See
+ * @ref event_message_handling for more information.
*
* Message handler returns are not ignored: if the handler returns
* non-zero, the error may cause the WiredTiger function posting the
@@ -2994,8 +3013,9 @@ struct __wt_event_handler {
WT_SESSION *session, const char *message);
/*!
- * Callback to handle progress messages; by default, no progress
- * messages are written. See @ref error_handling.
+ * Callback to handle progress messages; by default, progress messages
+ * are not written. See @ref event_message_handling for more
+ * information.
*
* Progress handler returns are not ignored: if the handler returns
* non-zero, the error may cause the WiredTiger function posting the
@@ -3051,12 +3071,12 @@ struct __wt_event_handler {
*
* @param session the session handle
* @param buffer a pointer to a packed byte array
- * @param size the number of valid bytes in the buffer
+ * @param len the number of valid bytes in the buffer
* @param format the data format, see @ref packing
* @errors
*/
int wiredtiger_struct_pack(WT_SESSION *session,
- void *buffer, size_t size, const char *format, ...)
+ void *buffer, size_t len, const char *format, ...)
WT_ATTRIBUTE_LIBRARY_VISIBLE;
/*!
@@ -3069,13 +3089,13 @@ int wiredtiger_struct_pack(WT_SESSION *session,
* @snippet ex_all.c Get the packed size
*
* @param session the session handle
- * @param sizep a location where the number of bytes needed for the
+ * @param lenp a location where the number of bytes needed for the
* matching call to ::wiredtiger_struct_pack is returned
* @param format the data format, see @ref packing
* @errors
*/
int wiredtiger_struct_size(WT_SESSION *session,
- size_t *sizep, const char *format, ...) WT_ATTRIBUTE_LIBRARY_VISIBLE;
+ size_t *lenp, const char *format, ...) WT_ATTRIBUTE_LIBRARY_VISIBLE;
/*!
* Unpack a structure from a buffer.
@@ -3087,12 +3107,12 @@ int wiredtiger_struct_size(WT_SESSION *session,
*
* @param session the session handle
* @param buffer a pointer to a packed byte array
- * @param size the number of valid bytes in the buffer
+ * @param len the number of valid bytes in the buffer
* @param format the data format, see @ref packing
* @errors
*/
int wiredtiger_struct_unpack(WT_SESSION *session,
- const void *buffer, size_t size, const char *format, ...)
+ const void *buffer, size_t len, const char *format, ...)
WT_ATTRIBUTE_LIBRARY_VISIBLE;
#if !defined(SWIG)
@@ -3296,9 +3316,9 @@ struct __wt_config_item {
* ::wiredtiger_open.
* @param session the session handle (may be \c NULL if the database not yet
* opened).
- * @param errhandler An error handler (used if \c session is \c NULL; if both
- * \c session and \c errhandler are \c NULL, error messages will be written to
- * stderr).
+ * @param event_handler An event handler (used if \c session is \c NULL; if both
+ * \c session and \c event_handler are \c NULL, error messages will be written
+ * to stderr).
* @param name the WiredTiger function or method to validate.
* @param config the configuration string being parsed.
* @returns zero for success, non-zero to indicate an error.
@@ -3306,7 +3326,7 @@ struct __wt_config_item {
* @snippet ex_all.c Validate a configuration string
*/
int wiredtiger_config_validate(WT_SESSION *session,
- WT_EVENT_HANDLER *errhandler, const char *name, const char *config)
+ WT_EVENT_HANDLER *event_handler, const char *name, const char *config)
WT_ATTRIBUTE_LIBRARY_VISIBLE;
#endif
@@ -4250,6 +4270,15 @@ struct __wt_file_system {
WT_SESSION *session, const char *directory, const char *prefix,
char ***dirlist, uint32_t *countp);
+#if !defined(DOXYGEN)
+ /*
+ * Return a single file name for the named directory.
+ */
+ int (*fs_directory_list_single)(WT_FILE_SYSTEM *file_system,
+ WT_SESSION *session, const char *directory, const char *prefix,
+ char ***dirlist, uint32_t *countp);
+#endif
+
/*!
* Free memory allocated by WT_FILE_SYSTEM::directory_list.
*
@@ -5079,316 +5108,422 @@ extern int wiredtiger_extension_terminate(WT_CONNECTION *connection);
/*! lock: checkpoint lock internal thread wait time (usecs) */
#define WT_STAT_CONN_LOCK_CHECKPOINT_WAIT_INTERNAL 1155
/*!
+ * lock: commit timestamp queue lock application thread time waiting for
+ * the dhandle lock (usecs)
+ */
+#define WT_STAT_CONN_LOCK_COMMIT_TIMESTAMP_WAIT_APPLICATION 1156
+/*!
+ * lock: commit timestamp queue lock internal thread time waiting for the
+ * dhandle lock (usecs)
+ */
+#define WT_STAT_CONN_LOCK_COMMIT_TIMESTAMP_WAIT_INTERNAL 1157
+/*! lock: commit timestamp queue read lock acquisitions */
+#define WT_STAT_CONN_LOCK_COMMIT_TIMESTAMP_READ_COUNT 1158
+/*! lock: commit timestamp queue write lock acquisitions */
+#define WT_STAT_CONN_LOCK_COMMIT_TIMESTAMP_WRITE_COUNT 1159
+/*!
* lock: dhandle lock application thread time waiting for the dhandle
* lock (usecs)
*/
-#define WT_STAT_CONN_LOCK_DHANDLE_WAIT_APPLICATION 1156
+#define WT_STAT_CONN_LOCK_DHANDLE_WAIT_APPLICATION 1160
/*!
* lock: dhandle lock internal thread time waiting for the dhandle lock
* (usecs)
*/
-#define WT_STAT_CONN_LOCK_DHANDLE_WAIT_INTERNAL 1157
+#define WT_STAT_CONN_LOCK_DHANDLE_WAIT_INTERNAL 1161
/*! lock: dhandle read lock acquisitions */
-#define WT_STAT_CONN_LOCK_DHANDLE_READ_COUNT 1158
+#define WT_STAT_CONN_LOCK_DHANDLE_READ_COUNT 1162
/*! lock: dhandle write lock acquisitions */
-#define WT_STAT_CONN_LOCK_DHANDLE_WRITE_COUNT 1159
+#define WT_STAT_CONN_LOCK_DHANDLE_WRITE_COUNT 1163
/*! lock: metadata lock acquisitions */
-#define WT_STAT_CONN_LOCK_METADATA_COUNT 1160
+#define WT_STAT_CONN_LOCK_METADATA_COUNT 1164
/*! lock: metadata lock application thread wait time (usecs) */
-#define WT_STAT_CONN_LOCK_METADATA_WAIT_APPLICATION 1161
+#define WT_STAT_CONN_LOCK_METADATA_WAIT_APPLICATION 1165
/*! lock: metadata lock internal thread wait time (usecs) */
-#define WT_STAT_CONN_LOCK_METADATA_WAIT_INTERNAL 1162
+#define WT_STAT_CONN_LOCK_METADATA_WAIT_INTERNAL 1166
+/*!
+ * lock: read timestamp queue lock application thread time waiting for
+ * the dhandle lock (usecs)
+ */
+#define WT_STAT_CONN_LOCK_READ_TIMESTAMP_WAIT_APPLICATION 1167
+/*!
+ * lock: read timestamp queue lock internal thread time waiting for the
+ * dhandle lock (usecs)
+ */
+#define WT_STAT_CONN_LOCK_READ_TIMESTAMP_WAIT_INTERNAL 1168
+/*! lock: read timestamp queue read lock acquisitions */
+#define WT_STAT_CONN_LOCK_READ_TIMESTAMP_READ_COUNT 1169
+/*! lock: read timestamp queue write lock acquisitions */
+#define WT_STAT_CONN_LOCK_READ_TIMESTAMP_WRITE_COUNT 1170
/*! lock: schema lock acquisitions */
-#define WT_STAT_CONN_LOCK_SCHEMA_COUNT 1163
+#define WT_STAT_CONN_LOCK_SCHEMA_COUNT 1171
/*! lock: schema lock application thread wait time (usecs) */
-#define WT_STAT_CONN_LOCK_SCHEMA_WAIT_APPLICATION 1164
+#define WT_STAT_CONN_LOCK_SCHEMA_WAIT_APPLICATION 1172
/*! lock: schema lock internal thread wait time (usecs) */
-#define WT_STAT_CONN_LOCK_SCHEMA_WAIT_INTERNAL 1165
+#define WT_STAT_CONN_LOCK_SCHEMA_WAIT_INTERNAL 1173
/*!
* lock: table lock application thread time waiting for the table lock
* (usecs)
*/
-#define WT_STAT_CONN_LOCK_TABLE_WAIT_APPLICATION 1166
+#define WT_STAT_CONN_LOCK_TABLE_WAIT_APPLICATION 1174
/*!
* lock: table lock internal thread time waiting for the table lock
* (usecs)
*/
-#define WT_STAT_CONN_LOCK_TABLE_WAIT_INTERNAL 1167
+#define WT_STAT_CONN_LOCK_TABLE_WAIT_INTERNAL 1175
/*! lock: table read lock acquisitions */
-#define WT_STAT_CONN_LOCK_TABLE_READ_COUNT 1168
+#define WT_STAT_CONN_LOCK_TABLE_READ_COUNT 1176
/*! lock: table write lock acquisitions */
-#define WT_STAT_CONN_LOCK_TABLE_WRITE_COUNT 1169
+#define WT_STAT_CONN_LOCK_TABLE_WRITE_COUNT 1177
+/*!
+ * lock: txn global lock application thread time waiting for the dhandle
+ * lock (usecs)
+ */
+#define WT_STAT_CONN_LOCK_TXN_GLOBAL_WAIT_APPLICATION 1178
+/*!
+ * lock: txn global lock internal thread time waiting for the dhandle
+ * lock (usecs)
+ */
+#define WT_STAT_CONN_LOCK_TXN_GLOBAL_WAIT_INTERNAL 1179
+/*! lock: txn global read lock acquisitions */
+#define WT_STAT_CONN_LOCK_TXN_GLOBAL_READ_COUNT 1180
+/*! lock: txn global write lock acquisitions */
+#define WT_STAT_CONN_LOCK_TXN_GLOBAL_WRITE_COUNT 1181
/*! log: busy returns attempting to switch slots */
-#define WT_STAT_CONN_LOG_SLOT_SWITCH_BUSY 1170
+#define WT_STAT_CONN_LOG_SLOT_SWITCH_BUSY 1182
/*! log: force checkpoint calls slept */
-#define WT_STAT_CONN_LOG_FORCE_CKPT_SLEEP 1171
+#define WT_STAT_CONN_LOG_FORCE_CKPT_SLEEP 1183
/*! log: log bytes of payload data */
-#define WT_STAT_CONN_LOG_BYTES_PAYLOAD 1172
+#define WT_STAT_CONN_LOG_BYTES_PAYLOAD 1184
/*! log: log bytes written */
-#define WT_STAT_CONN_LOG_BYTES_WRITTEN 1173
+#define WT_STAT_CONN_LOG_BYTES_WRITTEN 1185
/*! log: log files manually zero-filled */
-#define WT_STAT_CONN_LOG_ZERO_FILLS 1174
+#define WT_STAT_CONN_LOG_ZERO_FILLS 1186
/*! log: log flush operations */
-#define WT_STAT_CONN_LOG_FLUSH 1175
+#define WT_STAT_CONN_LOG_FLUSH 1187
/*! log: log force write operations */
-#define WT_STAT_CONN_LOG_FORCE_WRITE 1176
+#define WT_STAT_CONN_LOG_FORCE_WRITE 1188
/*! log: log force write operations skipped */
-#define WT_STAT_CONN_LOG_FORCE_WRITE_SKIP 1177
+#define WT_STAT_CONN_LOG_FORCE_WRITE_SKIP 1189
/*! log: log records compressed */
-#define WT_STAT_CONN_LOG_COMPRESS_WRITES 1178
+#define WT_STAT_CONN_LOG_COMPRESS_WRITES 1190
/*! log: log records not compressed */
-#define WT_STAT_CONN_LOG_COMPRESS_WRITE_FAILS 1179
+#define WT_STAT_CONN_LOG_COMPRESS_WRITE_FAILS 1191
/*! log: log records too small to compress */
-#define WT_STAT_CONN_LOG_COMPRESS_SMALL 1180
+#define WT_STAT_CONN_LOG_COMPRESS_SMALL 1192
/*! log: log release advances write LSN */
-#define WT_STAT_CONN_LOG_RELEASE_WRITE_LSN 1181
+#define WT_STAT_CONN_LOG_RELEASE_WRITE_LSN 1193
/*! log: log scan operations */
-#define WT_STAT_CONN_LOG_SCANS 1182
+#define WT_STAT_CONN_LOG_SCANS 1194
/*! log: log scan records requiring two reads */
-#define WT_STAT_CONN_LOG_SCAN_REREADS 1183
+#define WT_STAT_CONN_LOG_SCAN_REREADS 1195
/*! log: log server thread advances write LSN */
-#define WT_STAT_CONN_LOG_WRITE_LSN 1184
+#define WT_STAT_CONN_LOG_WRITE_LSN 1196
/*! log: log server thread write LSN walk skipped */
-#define WT_STAT_CONN_LOG_WRITE_LSN_SKIP 1185
+#define WT_STAT_CONN_LOG_WRITE_LSN_SKIP 1197
/*! log: log sync operations */
-#define WT_STAT_CONN_LOG_SYNC 1186
+#define WT_STAT_CONN_LOG_SYNC 1198
/*! log: log sync time duration (usecs) */
-#define WT_STAT_CONN_LOG_SYNC_DURATION 1187
+#define WT_STAT_CONN_LOG_SYNC_DURATION 1199
/*! log: log sync_dir operations */
-#define WT_STAT_CONN_LOG_SYNC_DIR 1188
+#define WT_STAT_CONN_LOG_SYNC_DIR 1200
/*! log: log sync_dir time duration (usecs) */
-#define WT_STAT_CONN_LOG_SYNC_DIR_DURATION 1189
+#define WT_STAT_CONN_LOG_SYNC_DIR_DURATION 1201
/*! log: log write operations */
-#define WT_STAT_CONN_LOG_WRITES 1190
+#define WT_STAT_CONN_LOG_WRITES 1202
/*! log: logging bytes consolidated */
-#define WT_STAT_CONN_LOG_SLOT_CONSOLIDATED 1191
+#define WT_STAT_CONN_LOG_SLOT_CONSOLIDATED 1203
/*! log: maximum log file size */
-#define WT_STAT_CONN_LOG_MAX_FILESIZE 1192
+#define WT_STAT_CONN_LOG_MAX_FILESIZE 1204
/*! log: number of pre-allocated log files to create */
-#define WT_STAT_CONN_LOG_PREALLOC_MAX 1193
+#define WT_STAT_CONN_LOG_PREALLOC_MAX 1205
/*! log: pre-allocated log files not ready and missed */
-#define WT_STAT_CONN_LOG_PREALLOC_MISSED 1194
+#define WT_STAT_CONN_LOG_PREALLOC_MISSED 1206
/*! log: pre-allocated log files prepared */
-#define WT_STAT_CONN_LOG_PREALLOC_FILES 1195
+#define WT_STAT_CONN_LOG_PREALLOC_FILES 1207
/*! log: pre-allocated log files used */
-#define WT_STAT_CONN_LOG_PREALLOC_USED 1196
+#define WT_STAT_CONN_LOG_PREALLOC_USED 1208
/*! log: records processed by log scan */
-#define WT_STAT_CONN_LOG_SCAN_RECORDS 1197
+#define WT_STAT_CONN_LOG_SCAN_RECORDS 1209
/*! log: slot close lost race */
-#define WT_STAT_CONN_LOG_SLOT_CLOSE_RACE 1198
+#define WT_STAT_CONN_LOG_SLOT_CLOSE_RACE 1210
/*! log: slot close unbuffered waits */
-#define WT_STAT_CONN_LOG_SLOT_CLOSE_UNBUF 1199
+#define WT_STAT_CONN_LOG_SLOT_CLOSE_UNBUF 1211
/*! log: slot closures */
-#define WT_STAT_CONN_LOG_SLOT_CLOSES 1200
+#define WT_STAT_CONN_LOG_SLOT_CLOSES 1212
/*! log: slot join atomic update races */
-#define WT_STAT_CONN_LOG_SLOT_RACES 1201
+#define WT_STAT_CONN_LOG_SLOT_RACES 1213
/*! log: slot join calls atomic updates raced */
-#define WT_STAT_CONN_LOG_SLOT_YIELD_RACE 1202
+#define WT_STAT_CONN_LOG_SLOT_YIELD_RACE 1214
/*! log: slot join calls did not yield */
-#define WT_STAT_CONN_LOG_SLOT_IMMEDIATE 1203
+#define WT_STAT_CONN_LOG_SLOT_IMMEDIATE 1215
/*! log: slot join calls found active slot closed */
-#define WT_STAT_CONN_LOG_SLOT_YIELD_CLOSE 1204
+#define WT_STAT_CONN_LOG_SLOT_YIELD_CLOSE 1216
/*! log: slot join calls slept */
-#define WT_STAT_CONN_LOG_SLOT_YIELD_SLEEP 1205
+#define WT_STAT_CONN_LOG_SLOT_YIELD_SLEEP 1217
/*! log: slot join calls yielded */
-#define WT_STAT_CONN_LOG_SLOT_YIELD 1206
+#define WT_STAT_CONN_LOG_SLOT_YIELD 1218
/*! log: slot join found active slot closed */
-#define WT_STAT_CONN_LOG_SLOT_ACTIVE_CLOSED 1207
+#define WT_STAT_CONN_LOG_SLOT_ACTIVE_CLOSED 1219
/*! log: slot joins yield time (usecs) */
-#define WT_STAT_CONN_LOG_SLOT_YIELD_DURATION 1208
+#define WT_STAT_CONN_LOG_SLOT_YIELD_DURATION 1220
/*! log: slot transitions unable to find free slot */
-#define WT_STAT_CONN_LOG_SLOT_NO_FREE_SLOTS 1209
+#define WT_STAT_CONN_LOG_SLOT_NO_FREE_SLOTS 1221
/*! log: slot unbuffered writes */
-#define WT_STAT_CONN_LOG_SLOT_UNBUFFERED 1210
+#define WT_STAT_CONN_LOG_SLOT_UNBUFFERED 1222
/*! log: total in-memory size of compressed records */
-#define WT_STAT_CONN_LOG_COMPRESS_MEM 1211
+#define WT_STAT_CONN_LOG_COMPRESS_MEM 1223
/*! log: total log buffer size */
-#define WT_STAT_CONN_LOG_BUFFER_SIZE 1212
+#define WT_STAT_CONN_LOG_BUFFER_SIZE 1224
/*! log: total size of compressed records */
-#define WT_STAT_CONN_LOG_COMPRESS_LEN 1213
+#define WT_STAT_CONN_LOG_COMPRESS_LEN 1225
/*! log: written slots coalesced */
-#define WT_STAT_CONN_LOG_SLOT_COALESCED 1214
+#define WT_STAT_CONN_LOG_SLOT_COALESCED 1226
/*! log: yields waiting for previous log file close */
-#define WT_STAT_CONN_LOG_CLOSE_YIELDS 1215
+#define WT_STAT_CONN_LOG_CLOSE_YIELDS 1227
+/*! perf: file system read latency histogram (bucket 1) - 10-49ms */
+#define WT_STAT_CONN_PERF_HIST_FSREAD_LATENCY_LT50 1228
+/*! perf: file system read latency histogram (bucket 2) - 50-99ms */
+#define WT_STAT_CONN_PERF_HIST_FSREAD_LATENCY_LT100 1229
+/*! perf: file system read latency histogram (bucket 3) - 100-249ms */
+#define WT_STAT_CONN_PERF_HIST_FSREAD_LATENCY_LT250 1230
+/*! perf: file system read latency histogram (bucket 4) - 250-499ms */
+#define WT_STAT_CONN_PERF_HIST_FSREAD_LATENCY_LT500 1231
+/*! perf: file system read latency histogram (bucket 5) - 500-999ms */
+#define WT_STAT_CONN_PERF_HIST_FSREAD_LATENCY_LT1000 1232
+/*! perf: file system read latency histogram (bucket 6) - 1000ms+ */
+#define WT_STAT_CONN_PERF_HIST_FSREAD_LATENCY_GT1000 1233
+/*! perf: file system write latency histogram (bucket 1) - 10-49ms */
+#define WT_STAT_CONN_PERF_HIST_FSWRITE_LATENCY_LT50 1234
+/*! perf: file system write latency histogram (bucket 2) - 50-99ms */
+#define WT_STAT_CONN_PERF_HIST_FSWRITE_LATENCY_LT100 1235
+/*! perf: file system write latency histogram (bucket 3) - 100-249ms */
+#define WT_STAT_CONN_PERF_HIST_FSWRITE_LATENCY_LT250 1236
+/*! perf: file system write latency histogram (bucket 4) - 250-499ms */
+#define WT_STAT_CONN_PERF_HIST_FSWRITE_LATENCY_LT500 1237
+/*! perf: file system write latency histogram (bucket 5) - 500-999ms */
+#define WT_STAT_CONN_PERF_HIST_FSWRITE_LATENCY_LT1000 1238
+/*! perf: file system write latency histogram (bucket 6) - 1000ms+ */
+#define WT_STAT_CONN_PERF_HIST_FSWRITE_LATENCY_GT1000 1239
+/*! perf: operation read latency histogram (bucket 1) - 100-249us */
+#define WT_STAT_CONN_PERF_HIST_OPREAD_LATENCY_LT250 1240
+/*! perf: operation read latency histogram (bucket 2) - 250-499us */
+#define WT_STAT_CONN_PERF_HIST_OPREAD_LATENCY_LT500 1241
+/*! perf: operation read latency histogram (bucket 3) - 500-999us */
+#define WT_STAT_CONN_PERF_HIST_OPREAD_LATENCY_LT1000 1242
+/*! perf: operation read latency histogram (bucket 4) - 1000-9999us */
+#define WT_STAT_CONN_PERF_HIST_OPREAD_LATENCY_LT10000 1243
+/*! perf: operation read latency histogram (bucket 5) - 10000us+ */
+#define WT_STAT_CONN_PERF_HIST_OPREAD_LATENCY_GT10000 1244
+/*! perf: operation write latency histogram (bucket 1) - 100-249us */
+#define WT_STAT_CONN_PERF_HIST_OPWRITE_LATENCY_LT250 1245
+/*! perf: operation write latency histogram (bucket 2) - 250-499us */
+#define WT_STAT_CONN_PERF_HIST_OPWRITE_LATENCY_LT500 1246
+/*! perf: operation write latency histogram (bucket 3) - 500-999us */
+#define WT_STAT_CONN_PERF_HIST_OPWRITE_LATENCY_LT1000 1247
+/*! perf: operation write latency histogram (bucket 4) - 1000-9999us */
+#define WT_STAT_CONN_PERF_HIST_OPWRITE_LATENCY_LT10000 1248
+/*! perf: operation write latency histogram (bucket 5) - 10000us+ */
+#define WT_STAT_CONN_PERF_HIST_OPWRITE_LATENCY_GT10000 1249
/*! reconciliation: fast-path pages deleted */
-#define WT_STAT_CONN_REC_PAGE_DELETE_FAST 1216
+#define WT_STAT_CONN_REC_PAGE_DELETE_FAST 1250
/*! reconciliation: page reconciliation calls */
-#define WT_STAT_CONN_REC_PAGES 1217
+#define WT_STAT_CONN_REC_PAGES 1251
/*! reconciliation: page reconciliation calls for eviction */
-#define WT_STAT_CONN_REC_PAGES_EVICTION 1218
+#define WT_STAT_CONN_REC_PAGES_EVICTION 1252
/*! reconciliation: pages deleted */
-#define WT_STAT_CONN_REC_PAGE_DELETE 1219
+#define WT_STAT_CONN_REC_PAGE_DELETE 1253
/*! reconciliation: split bytes currently awaiting free */
-#define WT_STAT_CONN_REC_SPLIT_STASHED_BYTES 1220
+#define WT_STAT_CONN_REC_SPLIT_STASHED_BYTES 1254
/*! reconciliation: split objects currently awaiting free */
-#define WT_STAT_CONN_REC_SPLIT_STASHED_OBJECTS 1221
+#define WT_STAT_CONN_REC_SPLIT_STASHED_OBJECTS 1255
/*! session: open cursor count */
-#define WT_STAT_CONN_SESSION_CURSOR_OPEN 1222
+#define WT_STAT_CONN_SESSION_CURSOR_OPEN 1256
/*! session: open session count */
-#define WT_STAT_CONN_SESSION_OPEN 1223
+#define WT_STAT_CONN_SESSION_OPEN 1257
/*! session: table alter failed calls */
-#define WT_STAT_CONN_SESSION_TABLE_ALTER_FAIL 1224
+#define WT_STAT_CONN_SESSION_TABLE_ALTER_FAIL 1258
/*! session: table alter successful calls */
-#define WT_STAT_CONN_SESSION_TABLE_ALTER_SUCCESS 1225
+#define WT_STAT_CONN_SESSION_TABLE_ALTER_SUCCESS 1259
/*! session: table alter unchanged and skipped */
-#define WT_STAT_CONN_SESSION_TABLE_ALTER_SKIP 1226
+#define WT_STAT_CONN_SESSION_TABLE_ALTER_SKIP 1260
/*! session: table compact failed calls */
-#define WT_STAT_CONN_SESSION_TABLE_COMPACT_FAIL 1227
+#define WT_STAT_CONN_SESSION_TABLE_COMPACT_FAIL 1261
/*! session: table compact successful calls */
-#define WT_STAT_CONN_SESSION_TABLE_COMPACT_SUCCESS 1228
+#define WT_STAT_CONN_SESSION_TABLE_COMPACT_SUCCESS 1262
/*! session: table create failed calls */
-#define WT_STAT_CONN_SESSION_TABLE_CREATE_FAIL 1229
+#define WT_STAT_CONN_SESSION_TABLE_CREATE_FAIL 1263
/*! session: table create successful calls */
-#define WT_STAT_CONN_SESSION_TABLE_CREATE_SUCCESS 1230
+#define WT_STAT_CONN_SESSION_TABLE_CREATE_SUCCESS 1264
/*! session: table drop failed calls */
-#define WT_STAT_CONN_SESSION_TABLE_DROP_FAIL 1231
+#define WT_STAT_CONN_SESSION_TABLE_DROP_FAIL 1265
/*! session: table drop successful calls */
-#define WT_STAT_CONN_SESSION_TABLE_DROP_SUCCESS 1232
+#define WT_STAT_CONN_SESSION_TABLE_DROP_SUCCESS 1266
/*! session: table rebalance failed calls */
-#define WT_STAT_CONN_SESSION_TABLE_REBALANCE_FAIL 1233
+#define WT_STAT_CONN_SESSION_TABLE_REBALANCE_FAIL 1267
/*! session: table rebalance successful calls */
-#define WT_STAT_CONN_SESSION_TABLE_REBALANCE_SUCCESS 1234
+#define WT_STAT_CONN_SESSION_TABLE_REBALANCE_SUCCESS 1268
/*! session: table rename failed calls */
-#define WT_STAT_CONN_SESSION_TABLE_RENAME_FAIL 1235
+#define WT_STAT_CONN_SESSION_TABLE_RENAME_FAIL 1269
/*! session: table rename successful calls */
-#define WT_STAT_CONN_SESSION_TABLE_RENAME_SUCCESS 1236
+#define WT_STAT_CONN_SESSION_TABLE_RENAME_SUCCESS 1270
/*! session: table salvage failed calls */
-#define WT_STAT_CONN_SESSION_TABLE_SALVAGE_FAIL 1237
+#define WT_STAT_CONN_SESSION_TABLE_SALVAGE_FAIL 1271
/*! session: table salvage successful calls */
-#define WT_STAT_CONN_SESSION_TABLE_SALVAGE_SUCCESS 1238
+#define WT_STAT_CONN_SESSION_TABLE_SALVAGE_SUCCESS 1272
/*! session: table truncate failed calls */
-#define WT_STAT_CONN_SESSION_TABLE_TRUNCATE_FAIL 1239
+#define WT_STAT_CONN_SESSION_TABLE_TRUNCATE_FAIL 1273
/*! session: table truncate successful calls */
-#define WT_STAT_CONN_SESSION_TABLE_TRUNCATE_SUCCESS 1240
+#define WT_STAT_CONN_SESSION_TABLE_TRUNCATE_SUCCESS 1274
/*! session: table verify failed calls */
-#define WT_STAT_CONN_SESSION_TABLE_VERIFY_FAIL 1241
+#define WT_STAT_CONN_SESSION_TABLE_VERIFY_FAIL 1275
/*! session: table verify successful calls */
-#define WT_STAT_CONN_SESSION_TABLE_VERIFY_SUCCESS 1242
+#define WT_STAT_CONN_SESSION_TABLE_VERIFY_SUCCESS 1276
/*! thread-state: active filesystem fsync calls */
-#define WT_STAT_CONN_THREAD_FSYNC_ACTIVE 1243
+#define WT_STAT_CONN_THREAD_FSYNC_ACTIVE 1277
/*! thread-state: active filesystem read calls */
-#define WT_STAT_CONN_THREAD_READ_ACTIVE 1244
+#define WT_STAT_CONN_THREAD_READ_ACTIVE 1278
/*! thread-state: active filesystem write calls */
-#define WT_STAT_CONN_THREAD_WRITE_ACTIVE 1245
+#define WT_STAT_CONN_THREAD_WRITE_ACTIVE 1279
/*! thread-yield: application thread time evicting (usecs) */
-#define WT_STAT_CONN_APPLICATION_EVICT_TIME 1246
+#define WT_STAT_CONN_APPLICATION_EVICT_TIME 1280
/*! thread-yield: application thread time waiting for cache (usecs) */
-#define WT_STAT_CONN_APPLICATION_CACHE_TIME 1247
+#define WT_STAT_CONN_APPLICATION_CACHE_TIME 1281
/*!
* thread-yield: connection close blocked waiting for transaction state
* stabilization
*/
-#define WT_STAT_CONN_TXN_RELEASE_BLOCKED 1248
+#define WT_STAT_CONN_TXN_RELEASE_BLOCKED 1282
/*! thread-yield: connection close yielded for lsm manager shutdown */
-#define WT_STAT_CONN_CONN_CLOSE_BLOCKED_LSM 1249
+#define WT_STAT_CONN_CONN_CLOSE_BLOCKED_LSM 1283
/*! thread-yield: data handle lock yielded */
-#define WT_STAT_CONN_DHANDLE_LOCK_BLOCKED 1250
+#define WT_STAT_CONN_DHANDLE_LOCK_BLOCKED 1284
/*!
* thread-yield: get reference for page index and slot time sleeping
* (usecs)
*/
-#define WT_STAT_CONN_PAGE_INDEX_SLOT_REF_BLOCKED 1251
+#define WT_STAT_CONN_PAGE_INDEX_SLOT_REF_BLOCKED 1285
/*! thread-yield: log server sync yielded for log write */
-#define WT_STAT_CONN_LOG_SERVER_SYNC_BLOCKED 1252
+#define WT_STAT_CONN_LOG_SERVER_SYNC_BLOCKED 1286
/*! thread-yield: page acquire busy blocked */
-#define WT_STAT_CONN_PAGE_BUSY_BLOCKED 1253
+#define WT_STAT_CONN_PAGE_BUSY_BLOCKED 1287
/*! thread-yield: page acquire eviction blocked */
-#define WT_STAT_CONN_PAGE_FORCIBLE_EVICT_BLOCKED 1254
+#define WT_STAT_CONN_PAGE_FORCIBLE_EVICT_BLOCKED 1288
/*! thread-yield: page acquire locked blocked */
-#define WT_STAT_CONN_PAGE_LOCKED_BLOCKED 1255
+#define WT_STAT_CONN_PAGE_LOCKED_BLOCKED 1289
/*! thread-yield: page acquire read blocked */
-#define WT_STAT_CONN_PAGE_READ_BLOCKED 1256
+#define WT_STAT_CONN_PAGE_READ_BLOCKED 1290
/*! thread-yield: page acquire time sleeping (usecs) */
-#define WT_STAT_CONN_PAGE_SLEEP 1257
+#define WT_STAT_CONN_PAGE_SLEEP 1291
/*!
* thread-yield: page delete rollback time sleeping for state change
* (usecs)
*/
-#define WT_STAT_CONN_PAGE_DEL_ROLLBACK_BLOCKED 1258
+#define WT_STAT_CONN_PAGE_DEL_ROLLBACK_BLOCKED 1292
/*! thread-yield: page reconciliation yielded due to child modification */
-#define WT_STAT_CONN_CHILD_MODIFY_BLOCKED_PAGE 1259
+#define WT_STAT_CONN_CHILD_MODIFY_BLOCKED_PAGE 1293
/*!
* thread-yield: tree descend one level yielded for split page index
* update
*/
-#define WT_STAT_CONN_TREE_DESCEND_BLOCKED 1260
+#define WT_STAT_CONN_TREE_DESCEND_BLOCKED 1294
+/*! transaction: commit timestamp queue insert to empty */
+#define WT_STAT_CONN_TXN_COMMIT_QUEUE_EMPTY 1295
+/*! transaction: commit timestamp queue inserts to head */
+#define WT_STAT_CONN_TXN_COMMIT_QUEUE_HEAD 1296
+/*! transaction: commit timestamp queue inserts total */
+#define WT_STAT_CONN_TXN_COMMIT_QUEUE_INSERTS 1297
+/*! transaction: commit timestamp queue length */
+#define WT_STAT_CONN_TXN_COMMIT_QUEUE_LEN 1298
/*! transaction: number of named snapshots created */
-#define WT_STAT_CONN_TXN_SNAPSHOTS_CREATED 1261
+#define WT_STAT_CONN_TXN_SNAPSHOTS_CREATED 1299
/*! transaction: number of named snapshots dropped */
-#define WT_STAT_CONN_TXN_SNAPSHOTS_DROPPED 1262
+#define WT_STAT_CONN_TXN_SNAPSHOTS_DROPPED 1300
+/*! transaction: query timestamp calls */
+#define WT_STAT_CONN_TXN_QUERY_TS 1301
+/*! transaction: read timestamp queue insert to empty */
+#define WT_STAT_CONN_TXN_READ_QUEUE_EMPTY 1302
+/*! transaction: read timestamp queue inserts to head */
+#define WT_STAT_CONN_TXN_READ_QUEUE_HEAD 1303
+/*! transaction: read timestamp queue inserts total */
+#define WT_STAT_CONN_TXN_READ_QUEUE_INSERTS 1304
+/*! transaction: read timestamp queue length */
+#define WT_STAT_CONN_TXN_READ_QUEUE_LEN 1305
+/*! transaction: set timestamp calls */
+#define WT_STAT_CONN_TXN_SET_TS 1306
+/*! transaction: set timestamp commit calls */
+#define WT_STAT_CONN_TXN_SET_TS_COMMIT 1307
+/*! transaction: set timestamp commit updates */
+#define WT_STAT_CONN_TXN_SET_TS_COMMIT_UPD 1308
+/*! transaction: set timestamp oldest calls */
+#define WT_STAT_CONN_TXN_SET_TS_OLDEST 1309
+/*! transaction: set timestamp oldest updates */
+#define WT_STAT_CONN_TXN_SET_TS_OLDEST_UPD 1310
+/*! transaction: set timestamp stable calls */
+#define WT_STAT_CONN_TXN_SET_TS_STABLE 1311
+/*! transaction: set timestamp stable updates */
+#define WT_STAT_CONN_TXN_SET_TS_STABLE_UPD 1312
/*! transaction: transaction begins */
-#define WT_STAT_CONN_TXN_BEGIN 1263
+#define WT_STAT_CONN_TXN_BEGIN 1313
/*! transaction: transaction checkpoint currently running */
-#define WT_STAT_CONN_TXN_CHECKPOINT_RUNNING 1264
+#define WT_STAT_CONN_TXN_CHECKPOINT_RUNNING 1314
/*! transaction: transaction checkpoint generation */
-#define WT_STAT_CONN_TXN_CHECKPOINT_GENERATION 1265
+#define WT_STAT_CONN_TXN_CHECKPOINT_GENERATION 1315
/*! transaction: transaction checkpoint max time (msecs) */
-#define WT_STAT_CONN_TXN_CHECKPOINT_TIME_MAX 1266
+#define WT_STAT_CONN_TXN_CHECKPOINT_TIME_MAX 1316
/*! transaction: transaction checkpoint min time (msecs) */
-#define WT_STAT_CONN_TXN_CHECKPOINT_TIME_MIN 1267
+#define WT_STAT_CONN_TXN_CHECKPOINT_TIME_MIN 1317
/*! transaction: transaction checkpoint most recent time (msecs) */
-#define WT_STAT_CONN_TXN_CHECKPOINT_TIME_RECENT 1268
+#define WT_STAT_CONN_TXN_CHECKPOINT_TIME_RECENT 1318
/*! transaction: transaction checkpoint scrub dirty target */
-#define WT_STAT_CONN_TXN_CHECKPOINT_SCRUB_TARGET 1269
+#define WT_STAT_CONN_TXN_CHECKPOINT_SCRUB_TARGET 1319
/*! transaction: transaction checkpoint scrub time (msecs) */
-#define WT_STAT_CONN_TXN_CHECKPOINT_SCRUB_TIME 1270
+#define WT_STAT_CONN_TXN_CHECKPOINT_SCRUB_TIME 1320
/*! transaction: transaction checkpoint total time (msecs) */
-#define WT_STAT_CONN_TXN_CHECKPOINT_TIME_TOTAL 1271
+#define WT_STAT_CONN_TXN_CHECKPOINT_TIME_TOTAL 1321
/*! transaction: transaction checkpoints */
-#define WT_STAT_CONN_TXN_CHECKPOINT 1272
+#define WT_STAT_CONN_TXN_CHECKPOINT 1322
/*!
* transaction: transaction checkpoints skipped because database was
* clean
*/
-#define WT_STAT_CONN_TXN_CHECKPOINT_SKIPPED 1273
+#define WT_STAT_CONN_TXN_CHECKPOINT_SKIPPED 1323
/*! transaction: transaction failures due to cache overflow */
-#define WT_STAT_CONN_TXN_FAIL_CACHE 1274
+#define WT_STAT_CONN_TXN_FAIL_CACHE 1324
/*!
* transaction: transaction fsync calls for checkpoint after allocating
* the transaction ID
*/
-#define WT_STAT_CONN_TXN_CHECKPOINT_FSYNC_POST 1275
+#define WT_STAT_CONN_TXN_CHECKPOINT_FSYNC_POST 1325
/*!
* transaction: transaction fsync duration for checkpoint after
* allocating the transaction ID (usecs)
*/
-#define WT_STAT_CONN_TXN_CHECKPOINT_FSYNC_POST_DURATION 1276
+#define WT_STAT_CONN_TXN_CHECKPOINT_FSYNC_POST_DURATION 1326
/*! transaction: transaction range of IDs currently pinned */
-#define WT_STAT_CONN_TXN_PINNED_RANGE 1277
+#define WT_STAT_CONN_TXN_PINNED_RANGE 1327
/*! transaction: transaction range of IDs currently pinned by a checkpoint */
-#define WT_STAT_CONN_TXN_PINNED_CHECKPOINT_RANGE 1278
+#define WT_STAT_CONN_TXN_PINNED_CHECKPOINT_RANGE 1328
/*!
* transaction: transaction range of IDs currently pinned by named
* snapshots
*/
-#define WT_STAT_CONN_TXN_PINNED_SNAPSHOT_RANGE 1279
+#define WT_STAT_CONN_TXN_PINNED_SNAPSHOT_RANGE 1329
/*! transaction: transaction range of timestamps currently pinned */
-#define WT_STAT_CONN_TXN_PINNED_TIMESTAMP 1280
+#define WT_STAT_CONN_TXN_PINNED_TIMESTAMP 1330
/*!
* transaction: transaction range of timestamps pinned by the oldest
* timestamp
*/
-#define WT_STAT_CONN_TXN_PINNED_TIMESTAMP_OLDEST 1281
+#define WT_STAT_CONN_TXN_PINNED_TIMESTAMP_OLDEST 1331
/*! transaction: transaction sync calls */
-#define WT_STAT_CONN_TXN_SYNC 1282
-/*! transaction: transactions commit timestamp queue inserts to head */
-#define WT_STAT_CONN_TXN_COMMIT_QUEUE_HEAD 1283
-/*! transaction: transactions commit timestamp queue inserts total */
-#define WT_STAT_CONN_TXN_COMMIT_QUEUE_INSERTS 1284
-/*! transaction: transactions commit timestamp queue length */
-#define WT_STAT_CONN_TXN_COMMIT_QUEUE_LEN 1285
+#define WT_STAT_CONN_TXN_SYNC 1332
/*! transaction: transactions committed */
-#define WT_STAT_CONN_TXN_COMMIT 1286
-/*! transaction: transactions read timestamp queue inserts to head */
-#define WT_STAT_CONN_TXN_READ_QUEUE_HEAD 1287
-/*! transaction: transactions read timestamp queue inserts total */
-#define WT_STAT_CONN_TXN_READ_QUEUE_INSERTS 1288
-/*! transaction: transactions read timestamp queue length */
-#define WT_STAT_CONN_TXN_READ_QUEUE_LEN 1289
+#define WT_STAT_CONN_TXN_COMMIT 1333
/*! transaction: transactions rolled back */
-#define WT_STAT_CONN_TXN_ROLLBACK 1290
+#define WT_STAT_CONN_TXN_ROLLBACK 1334
/*! transaction: update conflicts */
-#define WT_STAT_CONN_TXN_UPDATE_CONFLICT 1291
+#define WT_STAT_CONN_TXN_UPDATE_CONFLICT 1335
/*!
* @}
diff --git a/src/third_party/wiredtiger/src/include/wiredtiger_ext.h b/src/third_party/wiredtiger/src/include/wiredtiger_ext.h
index bc61c43e29d..f33402129ff 100644
--- a/src/third_party/wiredtiger/src/include/wiredtiger_ext.h
+++ b/src/third_party/wiredtiger/src/include/wiredtiger_ext.h
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/include/wt_internal.h b/src/third_party/wiredtiger/src/include/wt_internal.h
index 9fcf1401a4c..df3ee2da174 100644
--- a/src/third_party/wiredtiger/src/include/wt_internal.h
+++ b/src/third_party/wiredtiger/src/include/wt_internal.h
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
@@ -35,6 +35,7 @@ extern "C" {
#endif
#include <errno.h>
#include <fcntl.h>
+#include <float.h>
#include <inttypes.h>
#ifdef _WIN32
#include <io.h>
diff --git a/src/third_party/wiredtiger/src/log/log.c b/src/third_party/wiredtiger/src/log/log.c
index a04ab84845f..217a3deab60 100644
--- a/src/third_party/wiredtiger/src/log/log.c
+++ b/src/third_party/wiredtiger/src/log/log.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
@@ -25,13 +25,13 @@ static int __log_write_internal(
* Write a text message to the log.
*/
int
-__wt_log_printf(WT_SESSION_IMPL *session, const char *fmt, ...)
+__wt_log_printf(WT_SESSION_IMPL *session, const char *format, ...)
{
WT_DECL_RET;
va_list ap;
- va_start(ap, fmt);
- ret = __wt_log_vprintf(session, fmt, ap);
+ va_start(ap, format);
+ ret = __wt_log_vprintf(session, format, ap);
va_end(ap);
return (ret);
}
@@ -81,6 +81,28 @@ __log_get_files(WT_SESSION_IMPL *session,
}
/*
+ * __log_get_files_single --
+ * Retrieve a single log-related file of the given prefix type.
+ */
+static int
+__log_get_files_single(WT_SESSION_IMPL *session,
+ const char *file_prefix, char ***filesp, u_int *countp)
+{
+ WT_CONNECTION_IMPL *conn;
+ const char *log_path;
+
+ *countp = 0;
+ *filesp = NULL;
+
+ conn = S2C(session);
+ log_path = conn->log_path;
+ if (log_path == NULL)
+ log_path = "";
+ return (__wt_fs_directory_list_single(
+ session, log_path, file_prefix, filesp, countp));
+}
+
+/*
* __log_prealloc_remove --
* Remove all previously created pre-allocated files.
*/
@@ -266,7 +288,6 @@ __wt_log_force_sync(WT_SESSION_IMPL *session, WT_LSN *min_lsn)
log = S2C(session)->log;
log_fh = NULL;
- time_start = time_stop = 0;
/*
* We need to wait for the previous log file to get written
@@ -293,8 +314,7 @@ __wt_log_force_sync(WT_SESSION_IMPL *session, WT_LSN *min_lsn)
time_start = __wt_rdtsc(session);
WT_ERR(__wt_fsync(session, log->log_dir_fh, true));
time_stop = __wt_rdtsc(session);
- fsync_duration_usecs = WT_TSCDIFF_US(session,
- time_stop, time_start);
+ fsync_duration_usecs = WT_TSCDIFF_US(time_stop, time_start);
log->sync_dir_lsn = *min_lsn;
WT_STAT_CONN_INCR(session, log_sync_dir);
WT_STAT_CONN_INCRV(session,
@@ -317,8 +337,7 @@ __wt_log_force_sync(WT_SESSION_IMPL *session, WT_LSN *min_lsn)
time_start = __wt_rdtsc(session);
WT_ERR(__wt_fsync(session, log_fh, true));
time_stop = __wt_rdtsc(session);
- fsync_duration_usecs = WT_TSCDIFF_US(session,
- time_stop, time_start);
+ fsync_duration_usecs = WT_TSCDIFF_US(time_stop, time_start);
log->sync_lsn = *min_lsn;
WT_STAT_CONN_INCR(session, log_sync);
WT_STAT_CONN_INCRV(session,
@@ -1020,13 +1039,12 @@ __log_alloc_prealloc(WT_SESSION_IMPL *session, uint32_t to_num)
conn = S2C(session);
log = conn->log;
logfiles = NULL;
- WT_ERR(__log_get_files(session, WT_LOG_PREPNAME, &logfiles, &logcount));
+ WT_ERR(__log_get_files_single(
+ session, WT_LOG_PREPNAME, &logfiles, &logcount));
if (logcount == 0)
return (WT_NOTFOUND);
- /*
- * We have a file to use. Just use the first one.
- */
+ /* We have a file to use. */
WT_ERR(__wt_log_extract_lognum(session, logfiles[0], &from_num));
WT_ERR(__wt_scr_alloc(session, 0, &from_path));
@@ -1722,7 +1740,6 @@ __wt_log_release(WT_SESSION_IMPL *session, WT_LOGSLOT *slot, bool *freep)
conn = S2C(session);
log = conn->log;
locked = false;
- time_start = time_stop = 0;
if (freep != NULL)
*freep = 1;
release_buffered = WT_LOG_SLOT_RELEASED_BUFFERED(slot->slot_state);
@@ -1830,8 +1847,8 @@ __wt_log_release(WT_SESSION_IMPL *session, WT_LOGSLOT *slot, bool *freep)
time_start = __wt_rdtsc(session);
WT_ERR(__wt_fsync(session, log->log_dir_fh, true));
time_stop = __wt_rdtsc(session);
- fsync_duration_usecs = WT_TSCDIFF_US(session,
- time_stop, time_start);
+ fsync_duration_usecs =
+ WT_TSCDIFF_US(time_stop, time_start);
log->sync_dir_lsn = sync_lsn;
WT_STAT_CONN_INCR(session, log_sync_dir);
WT_STAT_CONN_INCRV(session,
@@ -1852,8 +1869,8 @@ __wt_log_release(WT_SESSION_IMPL *session, WT_LOGSLOT *slot, bool *freep)
time_start = __wt_rdtsc(session);
WT_ERR(__wt_fsync(session, log->log_fh, true));
time_stop = __wt_rdtsc(session);
- fsync_duration_usecs = WT_TSCDIFF_US(session,
- time_stop, time_start);
+ fsync_duration_usecs =
+ WT_TSCDIFF_US(time_stop, time_start);
WT_STAT_CONN_INCRV(session,
log_sync_duration, fsync_duration_usecs);
log->sync_lsn = sync_lsn;
diff --git a/src/third_party/wiredtiger/src/log/log_slot.c b/src/third_party/wiredtiger/src/log/log_slot.c
index 74ce16d0e21..4a556913cdc 100644
--- a/src/third_party/wiredtiger/src/log/log_slot.c
+++ b/src/third_party/wiredtiger/src/log/log_slot.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
@@ -172,7 +172,7 @@ retry:
if (count > WT_MILLION) {
time_stop = __wt_rdtsc(session);
if (WT_TSCDIFF_SEC(
- session, time_stop, time_start) > 10) {
+ time_stop, time_start) > 10) {
__wt_errx(session, "SLOT_CLOSE: Slot %"
PRIu32 " Timeout unbuffered, state 0x%"
PRIx64 " unbuffered %" PRId64,
@@ -272,8 +272,7 @@ __log_slot_new(WT_SESSION_IMPL *session)
++count;
if (count > WT_MILLION) {
time_stop = __wt_rdtsc(session);
- if (WT_TSCDIFF_SEC(
- session, time_stop, time_start) > 10) {
+ if (WT_TSCDIFF_SEC(time_stop, time_start) > 10) {
__wt_errx(session,
"SLOT_NEW: Timeout free slot");
__log_slot_dump(session);
@@ -600,7 +599,7 @@ __wt_log_slot_join(WT_SESSION_IMPL *session, uint64_t mysize,
else {
WT_STAT_CONN_INCR(session, log_slot_yield);
time_stop = __wt_rdtsc(session);
- usecs = WT_TSCDIFF_US(session, time_stop, time_start);
+ usecs = WT_TSCDIFF_US(time_stop, time_start);
WT_STAT_CONN_INCRV(session, log_slot_yield_duration, usecs);
if (closed)
WT_STAT_CONN_INCR(session, log_slot_yield_close);
diff --git a/src/third_party/wiredtiger/src/log/log_sys.c b/src/third_party/wiredtiger/src/log/log_sys.c
index ad65aaf9a8a..3a019c68acc 100644
--- a/src/third_party/wiredtiger/src/log/log_sys.c
+++ b/src/third_party/wiredtiger/src/log/log_sys.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/lsm/lsm_cursor.c b/src/third_party/wiredtiger/src/lsm/lsm_cursor.c
index 04c6d5c00c4..c5a3935813a 100644
--- a/src/third_party/wiredtiger/src/lsm/lsm_cursor.c
+++ b/src/third_party/wiredtiger/src/lsm/lsm_cursor.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
@@ -1838,7 +1838,8 @@ __wt_clsm_open(WT_SESSION_IMPL *session,
WT_ERR(__wt_clsm_open_bulk(clsm, cfg));
if (0) {
-err: if (clsm != NULL)
+err:
+ if (clsm != NULL)
WT_TRET(__wt_clsm_close(cursor));
else if (lsm_tree != NULL)
__wt_lsm_tree_release(session, lsm_tree);
diff --git a/src/third_party/wiredtiger/src/lsm/lsm_cursor_bulk.c b/src/third_party/wiredtiger/src/lsm/lsm_cursor_bulk.c
index 354e1626153..1dbf268577c 100644
--- a/src/third_party/wiredtiger/src/lsm/lsm_cursor_bulk.c
+++ b/src/third_party/wiredtiger/src/lsm/lsm_cursor_bulk.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/lsm/lsm_manager.c b/src/third_party/wiredtiger/src/lsm/lsm_manager.c
index 62f2c7795be..40ff5fc0b26 100644
--- a/src/third_party/wiredtiger/src/lsm/lsm_manager.c
+++ b/src/third_party/wiredtiger/src/lsm/lsm_manager.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/lsm/lsm_merge.c b/src/third_party/wiredtiger/src/lsm/lsm_merge.c
index 2a02792d392..1a2568a0d64 100644
--- a/src/third_party/wiredtiger/src/lsm/lsm_merge.c
+++ b/src/third_party/wiredtiger/src/lsm/lsm_merge.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/lsm/lsm_meta.c b/src/third_party/wiredtiger/src/lsm/lsm_meta.c
index 7cb82f94ad4..1337335ff5b 100644
--- a/src/third_party/wiredtiger/src/lsm/lsm_meta.c
+++ b/src/third_party/wiredtiger/src/lsm/lsm_meta.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
@@ -281,8 +281,7 @@ __lsm_meta_read_v1(
lsm_tree->last = (u_int)cv.val;
WT_ERR(__wt_config_getones(session, lsmconf, "chunks", &cv));
__wt_config_subinit(session, &lparser, &cv);
- for (nchunks = 0; (ret =
- __wt_config_next(&lparser, &lk, &lv)) == 0; ) {
+ for (nchunks = 0; (ret = __wt_config_next(&lparser, &lk, &lv)) == 0;) {
if (WT_STRING_MATCH("generation", lk.str, lk.len)) {
WT_ERR(__wt_realloc_def(session,
&lsm_tree->chunk_alloc,
@@ -290,25 +289,19 @@ __lsm_meta_read_v1(
WT_ERR(__wt_calloc_one(session, &chunk));
lsm_tree->chunk[nchunks++] = chunk;
chunk->generation = (uint32_t)lv.val;
- continue;
} else if (WT_STRING_MATCH("id", lk.str, lk.len)) {
chunk->id = (uint32_t)lv.val;
WT_ERR(__wt_lsm_tree_chunk_name(session, lsm_tree,
chunk->id, chunk->generation, &chunk->uri));
- F_SET(chunk,
- WT_LSM_CHUNK_ONDISK |
- WT_LSM_CHUNK_STABLE);
+ F_SET(chunk, WT_LSM_CHUNK_ONDISK | WT_LSM_CHUNK_STABLE);
} else if (WT_STRING_MATCH("bloom", lk.str, lk.len)) {
WT_ERR(__wt_lsm_tree_bloom_name(
session, lsm_tree, chunk->id, &chunk->bloom_uri));
F_SET(chunk, WT_LSM_CHUNK_BLOOM);
- continue;
} else if (WT_STRING_MATCH("chunk_size", lk.str, lk.len)) {
chunk->size = (uint64_t)lv.val;
- continue;
} else if (WT_STRING_MATCH("count", lk.str, lk.len)) {
chunk->count = (uint64_t)lv.val;
- continue;
}
}
WT_ERR_NOTFOUND_OK(ret);
@@ -316,8 +309,7 @@ __lsm_meta_read_v1(
WT_ERR(__wt_config_getones(session, lsmconf, "old_chunks", &cv));
__wt_config_subinit(session, &lparser, &cv);
- for (nchunks = 0; (ret =
- __wt_config_next(&lparser, &lk, &lv)) == 0; ) {
+ for (nchunks = 0; (ret = __wt_config_next(&lparser, &lk, &lv)) == 0;) {
if (WT_STRING_MATCH("bloom", lk.str, lk.len)) {
WT_ERR(__wt_strndup(session,
lv.str, lv.len, &chunk->bloom_uri));
diff --git a/src/third_party/wiredtiger/src/lsm/lsm_stat.c b/src/third_party/wiredtiger/src/lsm/lsm_stat.c
index 3688069d200..590aad926fc 100644
--- a/src/third_party/wiredtiger/src/lsm/lsm_stat.c
+++ b/src/third_party/wiredtiger/src/lsm/lsm_stat.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/lsm/lsm_tree.c b/src/third_party/wiredtiger/src/lsm/lsm_tree.c
index cef5e51e214..1b92028072d 100644
--- a/src/third_party/wiredtiger/src/lsm/lsm_tree.c
+++ b/src/third_party/wiredtiger/src/lsm/lsm_tree.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
@@ -912,6 +912,7 @@ __wt_lsm_tree_drop(
bool locked;
locked = false;
+ WT_NOT_READ(locked);
/* Get the LSM tree. */
WT_RET(__wt_lsm_tree_get(session, name, true, &lsm_tree));
@@ -971,6 +972,7 @@ __wt_lsm_tree_rename(WT_SESSION_IMPL *session,
old = NULL;
locked = false;
+ WT_NOT_READ(locked);
/* Get the LSM tree. */
WT_RET(__wt_lsm_tree_get(session, olduri, true, &lsm_tree));
@@ -1039,8 +1041,10 @@ __wt_lsm_tree_truncate(
bool locked;
WT_UNUSED(cfg);
+
chunk = NULL;
locked = false;
+ WT_NOT_READ(locked);
/* Get the LSM tree. */
WT_RET(__wt_lsm_tree_get(session, name, true, &lsm_tree));
@@ -1378,9 +1382,10 @@ __wt_lsm_tree_worker(WT_SESSION_IMPL *session,
u_int i;
bool exclusive, locked, need_release;
- locked = false;
- need_release = false;
+ locked = need_release = false;
+ WT_NOT_READ(locked);
exclusive = FLD_ISSET(open_flags, WT_DHANDLE_EXCLUSIVE);
+
WT_RET(__wt_lsm_tree_get(session, uri, exclusive, &lsm_tree));
need_release = true;
@@ -1419,20 +1424,18 @@ __wt_lsm_tree_worker(WT_SESSION_IMPL *session,
*/
if (FLD_ISSET(open_flags, WT_BTREE_ALTER)) {
WT_ERR(__wt_lsm_meta_write(session, lsm_tree, cfg[0]));
- /*
- * We're about to discard the tree so we do not need to
- * release it later.
- */
- need_release = false;
+
+ locked = false;
if (exclusive)
__wt_lsm_tree_writeunlock(session, lsm_tree);
else
__wt_lsm_tree_readunlock(session, lsm_tree);
- locked = false;
+
/*
* We rewrote the meta-data. Discard the tree and the next
* access will reopen it.
*/
+ need_release = false;
WT_WITH_HANDLE_LIST_WRITE_LOCK(session,
ret = __lsm_tree_discard(session, lsm_tree, false));
WT_ERR(ret);
diff --git a/src/third_party/wiredtiger/src/lsm/lsm_work_unit.c b/src/third_party/wiredtiger/src/lsm/lsm_work_unit.c
index 697c2986652..29ece08004d 100644
--- a/src/third_party/wiredtiger/src/lsm/lsm_work_unit.c
+++ b/src/third_party/wiredtiger/src/lsm/lsm_work_unit.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
@@ -326,6 +326,7 @@ __wt_lsm_checkpoint_chunk(WT_SESSION_IMPL *session,
bool flush_set, release_dhandle;
flush_set = release_dhandle = false;
+ WT_NOT_READ(flush_set);
/*
* If the chunk is already checkpointed, make sure it is also evicted.
@@ -338,9 +339,10 @@ __wt_lsm_checkpoint_chunk(WT_SESSION_IMPL *session,
ret = __lsm_discard_handle(session, chunk->uri, NULL));
if (ret == 0)
chunk->evicted = 1;
- else if (ret == EBUSY)
+ else if (ret == EBUSY) {
ret = 0;
- else
+ WT_NOT_READ(ret);
+ } else
WT_RET_MSG(session, ret, "discard handle");
}
if (F_ISSET(chunk, WT_LSM_CHUNK_ONDISK)) {
diff --git a/src/third_party/wiredtiger/src/lsm/lsm_worker.c b/src/third_party/wiredtiger/src/lsm/lsm_worker.c
index 8e89cf39099..82f72bdf355 100644
--- a/src/third_party/wiredtiger/src/lsm/lsm_worker.c
+++ b/src/third_party/wiredtiger/src/lsm/lsm_worker.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/meta/meta_apply.c b/src/third_party/wiredtiger/src/meta/meta_apply.c
index dbd3293dc2e..26d91c060ef 100644
--- a/src/third_party/wiredtiger/src/meta/meta_apply.c
+++ b/src/third_party/wiredtiger/src/meta/meta_apply.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/meta/meta_ckpt.c b/src/third_party/wiredtiger/src/meta/meta_ckpt.c
index 24f991cf549..a2edee8aac4 100644
--- a/src/third_party/wiredtiger/src/meta/meta_ckpt.c
+++ b/src/third_party/wiredtiger/src/meta/meta_ckpt.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/meta/meta_ext.c b/src/third_party/wiredtiger/src/meta/meta_ext.c
index b1d1d2be28f..7e28ba1d5cd 100644
--- a/src/third_party/wiredtiger/src/meta/meta_ext.c
+++ b/src/third_party/wiredtiger/src/meta/meta_ext.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/meta/meta_table.c b/src/third_party/wiredtiger/src/meta/meta_table.c
index 83688bbd591..d338c7769aa 100644
--- a/src/third_party/wiredtiger/src/meta/meta_table.c
+++ b/src/third_party/wiredtiger/src/meta/meta_table.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/meta/meta_track.c b/src/third_party/wiredtiger/src/meta/meta_track.c
index 0ad9a2aa429..6c92434aa2c 100644
--- a/src/third_party/wiredtiger/src/meta/meta_track.c
+++ b/src/third_party/wiredtiger/src/meta/meta_track.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/meta/meta_turtle.c b/src/third_party/wiredtiger/src/meta/meta_turtle.c
index f3e768c0948..8ce13384c0a 100644
--- a/src/third_party/wiredtiger/src/meta/meta_turtle.c
+++ b/src/third_party/wiredtiger/src/meta/meta_turtle.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/optrack/optrack.c b/src/third_party/wiredtiger/src/optrack/optrack.c
index 72789c4a154..4ac56391f15 100644
--- a/src/third_party/wiredtiger/src/optrack/optrack.c
+++ b/src/third_party/wiredtiger/src/optrack/optrack.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
@@ -107,17 +107,3 @@ __wt_optrack_flush_buffer(WT_SESSION_IMPL *s)
else
return (0);
}
-
-/*
- * __wt_optrack_get_expensive_timestamp --
- * Obtain a timestamp via a system call on platforms where obtaining it
- * directly from the hardware register is not supported.
- */
-uint64_t
-__wt_optrack_get_expensive_timestamp(WT_SESSION_IMPL *session)
-{
- struct timespec tsp;
-
- __wt_epoch_raw(session, &tsp);
- return ((uint64_t)(tsp.tv_sec * WT_BILLION + tsp.tv_nsec));
-}
diff --git a/src/third_party/wiredtiger/src/os_common/filename.c b/src/third_party/wiredtiger/src/os_common/filename.c
index 3430f15fec8..6eebe545242 100644
--- a/src/third_party/wiredtiger/src/os_common/filename.c
+++ b/src/third_party/wiredtiger/src/os_common/filename.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/os_common/os_abort.c b/src/third_party/wiredtiger/src/os_common/os_abort.c
index ebef001ce67..a725ad9151d 100644
--- a/src/third_party/wiredtiger/src/os_common/os_abort.c
+++ b/src/third_party/wiredtiger/src/os_common/os_abort.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/os_common/os_alloc.c b/src/third_party/wiredtiger/src/os_common/os_alloc.c
index eae81586f65..bec28c67c9c 100644
--- a/src/third_party/wiredtiger/src/os_common/os_alloc.c
+++ b/src/third_party/wiredtiger/src/os_common/os_alloc.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/os_common/os_errno.c b/src/third_party/wiredtiger/src/os_common/os_errno.c
index d88d06d7610..0f57658ab23 100644
--- a/src/third_party/wiredtiger/src/os_common/os_errno.c
+++ b/src/third_party/wiredtiger/src/os_common/os_errno.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/os_common/os_fhandle.c b/src/third_party/wiredtiger/src/os_common/os_fhandle.c
index 3b9e4fa26dc..3e5ad67e031 100644
--- a/src/third_party/wiredtiger/src/os_common/os_fhandle.c
+++ b/src/third_party/wiredtiger/src/os_common/os_fhandle.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/os_common/os_fs_inmemory.c b/src/third_party/wiredtiger/src/os_common/os_fs_inmemory.c
index e669ea2802d..cb7a05e05d9 100644
--- a/src/third_party/wiredtiger/src/os_common/os_fs_inmemory.c
+++ b/src/third_party/wiredtiger/src/os_common/os_fs_inmemory.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/os_common/os_fstream.c b/src/third_party/wiredtiger/src/os_common/os_fstream.c
index 7ceda73ce0a..184c4054e06 100644
--- a/src/third_party/wiredtiger/src/os_common/os_fstream.c
+++ b/src/third_party/wiredtiger/src/os_common/os_fstream.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/os_common/os_fstream_stdio.c b/src/third_party/wiredtiger/src/os_common/os_fstream_stdio.c
index 82e82b5f3e5..760abe84af5 100644
--- a/src/third_party/wiredtiger/src/os_common/os_fstream_stdio.c
+++ b/src/third_party/wiredtiger/src/os_common/os_fstream_stdio.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/os_common/os_getopt.c b/src/third_party/wiredtiger/src/os_common/os_getopt.c
index ca516ca62e5..caf1d7eba45 100644
--- a/src/third_party/wiredtiger/src/os_common/os_getopt.c
+++ b/src/third_party/wiredtiger/src/os_common/os_getopt.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/src/os_common/os_strtouq.c b/src/third_party/wiredtiger/src/os_common/os_strtouq.c
index 1cedfbdcb08..1ad2e05a22b 100644
--- a/src/third_party/wiredtiger/src/os_common/os_strtouq.c
+++ b/src/third_party/wiredtiger/src/os_common/os_strtouq.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/os_posix/os_dir.c b/src/third_party/wiredtiger/src/os_posix/os_dir.c
index 205ca389f43..a07577e6d38 100644
--- a/src/third_party/wiredtiger/src/os_posix/os_dir.c
+++ b/src/third_party/wiredtiger/src/os_posix/os_dir.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
@@ -11,13 +11,13 @@
#include <dirent.h>
/*
- * __wt_posix_directory_list --
+ * __directory_list_worker --
* Get a list of files from a directory, POSIX version.
*/
-int
-__wt_posix_directory_list(WT_FILE_SYSTEM *file_system,
+static int
+__directory_list_worker(WT_FILE_SYSTEM *file_system,
WT_SESSION *wt_session, const char *directory,
- const char *prefix, char ***dirlistp, uint32_t *countp)
+ const char *prefix, char ***dirlistp, uint32_t *countp, bool single)
{
struct dirent *dp;
DIR *dirp;
@@ -63,6 +63,9 @@ __wt_posix_directory_list(WT_FILE_SYSTEM *file_system,
session, &dirallocsz, count + 1, &entries));
WT_ERR(__wt_strdup(session, dp->d_name, &entries[count]));
++count;
+
+ if (single)
+ break;
}
*dirlistp = entries;
@@ -90,6 +93,32 @@ err: if (dirp != NULL) {
}
/*
+ * __wt_posix_directory_list --
+ * Get a list of files from a directory, POSIX version.
+ */
+int
+__wt_posix_directory_list(WT_FILE_SYSTEM *file_system,
+ WT_SESSION *wt_session, const char *directory,
+ const char *prefix, char ***dirlistp, uint32_t *countp)
+{
+ return (__directory_list_worker(file_system,
+ wt_session, directory, prefix, dirlistp, countp, false));
+}
+
+/*
+ * __wt_posix_directory_list_single --
+ * Get one file from a directory, POSIX version.
+ */
+int
+__wt_posix_directory_list_single(WT_FILE_SYSTEM *file_system,
+ WT_SESSION *wt_session, const char *directory,
+ const char *prefix, char ***dirlistp, uint32_t *countp)
+{
+ return (__directory_list_worker(file_system,
+ wt_session, directory, prefix, dirlistp, countp, true));
+}
+
+/*
* __wt_posix_directory_list_free --
* Free memory returned by __wt_posix_directory_list.
*/
diff --git a/src/third_party/wiredtiger/src/os_posix/os_dlopen.c b/src/third_party/wiredtiger/src/os_posix/os_dlopen.c
index 154b15a886c..b48e9d2f4db 100644
--- a/src/third_party/wiredtiger/src/os_posix/os_dlopen.c
+++ b/src/third_party/wiredtiger/src/os_posix/os_dlopen.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/os_posix/os_fallocate.c b/src/third_party/wiredtiger/src/os_posix/os_fallocate.c
index 5c57c5964b5..6f6e6a6bdc2 100644
--- a/src/third_party/wiredtiger/src/os_posix/os_fallocate.c
+++ b/src/third_party/wiredtiger/src/os_posix/os_fallocate.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/os_posix/os_fs.c b/src/third_party/wiredtiger/src/os_posix/os_fs.c
index c72c116015f..ca810fa8d88 100644
--- a/src/third_party/wiredtiger/src/os_posix/os_fs.c
+++ b/src/third_party/wiredtiger/src/os_posix/os_fs.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
@@ -776,6 +776,8 @@ __wt_os_posix(WT_SESSION_IMPL *session)
/* Initialize the POSIX jump table. */
file_system->fs_directory_list = __wt_posix_directory_list;
+ file_system->fs_directory_list_single =
+ __wt_posix_directory_list_single;
file_system->fs_directory_list_free = __wt_posix_directory_list_free;
file_system->fs_exist = __posix_fs_exist;
file_system->fs_open_file = __posix_open_file;
diff --git a/src/third_party/wiredtiger/src/os_posix/os_getenv.c b/src/third_party/wiredtiger/src/os_posix/os_getenv.c
index 5b5a52cb273..0570f117595 100644
--- a/src/third_party/wiredtiger/src/os_posix/os_getenv.c
+++ b/src/third_party/wiredtiger/src/os_posix/os_getenv.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/os_posix/os_map.c b/src/third_party/wiredtiger/src/os_posix/os_map.c
index 5e625a49bac..b9ec284e124 100644
--- a/src/third_party/wiredtiger/src/os_posix/os_map.c
+++ b/src/third_party/wiredtiger/src/os_posix/os_map.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/os_posix/os_mtx_cond.c b/src/third_party/wiredtiger/src/os_posix/os_mtx_cond.c
index c8819de599d..daaf55d65d2 100644
--- a/src/third_party/wiredtiger/src/os_posix/os_mtx_cond.c
+++ b/src/third_party/wiredtiger/src/os_posix/os_mtx_cond.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/os_posix/os_once.c b/src/third_party/wiredtiger/src/os_posix/os_once.c
index d2913997711..1e123c84a53 100644
--- a/src/third_party/wiredtiger/src/os_posix/os_once.c
+++ b/src/third_party/wiredtiger/src/os_posix/os_once.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/os_posix/os_pagesize.c b/src/third_party/wiredtiger/src/os_posix/os_pagesize.c
index 09c52c41fe5..360f772d328 100644
--- a/src/third_party/wiredtiger/src/os_posix/os_pagesize.c
+++ b/src/third_party/wiredtiger/src/os_posix/os_pagesize.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/os_posix/os_path.c b/src/third_party/wiredtiger/src/os_posix/os_path.c
index fc1a0fd4910..1f0a5f0dee6 100644
--- a/src/third_party/wiredtiger/src/os_posix/os_path.c
+++ b/src/third_party/wiredtiger/src/os_posix/os_path.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/os_posix/os_priv.c b/src/third_party/wiredtiger/src/os_posix/os_priv.c
index 0e0f5dfb190..3c981ce51c2 100644
--- a/src/third_party/wiredtiger/src/os_posix/os_priv.c
+++ b/src/third_party/wiredtiger/src/os_posix/os_priv.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/os_posix/os_setvbuf.c b/src/third_party/wiredtiger/src/os_posix/os_setvbuf.c
index a916ef79311..44836fba0d0 100644
--- a/src/third_party/wiredtiger/src/os_posix/os_setvbuf.c
+++ b/src/third_party/wiredtiger/src/os_posix/os_setvbuf.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/os_posix/os_sleep.c b/src/third_party/wiredtiger/src/os_posix/os_sleep.c
index 67c0aaa375c..88209d7308e 100644
--- a/src/third_party/wiredtiger/src/os_posix/os_sleep.c
+++ b/src/third_party/wiredtiger/src/os_posix/os_sleep.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/os_posix/os_snprintf.c b/src/third_party/wiredtiger/src/os_posix/os_snprintf.c
index 3ac0183f5ec..ff0bdd46251 100644
--- a/src/third_party/wiredtiger/src/os_posix/os_snprintf.c
+++ b/src/third_party/wiredtiger/src/os_posix/os_snprintf.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/os_posix/os_thread.c b/src/third_party/wiredtiger/src/os_posix/os_thread.c
index 4e93cdcb1af..7dd803e1b00 100644
--- a/src/third_party/wiredtiger/src/os_posix/os_thread.c
+++ b/src/third_party/wiredtiger/src/os_posix/os_thread.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/os_posix/os_time.c b/src/third_party/wiredtiger/src/os_posix/os_time.c
index 1b7a9359531..7db4522a3e6 100644
--- a/src/third_party/wiredtiger/src/os_posix/os_time.c
+++ b/src/third_party/wiredtiger/src/os_posix/os_time.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/os_posix/os_yield.c b/src/third_party/wiredtiger/src/os_posix/os_yield.c
index 3190e9e7062..2c0aeb4c94e 100644
--- a/src/third_party/wiredtiger/src/os_posix/os_yield.c
+++ b/src/third_party/wiredtiger/src/os_posix/os_yield.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/os_win/os_dir.c b/src/third_party/wiredtiger/src/os_win/os_dir.c
index 69235659f04..3b78106f3b4 100644
--- a/src/third_party/wiredtiger/src/os_win/os_dir.c
+++ b/src/third_party/wiredtiger/src/os_win/os_dir.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
@@ -9,13 +9,13 @@
#include "wt_internal.h"
/*
- * __wt_win_directory_list --
+ * __directory_list_worker --
* Get a list of files from a directory, MSVC version.
*/
-int
-__wt_win_directory_list(WT_FILE_SYSTEM *file_system,
+static int
+__directory_list_worker(WT_FILE_SYSTEM *file_system,
WT_SESSION *wt_session, const char *directory,
- const char *prefix, char ***dirlistp, uint32_t *countp)
+ const char *prefix, char ***dirlistp, uint32_t *countp, bool single)
{
DWORD windows_error;
HANDLE findhandle;
@@ -82,7 +82,7 @@ __wt_win_directory_list(WT_FILE_SYSTEM *file_system,
WT_ERR(__wt_strdup(session, file_utf8->data, &entries[count]));
++count;
__wt_scr_free(session, &file_utf8);
- } while (FindNextFileW(findhandle, &finddata) != 0);
+ } while (!single && FindNextFileW(findhandle, &finddata) != 0);
*dirlistp = entries;
*countp = count;
@@ -116,6 +116,32 @@ err: if (findhandle != INVALID_HANDLE_VALUE)
}
/*
+ * __wt_win_directory_list --
+ * Get a list of files from a directory, MSVC version.
+ */
+int
+__wt_win_directory_list(WT_FILE_SYSTEM *file_system,
+ WT_SESSION *wt_session, const char *directory,
+ const char *prefix, char ***dirlistp, uint32_t *countp)
+{
+ return (__directory_list_worker(file_system,
+ wt_session, directory, prefix, dirlistp, countp, false));
+}
+
+/*
+ * __wt_win_directory_list_single --
+ * Get a single file from a directory, MSVC version.
+ */
+int
+__wt_win_directory_list_single(WT_FILE_SYSTEM *file_system,
+ WT_SESSION *wt_session, const char *directory,
+ const char *prefix, char ***dirlistp, uint32_t *countp)
+{
+ return (__directory_list_worker(file_system,
+ wt_session, directory, prefix, dirlistp, countp, true));
+}
+
+/*
* __wt_win_directory_list_free --
* Free memory returned by __wt_win_directory_list, Windows version.
*/
diff --git a/src/third_party/wiredtiger/src/os_win/os_dlopen.c b/src/third_party/wiredtiger/src/os_win/os_dlopen.c
index 9ee4d703c7a..a4e7ebe4fbb 100644
--- a/src/third_party/wiredtiger/src/os_win/os_dlopen.c
+++ b/src/third_party/wiredtiger/src/os_win/os_dlopen.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/os_win/os_fs.c b/src/third_party/wiredtiger/src/os_win/os_fs.c
index 1410a7bad03..66f4de87299 100644
--- a/src/third_party/wiredtiger/src/os_win/os_fs.c
+++ b/src/third_party/wiredtiger/src/os_win/os_fs.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
@@ -651,6 +651,7 @@ __wt_os_win(WT_SESSION_IMPL *session)
/* Initialize the Windows jump table. */
file_system->fs_directory_list = __wt_win_directory_list;
+ file_system->fs_directory_list_single = __wt_win_directory_list_single;
file_system->fs_directory_list_free = __wt_win_directory_list_free;
file_system->fs_exist = __win_fs_exist;
file_system->fs_open_file = __win_open_file;
diff --git a/src/third_party/wiredtiger/src/os_win/os_getenv.c b/src/third_party/wiredtiger/src/os_win/os_getenv.c
index b7b7f765656..d3f779396f6 100644
--- a/src/third_party/wiredtiger/src/os_win/os_getenv.c
+++ b/src/third_party/wiredtiger/src/os_win/os_getenv.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/os_win/os_map.c b/src/third_party/wiredtiger/src/os_win/os_map.c
index c0aa6dac28f..2223a6037ef 100644
--- a/src/third_party/wiredtiger/src/os_win/os_map.c
+++ b/src/third_party/wiredtiger/src/os_win/os_map.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/os_win/os_mtx_cond.c b/src/third_party/wiredtiger/src/os_win/os_mtx_cond.c
index 9d4339c8731..4394d83afef 100644
--- a/src/third_party/wiredtiger/src/os_win/os_mtx_cond.c
+++ b/src/third_party/wiredtiger/src/os_win/os_mtx_cond.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/os_win/os_once.c b/src/third_party/wiredtiger/src/os_win/os_once.c
index dd21c58b8af..2b607c04c62 100644
--- a/src/third_party/wiredtiger/src/os_win/os_once.c
+++ b/src/third_party/wiredtiger/src/os_win/os_once.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/os_win/os_pagesize.c b/src/third_party/wiredtiger/src/os_win/os_pagesize.c
index 07b1c3afc5c..45afa35ff25 100644
--- a/src/third_party/wiredtiger/src/os_win/os_pagesize.c
+++ b/src/third_party/wiredtiger/src/os_win/os_pagesize.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/os_win/os_path.c b/src/third_party/wiredtiger/src/os_win/os_path.c
index 78ad3bda509..1c6cdc76ceb 100644
--- a/src/third_party/wiredtiger/src/os_win/os_path.c
+++ b/src/third_party/wiredtiger/src/os_win/os_path.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/os_win/os_priv.c b/src/third_party/wiredtiger/src/os_win/os_priv.c
index acc3793255a..ce48aa5fa4e 100644
--- a/src/third_party/wiredtiger/src/os_win/os_priv.c
+++ b/src/third_party/wiredtiger/src/os_win/os_priv.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/os_win/os_setvbuf.c b/src/third_party/wiredtiger/src/os_win/os_setvbuf.c
index 78e42ecf4b5..6a7f02fe106 100644
--- a/src/third_party/wiredtiger/src/os_win/os_setvbuf.c
+++ b/src/third_party/wiredtiger/src/os_win/os_setvbuf.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/os_win/os_sleep.c b/src/third_party/wiredtiger/src/os_win/os_sleep.c
index 477474e0665..448447f35ef 100644
--- a/src/third_party/wiredtiger/src/os_win/os_sleep.c
+++ b/src/third_party/wiredtiger/src/os_win/os_sleep.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/os_win/os_snprintf.c b/src/third_party/wiredtiger/src/os_win/os_snprintf.c
index 20231b468c6..c55422981eb 100644
--- a/src/third_party/wiredtiger/src/os_win/os_snprintf.c
+++ b/src/third_party/wiredtiger/src/os_win/os_snprintf.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/os_win/os_thread.c b/src/third_party/wiredtiger/src/os_win/os_thread.c
index 8761bf1e617..f27ea84181e 100644
--- a/src/third_party/wiredtiger/src/os_win/os_thread.c
+++ b/src/third_party/wiredtiger/src/os_win/os_thread.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/os_win/os_time.c b/src/third_party/wiredtiger/src/os_win/os_time.c
index 4e9d4595fae..284d2a63931 100644
--- a/src/third_party/wiredtiger/src/os_win/os_time.c
+++ b/src/third_party/wiredtiger/src/os_win/os_time.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/os_win/os_utf8.c b/src/third_party/wiredtiger/src/os_win/os_utf8.c
index f7bab41c81f..077c39db3ef 100644
--- a/src/third_party/wiredtiger/src/os_win/os_utf8.c
+++ b/src/third_party/wiredtiger/src/os_win/os_utf8.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/os_win/os_winerr.c b/src/third_party/wiredtiger/src/os_win/os_winerr.c
index c7748d80fb2..8c4b9d8e098 100644
--- a/src/third_party/wiredtiger/src/os_win/os_winerr.c
+++ b/src/third_party/wiredtiger/src/os_win/os_winerr.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/os_win/os_yield.c b/src/third_party/wiredtiger/src/os_win/os_yield.c
index e38fc21e16b..b347d2d510b 100644
--- a/src/third_party/wiredtiger/src/os_win/os_yield.c
+++ b/src/third_party/wiredtiger/src/os_win/os_yield.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/packing/pack_api.c b/src/third_party/wiredtiger/src/packing/pack_api.c
index ee7ce6c4c0d..db0485c459a 100644
--- a/src/third_party/wiredtiger/src/packing/pack_api.c
+++ b/src/third_party/wiredtiger/src/packing/pack_api.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
@@ -14,7 +14,7 @@
*/
int
wiredtiger_struct_pack(WT_SESSION *wt_session,
- void *buffer, size_t size, const char *fmt, ...)
+ void *buffer, size_t len, const char *format, ...)
{
WT_DECL_RET;
WT_SESSION_IMPL *session;
@@ -22,8 +22,8 @@ wiredtiger_struct_pack(WT_SESSION *wt_session,
session = (WT_SESSION_IMPL *)wt_session;
- va_start(ap, fmt);
- ret = __wt_struct_packv(session, buffer, size, fmt, ap);
+ va_start(ap, format);
+ ret = __wt_struct_packv(session, buffer, len, format, ap);
va_end(ap);
return (ret);
@@ -35,7 +35,7 @@ wiredtiger_struct_pack(WT_SESSION *wt_session,
*/
int
wiredtiger_struct_size(WT_SESSION *wt_session,
- size_t *sizep, const char *fmt, ...)
+ size_t *lenp, const char *format, ...)
{
WT_DECL_RET;
WT_SESSION_IMPL *session;
@@ -43,8 +43,8 @@ wiredtiger_struct_size(WT_SESSION *wt_session,
session = (WT_SESSION_IMPL *)wt_session;
- va_start(ap, fmt);
- ret = __wt_struct_sizev(session, sizep, fmt, ap);
+ va_start(ap, format);
+ ret = __wt_struct_sizev(session, lenp, format, ap);
va_end(ap);
return (ret);
@@ -56,7 +56,7 @@ wiredtiger_struct_size(WT_SESSION *wt_session,
*/
int
wiredtiger_struct_unpack(WT_SESSION *wt_session,
- const void *buffer, size_t size, const char *fmt, ...)
+ const void *buffer, size_t len, const char *format, ...)
{
WT_DECL_RET;
WT_SESSION_IMPL *session;
@@ -64,8 +64,8 @@ wiredtiger_struct_unpack(WT_SESSION *wt_session,
session = (WT_SESSION_IMPL *)wt_session;
- va_start(ap, fmt);
- ret = __wt_struct_unpackv(session, buffer, size, fmt, ap);
+ va_start(ap, format);
+ ret = __wt_struct_unpackv(session, buffer, len, format, ap);
va_end(ap);
return (ret);
@@ -77,7 +77,7 @@ wiredtiger_struct_unpack(WT_SESSION *wt_session,
*/
int
__wt_ext_struct_pack(WT_EXTENSION_API *wt_api, WT_SESSION *wt_session,
- void *buffer, size_t size, const char *fmt, ...)
+ void *buffer, size_t len, const char *fmt, ...)
{
WT_DECL_RET;
WT_SESSION_IMPL *session;
@@ -87,7 +87,7 @@ __wt_ext_struct_pack(WT_EXTENSION_API *wt_api, WT_SESSION *wt_session,
((WT_CONNECTION_IMPL *)wt_api->conn)->default_session;
va_start(ap, fmt);
- ret = __wt_struct_packv(session, buffer, size, fmt, ap);
+ ret = __wt_struct_packv(session, buffer, len, fmt, ap);
va_end(ap);
return (ret);
@@ -99,7 +99,7 @@ __wt_ext_struct_pack(WT_EXTENSION_API *wt_api, WT_SESSION *wt_session,
*/
int
__wt_ext_struct_size(WT_EXTENSION_API *wt_api, WT_SESSION *wt_session,
- size_t *sizep, const char *fmt, ...)
+ size_t *lenp, const char *fmt, ...)
{
WT_DECL_RET;
WT_SESSION_IMPL *session;
@@ -109,7 +109,7 @@ __wt_ext_struct_size(WT_EXTENSION_API *wt_api, WT_SESSION *wt_session,
((WT_CONNECTION_IMPL *)wt_api->conn)->default_session;
va_start(ap, fmt);
- ret = __wt_struct_sizev(session, sizep, fmt, ap);
+ ret = __wt_struct_sizev(session, lenp, fmt, ap);
va_end(ap);
return (ret);
@@ -121,7 +121,7 @@ __wt_ext_struct_size(WT_EXTENSION_API *wt_api, WT_SESSION *wt_session,
*/
int
__wt_ext_struct_unpack(WT_EXTENSION_API *wt_api, WT_SESSION *wt_session,
- const void *buffer, size_t size, const char *fmt, ...)
+ const void *buffer, size_t len, const char *fmt, ...)
{
WT_DECL_RET;
WT_SESSION_IMPL *session;
@@ -131,7 +131,7 @@ __wt_ext_struct_unpack(WT_EXTENSION_API *wt_api, WT_SESSION *wt_session,
((WT_CONNECTION_IMPL *)wt_api->conn)->default_session;
va_start(ap, fmt);
- ret = __wt_struct_unpackv(session, buffer, size, fmt, ap);
+ ret = __wt_struct_unpackv(session, buffer, len, fmt, ap);
va_end(ap);
return (ret);
diff --git a/src/third_party/wiredtiger/src/packing/pack_impl.c b/src/third_party/wiredtiger/src/packing/pack_impl.c
index d40043fc13c..285f8ddfdaa 100644
--- a/src/third_party/wiredtiger/src/packing/pack_impl.c
+++ b/src/third_party/wiredtiger/src/packing/pack_impl.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
@@ -25,9 +25,7 @@ __wt_struct_check(WT_SESSION_IMPL *session,
WT_RET(__pack_initn(session, &pack, fmt, len));
for (fields = 0; (ret = __pack_next(&pack, &pv)) == 0; fields++)
;
-
- if (ret != WT_NOTFOUND)
- return (ret);
+ WT_RET_NOTFOUND_OK(ret);
if (fixedp != NULL && fixed_lenp != NULL) {
if (fields == 0) {
@@ -58,13 +56,13 @@ __wt_struct_confchk(WT_SESSION_IMPL *session, WT_CONFIG_ITEM *v)
* Calculate the size of a packed byte string.
*/
int
-__wt_struct_size(WT_SESSION_IMPL *session, size_t *sizep, const char *fmt, ...)
+__wt_struct_size(WT_SESSION_IMPL *session, size_t *lenp, const char *fmt, ...)
{
WT_DECL_RET;
va_list ap;
va_start(ap, fmt);
- ret = __wt_struct_sizev(session, sizep, fmt, ap);
+ ret = __wt_struct_sizev(session, lenp, fmt, ap);
va_end(ap);
return (ret);
@@ -76,13 +74,13 @@ __wt_struct_size(WT_SESSION_IMPL *session, size_t *sizep, const char *fmt, ...)
*/
int
__wt_struct_pack(WT_SESSION_IMPL *session,
- void *buffer, size_t size, const char *fmt, ...)
+ void *buffer, size_t len, const char *fmt, ...)
{
WT_DECL_RET;
va_list ap;
va_start(ap, fmt);
- ret = __wt_struct_packv(session, buffer, size, fmt, ap);
+ ret = __wt_struct_packv(session, buffer, len, fmt, ap);
va_end(ap);
return (ret);
@@ -94,13 +92,13 @@ __wt_struct_pack(WT_SESSION_IMPL *session,
*/
int
__wt_struct_unpack(WT_SESSION_IMPL *session,
- const void *buffer, size_t size, const char *fmt, ...)
+ const void *buffer, size_t len, const char *fmt, ...)
{
WT_DECL_RET;
va_list ap;
va_start(ap, fmt);
- ret = __wt_struct_unpackv(session, buffer, size, fmt, ap);
+ ret = __wt_struct_unpackv(session, buffer, len, fmt, ap);
va_end(ap);
return (ret);
diff --git a/src/third_party/wiredtiger/src/packing/pack_stream.c b/src/third_party/wiredtiger/src/packing/pack_stream.c
index dc2925acaf3..80dfe906bdf 100644
--- a/src/third_party/wiredtiger/src/packing/pack_stream.c
+++ b/src/third_party/wiredtiger/src/packing/pack_stream.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
@@ -24,7 +24,7 @@ struct __wt_pack_stream {
*/
int
wiredtiger_pack_start(WT_SESSION *wt_session,
- const char *format, void *buffer, size_t len, WT_PACK_STREAM **psp)
+ const char *format, void *buffer, size_t size, WT_PACK_STREAM **psp)
{
WT_DECL_RET;
WT_PACK_STREAM *ps;
@@ -34,7 +34,7 @@ wiredtiger_pack_start(WT_SESSION *wt_session,
WT_RET(__wt_calloc_one(session, &ps));
WT_ERR(__pack_init(session, &ps->pack, format));
ps->p = ps->start = buffer;
- ps->end = ps->p + len;
+ ps->end = ps->p + size;
*psp = ps;
if (0) {
@@ -48,8 +48,8 @@ err: (void)wiredtiger_pack_close(ps, NULL);
* Open a stream for unpacking.
*/
int
-wiredtiger_unpack_start(WT_SESSION *wt_session, const char *format,
- const void *buffer, size_t size, WT_PACK_STREAM **psp)
+wiredtiger_unpack_start(WT_SESSION *wt_session,
+ const char *format, const void *buffer, size_t size, WT_PACK_STREAM **psp)
{
return (wiredtiger_pack_start(
wt_session, format, (void *)buffer, size, psp));
diff --git a/src/third_party/wiredtiger/src/reconcile/rec_track.c b/src/third_party/wiredtiger/src/reconcile/rec_track.c
index 8842da50f00..0a5eb7eacc2 100644
--- a/src/third_party/wiredtiger/src/reconcile/rec_track.c
+++ b/src/third_party/wiredtiger/src/reconcile/rec_track.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/reconcile/rec_write.c b/src/third_party/wiredtiger/src/reconcile/rec_write.c
index d686f87a637..ae8f640f733 100644
--- a/src/third_party/wiredtiger/src/reconcile/rec_write.c
+++ b/src/third_party/wiredtiger/src/reconcile/rec_write.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
@@ -387,8 +387,10 @@ __wt_reconcile(WT_SESSION_IMPL *session, WT_REF *ref,
* have a snapshot. This doesn't apply to checkpoints: there are
* (rare) cases where we write data at read-uncommitted isolation.
*/
- WT_ASSERT(session, !LF_ISSET(WT_REC_UPDATE_RESTORE) ||
- LF_ISSET(WT_REC_VISIBLE_ALL));
+ WT_ASSERT(session,
+ !LF_ISSET(WT_REC_LOOKASIDE) || !LF_ISSET(WT_REC_UPDATE_RESTORE));
+ WT_ASSERT(session,
+ !LF_ISSET(WT_REC_UPDATE_RESTORE) || LF_ISSET(WT_REC_VISIBLE_ALL));
WT_ASSERT(session, !LF_ISSET(WT_REC_EVICT) ||
LF_ISSET(WT_REC_VISIBLE_ALL) ||
F_ISSET(&session->txn, WT_TXN_HAS_SNAPSHOT));
@@ -1086,9 +1088,11 @@ __rec_init(WT_SESSION_IMPL *session,
/*
* The fake cursor used to figure out modified update values points to
- * the enclosing WT_REF as a way to access the page.
+ * the enclosing WT_REF as a way to access the page, and also needs to
+ * set the format.
*/
r->update_modify_cbt.ref = ref;
+ r->update_modify_cbt.iface.value_format = btree->value_format;
return (0);
}
@@ -1208,6 +1212,13 @@ __rec_append_orig_value(WT_SESSION_IMPL *session,
__wt_txn_upd_visible_all(session, upd))
return (0);
+ /* Add the original value after birthmarks. */
+ if (upd->type == WT_UPDATE_BIRTHMARK) {
+ WT_ASSERT(session, unpack != NULL &&
+ unpack->type != WT_CELL_DEL);
+ break;
+ }
+
/* Leave reference at the last item in the chain. */
if (upd->next == NULL)
break;
@@ -1226,7 +1237,7 @@ __rec_append_orig_value(WT_SESSION_IMPL *session,
size = 0; /* -Wconditional-uninitialized */
if (unpack == NULL || unpack->type == WT_CELL_DEL)
WT_RET(__wt_update_alloc(session,
- NULL, &append, &size, WT_UPDATE_DELETED));
+ NULL, &append, &size, WT_UPDATE_TOMBSTONE));
else {
WT_RET(__wt_scr_alloc(session, 0, &tmp));
WT_ERR(__wt_page_cell_data_ref(session, page, unpack, tmp));
@@ -1235,15 +1246,28 @@ __rec_append_orig_value(WT_SESSION_IMPL *session,
}
/*
- * Set the entry's transaction information to the lowest possible value.
- * Since cleared memory matches the lowest possible transaction ID and
- * timestamp, do nothing.
+ * If we're saving the original value for a birthmark, transfer over
+ * the transaction ID and clear out the birthmark update.
*
- * Append the new entry to the update list.
+ * Else, set the entry's transaction information to the lowest possible
+ * value. Cleared memory matches the lowest possible transaction ID and
+ * timestamp, do nothing.
*/
+ if (upd->type == WT_UPDATE_BIRTHMARK) {
+ append->txnid = upd->txnid;
+ __wt_timestamp_set(&append->timestamp, &upd->timestamp);
+ append->next = upd->next;
+ }
+
+ /* Append the new entry into the update list. */
WT_PUBLISH(upd->next, append);
__wt_cache_page_inmem_incr(session, page, size);
+ if (upd->type == WT_UPDATE_BIRTHMARK) {
+ upd->type = WT_UPDATE_STANDARD;
+ upd->txnid = WT_TXN_ABORTED;
+ }
+
err: __wt_scr_free(session, &tmp);
return (ret);
}
@@ -1263,7 +1287,7 @@ __rec_txn_read(WT_SESSION_IMPL *session, WT_RECONCILE *r,
wt_timestamp_t *timestampp;
size_t upd_memsize;
uint64_t max_txn, txnid;
- bool all_visible, uncommitted;
+ bool all_visible, skipped_birthmark, uncommitted;
#ifdef HAVE_TIMESTAMPS
WT_UPDATE *first_ts_upd;
@@ -1278,7 +1302,7 @@ __rec_txn_read(WT_SESSION_IMPL *session, WT_RECONCILE *r,
first_txn_upd = NULL;
upd_memsize = 0;
max_txn = WT_TXN_NONE;
- uncommitted = false;
+ skipped_birthmark = uncommitted = false;
/*
* If called with a WT_INSERT item, use its WT_UPDATE list (which must
@@ -1319,6 +1343,7 @@ __rec_txn_read(WT_SESSION_IMPL *session, WT_RECONCILE *r,
(F_ISSET(r, WT_REC_VISIBLE_ALL) ?
WT_TXNID_LE(r->last_running, txnid) :
!__txn_visible_id(session, txnid))) {
+ WT_ASSERT(session, upd->type != WT_UPDATE_BIRTHMARK);
uncommitted = r->update_uncommitted = true;
continue;
}
@@ -1338,15 +1363,15 @@ __rec_txn_read(WT_SESSION_IMPL *session, WT_RECONCILE *r,
* committed update. Regular eviction checks that the maximum
* transaction ID and timestamp seen are stable.
*
- * Lookaside eviction tries to choose the same version as a
- * subsequent checkpoint, so that checkpoint can skip over
- * pages with lookaside entries. If the application has
- * supplied a stable timestamp, we assume (a) that it is old,
- * and (b) that the next checkpoint will use it, so we wait to
- * see a stable update. If there is no stable timestamp, we
- * assume the next checkpoint will write the most recent
- * version (but we save enough information that checkpoint can
- * fix things up if we choose an update that is too new).
+ * Lookaside and update/restore eviction try to choose the same
+ * version as a subsequent checkpoint, so that checkpoint can
+ * skip over pages with lookaside entries. If the application
+ * has supplied a stable timestamp, we assume (a) that it is
+ * old, and (b) that the next checkpoint will use it, so we wait
+ * to see a stable update. If there is no stable timestamp, we
+ * assume the next checkpoint will write the most recent version
+ * (but we save enough information that checkpoint can fix
+ * things up if we choose an update that is too new).
*/
if (*updp == NULL && r->las_skew_newest)
*updp = upd;
@@ -1371,6 +1396,9 @@ __rec_txn_read(WT_SESSION_IMPL *session, WT_RECONCILE *r,
return (EBUSY);
}
+ if (upd->type == WT_UPDATE_BIRTHMARK)
+ skipped_birthmark = true;
+
continue;
}
@@ -1386,11 +1414,13 @@ __rec_txn_read(WT_SESSION_IMPL *session, WT_RECONCILE *r,
/* Reconciliation should never see an aborted or reserved update. */
WT_ASSERT(session, *updp == NULL ||
((*updp)->txnid != WT_TXN_ABORTED &&
- (*updp)->type != WT_UPDATE_RESERVED));
+ (*updp)->type != WT_UPDATE_RESERVE));
/* If all of the updates were aborted, quit. */
- if (first_txn_upd == NULL)
+ if (first_txn_upd == NULL) {
+ WT_ASSERT(session, *updp == NULL);
return (0);
+ }
/*
* Track the most recent transaction in the page. We store this in the
@@ -1440,6 +1470,26 @@ __rec_txn_read(WT_SESSION_IMPL *session, WT_RECONCILE *r,
__wt_txn_visible_all(session, max_txn, timestampp) :
__wt_txn_visible(session, max_txn, timestampp));
+ /*
+ * If the update we chose was a birthmark, or doing update-restore and
+ * we skipped a birthmark, the original on-page value must be retained.
+ *
+ * Update the maximum on-page timestamp before discarding the chosen
+ * update.
+ */
+ if ((upd = *updp) != NULL) {
+#ifdef HAVE_TIMESTAMPS
+ if (__wt_timestamp_cmp(
+ &upd->timestamp, &r->max_onpage_timestamp) > 0)
+ __wt_timestamp_set(
+ &r->max_onpage_timestamp, &upd->timestamp);
+#endif
+ if ((*updp)->type == WT_UPDATE_BIRTHMARK)
+ *updp = NULL;
+ if (F_ISSET(r, WT_REC_UPDATE_RESTORE) && skipped_birthmark)
+ *updp = NULL;
+ }
+
if (all_visible)
goto check_original_value;
@@ -1516,8 +1566,6 @@ check_original_value:
* Returning an update means the original on-page value might be lost,
* and that's a problem if there's a reader that needs it. There are
* several cases:
- * - any update with no backing record (because we will store an empty
- * value on page and returning that is wrong).
* - any update from a modify operation (because the modify has to be
* applied to a stable update, not the new on-page update),
* - any lookaside table eviction (because the backing disk image is
@@ -1531,12 +1579,6 @@ check_original_value:
WT_RET(
__rec_append_orig_value(session, page, first_upd, vpack));
-#ifdef HAVE_TIMESTAMPS
- if ((upd = *updp) != NULL &&
- __wt_timestamp_cmp(&upd->timestamp, &r->max_onpage_timestamp) > 0)
- __wt_timestamp_set(&r->max_onpage_timestamp, &upd->timestamp);
-#endif
-
return (0);
}
@@ -4626,10 +4668,7 @@ record_loop: /*
if (upd != NULL) {
switch (upd->type) {
- case WT_UPDATE_DELETED:
- deleted = true;
- break;
- case WT_UPDATE_MODIFIED:
+ case WT_UPDATE_MODIFY:
cbt->slot = WT_COL_SLOT(page, cip);
WT_ERR(__wt_value_return_upd(
session, cbt, upd,
@@ -4642,6 +4681,9 @@ record_loop: /*
data = upd->data;
size = upd->size;
break;
+ case WT_UPDATE_TOMBSTONE:
+ deleted = true;
+ break;
WT_ILLEGAL_VALUE_ERR(session);
}
} else if (vpack->raw == WT_CELL_VALUE_OVFL_RM) {
@@ -4867,10 +4909,7 @@ compare: /*
deleted = true;
else
switch (upd->type) {
- case WT_UPDATE_DELETED:
- deleted = true;
- break;
- case WT_UPDATE_MODIFIED:
+ case WT_UPDATE_MODIFY:
/*
* Impossible slot, there's no backing
* on-page item.
@@ -4887,6 +4926,9 @@ compare: /*
data = upd->data;
size = upd->size;
break;
+ case WT_UPDATE_TOMBSTONE:
+ deleted = true;
+ break;
WT_ILLEGAL_VALUE_ERR(session);
}
@@ -5434,7 +5476,33 @@ __rec_row_leaf(WT_SESSION_IMPL *session,
page, vpack, F_ISSET(r, WT_REC_EVICT)));
switch (upd->type) {
- case WT_UPDATE_DELETED:
+ case WT_UPDATE_MODIFY:
+ cbt->slot = WT_ROW_SLOT(page, rip);
+ WT_ERR(__wt_value_return_upd(session, cbt, upd,
+ F_ISSET(r, WT_REC_VISIBLE_ALL)));
+ WT_ERR(__rec_cell_build_val(session, r,
+ cbt->iface.value.data,
+ cbt->iface.value.size, (uint64_t)0));
+ dictionary = true;
+ break;
+ case WT_UPDATE_STANDARD:
+ /*
+ * If no value, nothing needs to be copied.
+ * Otherwise, build the value's chunk from the
+ * update value.
+ */
+ if (upd->size == 0) {
+ val->buf.data = NULL;
+ val->cell_len =
+ val->len = val->buf.size = 0;
+ } else {
+ WT_ERR(__rec_cell_build_val(session, r,
+ upd->data, upd->size,
+ (uint64_t)0));
+ dictionary = true;
+ }
+ break;
+ case WT_UPDATE_TOMBSTONE:
/*
* If this key/value pair was deleted, we're
* done.
@@ -5473,32 +5541,6 @@ __rec_row_leaf(WT_SESSION_IMPL *session,
/* Proceed with appended key/value pairs. */
goto leaf_insert;
- case WT_UPDATE_MODIFIED:
- cbt->slot = WT_ROW_SLOT(page, rip);
- WT_ERR(__wt_value_return_upd(session, cbt, upd,
- F_ISSET(r, WT_REC_VISIBLE_ALL)));
- WT_ERR(__rec_cell_build_val(session, r,
- cbt->iface.value.data,
- cbt->iface.value.size, (uint64_t)0));
- dictionary = true;
- break;
- case WT_UPDATE_STANDARD:
- /*
- * If no value, nothing needs to be copied.
- * Otherwise, build the value's chunk from the
- * update value.
- */
- if (upd->size == 0) {
- val->buf.data = NULL;
- val->cell_len =
- val->len = val->buf.size = 0;
- } else {
- WT_ERR(__rec_cell_build_val(session, r,
- upd->data, upd->size,
- (uint64_t)0));
- dictionary = true;
- }
- break;
WT_ILLEGAL_VALUE_ERR(session);
}
}
@@ -5590,6 +5632,7 @@ build:
WT_ERR(__wt_dsk_cell_data_ref(session,
WT_PAGE_ROW_LEAF, kpack, r->cur));
key_onpage_ovfl = false;
+ WT_NOT_READ(key_onpage_ovfl);
}
/*
@@ -5687,9 +5730,7 @@ __rec_row_leaf_insert(WT_SESSION_IMPL *session, WT_RECONCILE *r, WT_INSERT *ins)
}
switch (upd->type) {
- case WT_UPDATE_DELETED:
- continue;
- case WT_UPDATE_MODIFIED:
+ case WT_UPDATE_MODIFY:
/*
* Impossible slot, there's no backing on-page
* item.
@@ -5709,6 +5750,8 @@ __rec_row_leaf_insert(WT_SESSION_IMPL *session, WT_RECONCILE *r, WT_INSERT *ins)
r, upd->data, upd->size,
(uint64_t)0));
break;
+ case WT_UPDATE_TOMBSTONE:
+ continue;
WT_ILLEGAL_VALUE(session);
}
@@ -6086,7 +6129,7 @@ __rec_write_wrapup_err(WT_SESSION_IMPL *session, WT_RECONCILE *r, WT_PAGE *page)
/*
* __rec_las_wrapup --
- * Copy all of the saved updates into the database's lookaside buffer.
+ * Copy all of the saved updates into the database's lookaside table.
*/
static int
__rec_las_wrapup(WT_SESSION_IMPL *session, WT_RECONCILE *r)
diff --git a/src/third_party/wiredtiger/src/schema/schema_alter.c b/src/third_party/wiredtiger/src/schema/schema_alter.c
index 3b52b4bd222..a957969e6cc 100644
--- a/src/third_party/wiredtiger/src/schema/schema_alter.c
+++ b/src/third_party/wiredtiger/src/schema/schema_alter.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/schema/schema_create.c b/src/third_party/wiredtiger/src/schema/schema_create.c
index d924fe30d51..13298f56e9e 100644
--- a/src/third_party/wiredtiger/src/schema/schema_create.c
+++ b/src/third_party/wiredtiger/src/schema/schema_create.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/schema/schema_drop.c b/src/third_party/wiredtiger/src/schema/schema_drop.c
index 8501de8b805..12b577d0ea6 100644
--- a/src/third_party/wiredtiger/src/schema/schema_drop.c
+++ b/src/third_party/wiredtiger/src/schema/schema_drop.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/schema/schema_list.c b/src/third_party/wiredtiger/src/schema/schema_list.c
index 11257968b75..0f8806dd462 100644
--- a/src/third_party/wiredtiger/src/schema/schema_list.c
+++ b/src/third_party/wiredtiger/src/schema/schema_list.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/schema/schema_open.c b/src/third_party/wiredtiger/src/schema/schema_open.c
index 3b27c8300e2..0964483d57c 100644
--- a/src/third_party/wiredtiger/src/schema/schema_open.c
+++ b/src/third_party/wiredtiger/src/schema/schema_open.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/schema/schema_plan.c b/src/third_party/wiredtiger/src/schema/schema_plan.c
index 69ae3f4ce4b..abe76013e12 100644
--- a/src/third_party/wiredtiger/src/schema/schema_plan.c
+++ b/src/third_party/wiredtiger/src/schema/schema_plan.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
@@ -97,7 +97,7 @@ __wt_schema_colcheck(WT_SESSION_IMPL *session,
WT_RET(__pack_init(session, &pack, key_format));
for (kcols = 0; (ret = __pack_next(&pack, &pv)) == 0; kcols++)
;
- WT_RET_TEST(ret != WT_NOTFOUND, ret);
+ WT_RET_NOTFOUND_OK(ret);
WT_RET(__pack_init(session, &pack, value_format));
for (vcols = 0; (ret = __pack_next(&pack, &pv)) == 0; vcols++)
diff --git a/src/third_party/wiredtiger/src/schema/schema_project.c b/src/third_party/wiredtiger/src/schema/schema_project.c
index a682d63d002..9bc776bf8f2 100644
--- a/src/third_party/wiredtiger/src/schema/schema_project.c
+++ b/src/third_party/wiredtiger/src/schema/schema_project.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
@@ -92,7 +92,7 @@ __wt_schema_project_in(WT_SESSION_IMPL *session,
if (pv.type == 'S' || pv.type == 's')
pv.u.s = "";
- len = __pack_size(session, &pv);
+ WT_RET(__pack_size(session, &pv, &len));
WT_RET(__wt_buf_grow(session,
buf, buf->size + len));
p = (uint8_t *)buf->mem + buf->size;
@@ -121,7 +121,7 @@ __wt_schema_project_in(WT_SESSION_IMPL *session,
}
old_len = (size_t)(next - p);
- len = __pack_size(session, &pv);
+ WT_RET(__pack_size(session, &pv, &len));
offset = WT_PTRDIFF(p, buf->mem);
WT_RET(__wt_buf_grow(session,
buf, buf->size + len));
@@ -310,7 +310,7 @@ __wt_schema_project_slice(WT_SESSION_IMPL *session, WT_CURSOR **cp,
if (pv.type == 'S' || pv.type == 's')
pv.u.s = "";
- len = __pack_size(session, &pv);
+ WT_RET(__pack_size(session, &pv, &len));
WT_RET(__wt_buf_grow(session,
buf, buf->size + len));
p = (uint8_t *)buf->data + buf->size;
@@ -357,7 +357,7 @@ __wt_schema_project_slice(WT_SESSION_IMPL *session, WT_CURSOR **cp,
__wt_tolower((u_char)vpv.type));
pv.u = vpv.u;
- len = __pack_size(session, &pv);
+ WT_RET(__pack_size(session, &pv, &len));
offset = WT_PTRDIFF(p, buf->data);
/*
* Avoid growing the buffer if the value fits.
@@ -463,7 +463,7 @@ __wt_schema_project_merge(WT_SESSION_IMPL *session,
__wt_tolower((u_char)pv.type) ==
__wt_tolower((u_char)vpv.type));
vpv.u = pv.u;
- len = __pack_size(session, &vpv);
+ WT_RET(__pack_size(session, &vpv, &len));
WT_RET(__wt_buf_grow(session,
value, value->size + len));
vp = (uint8_t *)value->mem + value->size;
diff --git a/src/third_party/wiredtiger/src/schema/schema_rename.c b/src/third_party/wiredtiger/src/schema/schema_rename.c
index 9a61e39fe2e..0a8a80a214e 100644
--- a/src/third_party/wiredtiger/src/schema/schema_rename.c
+++ b/src/third_party/wiredtiger/src/schema/schema_rename.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/schema/schema_stat.c b/src/third_party/wiredtiger/src/schema/schema_stat.c
index 06518ffd50a..b86149bdb3a 100644
--- a/src/third_party/wiredtiger/src/schema/schema_stat.c
+++ b/src/third_party/wiredtiger/src/schema/schema_stat.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/schema/schema_truncate.c b/src/third_party/wiredtiger/src/schema/schema_truncate.c
index 7d5168fe72f..8eefdc1da5d 100644
--- a/src/third_party/wiredtiger/src/schema/schema_truncate.c
+++ b/src/third_party/wiredtiger/src/schema/schema_truncate.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/schema/schema_util.c b/src/third_party/wiredtiger/src/schema/schema_util.c
index f4625cd8ec4..ceec6db6cb5 100644
--- a/src/third_party/wiredtiger/src/schema/schema_util.c
+++ b/src/third_party/wiredtiger/src/schema/schema_util.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/schema/schema_worker.c b/src/third_party/wiredtiger/src/schema/schema_worker.c
index ce930c20818..1012749efc3 100644
--- a/src/third_party/wiredtiger/src/schema/schema_worker.c
+++ b/src/third_party/wiredtiger/src/schema/schema_worker.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/session/session_api.c b/src/third_party/wiredtiger/src/session/session_api.c
index 71665d9996f..bbe5d2a0218 100644
--- a/src/third_party/wiredtiger/src/session/session_api.c
+++ b/src/third_party/wiredtiger/src/session/session_api.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
@@ -507,7 +507,8 @@ __session_alter(WT_SESSION *wt_session, const char *uri, const char *config)
ret = __wt_schema_worker(session, uri, __wt_alter, NULL, cfg,
WT_BTREE_ALTER | WT_DHANDLE_EXCLUSIVE)));
-err: if (ret != 0)
+err:
+ if (ret != 0)
WT_STAT_CONN_INCR(session, session_table_alter_fail);
else
WT_STAT_CONN_INCR(session, session_table_alter_success);
@@ -598,7 +599,8 @@ __session_create(WT_SESSION *wt_session, const char *uri, const char *config)
ret = __wt_session_create(session, uri, config);
-err: if (ret != 0)
+err:
+ if (ret != 0)
WT_STAT_CONN_INCR(session, session_table_create_fail);
else
WT_STAT_CONN_INCR(session, session_table_create_success);
@@ -749,7 +751,8 @@ __session_rebalance(WT_SESSION *wt_session, const char *uri, const char *config)
ret = __wt_schema_worker(session, uri, __wt_bt_rebalance,
NULL, cfg, WT_DHANDLE_EXCLUSIVE | WT_BTREE_REBALANCE)));
-err: if (ret != 0)
+err:
+ if (ret != 0)
WT_STAT_CONN_INCR(session, session_table_rebalance_fail);
else
WT_STAT_CONN_INCR(session, session_table_rebalance_success);
@@ -800,8 +803,8 @@ __session_rename(WT_SESSION *wt_session,
WT_WITH_SCHEMA_LOCK(session,
WT_WITH_TABLE_WRITE_LOCK(session,
ret = __wt_schema_rename(session, uri, newuri, cfg))));
-
-err: if (ret != 0)
+err:
+ if (ret != 0)
WT_STAT_CONN_INCR(session, session_table_rename_fail);
else
WT_STAT_CONN_INCR(session, session_table_rename_success);
@@ -905,7 +908,8 @@ __session_drop(WT_SESSION *wt_session, const char *uri, const char *config)
ret = __wt_schema_drop(session, uri, cfg)));
}
-err: if (ret != 0)
+err:
+ if (ret != 0)
WT_STAT_CONN_INCR(session, session_table_drop_fail);
else
WT_STAT_CONN_INCR(session, session_table_drop_success);
@@ -1096,7 +1100,8 @@ __session_salvage(WT_SESSION *wt_session, const char *uri, const char *config)
ret = __wt_schema_worker(session, uri, __wt_salvage,
NULL, cfg, WT_DHANDLE_EXCLUSIVE | WT_BTREE_SALVAGE)));
-err: if (ret != 0)
+err:
+ if (ret != 0)
WT_STAT_CONN_INCR(session, session_table_salvage_fail);
else
WT_STAT_CONN_INCR(session, session_table_salvage_success);
@@ -1413,7 +1418,8 @@ __session_verify(WT_SESSION *wt_session, const char *uri, const char *config)
ret = __wt_schema_worker(session, uri, __wt_verify,
NULL, cfg, WT_DHANDLE_EXCLUSIVE | WT_BTREE_VERIFY)));
-err: if (ret != 0)
+err:
+ if (ret != 0)
WT_STAT_CONN_INCR(session, session_table_verify_fail);
else
WT_STAT_CONN_INCR(session, session_table_verify_success);
@@ -1581,7 +1587,6 @@ __session_transaction_sync(WT_SESSION *wt_session, const char *config)
session = (WT_SESSION_IMPL *)wt_session;
SESSION_API_CALL(session, transaction_sync, config, cfg);
WT_STAT_CONN_INCR(session, txn_sync);
- time_start = time_stop = 0;
conn = S2C(session);
WT_ERR(__wt_txn_context_check(session, false));
@@ -1619,18 +1624,18 @@ __session_transaction_sync(WT_SESSION *wt_session, const char *config)
if (timeout_ms == 0)
WT_ERR(ETIMEDOUT);
- time_start = __wt_rdtsc(session);
/*
* Keep checking the LSNs until we find it is stable or we reach
* our timeout, or there's some other reason to quit.
*/
+ time_start = __wt_rdtsc(session);
while (__wt_log_cmp(&session->bg_sync_lsn, &log->sync_lsn) > 0) {
if (!__transaction_sync_run_chk(session))
WT_ERR(ETIMEDOUT);
__wt_cond_signal(session, conn->log_file_cond);
time_stop = __wt_rdtsc(session);
- waited_ms = WT_TSCDIFF_MS(session, time_stop, time_start);
+ waited_ms = WT_TSCDIFF_MS(time_stop, time_start);
if (waited_ms < timeout_ms) {
remaining_usec = (timeout_ms - waited_ms) * WT_THOUSAND;
__wt_cond_wait(session, log->log_sync_cond,
@@ -1774,6 +1779,19 @@ __wt_session_strerror(WT_SESSION *wt_session, int error)
}
/*
+ * __wt_session_breakpoint --
+ * A place to put a breakpoint, if you need one, or call some check
+ * code.
+ */
+int
+__wt_session_breakpoint(WT_SESSION *wt_session)
+{
+ WT_UNUSED(wt_session);
+
+ return (0);
+}
+
+/*
* __open_session --
* Allocate a session handle.
*/
@@ -1810,7 +1828,8 @@ __open_session(WT_CONNECTION_IMPL *conn,
__session_checkpoint,
__session_snapshot,
__session_transaction_pinned_range,
- __session_transaction_sync
+ __session_transaction_sync,
+ __wt_session_breakpoint
}, stds_readonly = {
NULL,
NULL,
@@ -1839,7 +1858,8 @@ __open_session(WT_CONNECTION_IMPL *conn,
__session_checkpoint_readonly,
__session_snapshot,
__session_transaction_pinned_range,
- __session_transaction_sync_readonly
+ __session_transaction_sync_readonly,
+ __wt_session_breakpoint
};
WT_DECL_RET;
WT_SESSION_IMPL *session, *session_ret;
diff --git a/src/third_party/wiredtiger/src/session/session_compact.c b/src/third_party/wiredtiger/src/session/session_compact.c
index aa2f1bc3bd8..96761ff8745 100644
--- a/src/third_party/wiredtiger/src/session/session_compact.c
+++ b/src/third_party/wiredtiger/src/session/session_compact.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/session/session_dhandle.c b/src/third_party/wiredtiger/src/session/session_dhandle.c
index accdf615e37..caa775686cf 100644
--- a/src/third_party/wiredtiger/src/session/session_dhandle.c
+++ b/src/third_party/wiredtiger/src/session/session_dhandle.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/session/session_salvage.c b/src/third_party/wiredtiger/src/session/session_salvage.c
index 5a67bd1f7ac..0a5181dc218 100644
--- a/src/third_party/wiredtiger/src/session/session_salvage.c
+++ b/src/third_party/wiredtiger/src/session/session_salvage.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/support/cond_auto.c b/src/third_party/wiredtiger/src/support/cond_auto.c
index 2d43eb3bf79..61db334de24 100644
--- a/src/third_party/wiredtiger/src/support/cond_auto.c
+++ b/src/third_party/wiredtiger/src/support/cond_auto.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/support/crypto.c b/src/third_party/wiredtiger/src/support/crypto.c
index 6208d83b0f2..db59d3c6ccb 100644
--- a/src/third_party/wiredtiger/src/support/crypto.c
+++ b/src/third_party/wiredtiger/src/support/crypto.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/support/err.c b/src/third_party/wiredtiger/src/support/err.c
index a3b87b6edde..c7cfa0c3932 100644
--- a/src/third_party/wiredtiger/src/support/err.c
+++ b/src/third_party/wiredtiger/src/support/err.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/support/generation.c b/src/third_party/wiredtiger/src/support/generation.c
index 8bdbcc078fb..34f3ab6afb9 100644
--- a/src/third_party/wiredtiger/src/support/generation.c
+++ b/src/third_party/wiredtiger/src/support/generation.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/support/global.c b/src/third_party/wiredtiger/src/support/global.c
index fd0ecbe1b65..19786bb0974 100644
--- a/src/third_party/wiredtiger/src/support/global.c
+++ b/src/third_party/wiredtiger/src/support/global.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
@@ -41,6 +41,68 @@ __wt_endian_check(void)
}
/*
+ * __global_calibrate_ticks --
+ * Calibrate a ratio from rdtsc ticks to nanoseconds.
+ */
+static void
+__global_calibrate_ticks(void)
+{
+ /*
+ * Default to using __wt_epoch until we have a good value for the ratio.
+ */
+ __wt_process.tsc_nsec_ratio = WT_TSC_DEFAULT_RATIO;
+ __wt_process.use_epochtime = true;
+
+#if defined (__i386) || defined (__amd64)
+ {
+ struct timespec start, stop;
+ double ratio;
+ uint64_t diff_nsec, diff_tsc, min_nsec, min_tsc;
+ uint64_t tries, tsc_start, tsc_stop;
+ volatile uint64_t i;
+
+ /*
+ * Run this calibration loop a few times to make sure we get a
+ * reading that does not have a potential scheduling shift in it.
+ * The inner loop is CPU intensive but a scheduling change in the
+ * middle could throw off calculations. Take the minimum amount
+ * of time and compute the ratio.
+ */
+ min_nsec = min_tsc = UINT64_MAX;
+ for (tries = 0; tries < 3; ++tries) {
+ /* This needs to be CPU intensive and large enough. */
+ __wt_epoch(NULL, &start);
+ tsc_start = __wt_rdtsc(NULL);
+ for (i = 0; i < 100 * WT_MILLION; i++)
+ ;
+ tsc_stop = __wt_rdtsc(NULL);
+ __wt_epoch(NULL, &stop);
+ diff_nsec = WT_TIMEDIFF_NS(stop, start);
+ diff_tsc = tsc_stop - tsc_start;
+
+ /* If the clock didn't tick over, we don't have a sample. */
+ if (diff_nsec == 0 || diff_tsc == 0)
+ continue;
+ min_nsec = WT_MIN(min_nsec, diff_nsec);
+ min_tsc = WT_MIN(min_tsc, diff_tsc);
+ }
+
+ /*
+ * Only use rdtsc if we got a good reading. One reason this might fail
+ * is that the system's clock granularity is not fine-grained enough.
+ */
+ if (min_nsec != UINT64_MAX) {
+ ratio = (double)min_tsc / (double)min_nsec;
+ if (ratio > DBL_EPSILON) {
+ __wt_process.tsc_nsec_ratio = ratio;
+ __wt_process.use_epochtime = false;
+ }
+ }
+ }
+#endif
+}
+
+/*
* __wt_global_once --
* Global initialization, run once.
*/
@@ -56,13 +118,9 @@ __wt_global_once(void)
}
__wt_checksum_init();
+ __global_calibrate_ticks();
TAILQ_INIT(&__wt_process.connqh);
-
-#ifdef HAVE_DIAGNOSTIC
- /* Load debugging code the compiler might optimize out. */
- __wt_breakpoint();
-#endif
}
/*
@@ -91,19 +149,3 @@ __wt_library_init(void)
}
return (__wt_pthread_once_failed);
}
-
-#ifdef HAVE_DIAGNOSTIC
-/*
- * __wt_breakpoint --
- * A simple place to put a breakpoint, if you need one.
- */
-void
-__wt_breakpoint(void)
-{
- /*
- * Yield the processor (just to keep the compiler from optimizing the
- * function out).
- */
- __wt_yield();
-}
-#endif
diff --git a/src/third_party/wiredtiger/src/support/hash_city.c b/src/third_party/wiredtiger/src/support/hash_city.c
index e14368d3529..402e4f08394 100644
--- a/src/third_party/wiredtiger/src/support/hash_city.c
+++ b/src/third_party/wiredtiger/src/support/hash_city.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/src/support/hash_fnv.c b/src/third_party/wiredtiger/src/support/hash_fnv.c
index aad698229fd..c544e2d6096 100644
--- a/src/third_party/wiredtiger/src/support/hash_fnv.c
+++ b/src/third_party/wiredtiger/src/support/hash_fnv.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/src/support/hazard.c b/src/third_party/wiredtiger/src/support/hazard.c
index d2d2e855088..ac0b7f7de96 100644
--- a/src/third_party/wiredtiger/src/support/hazard.c
+++ b/src/third_party/wiredtiger/src/support/hazard.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/support/hex.c b/src/third_party/wiredtiger/src/support/hex.c
index 58730b1505b..69b33bad368 100644
--- a/src/third_party/wiredtiger/src/support/hex.c
+++ b/src/third_party/wiredtiger/src/support/hex.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/support/huffman.c b/src/third_party/wiredtiger/src/support/huffman.c
index e0e8f47e45c..f784352c981 100644
--- a/src/third_party/wiredtiger/src/support/huffman.c
+++ b/src/third_party/wiredtiger/src/support/huffman.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/support/modify.c b/src/third_party/wiredtiger/src/support/modify.c
index 42541ffc3ef..0d75ffa5679 100644
--- a/src/third_party/wiredtiger/src/support/modify.c
+++ b/src/third_party/wiredtiger/src/support/modify.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
@@ -56,11 +56,16 @@ __wt_modify_pack(WT_SESSION_IMPL *session,
* Apply a single modify structure change to the buffer.
*/
static int
-__modify_apply_one(WT_SESSION_IMPL *session, WT_ITEM *value,
+__modify_apply_one(WT_SESSION_IMPL *session, WT_CURSOR *cursor,
size_t data_size, size_t offset, size_t size, const uint8_t *data)
{
+ WT_ITEM *value;
size_t len;
uint8_t *from, *to;
+ bool sformat;
+
+ value = &cursor->value;
+ sformat = cursor->value_format[0] == 'S';
/*
* Grow the buffer to the maximum size we'll need. This is pessimistic
@@ -89,15 +94,26 @@ __modify_apply_one(WT_SESSION_IMPL *session, WT_ITEM *value,
}
/*
+ * Decrement the size to discard the trailing nul (done after growing
+ * the buffer to ensure it can be restored without further checking).
+ */
+ if (sformat)
+ --value->size;
+
+ /*
* If appending bytes past the end of the value, initialize gap bytes
* and copy the new bytes into place.
*/
if (value->size <= offset) {
if (value->size < offset)
- memset((uint8_t *)value->data +
- value->size, 0, offset - value->size);
+ memset((uint8_t *)value->data + value->size,
+ sformat ? ' ' : 0, offset - value->size);
memmove((uint8_t *)value->data + offset, data, data_size);
value->size = offset + data_size;
+
+ /* Restore the trailing nul. */
+ if (sformat)
+ ((char *)value->data)[value->size++] = '\0';
return (0);
}
@@ -149,6 +165,10 @@ __modify_apply_one(WT_SESSION_IMPL *session, WT_ITEM *value,
value->size += (data_size - size);
}
+ /* Restore the trailing nul. */
+ if (sformat)
+ ((char *)value->data)[value->size++] = '\0';
+
return (0);
}
@@ -158,14 +178,14 @@ __modify_apply_one(WT_SESSION_IMPL *session, WT_ITEM *value,
* interface.
*/
int
-__wt_modify_apply_api(
- WT_SESSION_IMPL *session, WT_ITEM *value, WT_MODIFY *entries, int nentries)
+__wt_modify_apply_api(WT_SESSION_IMPL *session,
+ WT_CURSOR *cursor, WT_MODIFY *entries, int nentries)
WT_GCC_FUNC_ATTRIBUTE((visibility("default")))
{
int i;
for (i = 0; i < nentries; ++i)
- WT_RET(__modify_apply_one(session, value, entries[i].data.size,
+ WT_RET(__modify_apply_one(session, cursor, entries[i].data.size,
entries[i].offset, entries[i].size, entries[i].data.data));
return (0);
@@ -176,7 +196,8 @@ __wt_modify_apply_api(
* Apply a single set of WT_MODIFY changes to a buffer.
*/
int
-__wt_modify_apply(WT_SESSION_IMPL *session, WT_ITEM *value, const void *modify)
+__wt_modify_apply(
+ WT_SESSION_IMPL *session, WT_CURSOR *cursor, const void *modify)
{
size_t data_size, nentries, offset, size;
const size_t *p;
@@ -198,7 +219,7 @@ __wt_modify_apply(WT_SESSION_IMPL *session, WT_ITEM *value, const void *modify)
memcpy(&offset, p++, sizeof(size_t));
memcpy(&size, p++, sizeof(size_t));
WT_RET(__modify_apply_one(
- session, value, data_size, offset, size, data));
+ session, cursor, data_size, offset, size, data));
}
return (0);
diff --git a/src/third_party/wiredtiger/src/support/mtx_rw.c b/src/third_party/wiredtiger/src/support/mtx_rw.c
index dc9ca4932c5..52c8004ecda 100644
--- a/src/third_party/wiredtiger/src/support/mtx_rw.c
+++ b/src/third_party/wiredtiger/src/support/mtx_rw.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
@@ -255,12 +255,10 @@ stall: __wt_cond_wait(session,
time_stop = __wt_rdtsc(session);
if (F_ISSET(session, WT_SESSION_INTERNAL))
stats[session->stat_bucket][l->stat_int_usecs_off] +=
- (int64_t)WT_TSCDIFF_US(
- session, time_stop, time_start);
+ (int64_t)WT_TSCDIFF_US(time_stop, time_start);
else
stats[session->stat_bucket][l->stat_app_usecs_off] +=
- (int64_t)WT_TSCDIFF_US(
- session, time_stop, time_start);
+ (int64_t)WT_TSCDIFF_US(time_stop, time_start);
}
/*
@@ -428,12 +426,10 @@ __wt_writelock(WT_SESSION_IMPL *session, WT_RWLOCK *l)
time_stop = __wt_rdtsc(session);
if (F_ISSET(session, WT_SESSION_INTERNAL))
stats[session->stat_bucket][l->stat_int_usecs_off] +=
- (int64_t)WT_TSCDIFF_US(
- session, time_stop, time_start);
+ (int64_t)WT_TSCDIFF_US(time_stop, time_start);
else
stats[session->stat_bucket][l->stat_app_usecs_off] +=
- (int64_t)WT_TSCDIFF_US(
- session, time_stop, time_start);
+ (int64_t)WT_TSCDIFF_US(time_stop, time_start);
}
/*
diff --git a/src/third_party/wiredtiger/src/support/pow.c b/src/third_party/wiredtiger/src/support/pow.c
index 2fb193afca8..60012feb88c 100644
--- a/src/third_party/wiredtiger/src/support/pow.c
+++ b/src/third_party/wiredtiger/src/support/pow.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/src/support/rand.c b/src/third_party/wiredtiger/src/support/rand.c
index 64ed2341eeb..9f76efb28e2 100644
--- a/src/third_party/wiredtiger/src/support/rand.c
+++ b/src/third_party/wiredtiger/src/support/rand.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/src/support/scratch.c b/src/third_party/wiredtiger/src/support/scratch.c
index 8596f4e1fe6..2ead79a1c1c 100644
--- a/src/third_party/wiredtiger/src/support/scratch.c
+++ b/src/third_party/wiredtiger/src/support/scratch.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
@@ -15,6 +15,7 @@
*/
int
__wt_buf_grow_worker(WT_SESSION_IMPL *session, WT_ITEM *buf, size_t size)
+ WT_GCC_FUNC_ATTRIBUTE((visibility("default")))
{
size_t offset;
bool copy_data;
@@ -68,6 +69,7 @@ __wt_buf_grow_worker(WT_SESSION_IMPL *session, WT_ITEM *buf, size_t size)
int
__wt_buf_fmt(WT_SESSION_IMPL *session, WT_ITEM *buf, const char *fmt, ...)
WT_GCC_FUNC_ATTRIBUTE((format (printf, 3, 4)))
+ WT_GCC_FUNC_ATTRIBUTE((visibility("default")))
{
WT_DECL_RET;
size_t len;
@@ -102,6 +104,7 @@ __wt_buf_fmt(WT_SESSION_IMPL *session, WT_ITEM *buf, const char *fmt, ...)
int
__wt_buf_catfmt(WT_SESSION_IMPL *session, WT_ITEM *buf, const char *fmt, ...)
WT_GCC_FUNC_ATTRIBUTE((format (printf, 3, 4)))
+ WT_GCC_FUNC_ATTRIBUTE((visibility("default")))
{
WT_DECL_RET;
size_t len, space;
@@ -141,8 +144,8 @@ __wt_buf_catfmt(WT_SESSION_IMPL *session, WT_ITEM *buf, const char *fmt, ...)
/*
* __wt_buf_set_printable --
- * Set the contents of the buffer to a printable representation of a
- * byte string.
+ * Set the contents of the buffer to a printable representation of a byte
+ * string.
*/
const char *
__wt_buf_set_printable(
@@ -156,6 +159,85 @@ __wt_buf_set_printable(
}
/*
+ * __wt_buf_set_printable_format --
+ * Set the contents of the buffer to a printable representation of a byte
+ * string, based on a format.
+ */
+const char *
+__wt_buf_set_printable_format(WT_SESSION_IMPL *session,
+ const void *buffer, size_t size, const char *format, WT_ITEM *buf)
+{
+ WT_DECL_ITEM(tmp);
+ WT_DECL_PACK_VALUE(pv);
+ WT_DECL_RET;
+ WT_PACK pack;
+ const uint8_t *p, *end;
+ const char *retp, *sep;
+
+ p = (const uint8_t *)buffer;
+ end = p + size;
+
+ WT_ERR(__wt_buf_init(session, buf, 0));
+
+ WT_ERR(__pack_init(session, &pack, format));
+ for (sep = ""; (ret = __pack_next(&pack, &pv)) == 0;) {
+ WT_ERR(__unpack_read(session, &pv, &p, (size_t)(end - p)));
+ switch (pv.type) {
+ case 'x':
+ break;
+ case 's':
+ case 'S':
+ WT_ERR(__wt_buf_catfmt(
+ session, buf, "%s%s", sep, pv.u.s));
+ sep = ",";
+ break;
+ case 'U':
+ case 'u':
+ if (pv.u.item.size == 0)
+ break;
+
+ if (tmp == NULL)
+ WT_ERR(__wt_scr_alloc(session, 0, &tmp));
+ WT_ERR(__wt_buf_catfmt(session, buf, "%s%s",
+ sep, __wt_buf_set_printable(
+ session, pv.u.item.data, pv.u.item.size, tmp)));
+ break;
+ case 'b':
+ case 'h':
+ case 'i':
+ case 'l':
+ case 'q':
+ WT_ERR(__wt_buf_catfmt(
+ session, buf, "%s%" PRId64, sep, pv.u.i));
+ sep = ",";
+ break;
+ case 'B':
+ case 't':
+ case 'H':
+ case 'I':
+ case 'L':
+ case 'Q':
+ case 'r':
+ case 'R':
+ WT_ERR(__wt_buf_catfmt(
+ session, buf, "%s%" PRIu64, sep, pv.u.u));
+ sep = ",";
+ break;
+ WT_ILLEGAL_VALUE_ERR(session);
+ }
+ }
+ WT_ERR_NOTFOUND_OK(ret);
+
+err: __wt_scr_free(session, &tmp);
+ if (ret == 0)
+ return ((const char *)buf->data);
+
+ retp = "failed to create printable output";
+ __wt_err(session, ret, "%s: %s", __func__, retp);
+ return (retp);
+}
+
+/*
* __wt_buf_set_size --
* Set the contents of the buffer to a printable representation of a
* byte size.
@@ -207,6 +289,7 @@ __wt_scr_alloc_func(WT_SESSION_IMPL *session, size_t size, WT_ITEM **scratchp
, const char *file, int line
#endif
)
+ WT_GCC_FUNC_ATTRIBUTE((visibility("default")))
{
WT_DECL_RET;
WT_ITEM *buf, **p, **best, **slot;
diff --git a/src/third_party/wiredtiger/src/support/stat.c b/src/third_party/wiredtiger/src/support/stat.c
index eeb1f2d26e9..148e6bfd4d7 100644
--- a/src/third_party/wiredtiger/src/support/stat.c
+++ b/src/third_party/wiredtiger/src/support/stat.c
@@ -881,6 +881,10 @@ static const char * const __stats_connection_desc[] = {
"lock: checkpoint lock acquisitions",
"lock: checkpoint lock application thread wait time (usecs)",
"lock: checkpoint lock internal thread wait time (usecs)",
+ "lock: commit timestamp queue lock application thread time waiting for the dhandle lock (usecs)",
+ "lock: commit timestamp queue lock internal thread time waiting for the dhandle lock (usecs)",
+ "lock: commit timestamp queue read lock acquisitions",
+ "lock: commit timestamp queue write lock acquisitions",
"lock: dhandle lock application thread time waiting for the dhandle lock (usecs)",
"lock: dhandle lock internal thread time waiting for the dhandle lock (usecs)",
"lock: dhandle read lock acquisitions",
@@ -888,6 +892,10 @@ static const char * const __stats_connection_desc[] = {
"lock: metadata lock acquisitions",
"lock: metadata lock application thread wait time (usecs)",
"lock: metadata lock internal thread wait time (usecs)",
+ "lock: read timestamp queue lock application thread time waiting for the dhandle lock (usecs)",
+ "lock: read timestamp queue lock internal thread time waiting for the dhandle lock (usecs)",
+ "lock: read timestamp queue read lock acquisitions",
+ "lock: read timestamp queue write lock acquisitions",
"lock: schema lock acquisitions",
"lock: schema lock application thread wait time (usecs)",
"lock: schema lock internal thread wait time (usecs)",
@@ -895,6 +903,10 @@ static const char * const __stats_connection_desc[] = {
"lock: table lock internal thread time waiting for the table lock (usecs)",
"lock: table read lock acquisitions",
"lock: table write lock acquisitions",
+ "lock: txn global lock application thread time waiting for the dhandle lock (usecs)",
+ "lock: txn global lock internal thread time waiting for the dhandle lock (usecs)",
+ "lock: txn global read lock acquisitions",
+ "lock: txn global write lock acquisitions",
"log: busy returns attempting to switch slots",
"log: force checkpoint calls slept",
"log: log bytes of payload data",
@@ -941,6 +953,28 @@ static const char * const __stats_connection_desc[] = {
"log: total size of compressed records",
"log: written slots coalesced",
"log: yields waiting for previous log file close",
+ "perf: file system read latency histogram (bucket 1) - 10-49ms",
+ "perf: file system read latency histogram (bucket 2) - 50-99ms",
+ "perf: file system read latency histogram (bucket 3) - 100-249ms",
+ "perf: file system read latency histogram (bucket 4) - 250-499ms",
+ "perf: file system read latency histogram (bucket 5) - 500-999ms",
+ "perf: file system read latency histogram (bucket 6) - 1000ms+",
+ "perf: file system write latency histogram (bucket 1) - 10-49ms",
+ "perf: file system write latency histogram (bucket 2) - 50-99ms",
+ "perf: file system write latency histogram (bucket 3) - 100-249ms",
+ "perf: file system write latency histogram (bucket 4) - 250-499ms",
+ "perf: file system write latency histogram (bucket 5) - 500-999ms",
+ "perf: file system write latency histogram (bucket 6) - 1000ms+",
+ "perf: operation read latency histogram (bucket 1) - 100-249us",
+ "perf: operation read latency histogram (bucket 2) - 250-499us",
+ "perf: operation read latency histogram (bucket 3) - 500-999us",
+ "perf: operation read latency histogram (bucket 4) - 1000-9999us",
+ "perf: operation read latency histogram (bucket 5) - 10000us+",
+ "perf: operation write latency histogram (bucket 1) - 100-249us",
+ "perf: operation write latency histogram (bucket 2) - 250-499us",
+ "perf: operation write latency histogram (bucket 3) - 500-999us",
+ "perf: operation write latency histogram (bucket 4) - 1000-9999us",
+ "perf: operation write latency histogram (bucket 5) - 10000us+",
"reconciliation: fast-path pages deleted",
"reconciliation: page reconciliation calls",
"reconciliation: page reconciliation calls for eviction",
@@ -986,8 +1020,24 @@ static const char * const __stats_connection_desc[] = {
"thread-yield: page delete rollback time sleeping for state change (usecs)",
"thread-yield: page reconciliation yielded due to child modification",
"thread-yield: tree descend one level yielded for split page index update",
+ "transaction: commit timestamp queue insert to empty",
+ "transaction: commit timestamp queue inserts to head",
+ "transaction: commit timestamp queue inserts total",
+ "transaction: commit timestamp queue length",
"transaction: number of named snapshots created",
"transaction: number of named snapshots dropped",
+ "transaction: query timestamp calls",
+ "transaction: read timestamp queue insert to empty",
+ "transaction: read timestamp queue inserts to head",
+ "transaction: read timestamp queue inserts total",
+ "transaction: read timestamp queue length",
+ "transaction: set timestamp calls",
+ "transaction: set timestamp commit calls",
+ "transaction: set timestamp commit updates",
+ "transaction: set timestamp oldest calls",
+ "transaction: set timestamp oldest updates",
+ "transaction: set timestamp stable calls",
+ "transaction: set timestamp stable updates",
"transaction: transaction begins",
"transaction: transaction checkpoint currently running",
"transaction: transaction checkpoint generation",
@@ -1008,13 +1058,7 @@ static const char * const __stats_connection_desc[] = {
"transaction: transaction range of timestamps currently pinned",
"transaction: transaction range of timestamps pinned by the oldest timestamp",
"transaction: transaction sync calls",
- "transaction: transactions commit timestamp queue inserts to head",
- "transaction: transactions commit timestamp queue inserts total",
- "transaction: transactions commit timestamp queue length",
"transaction: transactions committed",
- "transaction: transactions read timestamp queue inserts to head",
- "transaction: transactions read timestamp queue inserts total",
- "transaction: transactions read timestamp queue length",
"transaction: transactions rolled back",
"transaction: update conflicts",
};
@@ -1215,6 +1259,10 @@ __wt_stat_connection_clear_single(WT_CONNECTION_STATS *stats)
stats->lock_checkpoint_count = 0;
stats->lock_checkpoint_wait_application = 0;
stats->lock_checkpoint_wait_internal = 0;
+ stats->lock_commit_timestamp_wait_application = 0;
+ stats->lock_commit_timestamp_wait_internal = 0;
+ stats->lock_commit_timestamp_read_count = 0;
+ stats->lock_commit_timestamp_write_count = 0;
stats->lock_dhandle_wait_application = 0;
stats->lock_dhandle_wait_internal = 0;
stats->lock_dhandle_read_count = 0;
@@ -1222,6 +1270,10 @@ __wt_stat_connection_clear_single(WT_CONNECTION_STATS *stats)
stats->lock_metadata_count = 0;
stats->lock_metadata_wait_application = 0;
stats->lock_metadata_wait_internal = 0;
+ stats->lock_read_timestamp_wait_application = 0;
+ stats->lock_read_timestamp_wait_internal = 0;
+ stats->lock_read_timestamp_read_count = 0;
+ stats->lock_read_timestamp_write_count = 0;
stats->lock_schema_count = 0;
stats->lock_schema_wait_application = 0;
stats->lock_schema_wait_internal = 0;
@@ -1229,6 +1281,10 @@ __wt_stat_connection_clear_single(WT_CONNECTION_STATS *stats)
stats->lock_table_wait_internal = 0;
stats->lock_table_read_count = 0;
stats->lock_table_write_count = 0;
+ stats->lock_txn_global_wait_application = 0;
+ stats->lock_txn_global_wait_internal = 0;
+ stats->lock_txn_global_read_count = 0;
+ stats->lock_txn_global_write_count = 0;
stats->log_slot_switch_busy = 0;
stats->log_force_ckpt_sleep = 0;
stats->log_bytes_payload = 0;
@@ -1275,6 +1331,28 @@ __wt_stat_connection_clear_single(WT_CONNECTION_STATS *stats)
stats->log_compress_len = 0;
stats->log_slot_coalesced = 0;
stats->log_close_yields = 0;
+ stats->perf_hist_fsread_latency_lt50 = 0;
+ stats->perf_hist_fsread_latency_lt100 = 0;
+ stats->perf_hist_fsread_latency_lt250 = 0;
+ stats->perf_hist_fsread_latency_lt500 = 0;
+ stats->perf_hist_fsread_latency_lt1000 = 0;
+ stats->perf_hist_fsread_latency_gt1000 = 0;
+ stats->perf_hist_fswrite_latency_lt50 = 0;
+ stats->perf_hist_fswrite_latency_lt100 = 0;
+ stats->perf_hist_fswrite_latency_lt250 = 0;
+ stats->perf_hist_fswrite_latency_lt500 = 0;
+ stats->perf_hist_fswrite_latency_lt1000 = 0;
+ stats->perf_hist_fswrite_latency_gt1000 = 0;
+ stats->perf_hist_opread_latency_lt250 = 0;
+ stats->perf_hist_opread_latency_lt500 = 0;
+ stats->perf_hist_opread_latency_lt1000 = 0;
+ stats->perf_hist_opread_latency_lt10000 = 0;
+ stats->perf_hist_opread_latency_gt10000 = 0;
+ stats->perf_hist_opwrite_latency_lt250 = 0;
+ stats->perf_hist_opwrite_latency_lt500 = 0;
+ stats->perf_hist_opwrite_latency_lt1000 = 0;
+ stats->perf_hist_opwrite_latency_lt10000 = 0;
+ stats->perf_hist_opwrite_latency_gt10000 = 0;
stats->rec_page_delete_fast = 0;
stats->rec_pages = 0;
stats->rec_pages_eviction = 0;
@@ -1320,8 +1398,24 @@ __wt_stat_connection_clear_single(WT_CONNECTION_STATS *stats)
stats->page_del_rollback_blocked = 0;
stats->child_modify_blocked_page = 0;
stats->tree_descend_blocked = 0;
+ stats->txn_commit_queue_empty = 0;
+ stats->txn_commit_queue_head = 0;
+ stats->txn_commit_queue_inserts = 0;
+ stats->txn_commit_queue_len = 0;
stats->txn_snapshots_created = 0;
stats->txn_snapshots_dropped = 0;
+ stats->txn_query_ts = 0;
+ stats->txn_read_queue_empty = 0;
+ stats->txn_read_queue_head = 0;
+ stats->txn_read_queue_inserts = 0;
+ stats->txn_read_queue_len = 0;
+ stats->txn_set_ts = 0;
+ stats->txn_set_ts_commit = 0;
+ stats->txn_set_ts_commit_upd = 0;
+ stats->txn_set_ts_oldest = 0;
+ stats->txn_set_ts_oldest_upd = 0;
+ stats->txn_set_ts_stable = 0;
+ stats->txn_set_ts_stable_upd = 0;
stats->txn_begin = 0;
/* not clearing txn_checkpoint_running */
/* not clearing txn_checkpoint_generation */
@@ -1342,13 +1436,7 @@ __wt_stat_connection_clear_single(WT_CONNECTION_STATS *stats)
/* not clearing txn_pinned_timestamp */
/* not clearing txn_pinned_timestamp_oldest */
stats->txn_sync = 0;
- stats->txn_commit_queue_head = 0;
- stats->txn_commit_queue_inserts = 0;
- stats->txn_commit_queue_len = 0;
stats->txn_commit = 0;
- stats->txn_read_queue_head = 0;
- stats->txn_read_queue_inserts = 0;
- stats->txn_read_queue_len = 0;
stats->txn_rollback = 0;
stats->txn_update_conflict = 0;
}
@@ -1590,6 +1678,14 @@ __wt_stat_connection_aggregate(
WT_STAT_READ(from, lock_checkpoint_wait_application);
to->lock_checkpoint_wait_internal +=
WT_STAT_READ(from, lock_checkpoint_wait_internal);
+ to->lock_commit_timestamp_wait_application +=
+ WT_STAT_READ(from, lock_commit_timestamp_wait_application);
+ to->lock_commit_timestamp_wait_internal +=
+ WT_STAT_READ(from, lock_commit_timestamp_wait_internal);
+ to->lock_commit_timestamp_read_count +=
+ WT_STAT_READ(from, lock_commit_timestamp_read_count);
+ to->lock_commit_timestamp_write_count +=
+ WT_STAT_READ(from, lock_commit_timestamp_write_count);
to->lock_dhandle_wait_application +=
WT_STAT_READ(from, lock_dhandle_wait_application);
to->lock_dhandle_wait_internal +=
@@ -1603,6 +1699,14 @@ __wt_stat_connection_aggregate(
WT_STAT_READ(from, lock_metadata_wait_application);
to->lock_metadata_wait_internal +=
WT_STAT_READ(from, lock_metadata_wait_internal);
+ to->lock_read_timestamp_wait_application +=
+ WT_STAT_READ(from, lock_read_timestamp_wait_application);
+ to->lock_read_timestamp_wait_internal +=
+ WT_STAT_READ(from, lock_read_timestamp_wait_internal);
+ to->lock_read_timestamp_read_count +=
+ WT_STAT_READ(from, lock_read_timestamp_read_count);
+ to->lock_read_timestamp_write_count +=
+ WT_STAT_READ(from, lock_read_timestamp_write_count);
to->lock_schema_count += WT_STAT_READ(from, lock_schema_count);
to->lock_schema_wait_application +=
WT_STAT_READ(from, lock_schema_wait_application);
@@ -1616,6 +1720,14 @@ __wt_stat_connection_aggregate(
WT_STAT_READ(from, lock_table_read_count);
to->lock_table_write_count +=
WT_STAT_READ(from, lock_table_write_count);
+ to->lock_txn_global_wait_application +=
+ WT_STAT_READ(from, lock_txn_global_wait_application);
+ to->lock_txn_global_wait_internal +=
+ WT_STAT_READ(from, lock_txn_global_wait_internal);
+ to->lock_txn_global_read_count +=
+ WT_STAT_READ(from, lock_txn_global_read_count);
+ to->lock_txn_global_write_count +=
+ WT_STAT_READ(from, lock_txn_global_write_count);
to->log_slot_switch_busy += WT_STAT_READ(from, log_slot_switch_busy);
to->log_force_ckpt_sleep += WT_STAT_READ(from, log_force_ckpt_sleep);
to->log_bytes_payload += WT_STAT_READ(from, log_bytes_payload);
@@ -1669,6 +1781,50 @@ __wt_stat_connection_aggregate(
to->log_compress_len += WT_STAT_READ(from, log_compress_len);
to->log_slot_coalesced += WT_STAT_READ(from, log_slot_coalesced);
to->log_close_yields += WT_STAT_READ(from, log_close_yields);
+ to->perf_hist_fsread_latency_lt50 +=
+ WT_STAT_READ(from, perf_hist_fsread_latency_lt50);
+ to->perf_hist_fsread_latency_lt100 +=
+ WT_STAT_READ(from, perf_hist_fsread_latency_lt100);
+ to->perf_hist_fsread_latency_lt250 +=
+ WT_STAT_READ(from, perf_hist_fsread_latency_lt250);
+ to->perf_hist_fsread_latency_lt500 +=
+ WT_STAT_READ(from, perf_hist_fsread_latency_lt500);
+ to->perf_hist_fsread_latency_lt1000 +=
+ WT_STAT_READ(from, perf_hist_fsread_latency_lt1000);
+ to->perf_hist_fsread_latency_gt1000 +=
+ WT_STAT_READ(from, perf_hist_fsread_latency_gt1000);
+ to->perf_hist_fswrite_latency_lt50 +=
+ WT_STAT_READ(from, perf_hist_fswrite_latency_lt50);
+ to->perf_hist_fswrite_latency_lt100 +=
+ WT_STAT_READ(from, perf_hist_fswrite_latency_lt100);
+ to->perf_hist_fswrite_latency_lt250 +=
+ WT_STAT_READ(from, perf_hist_fswrite_latency_lt250);
+ to->perf_hist_fswrite_latency_lt500 +=
+ WT_STAT_READ(from, perf_hist_fswrite_latency_lt500);
+ to->perf_hist_fswrite_latency_lt1000 +=
+ WT_STAT_READ(from, perf_hist_fswrite_latency_lt1000);
+ to->perf_hist_fswrite_latency_gt1000 +=
+ WT_STAT_READ(from, perf_hist_fswrite_latency_gt1000);
+ to->perf_hist_opread_latency_lt250 +=
+ WT_STAT_READ(from, perf_hist_opread_latency_lt250);
+ to->perf_hist_opread_latency_lt500 +=
+ WT_STAT_READ(from, perf_hist_opread_latency_lt500);
+ to->perf_hist_opread_latency_lt1000 +=
+ WT_STAT_READ(from, perf_hist_opread_latency_lt1000);
+ to->perf_hist_opread_latency_lt10000 +=
+ WT_STAT_READ(from, perf_hist_opread_latency_lt10000);
+ to->perf_hist_opread_latency_gt10000 +=
+ WT_STAT_READ(from, perf_hist_opread_latency_gt10000);
+ to->perf_hist_opwrite_latency_lt250 +=
+ WT_STAT_READ(from, perf_hist_opwrite_latency_lt250);
+ to->perf_hist_opwrite_latency_lt500 +=
+ WT_STAT_READ(from, perf_hist_opwrite_latency_lt500);
+ to->perf_hist_opwrite_latency_lt1000 +=
+ WT_STAT_READ(from, perf_hist_opwrite_latency_lt1000);
+ to->perf_hist_opwrite_latency_lt10000 +=
+ WT_STAT_READ(from, perf_hist_opwrite_latency_lt10000);
+ to->perf_hist_opwrite_latency_gt10000 +=
+ WT_STAT_READ(from, perf_hist_opwrite_latency_gt10000);
to->rec_page_delete_fast += WT_STAT_READ(from, rec_page_delete_fast);
to->rec_pages += WT_STAT_READ(from, rec_pages);
to->rec_pages_eviction += WT_STAT_READ(from, rec_pages_eviction);
@@ -1743,10 +1899,33 @@ __wt_stat_connection_aggregate(
to->child_modify_blocked_page +=
WT_STAT_READ(from, child_modify_blocked_page);
to->tree_descend_blocked += WT_STAT_READ(from, tree_descend_blocked);
+ to->txn_commit_queue_empty +=
+ WT_STAT_READ(from, txn_commit_queue_empty);
+ to->txn_commit_queue_head +=
+ WT_STAT_READ(from, txn_commit_queue_head);
+ to->txn_commit_queue_inserts +=
+ WT_STAT_READ(from, txn_commit_queue_inserts);
+ to->txn_commit_queue_len += WT_STAT_READ(from, txn_commit_queue_len);
to->txn_snapshots_created +=
WT_STAT_READ(from, txn_snapshots_created);
to->txn_snapshots_dropped +=
WT_STAT_READ(from, txn_snapshots_dropped);
+ to->txn_query_ts += WT_STAT_READ(from, txn_query_ts);
+ to->txn_read_queue_empty += WT_STAT_READ(from, txn_read_queue_empty);
+ to->txn_read_queue_head += WT_STAT_READ(from, txn_read_queue_head);
+ to->txn_read_queue_inserts +=
+ WT_STAT_READ(from, txn_read_queue_inserts);
+ to->txn_read_queue_len += WT_STAT_READ(from, txn_read_queue_len);
+ to->txn_set_ts += WT_STAT_READ(from, txn_set_ts);
+ to->txn_set_ts_commit += WT_STAT_READ(from, txn_set_ts_commit);
+ to->txn_set_ts_commit_upd +=
+ WT_STAT_READ(from, txn_set_ts_commit_upd);
+ to->txn_set_ts_oldest += WT_STAT_READ(from, txn_set_ts_oldest);
+ to->txn_set_ts_oldest_upd +=
+ WT_STAT_READ(from, txn_set_ts_oldest_upd);
+ to->txn_set_ts_stable += WT_STAT_READ(from, txn_set_ts_stable);
+ to->txn_set_ts_stable_upd +=
+ WT_STAT_READ(from, txn_set_ts_stable_upd);
to->txn_begin += WT_STAT_READ(from, txn_begin);
to->txn_checkpoint_running +=
WT_STAT_READ(from, txn_checkpoint_running);
@@ -1781,16 +1960,7 @@ __wt_stat_connection_aggregate(
to->txn_pinned_timestamp_oldest +=
WT_STAT_READ(from, txn_pinned_timestamp_oldest);
to->txn_sync += WT_STAT_READ(from, txn_sync);
- to->txn_commit_queue_head +=
- WT_STAT_READ(from, txn_commit_queue_head);
- to->txn_commit_queue_inserts +=
- WT_STAT_READ(from, txn_commit_queue_inserts);
- to->txn_commit_queue_len += WT_STAT_READ(from, txn_commit_queue_len);
to->txn_commit += WT_STAT_READ(from, txn_commit);
- to->txn_read_queue_head += WT_STAT_READ(from, txn_read_queue_head);
- to->txn_read_queue_inserts +=
- WT_STAT_READ(from, txn_read_queue_inserts);
- to->txn_read_queue_len += WT_STAT_READ(from, txn_read_queue_len);
to->txn_rollback += WT_STAT_READ(from, txn_rollback);
to->txn_update_conflict += WT_STAT_READ(from, txn_update_conflict);
}
diff --git a/src/third_party/wiredtiger/src/support/thread_group.c b/src/third_party/wiredtiger/src/support/thread_group.c
index ba0c57e9468..50abe64bbe6 100644
--- a/src/third_party/wiredtiger/src/support/thread_group.c
+++ b/src/third_party/wiredtiger/src/support/thread_group.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/support/time.c b/src/third_party/wiredtiger/src/support/time.c
index e3444aea75a..34198508988 100644
--- a/src/third_party/wiredtiger/src/support/time.c
+++ b/src/third_party/wiredtiger/src/support/time.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
@@ -77,7 +77,31 @@ __wt_seconds(WT_SESSION_IMPL *session, time_t *timep)
* Convert from rdtsc ticks to nanoseconds.
*/
uint64_t
-__wt_tsc_to_nsec(WT_SESSION_IMPL *session, uint64_t tsc_diff)
+__wt_tsc_to_nsec(uint64_t end, uint64_t begin)
{
- return ((uint64_t)((double)tsc_diff / S2C(session)->tsc_nsec_ratio));
+ double tsc_diff;
+
+ /*
+ * If the ticks were reset, consider it an invalid check and just
+ * return zero as the time difference because we cannot compute
+ * anything meaningful.
+ */
+ if (end < begin)
+ return (0);
+ tsc_diff = (double)(end - begin);
+ return ((uint64_t)(tsc_diff / __wt_process.tsc_nsec_ratio));
+}
+
+/*
+ * __wt_tsc_get_expensive_timestamp --
+ * Obtain a timestamp via a system call on platforms where obtaining it
+ * directly from the hardware register is not supported.
+ */
+uint64_t
+__wt_tsc_get_expensive_timestamp(WT_SESSION_IMPL *session)
+{
+ struct timespec tsp;
+
+ __wt_epoch(session, &tsp);
+ return ((uint64_t)(tsp.tv_sec * WT_BILLION + tsp.tv_nsec));
}
diff --git a/src/third_party/wiredtiger/src/txn/txn.c b/src/third_party/wiredtiger/src/txn/txn.c
index cfb1dfc3458..140731bcb54 100644
--- a/src/third_party/wiredtiger/src/txn/txn.c
+++ b/src/third_party/wiredtiger/src/txn/txn.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
@@ -747,7 +747,7 @@ __wt_txn_commit(WT_SESSION_IMPL *session, const char *cfg[])
* Switch reserved operations to abort to
* simplify obsolete update list truncation.
*/
- if (op->u.upd->type == WT_UPDATE_RESERVED) {
+ if (op->u.upd->type == WT_UPDATE_RESERVE) {
op->u.upd->txnid = WT_TXN_ABORTED;
break;
}
@@ -1059,13 +1059,15 @@ __wt_txn_global_init(WT_SESSION_IMPL *session, const char *cfg[])
WT_RET(__wt_spin_init(
session, &txn_global->id_lock, "transaction id lock"));
- WT_RET(__wt_rwlock_init(session, &txn_global->rwlock));
+ WT_RWLOCK_INIT_TRACKED(session, &txn_global->rwlock, txn_global);
WT_RET(__wt_rwlock_init(session, &txn_global->visibility_rwlock));
- WT_RET(__wt_rwlock_init(session, &txn_global->commit_timestamp_rwlock));
+ WT_RWLOCK_INIT_TRACKED(session,
+ &txn_global->commit_timestamp_rwlock, commit_timestamp);
TAILQ_INIT(&txn_global->commit_timestamph);
- WT_RET(__wt_rwlock_init(session, &txn_global->read_timestamp_rwlock));
+ WT_RWLOCK_INIT_TRACKED(session,
+ &txn_global->read_timestamp_rwlock, read_timestamp);
TAILQ_INIT(&txn_global->read_timestamph);
WT_RET(__wt_rwlock_init(session, &txn_global->nsnap_rwlock));
@@ -1156,6 +1158,7 @@ __wt_verbose_dump_txn_one(WT_SESSION_IMPL *session, WT_TXN *txn)
const char *iso_tag;
iso_tag = "INVALID";
+ WT_NOT_READ(iso_tag);
switch (txn->isolation) {
case WT_ISO_READ_COMMITTED:
iso_tag = "WT_ISO_READ_COMMITTED";
diff --git a/src/third_party/wiredtiger/src/txn/txn_ckpt.c b/src/third_party/wiredtiger/src/txn/txn_ckpt.c
index d5c2951c8f8..2e902a8db94 100644
--- a/src/third_party/wiredtiger/src/txn/txn_ckpt.c
+++ b/src/third_party/wiredtiger/src/txn/txn_ckpt.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
@@ -380,15 +380,13 @@ __checkpoint_reduce_dirty_cache(WT_SESSION_IMPL *session)
conn = S2C(session);
cache = conn->cache;
- time_last = time_start = time_stop = 0;
/* Give up if scrubbing is disabled. */
if (cache->eviction_checkpoint_target == 0 ||
cache->eviction_checkpoint_target >= cache->eviction_dirty_trigger)
return;
- time_start = __wt_rdtsc(session);
- time_last = time_start;
+ time_last = time_start = __wt_rdtsc(session);
bytes_written_last = 0;
bytes_written_start = cache->bytes_written;
cache_size = conn->cache_size;
@@ -450,7 +448,7 @@ __checkpoint_reduce_dirty_cache(WT_SESSION_IMPL *session)
__wt_sleep(0, stepdown_us / 10);
time_stop = __wt_rdtsc(session);
- current_us = WT_TSCDIFF_US(session, time_stop, time_last);
+ current_us = WT_TSCDIFF_US(time_stop, time_last);
bytes_written_total =
cache->bytes_written - bytes_written_start;
@@ -508,7 +506,7 @@ __checkpoint_reduce_dirty_cache(WT_SESSION_IMPL *session)
}
time_stop = __wt_rdtsc(session);
- total_ms = WT_TSCDIFF_MS(session, time_stop, time_start);
+ total_ms = WT_TSCDIFF_MS(time_stop, time_start);
WT_STAT_CONN_SET(session, txn_checkpoint_scrub_time, total_ms);
}
@@ -758,7 +756,6 @@ __txn_checkpoint(WT_SESSION_IMPL *session, const char *cfg[])
txn_global = &conn->txn_global;
saved_isolation = session->isolation;
full = idle = logging = tracking = false;
- time_start = time_stop = 0;
/*
* Do a pass over the configuration arguments and figure out what kind
@@ -886,7 +883,7 @@ __txn_checkpoint(WT_SESSION_IMPL *session, const char *cfg[])
time_start = __wt_rdtsc(session);
WT_ERR(__checkpoint_apply(session, cfg, __wt_checkpoint_sync));
time_stop = __wt_rdtsc(session);
- fsync_duration_usecs = WT_TSCDIFF_US(session, time_stop, time_start);
+ fsync_duration_usecs = WT_TSCDIFF_US(time_stop, time_start);
WT_STAT_CONN_INCR(session, txn_checkpoint_fsync_post);
WT_STAT_CONN_SET(session,
txn_checkpoint_fsync_post_duration, fsync_duration_usecs);
diff --git a/src/third_party/wiredtiger/src/txn/txn_ext.c b/src/third_party/wiredtiger/src/txn/txn_ext.c
index 38d2a08a13c..e0401c83be5 100644
--- a/src/third_party/wiredtiger/src/txn/txn_ext.c
+++ b/src/third_party/wiredtiger/src/txn/txn_ext.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/txn/txn_log.c b/src/third_party/wiredtiger/src/txn/txn_log.c
index bd1b2239e2d..a52e97d6b44 100644
--- a/src/third_party/wiredtiger/src/txn/txn_log.c
+++ b/src/third_party/wiredtiger/src/txn/txn_log.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
@@ -85,11 +85,7 @@ __txn_op_log(WT_SESSION_IMPL *session,
__txn_op_log_row_key_check(session, cbt);
#endif
switch (upd->type) {
- case WT_UPDATE_DELETED:
- WT_RET(__wt_logop_row_remove_pack(
- session, logrec, op->fileid, &cursor->key));
- break;
- case WT_UPDATE_MODIFIED:
+ case WT_UPDATE_MODIFY:
WT_RET(__wt_logop_row_modify_pack(
session, logrec, op->fileid, &cursor->key, &value));
break;
@@ -97,6 +93,10 @@ __txn_op_log(WT_SESSION_IMPL *session,
WT_RET(__wt_logop_row_put_pack(
session, logrec, op->fileid, &cursor->key, &value));
break;
+ case WT_UPDATE_TOMBSTONE:
+ WT_RET(__wt_logop_row_remove_pack(
+ session, logrec, op->fileid, &cursor->key));
+ break;
WT_ILLEGAL_VALUE(session);
}
} else {
@@ -104,11 +104,7 @@ __txn_op_log(WT_SESSION_IMPL *session,
WT_ASSERT(session, recno != WT_RECNO_OOB);
switch (upd->type) {
- case WT_UPDATE_DELETED:
- WT_RET(__wt_logop_col_remove_pack(
- session, logrec, op->fileid, recno));
- break;
- case WT_UPDATE_MODIFIED:
+ case WT_UPDATE_MODIFY:
WT_RET(__wt_logop_col_modify_pack(
session, logrec, op->fileid, recno, &value));
break;
@@ -116,6 +112,10 @@ __txn_op_log(WT_SESSION_IMPL *session,
WT_RET(__wt_logop_col_put_pack(
session, logrec, op->fileid, recno, &value));
break;
+ case WT_UPDATE_TOMBSTONE:
+ WT_RET(__wt_logop_col_remove_pack(
+ session, logrec, op->fileid, recno));
+ break;
WT_ILLEGAL_VALUE(session);
}
}
diff --git a/src/third_party/wiredtiger/src/txn/txn_nsnap.c b/src/third_party/wiredtiger/src/txn/txn_nsnap.c
index 487631aa687..ed1d5407de4 100644
--- a/src/third_party/wiredtiger/src/txn/txn_nsnap.c
+++ b/src/third_party/wiredtiger/src/txn/txn_nsnap.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/txn/txn_recover.c b/src/third_party/wiredtiger/src/txn/txn_recover.c
index 97d45eb9d98..e058d08cc17 100644
--- a/src/third_party/wiredtiger/src/txn/txn_recover.c
+++ b/src/third_party/wiredtiger/src/txn/txn_recover.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
@@ -136,8 +136,7 @@ __txn_op_apply(
* than using cursor modify to create a partial update
* (for no particular reason than simplicity).
*/
- WT_ERR(__wt_modify_apply(
- session, &cursor->value, value.data));
+ WT_ERR(__wt_modify_apply(session, cursor, value.data));
WT_ERR(cursor->insert(cursor));
}
break;
@@ -204,8 +203,7 @@ __txn_op_apply(
* than using cursor modify to create a partial update
* (for no particular reason than simplicity).
*/
- WT_ERR(__wt_modify_apply(
- session, &cursor->value, value.data));
+ WT_ERR(__wt_modify_apply(session, cursor, value.data));
WT_ERR(cursor->insert(cursor));
}
break;
diff --git a/src/third_party/wiredtiger/src/txn/txn_rollback_to_stable.c b/src/third_party/wiredtiger/src/txn/txn_rollback_to_stable.c
index c68d00d7503..88b3bdb6693 100644
--- a/src/third_party/wiredtiger/src/txn/txn_rollback_to_stable.c
+++ b/src/third_party/wiredtiger/src/txn/txn_rollback_to_stable.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
@@ -49,7 +49,7 @@ __txn_rollback_to_stable_lookaside_fixup(WT_SESSION_IMPL *session)
F_SET(session, WT_SESSION_READ_WONT_NEED);
/* Walk the file. */
- for (; (ret = cursor->next(cursor)) == 0; ) {
+ while ((ret = cursor->next(cursor)) == 0) {
WT_ERR(cursor->get_key(cursor,
&las_pageid, &las_id, &las_counter, &las_key));
@@ -369,7 +369,7 @@ __txn_rollback_to_stable_btree(WT_SESSION_IMPL *session, const char *cfg[])
*/
WT_WITH_TIMESTAMP_READLOCK(session, &txn_global->rwlock,
__wt_timestamp_set(
- &rollback_timestamp, &txn_global->stable_timestamp));
+ &rollback_timestamp, &txn_global->stable_timestamp));
/*
* Ensure the eviction server is out of the file - we don't
diff --git a/src/third_party/wiredtiger/src/txn/txn_timestamp.c b/src/third_party/wiredtiger/src/txn/txn_timestamp.c
index 99d52f5a4b4..be771677a95 100644
--- a/src/third_party/wiredtiger/src/txn/txn_timestamp.c
+++ b/src/third_party/wiredtiger/src/txn/txn_timestamp.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
@@ -197,6 +197,7 @@ __txn_global_query_timestamp(
conn = S2C(session);
txn_global = &conn->txn_global;
+ WT_STAT_CONN_INCR(session, txn_query_ts);
WT_RET(__wt_config_gets(session, cfg, "get", &cval));
if (WT_STRING_MATCH("all_committed", cval.str, cval.len)) {
if (!txn_global->has_commit_timestamp)
@@ -304,7 +305,7 @@ __wt_txn_update_pinned_timestamp(WT_SESSION_IMPL *session, bool force)
WT_WITH_TIMESTAMP_READLOCK(session, &txn_global->rwlock,
__wt_timestamp_set(
- &oldest_timestamp, &txn_global->oldest_timestamp));
+ &oldest_timestamp, &txn_global->oldest_timestamp));
/* Scan to find the global pinned timestamp. */
if ((ret = __txn_global_query_timestamp(
@@ -319,7 +320,7 @@ __wt_txn_update_pinned_timestamp(WT_SESSION_IMPL *session, bool force)
if (txn_global->has_pinned_timestamp && !force) {
WT_WITH_TIMESTAMP_READLOCK(session, &txn_global->rwlock,
__wt_timestamp_set(
- &last_pinned_timestamp, &txn_global->pinned_timestamp));
+ &last_pinned_timestamp, &txn_global->pinned_timestamp));
if (__wt_timestamp_cmp(
&pinned_timestamp, &last_pinned_timestamp) <= 0)
@@ -354,17 +355,24 @@ __wt_txn_global_set_timestamp(WT_SESSION_IMPL *session, const char *cfg[])
WT_CONFIG_ITEM commit_cval, oldest_cval, stable_cval;
bool has_commit, has_oldest, has_stable;
+ WT_STAT_CONN_INCR(session, txn_set_ts);
WT_RET(__wt_config_gets_def(session,
cfg, "commit_timestamp", 0, &commit_cval));
has_commit = commit_cval.len != 0;
+ if (has_commit)
+ WT_STAT_CONN_INCR(session, txn_set_ts_commit);
WT_RET(__wt_config_gets_def(session,
cfg, "oldest_timestamp", 0, &oldest_cval));
has_oldest = oldest_cval.len != 0;
+ if (has_oldest)
+ WT_STAT_CONN_INCR(session, txn_set_ts_oldest);
WT_RET(__wt_config_gets_def(session,
cfg, "stable_timestamp", 0, &stable_cval));
has_stable = stable_cval.len != 0;
+ if (has_stable)
+ WT_STAT_CONN_INCR(session, txn_set_ts_stable);
/* If no timestamp was supplied, there's nothing to do. */
if (!has_commit && !has_oldest && !has_stable)
@@ -479,6 +487,7 @@ set: __wt_writelock(session, &txn_global->rwlock);
if (has_commit) {
__wt_timestamp_set(&txn_global->commit_timestamp, &commit_ts);
txn_global->has_commit_timestamp = true;
+ WT_STAT_CONN_INCR(session, txn_set_ts_commit_upd);
__wt_verbose_timestamp(session, &commit_ts,
"Updated global commit timestamp");
}
@@ -487,6 +496,7 @@ set: __wt_writelock(session, &txn_global->rwlock);
force || __wt_timestamp_cmp(
&oldest_ts, &txn_global->oldest_timestamp) > 0)) {
__wt_timestamp_set(&txn_global->oldest_timestamp, &oldest_ts);
+ WT_STAT_CONN_INCR(session, txn_set_ts_oldest_upd);
txn_global->has_oldest_timestamp = true;
txn_global->oldest_is_pinned = false;
__wt_verbose_timestamp(session, &oldest_ts,
@@ -497,6 +507,7 @@ set: __wt_writelock(session, &txn_global->rwlock);
force || __wt_timestamp_cmp(
&stable_ts, &txn_global->stable_timestamp) > 0)) {
__wt_timestamp_set(&txn_global->stable_timestamp, &stable_ts);
+ WT_STAT_CONN_INCR(session, txn_set_ts_stable_upd);
txn_global->has_stable_timestamp = true;
txn_global->stable_is_pinned = false;
__wt_verbose_timestamp(session, &stable_ts,
@@ -535,12 +546,12 @@ __wt_timestamp_validate(WT_SESSION_IMPL *session, const char *name,
* if the given timestamp is older than oldest and/or stable timestamp.
*/
WT_WITH_TIMESTAMP_READLOCK(session, &txn_global->rwlock,
- older_than_oldest_ts = (cmp_oldest &&
- txn_global->has_oldest_timestamp &&
- __wt_timestamp_cmp(ts, &txn_global->oldest_timestamp) < 0);
+ older_than_oldest_ts =
+ (cmp_oldest && txn_global->has_oldest_timestamp &&
+ __wt_timestamp_cmp(ts, &txn_global->oldest_timestamp) < 0);
older_than_stable_ts = (cmp_stable &&
- txn_global->has_stable_timestamp &&
- __wt_timestamp_cmp(ts, &txn_global->stable_timestamp) < 0));
+ txn_global->has_stable_timestamp &&
+ __wt_timestamp_cmp(ts, &txn_global->stable_timestamp) < 0));
if (older_than_oldest_ts)
WT_RET_MSG(session, EINVAL,
@@ -635,8 +646,10 @@ __wt_txn_set_commit_timestamp(WT_SESSION_IMPL *session)
__wt_timestamp_set(&txn->first_commit_timestamp, &ts);
__wt_writelock(session, &txn_global->commit_timestamp_rwlock);
- for (prev = TAILQ_LAST(&txn_global->commit_timestamph, __wt_txn_cts_qh);
- prev != NULL &&
+ prev = TAILQ_LAST(&txn_global->commit_timestamph, __wt_txn_cts_qh);
+ if (prev == NULL)
+ WT_STAT_CONN_INCR(session, txn_commit_queue_empty);
+ for (; prev != NULL &&
__wt_timestamp_cmp(&prev->first_commit_timestamp, &ts) > 0;
prev = TAILQ_PREV(prev, __wt_txn_cts_qh, commit_timestampq))
;
@@ -693,8 +706,10 @@ __wt_txn_set_read_timestamp(WT_SESSION_IMPL *session)
return;
__wt_writelock(session, &txn_global->read_timestamp_rwlock);
- for (prev = TAILQ_LAST(&txn_global->read_timestamph, __wt_txn_rts_qh);
- prev != NULL && __wt_timestamp_cmp(
+ prev = TAILQ_LAST(&txn_global->read_timestamph, __wt_txn_rts_qh);
+ if (prev == NULL)
+ WT_STAT_CONN_INCR(session, txn_read_queue_empty);
+ for (; prev != NULL && __wt_timestamp_cmp(
&prev->read_timestamp, &txn->read_timestamp) > 0;
prev = TAILQ_PREV(prev, __wt_txn_rts_qh, read_timestampq))
;
diff --git a/src/third_party/wiredtiger/src/utilities/util.h b/src/third_party/wiredtiger/src/utilities/util.h
index adf3f844295..1dda8c2fb61 100644
--- a/src/third_party/wiredtiger/src/utilities/util.h
+++ b/src/third_party/wiredtiger/src/utilities/util.h
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
@@ -48,7 +48,7 @@ int util_rebalance(WT_SESSION *, int, char *[]);
int util_rename(WT_SESSION *, int, char *[]);
int util_salvage(WT_SESSION *, int, char *[]);
int util_stat(WT_SESSION *, int, char *[]);
-int util_str2recno(WT_SESSION *, const char *p, uint64_t *recnop);
+int util_str2num(WT_SESSION *, const char *, bool, uint64_t *);
int util_truncate(WT_SESSION *, int, char *[]);
int util_upgrade(WT_SESSION *, int, char *[]);
char *util_uri(WT_SESSION *, const char *, const char *);
diff --git a/src/third_party/wiredtiger/src/utilities/util_alter.c b/src/third_party/wiredtiger/src/utilities/util_alter.c
index da6316b2364..b57c2d7b090 100644
--- a/src/third_party/wiredtiger/src/utilities/util_alter.c
+++ b/src/third_party/wiredtiger/src/utilities/util_alter.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/utilities/util_backup.c b/src/third_party/wiredtiger/src/utilities/util_backup.c
index bf4d7b67671..f0296de7ba8 100644
--- a/src/third_party/wiredtiger/src/utilities/util_backup.c
+++ b/src/third_party/wiredtiger/src/utilities/util_backup.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
@@ -11,53 +11,31 @@
static int copy(WT_SESSION *, const char *, const char *);
static int usage(void);
-/*
- * append_target --
- * Build a list of comma-separated targets.
- */
-static int
-append_target(WT_SESSION *session, const char *target, char **bufp)
-{
- static size_t len = 0, remain = 0;
- static char *buf = NULL;
- static bool first = true;
-
- /* 20 bytes of slop */
- if (buf == NULL || remain < strlen(target) + 20) {
- len += strlen(target) + 512;
- remain += strlen(target) + 512;
- if ((buf = realloc(buf, len)) == NULL)
- return (util_err(session, errno, NULL));
- *bufp = buf;
- }
- if (first) {
- first = false;
- strcpy(buf, "target=(");
- } else
- buf[strlen(buf) - 1] = ','; /* overwrite previous ")" */
- strcat(buf, "\"");
- strcat(buf, target);
- strcat(buf, "\")");
- remain -= strlen(target) + 1;
-
- return (0);
-}
-
int
util_backup(WT_SESSION *session, int argc, char *argv[])
{
WT_CURSOR *cursor;
+ WT_DECL_ITEM(tmp);
WT_DECL_RET;
+ WT_SESSION_IMPL *session_impl;
int ch;
- char *config;
const char *directory, *name;
+ bool target;
- config = NULL;
+ session_impl = (WT_SESSION_IMPL *)session;
+
+ target = false;
while ((ch = __wt_getopt(progname, argc, argv, "t:")) != EOF)
switch (ch) {
case 't':
- if (append_target(session, __wt_optarg, &config))
- return (1);
+ if (!target) {
+ WT_ERR(__wt_scr_alloc(session_impl, 0, &tmp));
+ WT_ERR(__wt_buf_fmt(
+ session_impl, tmp, "%s", "target=("));
+ }
+ WT_ERR(__wt_buf_catfmt(session_impl, tmp,
+ "%s\"%s\"", target ? "," : "", __wt_optarg));
+ target = true;
break;
case '?':
default:
@@ -72,8 +50,12 @@ util_backup(WT_SESSION *session, int argc, char *argv[])
}
directory = *argv;
- if ((ret = session->open_cursor(
- session, "backup:", NULL, config, &cursor)) != 0) {
+ /* Terminate any target. */
+ if (target)
+ WT_ERR(__wt_buf_catfmt(session_impl, tmp, "%s", ")"));
+
+ if ((ret = session->open_cursor(session, "backup:",
+ NULL, target ? (char *)tmp->data : NULL, &cursor)) != 0) {
fprintf(stderr, "%s: cursor open(backup:) failed: %s\n",
progname, session->strerror(session, ret));
goto err;
@@ -94,7 +76,7 @@ util_backup(WT_SESSION *session, int argc, char *argv[])
goto err;
}
-err: free(config);
+err: __wt_scr_free(session_impl, &tmp);
return (ret);
}
diff --git a/src/third_party/wiredtiger/src/utilities/util_compact.c b/src/third_party/wiredtiger/src/utilities/util_compact.c
index c8963a8fda6..3236100c030 100644
--- a/src/third_party/wiredtiger/src/utilities/util_compact.c
+++ b/src/third_party/wiredtiger/src/utilities/util_compact.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/utilities/util_cpyright.c b/src/third_party/wiredtiger/src/utilities/util_cpyright.c
index 0cfba056387..98e5c919a48 100644
--- a/src/third_party/wiredtiger/src/utilities/util_cpyright.c
+++ b/src/third_party/wiredtiger/src/utilities/util_cpyright.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
@@ -11,7 +11,7 @@
void
util_copyright(void)
{
- printf("%s\n", "Copyright (c) 2008-2017 MongoDB, Inc.");
+ printf("%s\n", "Copyright (c) 2008-2018 MongoDB, Inc.");
printf("%s\n\n", "All rights reserved.");
printf("%s\n\n",
diff --git a/src/third_party/wiredtiger/src/utilities/util_create.c b/src/third_party/wiredtiger/src/utilities/util_create.c
index 2c7a87fd406..a8ada11ccb1 100644
--- a/src/third_party/wiredtiger/src/utilities/util_create.c
+++ b/src/third_party/wiredtiger/src/utilities/util_create.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/utilities/util_downgrade.c b/src/third_party/wiredtiger/src/utilities/util_downgrade.c
index 4263727242c..c999fb068da 100644
--- a/src/third_party/wiredtiger/src/utilities/util_downgrade.c
+++ b/src/third_party/wiredtiger/src/utilities/util_downgrade.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
@@ -28,7 +28,6 @@ util_downgrade(WT_SESSION *session, WT_CONNECTION *conn, int argc, char *argv[])
return (usage());
}
argc -= __wt_optind;
- argv += __wt_optind;
/*
* The release argument is required.
diff --git a/src/third_party/wiredtiger/src/utilities/util_drop.c b/src/third_party/wiredtiger/src/utilities/util_drop.c
index 460c9a6de57..7c4e06da341 100644
--- a/src/third_party/wiredtiger/src/utilities/util_drop.c
+++ b/src/third_party/wiredtiger/src/utilities/util_drop.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/utilities/util_dump.c b/src/third_party/wiredtiger/src/utilities/util_dump.c
index f768d323afb..73e0e097c31 100644
--- a/src/third_party/wiredtiger/src/utilities/util_dump.c
+++ b/src/third_party/wiredtiger/src/utilities/util_dump.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
@@ -33,14 +33,17 @@ int
util_dump(WT_SESSION *session, int argc, char *argv[])
{
WT_CURSOR *cursor;
+ WT_DECL_ITEM(tmp);
WT_DECL_RET;
- size_t len;
+ WT_SESSION_IMPL *session_impl;
int ch, i;
- char *checkpoint, *config, *p, *simpleuri, *uri;
+ char *checkpoint, *p, *simpleuri, *uri;
bool hex, json, reverse;
+ session_impl = (WT_SESSION_IMPL *)session;
+
hex = json = reverse = false;
- checkpoint = config = simpleuri = uri = NULL;
+ checkpoint = simpleuri = uri = NULL;
cursor = NULL;
while ((ch = __wt_getopt(progname, argc, argv, "c:f:jrx")) != EOF)
switch (ch) {
@@ -85,6 +88,7 @@ util_dump(WT_SESSION *session, int argc, char *argv[])
dump_prefix(session, hex, json) != 0))
goto err;
+ WT_RET(__wt_scr_alloc(session_impl, 0, &tmp));
for (i = 0; i < argc; i++) {
if (json && i > 0)
if (dump_json_separator(session) != 0)
@@ -96,24 +100,14 @@ util_dump(WT_SESSION *session, int argc, char *argv[])
if ((uri = util_uri(session, argv[i], "table")) == NULL)
goto err;
- len =
- checkpoint == NULL ? 0 : strlen("checkpoint=") +
- strlen(checkpoint) + 1;
- len += strlen(json ? "dump=json" :
- (hex ? "dump=hex" : "dump=print"));
- if ((config = malloc(len + 10)) == NULL)
- goto err;
- if (checkpoint == NULL)
- config[0] = '\0';
- else {
- (void)strcpy(config, "checkpoint=");
- (void)strcat(config, checkpoint);
- (void)strcat(config, ",");
- }
- (void)strcat(config, json ? "dump=json" :
- (hex ? "dump=hex" : "dump=print"));
+ WT_ERR(__wt_buf_set(session_impl, tmp, "", 0));
+ if (checkpoint != NULL)
+ WT_ERR(__wt_buf_catfmt(
+ session_impl, tmp, "checkpoint=%s,", checkpoint));
+ WT_ERR(__wt_buf_catfmt(session_impl, tmp,
+ "dump=%s", json ? "json" : (hex ? "hex" : "print")));
if ((ret = session->open_cursor(
- session, uri, NULL, config, &cursor)) != 0) {
+ session, uri, NULL, (char *)tmp->data, &cursor)) != 0) {
fprintf(stderr, "%s: cursor open(%s) failed: %s\n",
progname, uri, session->strerror(session, ret));
goto err;
@@ -147,7 +141,7 @@ util_dump(WT_SESSION *session, int argc, char *argv[])
err: ret = 1;
}
- free(config);
+ __wt_scr_free(session_impl, &tmp);
free(uri);
free(simpleuri);
if (cursor != NULL && (ret = cursor->close(cursor)) != 0) {
diff --git a/src/third_party/wiredtiger/src/utilities/util_dump.h b/src/third_party/wiredtiger/src/utilities/util_dump.h
index 7f037cc659a..fa66c5e1789 100644
--- a/src/third_party/wiredtiger/src/utilities/util_dump.h
+++ b/src/third_party/wiredtiger/src/utilities/util_dump.h
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/utilities/util_list.c b/src/third_party/wiredtiger/src/utilities/util_list.c
index e64768bf1e5..7ff17394f79 100644
--- a/src/third_party/wiredtiger/src/utilities/util_list.c
+++ b/src/third_party/wiredtiger/src/utilities/util_list.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/utilities/util_load.c b/src/third_party/wiredtiger/src/utilities/util_load.c
index 813ed7481e3..3ed21fc591c 100644
--- a/src/third_party/wiredtiger/src/utilities/util_load.c
+++ b/src/third_party/wiredtiger/src/utilities/util_load.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/utilities/util_load.h b/src/third_party/wiredtiger/src/utilities/util_load.h
index 390b9523214..c7ba98591e9 100644
--- a/src/third_party/wiredtiger/src/utilities/util_load.h
+++ b/src/third_party/wiredtiger/src/utilities/util_load.h
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/utilities/util_load_json.c b/src/third_party/wiredtiger/src/utilities/util_load_json.c
index 92c30bdd78b..91358fd29f0 100644
--- a/src/third_party/wiredtiger/src/utilities/util_load_json.c
+++ b/src/third_party/wiredtiger/src/utilities/util_load_json.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
@@ -354,8 +354,9 @@ json_top_level(WT_SESSION *session, JSON_INPUT_STATE *ins, uint32_t flags)
WT_DECL_RET;
static const char *json_markers[] = {
"\"config\"", "\"colgroups\"", "\"indices\"", "\"data\"", NULL };
+ uint64_t curversion;
+ int toktype;
char *config, *tableuri;
- int curversion, toktype;
bool hasversion;
memset(&cl, 0, sizeof(cl));
@@ -380,8 +381,10 @@ json_top_level(WT_SESSION *session, JSON_INPUT_STATE *ins, uint32_t flags)
}
hasversion = true;
JSON_EXPECT(session, ins, 's');
- if ((curversion = atoi(ins->tokstart + 1)) <= 0 ||
- curversion > DUMP_JSON_SUPPORTED_VERSION) {
+ if ((ret = util_str2num(session,
+ ins->tokstart + 1, false, &curversion)) != 0)
+ goto err;
+ if (curversion > DUMP_JSON_SUPPORTED_VERSION) {
ret = util_err(session, ENOTSUP,
"unsupported JSON dump version \"%.*s\"",
(int)(ins->toklen - 1), ins->tokstart + 1);
diff --git a/src/third_party/wiredtiger/src/utilities/util_loadtext.c b/src/third_party/wiredtiger/src/utilities/util_loadtext.c
index 1053ab89694..1519a0e4fa5 100644
--- a/src/third_party/wiredtiger/src/utilities/util_loadtext.c
+++ b/src/third_party/wiredtiger/src/utilities/util_loadtext.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/utilities/util_main.c b/src/third_party/wiredtiger/src/utilities/util_main.c
index d712a2bec05..fb9fb433892 100644
--- a/src/third_party/wiredtiger/src/utilities/util_main.c
+++ b/src/third_party/wiredtiger/src/utilities/util_main.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/utilities/util_misc.c b/src/third_party/wiredtiger/src/utilities/util_misc.c
index d0fe35ff370..63d02a32472 100644
--- a/src/third_party/wiredtiger/src/utilities/util_misc.c
+++ b/src/third_party/wiredtiger/src/utilities/util_misc.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
@@ -94,13 +94,13 @@ util_read_line(WT_SESSION *session, ULINE *l, bool eof_expected, bool *eofp)
}
/*
- * util_str2recno --
- * Convert a string to a record number.
+ * util_str2num --
+ * Convert a string to a number.
*/
int
-util_str2recno(WT_SESSION *session, const char *p, uint64_t *recnop)
+util_str2num(WT_SESSION *session, const char *p, bool endnul, uint64_t *vp)
{
- uint64_t recno;
+ uint64_t v;
char *endptr;
/*
@@ -112,16 +112,20 @@ util_str2recno(WT_SESSION *session, const char *p, uint64_t *recnop)
goto format;
errno = 0;
- recno = __wt_strtouq(p, &endptr, 0);
- if (recno == ULLONG_MAX && errno == ERANGE)
- return (
- util_err(session, ERANGE, "%s: invalid record number", p));
+ v = __wt_strtouq(p, &endptr, 0);
+ if (v == ULLONG_MAX && errno == ERANGE)
+ return (util_err(session, ERANGE, "%s: invalid number", p));
- if (endptr[0] != '\0')
-format: return (
- util_err(session, EINVAL, "%s: invalid record number", p));
+ /*
+ * In most cases we expect the number to be a string and end with a
+ * nul byte (and we want to confirm that because it's a user-entered
+ * command-line argument), but we allow the caller to configure that
+ * test off.
+ */
+ if (endnul && endptr[0] != '\0')
+format: return (util_err(session, EINVAL, "%s: invalid number", p));
- *recnop = recno;
+ *vp = v;
return (0);
}
diff --git a/src/third_party/wiredtiger/src/utilities/util_printlog.c b/src/third_party/wiredtiger/src/utilities/util_printlog.c
index 2e5ae3aa926..a0181ff97f2 100644
--- a/src/third_party/wiredtiger/src/utilities/util_printlog.c
+++ b/src/third_party/wiredtiger/src/utilities/util_printlog.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
@@ -35,7 +35,6 @@ util_printlog(WT_SESSION *session, int argc, char *argv[])
return (usage());
}
argc -= __wt_optind;
- argv += __wt_optind;
/* There should not be any more arguments. */
if (argc != 0)
diff --git a/src/third_party/wiredtiger/src/utilities/util_read.c b/src/third_party/wiredtiger/src/utilities/util_read.c
index 9a5954f95e4..ab2b2a79968 100644
--- a/src/third_party/wiredtiger/src/utilities/util_read.c
+++ b/src/third_party/wiredtiger/src/utilities/util_read.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
@@ -74,7 +74,7 @@ util_read(WT_SESSION *session, int argc, char *argv[])
*/
for (rval = false; *++argv != NULL;) {
if (rkey) {
- if (util_str2recno(session, *argv, &recno))
+ if (util_str2num(session, *argv, true, &recno))
return (1);
cursor->set_key(cursor, recno);
} else
diff --git a/src/third_party/wiredtiger/src/utilities/util_rebalance.c b/src/third_party/wiredtiger/src/utilities/util_rebalance.c
index f58f086e777..151474923c7 100644
--- a/src/third_party/wiredtiger/src/utilities/util_rebalance.c
+++ b/src/third_party/wiredtiger/src/utilities/util_rebalance.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/utilities/util_rename.c b/src/third_party/wiredtiger/src/utilities/util_rename.c
index 51e936100ff..2321fbb32b5 100644
--- a/src/third_party/wiredtiger/src/utilities/util_rename.c
+++ b/src/third_party/wiredtiger/src/utilities/util_rename.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/utilities/util_salvage.c b/src/third_party/wiredtiger/src/utilities/util_salvage.c
index dc311b5ee9a..ee7b64d8f98 100644
--- a/src/third_party/wiredtiger/src/utilities/util_salvage.c
+++ b/src/third_party/wiredtiger/src/utilities/util_salvage.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/utilities/util_stat.c b/src/third_party/wiredtiger/src/utilities/util_stat.c
index f9c66a15885..eb3f64c6240 100644
--- a/src/third_party/wiredtiger/src/utilities/util_stat.c
+++ b/src/third_party/wiredtiger/src/utilities/util_stat.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/utilities/util_truncate.c b/src/third_party/wiredtiger/src/utilities/util_truncate.c
index 101fa23c0cb..02b25086657 100644
--- a/src/third_party/wiredtiger/src/utilities/util_truncate.c
+++ b/src/third_party/wiredtiger/src/utilities/util_truncate.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/utilities/util_upgrade.c b/src/third_party/wiredtiger/src/utilities/util_upgrade.c
index 1ad95bf3cf2..6672af8fd39 100644
--- a/src/third_party/wiredtiger/src/utilities/util_upgrade.c
+++ b/src/third_party/wiredtiger/src/utilities/util_upgrade.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/utilities/util_verbose.c b/src/third_party/wiredtiger/src/utilities/util_verbose.c
index 979cd7451c1..2f675a66bc2 100644
--- a/src/third_party/wiredtiger/src/utilities/util_verbose.c
+++ b/src/third_party/wiredtiger/src/utilities/util_verbose.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/utilities/util_verify.c b/src/third_party/wiredtiger/src/utilities/util_verify.c
index ac8bfe8a5bc..0c28120995c 100644
--- a/src/third_party/wiredtiger/src/utilities/util_verify.c
+++ b/src/third_party/wiredtiger/src/utilities/util_verify.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
diff --git a/src/third_party/wiredtiger/src/utilities/util_write.c b/src/third_party/wiredtiger/src/utilities/util_write.c
index fa03201cd1f..da958f86c2d 100644
--- a/src/third_party/wiredtiger/src/utilities/util_write.c
+++ b/src/third_party/wiredtiger/src/utilities/util_write.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014-2017 MongoDB, Inc.
+ * Copyright (c) 2014-2018 MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
* All rights reserved.
*
@@ -92,7 +92,7 @@ util_write(WT_SESSION *session, int argc, char *argv[])
while (*++argv != NULL) {
if (!append) {
if (rkey) {
- if (util_str2recno(session, *argv, &recno))
+ if (util_str2num(session, *argv, true, &recno))
return (1);
cursor->set_key(cursor, recno);
} else
diff --git a/src/third_party/wiredtiger/test/bloom/test_bloom.c b/src/third_party/wiredtiger/test/bloom/test_bloom.c
index e545565057b..10607a3719c 100644
--- a/src/third_party/wiredtiger/test/bloom/test_bloom.c
+++ b/src/third_party/wiredtiger/test/bloom/test_bloom.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/checkpoint/checkpointer.c b/src/third_party/wiredtiger/test/checkpoint/checkpointer.c
index ae499c2e96b..170cde22fa1 100644
--- a/src/third_party/wiredtiger/test/checkpoint/checkpointer.c
+++ b/src/third_party/wiredtiger/test/checkpoint/checkpointer.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/checkpoint/test_checkpoint.c b/src/third_party/wiredtiger/test/checkpoint/test_checkpoint.c
index a646482b392..d5673f51cb2 100644
--- a/src/third_party/wiredtiger/test/checkpoint/test_checkpoint.c
+++ b/src/third_party/wiredtiger/test/checkpoint/test_checkpoint.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/checkpoint/test_checkpoint.h b/src/third_party/wiredtiger/test/checkpoint/test_checkpoint.h
index 36551211b7e..93cebf762fd 100644
--- a/src/third_party/wiredtiger/test/checkpoint/test_checkpoint.h
+++ b/src/third_party/wiredtiger/test/checkpoint/test_checkpoint.h
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/checkpoint/workers.c b/src/third_party/wiredtiger/test/checkpoint/workers.c
index cd32db6746f..c72b4b897b1 100644
--- a/src/third_party/wiredtiger/test/checkpoint/workers.c
+++ b/src/third_party/wiredtiger/test/checkpoint/workers.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/csuite/random_abort/main.c b/src/third_party/wiredtiger/test/csuite/random_abort/main.c
index ad49f01dde5..e98c0474582 100644
--- a/src/third_party/wiredtiger/test/csuite/random_abort/main.c
+++ b/src/third_party/wiredtiger/test/csuite/random_abort/main.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/csuite/rwlock/main.c b/src/third_party/wiredtiger/test/csuite/rwlock/main.c
index f1bad3f538f..2b4e9144fe4 100644
--- a/src/third_party/wiredtiger/test/csuite/rwlock/main.c
+++ b/src/third_party/wiredtiger/test/csuite/rwlock/main.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/csuite/scope/main.c b/src/third_party/wiredtiger/test/csuite/scope/main.c
index e9035775ba5..eed9207951a 100644
--- a/src/third_party/wiredtiger/test/csuite/scope/main.c
+++ b/src/third_party/wiredtiger/test/csuite/scope/main.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/csuite/timestamp_abort/main.c b/src/third_party/wiredtiger/test/csuite/timestamp_abort/main.c
index 530f7393374..acd5743ebe4 100644
--- a/src/third_party/wiredtiger/test/csuite/timestamp_abort/main.c
+++ b/src/third_party/wiredtiger/test/csuite/timestamp_abort/main.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/csuite/truncated_log/main.c b/src/third_party/wiredtiger/test/csuite/truncated_log/main.c
index b5da289efb3..be28a8d9500 100644
--- a/src/third_party/wiredtiger/test/csuite/truncated_log/main.c
+++ b/src/third_party/wiredtiger/test/csuite/truncated_log/main.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/csuite/wt1965_col_efficiency/main.c b/src/third_party/wiredtiger/test/csuite/wt1965_col_efficiency/main.c
index 265fef8e76f..39fc9dc03a2 100644
--- a/src/third_party/wiredtiger/test/csuite/wt1965_col_efficiency/main.c
+++ b/src/third_party/wiredtiger/test/csuite/wt1965_col_efficiency/main.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/csuite/wt2246_col_append/main.c b/src/third_party/wiredtiger/test/csuite/wt2246_col_append/main.c
index bf2d4b8ffc4..fca3d8fcd00 100644
--- a/src/third_party/wiredtiger/test/csuite/wt2246_col_append/main.c
+++ b/src/third_party/wiredtiger/test/csuite/wt2246_col_append/main.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/csuite/wt2323_join_visibility/main.c b/src/third_party/wiredtiger/test/csuite/wt2323_join_visibility/main.c
index b779281a0c0..0de304e61bd 100644
--- a/src/third_party/wiredtiger/test/csuite/wt2323_join_visibility/main.c
+++ b/src/third_party/wiredtiger/test/csuite/wt2323_join_visibility/main.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/csuite/wt2403_lsm_workload/main.c b/src/third_party/wiredtiger/test/csuite/wt2403_lsm_workload/main.c
index 214276bda21..c039cd80d31 100644
--- a/src/third_party/wiredtiger/test/csuite/wt2403_lsm_workload/main.c
+++ b/src/third_party/wiredtiger/test/csuite/wt2403_lsm_workload/main.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/csuite/wt2447_join_main_table/main.c b/src/third_party/wiredtiger/test/csuite/wt2447_join_main_table/main.c
index 8ad721c8d51..85a581d73c9 100644
--- a/src/third_party/wiredtiger/test/csuite/wt2447_join_main_table/main.c
+++ b/src/third_party/wiredtiger/test/csuite/wt2447_join_main_table/main.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/csuite/wt2535_insert_race/main.c b/src/third_party/wiredtiger/test/csuite/wt2535_insert_race/main.c
index f5848203f37..a0239e40a8a 100644
--- a/src/third_party/wiredtiger/test/csuite/wt2535_insert_race/main.c
+++ b/src/third_party/wiredtiger/test/csuite/wt2535_insert_race/main.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/csuite/wt2592_join_schema/main.c b/src/third_party/wiredtiger/test/csuite/wt2592_join_schema/main.c
index acdb6d80b27..1bc202954ab 100644
--- a/src/third_party/wiredtiger/test/csuite/wt2592_join_schema/main.c
+++ b/src/third_party/wiredtiger/test/csuite/wt2592_join_schema/main.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/csuite/wt2695_checksum/main.c b/src/third_party/wiredtiger/test/csuite/wt2695_checksum/main.c
index 3bd9bfca3c0..8a130f8d958 100644
--- a/src/third_party/wiredtiger/test/csuite/wt2695_checksum/main.c
+++ b/src/third_party/wiredtiger/test/csuite/wt2695_checksum/main.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/csuite/wt2719_reconfig/main.c b/src/third_party/wiredtiger/test/csuite/wt2719_reconfig/main.c
index d7d408f6ea4..739f8c77fc4 100644
--- a/src/third_party/wiredtiger/test/csuite/wt2719_reconfig/main.c
+++ b/src/third_party/wiredtiger/test/csuite/wt2719_reconfig/main.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/csuite/wt2834_join_bloom_fix/main.c b/src/third_party/wiredtiger/test/csuite/wt2834_join_bloom_fix/main.c
index acce1007f79..de05c459e10 100644
--- a/src/third_party/wiredtiger/test/csuite/wt2834_join_bloom_fix/main.c
+++ b/src/third_party/wiredtiger/test/csuite/wt2834_join_bloom_fix/main.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
@@ -67,11 +67,15 @@ main(int argc, char *argv[])
memset(opts, 0, sizeof(*opts));
testutil_check(testutil_parse_opts(argc, argv, opts));
testutil_make_work_dir(opts->home);
+ testutil_progress(opts, "start");
testutil_check(wiredtiger_open(opts->home, NULL,
"create,cache_size=250M", &opts->conn));
+ testutil_progress(opts, "wiredtiger_open");
testutil_check(
opts->conn->open_session(opts->conn, NULL, NULL, &session));
+ testutil_progress(opts, "sessions opened");
+
/*
* Note: repeated primary key 'id' as 'id2'. This makes
* it easier to dump an index and know which record we're
@@ -97,6 +101,7 @@ main(int argc, char *argv[])
testutil_check(session->create(session, balanceuri,
"columns=(balance)"));
testutil_check(session->create(session, flaguri, "columns=(flag)"));
+ testutil_progress(opts, "setup complete");
/*
* Insert a single record with all items we are search for,
@@ -110,7 +115,9 @@ main(int argc, char *argv[])
testutil_check(maincur->close(maincur));
testutil_check(session->close(session, NULL));
+ testutil_progress(opts, "populate start");
populate(opts);
+ testutil_progress(opts, "populate end");
testutil_check(opts->conn->open_session(
opts->conn, NULL, NULL, &session));
@@ -159,10 +166,11 @@ main(int argc, char *argv[])
testutil_assert(ret == WT_NOTFOUND);
testutil_assert(count == 0);
+ testutil_progress(opts, "cleanup starting");
+#if 0
testutil_cleanup(opts);
- /* NOTREACHED */
-
- return (0);
+#endif
+ return (EXIT_SUCCESS);
}
void
diff --git a/src/third_party/wiredtiger/test/csuite/wt2853_perf/main.c b/src/third_party/wiredtiger/test/csuite/wt2853_perf/main.c
index 3bee610bfa6..93fb94836c0 100644
--- a/src/third_party/wiredtiger/test/csuite/wt2853_perf/main.c
+++ b/src/third_party/wiredtiger/test/csuite/wt2853_perf/main.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
@@ -97,12 +97,15 @@ main(int argc, char *argv[])
sharedopts->bloom = BLOOM;
testutil_check(testutil_parse_opts(argc, argv, opts));
testutil_make_work_dir(opts->home);
+ testutil_progress(opts, "start");
testutil_check(wiredtiger_open(opts->home, NULL,
"create,cache_size=1G", &opts->conn));
+ testutil_progress(opts, "wiredtiger_open");
testutil_check(
opts->conn->open_session(opts->conn, NULL, NULL, &session));
+ testutil_progress(opts, "sessions opened");
/*
* Note: id is repeated as id2. This makes it easier to
@@ -143,6 +146,7 @@ main(int argc, char *argv[])
testutil_check(maincur->insert(maincur));
testutil_check(maincur->close(maincur));
testutil_check(session->close(session, NULL));
+ testutil_progress(opts, "setup complete");
for (i = 0; i < N_INSERT_THREAD; ++i) {
insert_args[i].threadnum = i;
@@ -161,6 +165,7 @@ main(int argc, char *argv[])
testutil_check(pthread_create(
&get_tid[i], NULL, thread_get, &get_args[i]));
}
+ testutil_progress(opts, "threads started");
/*
* Wait for insert threads to finish. When they
@@ -175,6 +180,7 @@ main(int argc, char *argv[])
for (i = 0; i < N_GET_THREAD; ++i)
testutil_check(pthread_join(get_tid[i], NULL));
+ testutil_progress(opts, "threads joined");
fprintf(stderr, "\n");
for (i = 0; i < N_GET_THREAD; ++i) {
fprintf(stderr, " thread %d did %d joins (%d fails)\n", i,
@@ -183,7 +189,10 @@ main(int argc, char *argv[])
}
testutil_assert(nfail == 0);
+ testutil_progress(opts, "cleanup starting");
+#if 0
testutil_cleanup(opts);
+#endif
return (0);
}
@@ -212,6 +221,7 @@ thread_insert(void *arg)
testutil_check(session->open_cursor(session, opts->uri, NULL, NULL,
&maincur));
+ testutil_progress(opts, "insert start");
for (i = 0; i < N_INSERT; i++) {
/*
* Insert threads may stomp on each other's records;
@@ -242,6 +252,7 @@ thread_insert(void *arg)
fprintf(stderr, ".");
(void)time(&curtime);
if ((elapsed = difftime(curtime, prevtime)) > 5.0) {
+ testutil_progress(opts, "insert time gap");
fprintf(stderr, "\n"
"GAP: %.0f secs after %d inserts\n",
elapsed, i);
@@ -250,6 +261,7 @@ thread_insert(void *arg)
prevtime = curtime;
}
}
+ testutil_progress(opts, "insert end");
testutil_check(maincur->close(maincur));
testutil_check(session->close(session, NULL));
return (NULL);
@@ -281,6 +293,7 @@ thread_get(void *arg)
testutil_check(session->open_cursor(
session, sharedopts->posturi, NULL, NULL, &postcur));
+ testutil_progress(opts, "get start");
for (threadargs->njoins = 0; threadargs->done == 0;
threadargs->njoins++) {
testutil_check(session->begin_transaction(session, NULL));
@@ -290,20 +303,14 @@ thread_get(void *arg)
testutil_check(postcur->get_key(postcur, &post));
testutil_check(postcur->get_value(postcur, &post2,
&bal, &extra, &flag, &key));
- testutil_assert(post == post2);
- if (post != 54321)
- break;
+ testutil_assert((flag > 0 && bal < 0) ||
+ (flag == 0 && bal >= 0));
maincur->set_key(maincur, key);
testutil_check(maincur->search(maincur));
testutil_check(maincur->get_value(maincur, &post2,
&bal2, &extra, &flag2, &key2));
testutil_check(maincur->reset(maincur));
- testutil_assert(key == key2);
- testutil_assert(post == post2);
- testutil_assert(bal == bal2);
- testutil_assert(flag == flag2);
-
testutil_assert((flag2 > 0 && bal2 < 0) ||
(flag2 == 0 && bal2 >= 0));
}
@@ -318,6 +325,7 @@ thread_get(void *arg)
(void)time(&curtime);
if ((elapsed = difftime(curtime, prevtime)) > 5.0) {
+ testutil_progress(opts, "get time gap");
fprintf(stderr, "\n"
"GAP: %.0f secs after %d gets\n",
elapsed, threadargs->njoins);
@@ -325,6 +333,7 @@ thread_get(void *arg)
}
prevtime = curtime;
}
+ testutil_progress(opts, "get end");
testutil_check(postcur->close(postcur));
testutil_check(maincur->close(maincur));
testutil_check(session->close(session, NULL));
diff --git a/src/third_party/wiredtiger/test/csuite/wt2909_checkpoint_integrity/main.c b/src/third_party/wiredtiger/test/csuite/wt2909_checkpoint_integrity/main.c
index 22b77d8f4f4..fd713e50ba0 100644
--- a/src/third_party/wiredtiger/test/csuite/wt2909_checkpoint_integrity/main.c
+++ b/src/third_party/wiredtiger/test/csuite/wt2909_checkpoint_integrity/main.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/csuite/wt2999_join_extractor/main.c b/src/third_party/wiredtiger/test/csuite/wt2999_join_extractor/main.c
index 194ff143610..502c0d05a31 100644
--- a/src/third_party/wiredtiger/test/csuite/wt2999_join_extractor/main.c
+++ b/src/third_party/wiredtiger/test/csuite/wt2999_join_extractor/main.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/csuite/wt3120_filesys/main.c b/src/third_party/wiredtiger/test/csuite/wt3120_filesys/main.c
index 2fae85017d4..82d8cae5d04 100644
--- a/src/third_party/wiredtiger/test/csuite/wt3120_filesys/main.c
+++ b/src/third_party/wiredtiger/test/csuite/wt3120_filesys/main.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/csuite/wt3135_search_near_collator/main.c b/src/third_party/wiredtiger/test/csuite/wt3135_search_near_collator/main.c
index 103a502f808..d880093a074 100644
--- a/src/third_party/wiredtiger/test/csuite/wt3135_search_near_collator/main.c
+++ b/src/third_party/wiredtiger/test/csuite/wt3135_search_near_collator/main.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/csuite/wt3184_dup_index_collator/main.c b/src/third_party/wiredtiger/test/csuite/wt3184_dup_index_collator/main.c
index c6dd726e58a..94592bc8e59 100644
--- a/src/third_party/wiredtiger/test/csuite/wt3184_dup_index_collator/main.c
+++ b/src/third_party/wiredtiger/test/csuite/wt3184_dup_index_collator/main.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/csuite/wt3338_partial_update/main.c b/src/third_party/wiredtiger/test/csuite/wt3338_partial_update/main.c
index e4b265985f7..fb246f87da1 100644
--- a/src/third_party/wiredtiger/test/csuite/wt3338_partial_update/main.c
+++ b/src/third_party/wiredtiger/test/csuite/wt3338_partial_update/main.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
@@ -253,21 +253,21 @@ static int nruns = 1000;
* Run some tests.
*/
static void
-modify_run(WT_ITEM *local, WT_ITEM *library, bool verbose)
+modify_run(WT_CURSOR *cursor, WT_ITEM *local, bool verbose)
{
int i, j;
for (i = 0; i < nruns; ++i) {
- modify_init(local, library);
+ modify_init(local, &cursor->value);
for (j = 0; j < 1000; ++j) {
modify_build();
slow_apply_api(local);
testutil_check(__wt_modify_apply_api(
- NULL, library, entries, nentries));
+ NULL, cursor, entries, nentries));
- diff(local, library);
+ diff(local, &cursor->value);
}
if (verbose) {
printf("%d (%d%%)\r", i, (i * 100) / nruns);
@@ -282,7 +282,8 @@ int
main(int argc, char *argv[])
{
TEST_OPTS *opts, _opts;
- WT_ITEM *library, _library, *local, _local;
+ WT_CURSOR *cursor, _cursor;
+ WT_ITEM *local, _local;
if (testutil_is_flag_set("TESTUTIL_ENABLE_LONG_TESTS"))
nruns = 10000;
@@ -300,17 +301,18 @@ main(int argc, char *argv[])
/* Set up replacement information. */
modify_repl_init();
- /* Allocate a pair of buffers. */
+ /* We need two items, one of them hooked into fake cursor. */
local = &_local;
memset(&_local, 0, sizeof(_local));
- library = &_library;
- memset(&_library, 0, sizeof(_library));
+ cursor = &_cursor;
+ memset(&_cursor, 0, sizeof(_cursor));
+ cursor->value_format = "u";
/* Run the test. */
- modify_run(local, library, opts->verbose);
+ modify_run(cursor, local, opts->verbose);
__wt_buf_free(NULL, local);
- __wt_buf_free(NULL, library);
+ __wt_buf_free(NULL, &cursor->value);
testutil_cleanup(opts);
return (EXIT_SUCCESS);
diff --git a/src/third_party/wiredtiger/test/csuite/wt3363_checkpoint_op_races/main.c b/src/third_party/wiredtiger/test/csuite/wt3363_checkpoint_op_races/main.c
index 9cb1ab0f4c6..47a0f9df760 100644
--- a/src/third_party/wiredtiger/test/csuite/wt3363_checkpoint_op_races/main.c
+++ b/src/third_party/wiredtiger/test/csuite/wt3363_checkpoint_op_races/main.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/cursor_order/cursor_order.c b/src/third_party/wiredtiger/test/cursor_order/cursor_order.c
index 2c9cc1410de..b2e847f880c 100644
--- a/src/third_party/wiredtiger/test/cursor_order/cursor_order.c
+++ b/src/third_party/wiredtiger/test/cursor_order/cursor_order.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/cursor_order/cursor_order.h b/src/third_party/wiredtiger/test/cursor_order/cursor_order.h
index ab9f94850df..12a5732bd0f 100644
--- a/src/third_party/wiredtiger/test/cursor_order/cursor_order.h
+++ b/src/third_party/wiredtiger/test/cursor_order/cursor_order.h
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/cursor_order/cursor_order_file.c b/src/third_party/wiredtiger/test/cursor_order/cursor_order_file.c
index 3473cb16607..4706703b054 100644
--- a/src/third_party/wiredtiger/test/cursor_order/cursor_order_file.c
+++ b/src/third_party/wiredtiger/test/cursor_order/cursor_order_file.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/cursor_order/cursor_order_ops.c b/src/third_party/wiredtiger/test/cursor_order/cursor_order_ops.c
index 576860483ba..2ff4b5ed5fb 100644
--- a/src/third_party/wiredtiger/test/cursor_order/cursor_order_ops.c
+++ b/src/third_party/wiredtiger/test/cursor_order/cursor_order_ops.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/fops/file.c b/src/third_party/wiredtiger/test/fops/file.c
index 62f1cc8b5bf..9437230afbd 100644
--- a/src/third_party/wiredtiger/test/fops/file.c
+++ b/src/third_party/wiredtiger/test/fops/file.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/fops/fops.c b/src/third_party/wiredtiger/test/fops/fops.c
index 9f2257d8e96..99c333be4a0 100644
--- a/src/third_party/wiredtiger/test/fops/fops.c
+++ b/src/third_party/wiredtiger/test/fops/fops.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/fops/t.c b/src/third_party/wiredtiger/test/fops/t.c
index eecb8a10f06..e748918a08a 100644
--- a/src/third_party/wiredtiger/test/fops/t.c
+++ b/src/third_party/wiredtiger/test/fops/t.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/fops/thread.h b/src/third_party/wiredtiger/test/fops/thread.h
index 0df36025be0..a936d62f521 100644
--- a/src/third_party/wiredtiger/test/fops/thread.h
+++ b/src/third_party/wiredtiger/test/fops/thread.h
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/format/backup.c b/src/third_party/wiredtiger/test/format/backup.c
index df4fcd323dc..5ad37905cd0 100644
--- a/src/third_party/wiredtiger/test/format/backup.c
+++ b/src/third_party/wiredtiger/test/format/backup.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/format/bdb.c b/src/third_party/wiredtiger/test/format/bdb.c
index f3dd9e44f17..a3a9ad3a62f 100644
--- a/src/third_party/wiredtiger/test/format/bdb.c
+++ b/src/third_party/wiredtiger/test/format/bdb.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/format/bulk.c b/src/third_party/wiredtiger/test/format/bulk.c
index 398471786e6..4f207037419 100644
--- a/src/third_party/wiredtiger/test/format/bulk.c
+++ b/src/third_party/wiredtiger/test/format/bulk.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/format/compact.c b/src/third_party/wiredtiger/test/format/compact.c
index 2df3839f67b..7331112da9b 100644
--- a/src/third_party/wiredtiger/test/format/compact.c
+++ b/src/third_party/wiredtiger/test/format/compact.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/format/config.c b/src/third_party/wiredtiger/test/format/config.c
index 769ed608e64..709eb9a4a26 100644
--- a/src/third_party/wiredtiger/test/format/config.c
+++ b/src/third_party/wiredtiger/test/format/config.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/format/config.h b/src/third_party/wiredtiger/test/format/config.h
index e6c31550cc9..ba5774e8a6a 100644
--- a/src/third_party/wiredtiger/test/format/config.h
+++ b/src/third_party/wiredtiger/test/format/config.h
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/format/format.h b/src/third_party/wiredtiger/test/format/format.h
index af66e166f47..d2dee60d6b5 100644
--- a/src/third_party/wiredtiger/test/format/format.h
+++ b/src/third_party/wiredtiger/test/format/format.h
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/format/lrt.c b/src/third_party/wiredtiger/test/format/lrt.c
index fab3b54126e..fdf91508dd6 100644
--- a/src/third_party/wiredtiger/test/format/lrt.c
+++ b/src/third_party/wiredtiger/test/format/lrt.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/format/ops.c b/src/third_party/wiredtiger/test/format/ops.c
index 4c5576654d2..a5493321d3c 100644
--- a/src/third_party/wiredtiger/test/format/ops.c
+++ b/src/third_party/wiredtiger/test/format/ops.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/format/rebalance.c b/src/third_party/wiredtiger/test/format/rebalance.c
index 195130cfa68..c1b20b92857 100644
--- a/src/third_party/wiredtiger/test/format/rebalance.c
+++ b/src/third_party/wiredtiger/test/format/rebalance.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/format/salvage.c b/src/third_party/wiredtiger/test/format/salvage.c
index e18137b4f01..c631ea599e3 100644
--- a/src/third_party/wiredtiger/test/format/salvage.c
+++ b/src/third_party/wiredtiger/test/format/salvage.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/format/t.c b/src/third_party/wiredtiger/test/format/t.c
index 02ed0a2da60..6077a67a541 100644
--- a/src/third_party/wiredtiger/test/format/t.c
+++ b/src/third_party/wiredtiger/test/format/t.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/format/util.c b/src/third_party/wiredtiger/test/format/util.c
index 3c61ab5a66b..c21e58f84e4 100644
--- a/src/third_party/wiredtiger/test/format/util.c
+++ b/src/third_party/wiredtiger/test/format/util.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/format/wts.c b/src/third_party/wiredtiger/test/format/wts.c
index ddcd14cfd55..0b234cc772b 100644
--- a/src/third_party/wiredtiger/test/format/wts.c
+++ b/src/third_party/wiredtiger/test/format/wts.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/huge/huge.c b/src/third_party/wiredtiger/test/huge/huge.c
index 145f5720cb6..11d6bbdc312 100644
--- a/src/third_party/wiredtiger/test/huge/huge.c
+++ b/src/third_party/wiredtiger/test/huge/huge.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/java/com/wiredtiger/test/AsyncTest.java b/src/third_party/wiredtiger/test/java/com/wiredtiger/test/AsyncTest.java
index 11d98fb3b4e..e2db98e3d70 100644
--- a/src/third_party/wiredtiger/test/java/com/wiredtiger/test/AsyncTest.java
+++ b/src/third_party/wiredtiger/test/java/com/wiredtiger/test/AsyncTest.java
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/java/com/wiredtiger/test/AutoCloseTest.java b/src/third_party/wiredtiger/test/java/com/wiredtiger/test/AutoCloseTest.java
index e4f720ede8b..a4a5416b398 100644
--- a/src/third_party/wiredtiger/test/java/com/wiredtiger/test/AutoCloseTest.java
+++ b/src/third_party/wiredtiger/test/java/com/wiredtiger/test/AutoCloseTest.java
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/java/com/wiredtiger/test/BackupCursorTest.java b/src/third_party/wiredtiger/test/java/com/wiredtiger/test/BackupCursorTest.java
index af0a2784589..69572ef9a19 100644
--- a/src/third_party/wiredtiger/test/java/com/wiredtiger/test/BackupCursorTest.java
+++ b/src/third_party/wiredtiger/test/java/com/wiredtiger/test/BackupCursorTest.java
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/java/com/wiredtiger/test/ConcurrentCloseTest.java b/src/third_party/wiredtiger/test/java/com/wiredtiger/test/ConcurrentCloseTest.java
index 3759057ef1f..8a939729c73 100644
--- a/src/third_party/wiredtiger/test/java/com/wiredtiger/test/ConcurrentCloseTest.java
+++ b/src/third_party/wiredtiger/test/java/com/wiredtiger/test/ConcurrentCloseTest.java
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/java/com/wiredtiger/test/ConfigTest.java b/src/third_party/wiredtiger/test/java/com/wiredtiger/test/ConfigTest.java
index 432aa245afa..2e39263ceb6 100644
--- a/src/third_party/wiredtiger/test/java/com/wiredtiger/test/ConfigTest.java
+++ b/src/third_party/wiredtiger/test/java/com/wiredtiger/test/ConfigTest.java
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/java/com/wiredtiger/test/CursorTest.java b/src/third_party/wiredtiger/test/java/com/wiredtiger/test/CursorTest.java
index 28c92dd8a8d..02896f834cf 100644
--- a/src/third_party/wiredtiger/test/java/com/wiredtiger/test/CursorTest.java
+++ b/src/third_party/wiredtiger/test/java/com/wiredtiger/test/CursorTest.java
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/java/com/wiredtiger/test/CursorTest02.java b/src/third_party/wiredtiger/test/java/com/wiredtiger/test/CursorTest02.java
index 10705997352..09229fb5c53 100644
--- a/src/third_party/wiredtiger/test/java/com/wiredtiger/test/CursorTest02.java
+++ b/src/third_party/wiredtiger/test/java/com/wiredtiger/test/CursorTest02.java
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/java/com/wiredtiger/test/CursorTest03.java b/src/third_party/wiredtiger/test/java/com/wiredtiger/test/CursorTest03.java
index 73c7a22f69d..d2df05dbbb0 100644
--- a/src/third_party/wiredtiger/test/java/com/wiredtiger/test/CursorTest03.java
+++ b/src/third_party/wiredtiger/test/java/com/wiredtiger/test/CursorTest03.java
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/java/com/wiredtiger/test/ExceptionTest.java b/src/third_party/wiredtiger/test/java/com/wiredtiger/test/ExceptionTest.java
index 99719225b05..d165270b3f7 100644
--- a/src/third_party/wiredtiger/test/java/com/wiredtiger/test/ExceptionTest.java
+++ b/src/third_party/wiredtiger/test/java/com/wiredtiger/test/ExceptionTest.java
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/java/com/wiredtiger/test/PackTest.java b/src/third_party/wiredtiger/test/java/com/wiredtiger/test/PackTest.java
index 302313169cd..6623a6face3 100644
--- a/src/third_party/wiredtiger/test/java/com/wiredtiger/test/PackTest.java
+++ b/src/third_party/wiredtiger/test/java/com/wiredtiger/test/PackTest.java
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/java/com/wiredtiger/test/PackTest02.java b/src/third_party/wiredtiger/test/java/com/wiredtiger/test/PackTest02.java
index 517afd1ec03..edef545619b 100644
--- a/src/third_party/wiredtiger/test/java/com/wiredtiger/test/PackTest02.java
+++ b/src/third_party/wiredtiger/test/java/com/wiredtiger/test/PackTest02.java
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/java/com/wiredtiger/test/PackTest03.java b/src/third_party/wiredtiger/test/java/com/wiredtiger/test/PackTest03.java
index 81e7987f987..f24648ff0aa 100644
--- a/src/third_party/wiredtiger/test/java/com/wiredtiger/test/PackTest03.java
+++ b/src/third_party/wiredtiger/test/java/com/wiredtiger/test/PackTest03.java
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/java/com/wiredtiger/test/WiredTigerSuite.java b/src/third_party/wiredtiger/test/java/com/wiredtiger/test/WiredTigerSuite.java
index c77ff5b3507..78687c71041 100644
--- a/src/third_party/wiredtiger/test/java/com/wiredtiger/test/WiredTigerSuite.java
+++ b/src/third_party/wiredtiger/test/java/com/wiredtiger/test/WiredTigerSuite.java
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/manydbs/manydbs.c b/src/third_party/wiredtiger/test/manydbs/manydbs.c
index 61fd3d01776..a6574d21d72 100644
--- a/src/third_party/wiredtiger/test/manydbs/manydbs.c
+++ b/src/third_party/wiredtiger/test/manydbs/manydbs.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/packing/intpack-test.c b/src/third_party/wiredtiger/test/packing/intpack-test.c
index 3d2797a3553..4f6b7143108 100644
--- a/src/third_party/wiredtiger/test/packing/intpack-test.c
+++ b/src/third_party/wiredtiger/test/packing/intpack-test.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/packing/intpack-test2.c b/src/third_party/wiredtiger/test/packing/intpack-test2.c
index 7fa455842b5..1be6e78751c 100644
--- a/src/third_party/wiredtiger/test/packing/intpack-test2.c
+++ b/src/third_party/wiredtiger/test/packing/intpack-test2.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/packing/intpack-test3.c b/src/third_party/wiredtiger/test/packing/intpack-test3.c
index 2f74c84c6d8..d327c21a738 100644
--- a/src/third_party/wiredtiger/test/packing/intpack-test3.c
+++ b/src/third_party/wiredtiger/test/packing/intpack-test3.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/packing/packing-test.c b/src/third_party/wiredtiger/test/packing/packing-test.c
index e53664ee9c5..7451aefc494 100644
--- a/src/third_party/wiredtiger/test/packing/packing-test.c
+++ b/src/third_party/wiredtiger/test/packing/packing-test.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/readonly/readonly.c b/src/third_party/wiredtiger/test/readonly/readonly.c
index 40de5fff1a4..b5342831320 100644
--- a/src/third_party/wiredtiger/test/readonly/readonly.c
+++ b/src/third_party/wiredtiger/test/readonly/readonly.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/salvage/salvage.c b/src/third_party/wiredtiger/test/salvage/salvage.c
index 9eb2a9de383..9c8a90d37b9 100644
--- a/src/third_party/wiredtiger/test/salvage/salvage.c
+++ b/src/third_party/wiredtiger/test/salvage/salvage.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/helper.py b/src/third_party/wiredtiger/test/suite/helper.py
index 2f9bbf8aa68..7aec06f5260 100644
--- a/src/third_party/wiredtiger/test/suite/helper.py
+++ b/src/third_party/wiredtiger/test/suite/helper.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/run.py b/src/third_party/wiredtiger/test/suite/run.py
index 8a936de584b..6b668ad3e07 100644
--- a/src/third_party/wiredtiger/test/suite/run.py
+++ b/src/third_party/wiredtiger/test/suite/run.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/suite_random.py b/src/third_party/wiredtiger/test/suite/suite_random.py
index 16a8b89113c..f31f92410aa 100644
--- a/src/third_party/wiredtiger/test/suite/suite_random.py
+++ b/src/third_party/wiredtiger/test/suite/suite_random.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/suite_subprocess.py b/src/third_party/wiredtiger/test/suite/suite_subprocess.py
index 71aab9c5422..c2e9d99f691 100644
--- a/src/third_party/wiredtiger/test/suite/suite_subprocess.py
+++ b/src/third_party/wiredtiger/test/suite/suite_subprocess.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_alter01.py b/src/third_party/wiredtiger/test/suite/test_alter01.py
index 7a143afb32c..aabe071ef03 100644
--- a/src/third_party/wiredtiger/test/suite/test_alter01.py
+++ b/src/third_party/wiredtiger/test/suite/test_alter01.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_alter02.py b/src/third_party/wiredtiger/test/suite/test_alter02.py
index 3a288d7edf1..d32538c80f1 100644
--- a/src/third_party/wiredtiger/test/suite/test_alter02.py
+++ b/src/third_party/wiredtiger/test/suite/test_alter02.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_assert01.py b/src/third_party/wiredtiger/test/suite/test_assert01.py
index 3a4f8e4127a..acdb3d9ee69 100644
--- a/src/third_party/wiredtiger/test/suite/test_assert01.py
+++ b/src/third_party/wiredtiger/test/suite/test_assert01.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_assert02.py b/src/third_party/wiredtiger/test/suite/test_assert02.py
index d264273c3a0..ff1a4bd05e5 100644
--- a/src/third_party/wiredtiger/test/suite/test_assert02.py
+++ b/src/third_party/wiredtiger/test/suite/test_assert02.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_assert03.py b/src/third_party/wiredtiger/test/suite/test_assert03.py
index 36d4936a82e..c78991aba33 100644
--- a/src/third_party/wiredtiger/test/suite/test_assert03.py
+++ b/src/third_party/wiredtiger/test/suite/test_assert03.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_async01.py b/src/third_party/wiredtiger/test/suite/test_async01.py
index 4faaad6b8f4..432325db9be 100644
--- a/src/third_party/wiredtiger/test/suite/test_async01.py
+++ b/src/third_party/wiredtiger/test/suite/test_async01.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_async02.py b/src/third_party/wiredtiger/test/suite/test_async02.py
index fbd743fec29..1d3095551ab 100644
--- a/src/third_party/wiredtiger/test/suite/test_async02.py
+++ b/src/third_party/wiredtiger/test/suite/test_async02.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_async03.py b/src/third_party/wiredtiger/test/suite/test_async03.py
index cf993071d73..4af5a6b01bd 100644
--- a/src/third_party/wiredtiger/test/suite/test_async03.py
+++ b/src/third_party/wiredtiger/test/suite/test_async03.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_autoclose.py b/src/third_party/wiredtiger/test/suite/test_autoclose.py
index ce152b24fe3..cfe016d66fe 100644
--- a/src/third_party/wiredtiger/test/suite/test_autoclose.py
+++ b/src/third_party/wiredtiger/test/suite/test_autoclose.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_backup01.py b/src/third_party/wiredtiger/test/suite/test_backup01.py
index 52d71ab53bb..2eb6efc4eed 100644
--- a/src/third_party/wiredtiger/test/suite/test_backup01.py
+++ b/src/third_party/wiredtiger/test/suite/test_backup01.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_backup02.py b/src/third_party/wiredtiger/test/suite/test_backup02.py
index c0410b41708..f4f5219440b 100644
--- a/src/third_party/wiredtiger/test/suite/test_backup02.py
+++ b/src/third_party/wiredtiger/test/suite/test_backup02.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_backup03.py b/src/third_party/wiredtiger/test/suite/test_backup03.py
index 7d0bfd5eaaf..da94dfe5f17 100644
--- a/src/third_party/wiredtiger/test/suite/test_backup03.py
+++ b/src/third_party/wiredtiger/test/suite/test_backup03.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_backup04.py b/src/third_party/wiredtiger/test/suite/test_backup04.py
index 9f40ae2427b..13b2436d7ad 100644
--- a/src/third_party/wiredtiger/test/suite/test_backup04.py
+++ b/src/third_party/wiredtiger/test/suite/test_backup04.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_backup05.py b/src/third_party/wiredtiger/test/suite/test_backup05.py
index fb44de04694..96b7cbea58e 100644
--- a/src/third_party/wiredtiger/test/suite/test_backup05.py
+++ b/src/third_party/wiredtiger/test/suite/test_backup05.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_backup06.py b/src/third_party/wiredtiger/test/suite/test_backup06.py
index d416ba035b5..1540e114bb8 100644
--- a/src/third_party/wiredtiger/test/suite/test_backup06.py
+++ b/src/third_party/wiredtiger/test/suite/test_backup06.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_backup07.py b/src/third_party/wiredtiger/test/suite/test_backup07.py
index 8332815b0ca..b15ab274a8b 100644
--- a/src/third_party/wiredtiger/test/suite/test_backup07.py
+++ b/src/third_party/wiredtiger/test/suite/test_backup07.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_base01.py b/src/third_party/wiredtiger/test/suite/test_base01.py
index f39ec3eb739..1a2133b17bb 100644
--- a/src/third_party/wiredtiger/test/suite/test_base01.py
+++ b/src/third_party/wiredtiger/test/suite/test_base01.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_base02.py b/src/third_party/wiredtiger/test/suite/test_base02.py
index 5e1140a5700..6af674c6402 100644
--- a/src/third_party/wiredtiger/test/suite/test_base02.py
+++ b/src/third_party/wiredtiger/test/suite/test_base02.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_base03.py b/src/third_party/wiredtiger/test/suite/test_base03.py
index ad1629db77e..8e7b44ed092 100644
--- a/src/third_party/wiredtiger/test/suite/test_base03.py
+++ b/src/third_party/wiredtiger/test/suite/test_base03.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_base04.py b/src/third_party/wiredtiger/test/suite/test_base04.py
index f9fdddce157..e78af565679 100644
--- a/src/third_party/wiredtiger/test/suite/test_base04.py
+++ b/src/third_party/wiredtiger/test/suite/test_base04.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_base05.py b/src/third_party/wiredtiger/test/suite/test_base05.py
index 5ba6d5eda4b..847cbd0a738 100644
--- a/src/third_party/wiredtiger/test/suite/test_base05.py
+++ b/src/third_party/wiredtiger/test/suite/test_base05.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_baseconfig.py b/src/third_party/wiredtiger/test/suite/test_baseconfig.py
index 3a5778b3bb5..57c2c7a203c 100644
--- a/src/third_party/wiredtiger/test/suite/test_baseconfig.py
+++ b/src/third_party/wiredtiger/test/suite/test_baseconfig.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_bug001.py b/src/third_party/wiredtiger/test/suite/test_bug001.py
index 4353dad5e68..9882cb2c700 100644
--- a/src/third_party/wiredtiger/test/suite/test_bug001.py
+++ b/src/third_party/wiredtiger/test/suite/test_bug001.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_bug003.py b/src/third_party/wiredtiger/test/suite/test_bug003.py
index 799c004e17d..b44bb33c69b 100644
--- a/src/third_party/wiredtiger/test/suite/test_bug003.py
+++ b/src/third_party/wiredtiger/test/suite/test_bug003.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_bug004.py b/src/third_party/wiredtiger/test/suite/test_bug004.py
index a47bdc6dd1e..c94ea70225c 100644
--- a/src/third_party/wiredtiger/test/suite/test_bug004.py
+++ b/src/third_party/wiredtiger/test/suite/test_bug004.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_bug005.py b/src/third_party/wiredtiger/test/suite/test_bug005.py
index 6d099bf2708..c6c4f6d18a6 100644
--- a/src/third_party/wiredtiger/test/suite/test_bug005.py
+++ b/src/third_party/wiredtiger/test/suite/test_bug005.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_bug006.py b/src/third_party/wiredtiger/test/suite/test_bug006.py
index 505325de200..c65780a176c 100644
--- a/src/third_party/wiredtiger/test/suite/test_bug006.py
+++ b/src/third_party/wiredtiger/test/suite/test_bug006.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_bug007.py b/src/third_party/wiredtiger/test/suite/test_bug007.py
index 806d75d8394..b654fbd260c 100644
--- a/src/third_party/wiredtiger/test/suite/test_bug007.py
+++ b/src/third_party/wiredtiger/test/suite/test_bug007.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_bug008.py b/src/third_party/wiredtiger/test/suite/test_bug008.py
index cb0bb390ad4..d0377f318ee 100644
--- a/src/third_party/wiredtiger/test/suite/test_bug008.py
+++ b/src/third_party/wiredtiger/test/suite/test_bug008.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_bug009.py b/src/third_party/wiredtiger/test/suite/test_bug009.py
index 7f2af55f2d0..25041921055 100644
--- a/src/third_party/wiredtiger/test/suite/test_bug009.py
+++ b/src/third_party/wiredtiger/test/suite/test_bug009.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_bug010.py b/src/third_party/wiredtiger/test/suite/test_bug010.py
index 1584c173053..01d604e5a07 100644
--- a/src/third_party/wiredtiger/test/suite/test_bug010.py
+++ b/src/third_party/wiredtiger/test/suite/test_bug010.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_bug011.py b/src/third_party/wiredtiger/test/suite/test_bug011.py
index 2c3fd831f93..02c43231499 100644
--- a/src/third_party/wiredtiger/test/suite/test_bug011.py
+++ b/src/third_party/wiredtiger/test/suite/test_bug011.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_bug012.py b/src/third_party/wiredtiger/test/suite/test_bug012.py
index ae80a9c7179..fd38f97bc46 100644
--- a/src/third_party/wiredtiger/test/suite/test_bug012.py
+++ b/src/third_party/wiredtiger/test/suite/test_bug012.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_bug013.py b/src/third_party/wiredtiger/test/suite/test_bug013.py
index a15bd42c9da..d8db304543e 100644
--- a/src/third_party/wiredtiger/test/suite/test_bug013.py
+++ b/src/third_party/wiredtiger/test/suite/test_bug013.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_bug014.py b/src/third_party/wiredtiger/test/suite/test_bug014.py
index 81e47bc331b..dc96e4c7f82 100644
--- a/src/third_party/wiredtiger/test/suite/test_bug014.py
+++ b/src/third_party/wiredtiger/test/suite/test_bug014.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_bug015.py b/src/third_party/wiredtiger/test/suite/test_bug015.py
index 5b2a64dc76e..e93b62bcd50 100644
--- a/src/third_party/wiredtiger/test/suite/test_bug015.py
+++ b/src/third_party/wiredtiger/test/suite/test_bug015.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_bug016.py b/src/third_party/wiredtiger/test/suite/test_bug016.py
index a2a40118008..5c14f59d8cd 100644
--- a/src/third_party/wiredtiger/test/suite/test_bug016.py
+++ b/src/third_party/wiredtiger/test/suite/test_bug016.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_bug017.py b/src/third_party/wiredtiger/test/suite/test_bug017.py
index 43aeee07bb6..e85be77fffc 100644
--- a/src/third_party/wiredtiger/test/suite/test_bug017.py
+++ b/src/third_party/wiredtiger/test/suite/test_bug017.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_bug018.py b/src/third_party/wiredtiger/test/suite/test_bug018.py
index b904b688586..f32140d1987 100644
--- a/src/third_party/wiredtiger/test/suite/test_bug018.py
+++ b/src/third_party/wiredtiger/test/suite/test_bug018.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_bulk01.py b/src/third_party/wiredtiger/test/suite/test_bulk01.py
index 5cbb722d7a5..f718e377e05 100644
--- a/src/third_party/wiredtiger/test/suite/test_bulk01.py
+++ b/src/third_party/wiredtiger/test/suite/test_bulk01.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_bulk02.py b/src/third_party/wiredtiger/test/suite/test_bulk02.py
index de9ebec5204..ec20c3242c3 100644
--- a/src/third_party/wiredtiger/test/suite/test_bulk02.py
+++ b/src/third_party/wiredtiger/test/suite/test_bulk02.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_checkpoint01.py b/src/third_party/wiredtiger/test/suite/test_checkpoint01.py
index 1964a94b31c..38569ad090e 100644
--- a/src/third_party/wiredtiger/test/suite/test_checkpoint01.py
+++ b/src/third_party/wiredtiger/test/suite/test_checkpoint01.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_checkpoint02.py b/src/third_party/wiredtiger/test/suite/test_checkpoint02.py
index 3a0a47d8163..e88c3bfd146 100644
--- a/src/third_party/wiredtiger/test/suite/test_checkpoint02.py
+++ b/src/third_party/wiredtiger/test/suite/test_checkpoint02.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_colgap.py b/src/third_party/wiredtiger/test/suite/test_colgap.py
index 1ea55e11d78..af2022a74ee 100644
--- a/src/third_party/wiredtiger/test/suite/test_colgap.py
+++ b/src/third_party/wiredtiger/test/suite/test_colgap.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_collator.py b/src/third_party/wiredtiger/test/suite/test_collator.py
index c614ea10c83..e1dd2bb39a2 100644
--- a/src/third_party/wiredtiger/test/suite/test_collator.py
+++ b/src/third_party/wiredtiger/test/suite/test_collator.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_compact01.py b/src/third_party/wiredtiger/test/suite/test_compact01.py
index cfe5c909b1f..4a0926e8faa 100644
--- a/src/third_party/wiredtiger/test/suite/test_compact01.py
+++ b/src/third_party/wiredtiger/test/suite/test_compact01.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_compact02.py b/src/third_party/wiredtiger/test/suite/test_compact02.py
index bea370280d1..bb53ea06288 100644
--- a/src/third_party/wiredtiger/test/suite/test_compact02.py
+++ b/src/third_party/wiredtiger/test/suite/test_compact02.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_compat01.py b/src/third_party/wiredtiger/test/suite/test_compat01.py
index ce87e072fc9..f4d37a18971 100644
--- a/src/third_party/wiredtiger/test/suite/test_compat01.py
+++ b/src/third_party/wiredtiger/test/suite/test_compat01.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_compress01.py b/src/third_party/wiredtiger/test/suite/test_compress01.py
index 1190a9dbe00..aa6f5104216 100644
--- a/src/third_party/wiredtiger/test/suite/test_compress01.py
+++ b/src/third_party/wiredtiger/test/suite/test_compress01.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_config01.py b/src/third_party/wiredtiger/test/suite/test_config01.py
index 5252d805e07..595f2ff9496 100644
--- a/src/third_party/wiredtiger/test/suite/test_config01.py
+++ b/src/third_party/wiredtiger/test/suite/test_config01.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_config02.py b/src/third_party/wiredtiger/test/suite/test_config02.py
index 441aa41d218..eaf0c867893 100644
--- a/src/third_party/wiredtiger/test/suite/test_config02.py
+++ b/src/third_party/wiredtiger/test/suite/test_config02.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_config03.py b/src/third_party/wiredtiger/test/suite/test_config03.py
index 810d399613a..49ea1d70b30 100644
--- a/src/third_party/wiredtiger/test/suite/test_config03.py
+++ b/src/third_party/wiredtiger/test/suite/test_config03.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_config04.py b/src/third_party/wiredtiger/test/suite/test_config04.py
index b09189be8ea..11a36c2a5d2 100644
--- a/src/third_party/wiredtiger/test/suite/test_config04.py
+++ b/src/third_party/wiredtiger/test/suite/test_config04.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_config05.py b/src/third_party/wiredtiger/test/suite/test_config05.py
index 0004851b905..21ddd14662d 100644
--- a/src/third_party/wiredtiger/test/suite/test_config05.py
+++ b/src/third_party/wiredtiger/test/suite/test_config05.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_config06.py b/src/third_party/wiredtiger/test/suite/test_config06.py
index f39fe2d3a4f..ef041a78449 100644
--- a/src/third_party/wiredtiger/test/suite/test_config06.py
+++ b/src/third_party/wiredtiger/test/suite/test_config06.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_cursor01.py b/src/third_party/wiredtiger/test/suite/test_cursor01.py
index 99bdb6182c7..ae98d1688cd 100644
--- a/src/third_party/wiredtiger/test/suite/test_cursor01.py
+++ b/src/third_party/wiredtiger/test/suite/test_cursor01.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_cursor02.py b/src/third_party/wiredtiger/test/suite/test_cursor02.py
index 35dc2587b1f..ae146ae6e36 100644
--- a/src/third_party/wiredtiger/test/suite/test_cursor02.py
+++ b/src/third_party/wiredtiger/test/suite/test_cursor02.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_cursor03.py b/src/third_party/wiredtiger/test/suite/test_cursor03.py
index 8910dc741a4..f44c4ed0b36 100644
--- a/src/third_party/wiredtiger/test/suite/test_cursor03.py
+++ b/src/third_party/wiredtiger/test/suite/test_cursor03.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_cursor04.py b/src/third_party/wiredtiger/test/suite/test_cursor04.py
index b7457ec623d..cfc6953788c 100644
--- a/src/third_party/wiredtiger/test/suite/test_cursor04.py
+++ b/src/third_party/wiredtiger/test/suite/test_cursor04.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_cursor05.py b/src/third_party/wiredtiger/test/suite/test_cursor05.py
index e0cce3dcb5e..67b69560a8a 100644
--- a/src/third_party/wiredtiger/test/suite/test_cursor05.py
+++ b/src/third_party/wiredtiger/test/suite/test_cursor05.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_cursor06.py b/src/third_party/wiredtiger/test/suite/test_cursor06.py
index 280d6f09171..c812ff33a9b 100644
--- a/src/third_party/wiredtiger/test/suite/test_cursor06.py
+++ b/src/third_party/wiredtiger/test/suite/test_cursor06.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_cursor07.py b/src/third_party/wiredtiger/test/suite/test_cursor07.py
index 94989dd68a2..c9967825867 100644
--- a/src/third_party/wiredtiger/test/suite/test_cursor07.py
+++ b/src/third_party/wiredtiger/test/suite/test_cursor07.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_cursor08.py b/src/third_party/wiredtiger/test/suite/test_cursor08.py
index 82b4a3b7c7c..cef4d5d6166 100644
--- a/src/third_party/wiredtiger/test/suite/test_cursor08.py
+++ b/src/third_party/wiredtiger/test/suite/test_cursor08.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_cursor09.py b/src/third_party/wiredtiger/test/suite/test_cursor09.py
index de9ae5163b6..feb918553d9 100644
--- a/src/third_party/wiredtiger/test/suite/test_cursor09.py
+++ b/src/third_party/wiredtiger/test/suite/test_cursor09.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_cursor10.py b/src/third_party/wiredtiger/test/suite/test_cursor10.py
index 11fb43825ad..91e6997ff06 100644
--- a/src/third_party/wiredtiger/test/suite/test_cursor10.py
+++ b/src/third_party/wiredtiger/test/suite/test_cursor10.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_cursor11.py b/src/third_party/wiredtiger/test/suite/test_cursor11.py
index 1f3ea1555f2..5afbe626e42 100644
--- a/src/third_party/wiredtiger/test/suite/test_cursor11.py
+++ b/src/third_party/wiredtiger/test/suite/test_cursor11.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_cursor12.py b/src/third_party/wiredtiger/test/suite/test_cursor12.py
index b2c1065b316..50204274b94 100644
--- a/src/third_party/wiredtiger/test/suite/test_cursor12.py
+++ b/src/third_party/wiredtiger/test/suite/test_cursor12.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
@@ -39,13 +39,17 @@ class test_cursor12(wttest.WiredTigerTestCase):
('recno', dict(keyfmt='r')),
('string', dict(keyfmt='S')),
]
+ valuefmt = [
+ ('item', dict(valuefmt='u')),
+ ('string', dict(valuefmt='S')),
+ ]
types = [
('file', dict(uri='file:modify')),
('lsm', dict(uri='lsm:modify')),
('table', dict(uri='table:modify')),
]
# Skip record number keys with LSM.
- scenarios = filter_scenarios(make_scenarios(types, keyfmt),
+ scenarios = filter_scenarios(make_scenarios(types, keyfmt, valuefmt),
lambda name, d: not ('lsm' in d['uri'] and d['keyfmt'] == 'r'))
# List with original value, final value, and modifications to get
@@ -73,7 +77,7 @@ class test_cursor12(wttest.WiredTigerTestCase):
'mods' : [['--', 8, 2]]
},{
'o' : 'ABCDEFGH', # append with gap
- 'f' : 'ABCDEFGH\00\00--',
+ 'f' : 'ABCDEFGH --',
'mods' : [['--', 10, 2]]
},{
'o' : 'ABCDEFGH', # multiple replacements
@@ -85,7 +89,7 @@ class test_cursor12(wttest.WiredTigerTestCase):
'mods' : [['+', 1, 1], ['+', 1, 1], ['+', 1, 1], ['-', 1, 1]]
},{
'o' : 'ABCDEFGH', # multiple overlapping gap replacements
- 'f' : 'ABCDEFGH\00\00--',
+ 'f' : 'ABCDEFGH --',
'mods' : [['+', 10, 1], ['+', 10, 1], ['+', 10, 1], ['--', 10, 2]]
},{
'o' : 'ABCDEFGH', # shrink beginning
@@ -200,7 +204,8 @@ class test_cursor12(wttest.WiredTigerTestCase):
c.set_key(ds.key(row))
self.assertEquals(c.search(), 0)
- self.assertEquals(c.get_value(), i['f'])
+ v = c.get_value()
+ self.assertEquals(v.replace("\x00", " "), i['f'])
if not single:
row = row + 1
@@ -215,7 +220,8 @@ class test_cursor12(wttest.WiredTigerTestCase):
for i in self.list:
c.set_key(ds.key(row))
self.assertEquals(c.search(), 0)
- self.assertEquals(c.get_value(), i['f'])
+ v = c.get_value()
+ self.assertEquals(v.replace("\x00", " "), i['f'])
if not single:
row = row + 1
@@ -224,21 +230,21 @@ class test_cursor12(wttest.WiredTigerTestCase):
# Smoke-test the modify API, operating on a group of records.
def test_modify_smoke(self):
ds = SimpleDataSet(self,
- self.uri, 100, key_format=self.keyfmt, value_format='u')
+ self.uri, 100, key_format=self.keyfmt, value_format=self.valuefmt)
ds.populate()
self.modify_load(ds, False)
# Smoke-test the modify API, operating on a single record
def test_modify_smoke_single(self):
ds = SimpleDataSet(self,
- self.uri, 100, key_format=self.keyfmt, value_format='u')
+ self.uri, 100, key_format=self.keyfmt, value_format=self.valuefmt)
ds.populate()
self.modify_load(ds, True)
# Smoke-test the modify API, closing and re-opening the database.
def test_modify_smoke_reopen(self):
ds = SimpleDataSet(self,
- self.uri, 100, key_format=self.keyfmt, value_format='u')
+ self.uri, 100, key_format=self.keyfmt, value_format=self.valuefmt)
ds.populate()
self.modify_load(ds, False)
@@ -260,7 +266,7 @@ class test_cursor12(wttest.WiredTigerTestCase):
# Populate a database, and checkpoint it so it exists after recovery.
ds = SimpleDataSet(self,
- self.uri, 100, key_format=self.keyfmt, value_format='u')
+ self.uri, 100, key_format=self.keyfmt, value_format=self.valuefmt)
ds.populate()
self.session.checkpoint()
self.modify_load(ds, False)
@@ -278,7 +284,7 @@ class test_cursor12(wttest.WiredTigerTestCase):
# Check that we can perform a large number of modifications to a record.
def test_modify_many(self):
ds = SimpleDataSet(self,
- self.uri, 20, key_format=self.keyfmt, value_format='u')
+ self.uri, 20, key_format=self.keyfmt, value_format=self.valuefmt)
ds.populate()
c = self.session.open_cursor(self.uri, None)
@@ -301,7 +307,7 @@ class test_cursor12(wttest.WiredTigerTestCase):
# Check that modify returns not-found after a delete.
def test_modify_delete(self):
ds = SimpleDataSet(self,
- self.uri, 20, key_format=self.keyfmt, value_format='u')
+ self.uri, 20, key_format=self.keyfmt, value_format=self.valuefmt)
ds.populate()
c = self.session.open_cursor(self.uri, None)
@@ -319,7 +325,7 @@ class test_cursor12(wttest.WiredTigerTestCase):
# and after it's aborted.
def test_modify_abort(self):
ds = SimpleDataSet(self,
- self.uri, 20, key_format=self.keyfmt, value_format='u')
+ self.uri, 20, key_format=self.keyfmt, value_format=self.valuefmt)
ds.populate()
# Start a transaction.
diff --git a/src/third_party/wiredtiger/test/suite/test_cursor_compare.py b/src/third_party/wiredtiger/test/suite/test_cursor_compare.py
index 7dceb9a86cb..0d69a7a985f 100644
--- a/src/third_party/wiredtiger/test/suite/test_cursor_compare.py
+++ b/src/third_party/wiredtiger/test/suite/test_cursor_compare.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_cursor_pin.py b/src/third_party/wiredtiger/test/suite/test_cursor_pin.py
index 91690ef6ed2..34641585552 100644
--- a/src/third_party/wiredtiger/test/suite/test_cursor_pin.py
+++ b/src/third_party/wiredtiger/test/suite/test_cursor_pin.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_cursor_random.py b/src/third_party/wiredtiger/test/suite/test_cursor_random.py
index c7736e322e1..27445fe3cc8 100644
--- a/src/third_party/wiredtiger/test/suite/test_cursor_random.py
+++ b/src/third_party/wiredtiger/test/suite/test_cursor_random.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_cursor_random02.py b/src/third_party/wiredtiger/test/suite/test_cursor_random02.py
index 11ea8e1f489..5303da6488e 100644
--- a/src/third_party/wiredtiger/test/suite/test_cursor_random02.py
+++ b/src/third_party/wiredtiger/test/suite/test_cursor_random02.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_cursor_tracker.py b/src/third_party/wiredtiger/test/suite/test_cursor_tracker.py
index dee3c6d1b45..02f73cc0978 100644
--- a/src/third_party/wiredtiger/test/suite/test_cursor_tracker.py
+++ b/src/third_party/wiredtiger/test/suite/test_cursor_tracker.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_debug_info.py b/src/third_party/wiredtiger/test/suite/test_debug_info.py
index 97fa8efbc86..70ab6e058fa 100644
--- a/src/third_party/wiredtiger/test/suite/test_debug_info.py
+++ b/src/third_party/wiredtiger/test/suite/test_debug_info.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_drop.py b/src/third_party/wiredtiger/test/suite/test_drop.py
index 4be311b8bb2..deea7d6f240 100644
--- a/src/third_party/wiredtiger/test/suite/test_drop.py
+++ b/src/third_party/wiredtiger/test/suite/test_drop.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_drop02.py b/src/third_party/wiredtiger/test/suite/test_drop02.py
index 7ab891daf15..c2fd5b346ff 100644
--- a/src/third_party/wiredtiger/test/suite/test_drop02.py
+++ b/src/third_party/wiredtiger/test/suite/test_drop02.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_drop_create.py b/src/third_party/wiredtiger/test/suite/test_drop_create.py
index eb851c3212f..63c833a2e41 100644
--- a/src/third_party/wiredtiger/test/suite/test_drop_create.py
+++ b/src/third_party/wiredtiger/test/suite/test_drop_create.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_dump.py b/src/third_party/wiredtiger/test/suite/test_dump.py
index 37f4572b5c9..89ae5a81c97 100644
--- a/src/third_party/wiredtiger/test/suite/test_dump.py
+++ b/src/third_party/wiredtiger/test/suite/test_dump.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_dupc.py b/src/third_party/wiredtiger/test/suite/test_dupc.py
index 6e35eb361a0..ba1726b0bf0 100644
--- a/src/third_party/wiredtiger/test/suite/test_dupc.py
+++ b/src/third_party/wiredtiger/test/suite/test_dupc.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_durability01.py b/src/third_party/wiredtiger/test/suite/test_durability01.py
index 97c89aabc4c..b4344677696 100644
--- a/src/third_party/wiredtiger/test/suite/test_durability01.py
+++ b/src/third_party/wiredtiger/test/suite/test_durability01.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_empty.py b/src/third_party/wiredtiger/test/suite/test_empty.py
index ad57bc78036..32726e26c25 100644
--- a/src/third_party/wiredtiger/test/suite/test_empty.py
+++ b/src/third_party/wiredtiger/test/suite/test_empty.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_encrypt01.py b/src/third_party/wiredtiger/test/suite/test_encrypt01.py
index 5b4be01c861..8d305ee9283 100644
--- a/src/third_party/wiredtiger/test/suite/test_encrypt01.py
+++ b/src/third_party/wiredtiger/test/suite/test_encrypt01.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_encrypt02.py b/src/third_party/wiredtiger/test/suite/test_encrypt02.py
index c62828cf607..6df8e212057 100644
--- a/src/third_party/wiredtiger/test/suite/test_encrypt02.py
+++ b/src/third_party/wiredtiger/test/suite/test_encrypt02.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_encrypt03.py b/src/third_party/wiredtiger/test/suite/test_encrypt03.py
index 85be38a27ae..ce6cfbc22e6 100644
--- a/src/third_party/wiredtiger/test/suite/test_encrypt03.py
+++ b/src/third_party/wiredtiger/test/suite/test_encrypt03.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_encrypt04.py b/src/third_party/wiredtiger/test/suite/test_encrypt04.py
index 3f9058404a8..fae455084a4 100644
--- a/src/third_party/wiredtiger/test/suite/test_encrypt04.py
+++ b/src/third_party/wiredtiger/test/suite/test_encrypt04.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_encrypt05.py b/src/third_party/wiredtiger/test/suite/test_encrypt05.py
index d4653b2e9b6..fa5ed483462 100644
--- a/src/third_party/wiredtiger/test/suite/test_encrypt05.py
+++ b/src/third_party/wiredtiger/test/suite/test_encrypt05.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_encrypt06.py b/src/third_party/wiredtiger/test/suite/test_encrypt06.py
index 62e32597f3d..2187182b193 100644
--- a/src/third_party/wiredtiger/test/suite/test_encrypt06.py
+++ b/src/third_party/wiredtiger/test/suite/test_encrypt06.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_encrypt07.py b/src/third_party/wiredtiger/test/suite/test_encrypt07.py
index 4846a520b00..d4cb7461e1b 100644
--- a/src/third_party/wiredtiger/test/suite/test_encrypt07.py
+++ b/src/third_party/wiredtiger/test/suite/test_encrypt07.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_env01.py b/src/third_party/wiredtiger/test/suite/test_env01.py
index c4ce7f69dd2..5d83f800a8b 100644
--- a/src/third_party/wiredtiger/test/suite/test_env01.py
+++ b/src/third_party/wiredtiger/test/suite/test_env01.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_excl.py b/src/third_party/wiredtiger/test/suite/test_excl.py
index 539d599fe32..d12264d72d2 100644
--- a/src/third_party/wiredtiger/test/suite/test_excl.py
+++ b/src/third_party/wiredtiger/test/suite/test_excl.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_hazard.py b/src/third_party/wiredtiger/test/suite/test_hazard.py
index 73c63099c85..36a9d040fb5 100644
--- a/src/third_party/wiredtiger/test/suite/test_hazard.py
+++ b/src/third_party/wiredtiger/test/suite/test_hazard.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_home.py b/src/third_party/wiredtiger/test/suite/test_home.py
index 667d466266b..32a2984dd28 100644
--- a/src/third_party/wiredtiger/test/suite/test_home.py
+++ b/src/third_party/wiredtiger/test/suite/test_home.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_huffman01.py b/src/third_party/wiredtiger/test/suite/test_huffman01.py
index 04a13210e40..83560f4e4b0 100644
--- a/src/third_party/wiredtiger/test/suite/test_huffman01.py
+++ b/src/third_party/wiredtiger/test/suite/test_huffman01.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_huffman02.py b/src/third_party/wiredtiger/test/suite/test_huffman02.py
index e009734ffb6..924394566c5 100644
--- a/src/third_party/wiredtiger/test/suite/test_huffman02.py
+++ b/src/third_party/wiredtiger/test/suite/test_huffman02.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_index01.py b/src/third_party/wiredtiger/test/suite/test_index01.py
index bd3794bf730..a802c66a716 100644
--- a/src/third_party/wiredtiger/test/suite/test_index01.py
+++ b/src/third_party/wiredtiger/test/suite/test_index01.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_index02.py b/src/third_party/wiredtiger/test/suite/test_index02.py
index d2b7b66dfe3..7ded6757c38 100644
--- a/src/third_party/wiredtiger/test/suite/test_index02.py
+++ b/src/third_party/wiredtiger/test/suite/test_index02.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_index03.py b/src/third_party/wiredtiger/test/suite/test_index03.py
index 1052cc291d6..d4670a71937 100644
--- a/src/third_party/wiredtiger/test/suite/test_index03.py
+++ b/src/third_party/wiredtiger/test/suite/test_index03.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_inmem01.py b/src/third_party/wiredtiger/test/suite/test_inmem01.py
index 694bcabbe77..e100643af1a 100644
--- a/src/third_party/wiredtiger/test/suite/test_inmem01.py
+++ b/src/third_party/wiredtiger/test/suite/test_inmem01.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_inmem02.py b/src/third_party/wiredtiger/test/suite/test_inmem02.py
index f2340f6af69..b691f3f9cc8 100644
--- a/src/third_party/wiredtiger/test/suite/test_inmem02.py
+++ b/src/third_party/wiredtiger/test/suite/test_inmem02.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_intpack.py b/src/third_party/wiredtiger/test/suite/test_intpack.py
index 215ebc8856a..68c9f7b5566 100644
--- a/src/third_party/wiredtiger/test/suite/test_intpack.py
+++ b/src/third_party/wiredtiger/test/suite/test_intpack.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_join01.py b/src/third_party/wiredtiger/test/suite/test_join01.py
index 167f4793ce4..6204c4deed2 100644
--- a/src/third_party/wiredtiger/test/suite/test_join01.py
+++ b/src/third_party/wiredtiger/test/suite/test_join01.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_join02.py b/src/third_party/wiredtiger/test/suite/test_join02.py
index 7b85791f17a..f97e496f3c6 100644
--- a/src/third_party/wiredtiger/test/suite/test_join02.py
+++ b/src/third_party/wiredtiger/test/suite/test_join02.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_join03.py b/src/third_party/wiredtiger/test/suite/test_join03.py
index 552e27632d2..efa445cb619 100644
--- a/src/third_party/wiredtiger/test/suite/test_join03.py
+++ b/src/third_party/wiredtiger/test/suite/test_join03.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_join04.py b/src/third_party/wiredtiger/test/suite/test_join04.py
index c5ba1ad8c79..cd72e4599f7 100644
--- a/src/third_party/wiredtiger/test/suite/test_join04.py
+++ b/src/third_party/wiredtiger/test/suite/test_join04.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_join05.py b/src/third_party/wiredtiger/test/suite/test_join05.py
index aedf7a04c24..16a8a2bd1eb 100644
--- a/src/third_party/wiredtiger/test/suite/test_join05.py
+++ b/src/third_party/wiredtiger/test/suite/test_join05.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_join06.py b/src/third_party/wiredtiger/test/suite/test_join06.py
index c3d2aa2b9ca..52d93f55ea0 100644
--- a/src/third_party/wiredtiger/test/suite/test_join06.py
+++ b/src/third_party/wiredtiger/test/suite/test_join06.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_join07.py b/src/third_party/wiredtiger/test/suite/test_join07.py
index 87bcc8040d3..7f7c791b236 100644
--- a/src/third_party/wiredtiger/test/suite/test_join07.py
+++ b/src/third_party/wiredtiger/test/suite/test_join07.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_join08.py b/src/third_party/wiredtiger/test/suite/test_join08.py
index cdcd89a207a..d098dbdc0d3 100644
--- a/src/third_party/wiredtiger/test/suite/test_join08.py
+++ b/src/third_party/wiredtiger/test/suite/test_join08.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_join09.py b/src/third_party/wiredtiger/test/suite/test_join09.py
index 0441349803e..36d0c5dd18d 100644
--- a/src/third_party/wiredtiger/test/suite/test_join09.py
+++ b/src/third_party/wiredtiger/test/suite/test_join09.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_jsondump01.py b/src/third_party/wiredtiger/test/suite/test_jsondump01.py
index 13eb7e7be26..4f0c3f71576 100644
--- a/src/third_party/wiredtiger/test/suite/test_jsondump01.py
+++ b/src/third_party/wiredtiger/test/suite/test_jsondump01.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_jsondump02.py b/src/third_party/wiredtiger/test/suite/test_jsondump02.py
index 5c6bf810e08..f0aed597d4e 100644
--- a/src/third_party/wiredtiger/test/suite/test_jsondump02.py
+++ b/src/third_party/wiredtiger/test/suite/test_jsondump02.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_las.py b/src/third_party/wiredtiger/test/suite/test_las.py
index d07476382b9..f38b11138d2 100644
--- a/src/third_party/wiredtiger/test/suite/test_las.py
+++ b/src/third_party/wiredtiger/test/suite/test_las.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_lsm01.py b/src/third_party/wiredtiger/test/suite/test_lsm01.py
index 8a9972261fd..aaee405d40e 100644
--- a/src/third_party/wiredtiger/test/suite/test_lsm01.py
+++ b/src/third_party/wiredtiger/test/suite/test_lsm01.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_lsm02.py b/src/third_party/wiredtiger/test/suite/test_lsm02.py
index c35dfa43646..94b8fe5d00c 100644
--- a/src/third_party/wiredtiger/test/suite/test_lsm02.py
+++ b/src/third_party/wiredtiger/test/suite/test_lsm02.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_lsm03.py b/src/third_party/wiredtiger/test/suite/test_lsm03.py
index 0eb02d546f0..daf9f3d4bc4 100644
--- a/src/third_party/wiredtiger/test/suite/test_lsm03.py
+++ b/src/third_party/wiredtiger/test/suite/test_lsm03.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_lsm04.py b/src/third_party/wiredtiger/test/suite/test_lsm04.py
index 83e3bb552cf..82b937a713b 100644
--- a/src/third_party/wiredtiger/test/suite/test_lsm04.py
+++ b/src/third_party/wiredtiger/test/suite/test_lsm04.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_metadata_cursor01.py b/src/third_party/wiredtiger/test/suite/test_metadata_cursor01.py
index f9476a06642..9fc2130fc9a 100644
--- a/src/third_party/wiredtiger/test/suite/test_metadata_cursor01.py
+++ b/src/third_party/wiredtiger/test/suite/test_metadata_cursor01.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_nsnap01.py b/src/third_party/wiredtiger/test/suite/test_nsnap01.py
index ee97e4f9985..10e9885325a 100644
--- a/src/third_party/wiredtiger/test/suite/test_nsnap01.py
+++ b/src/third_party/wiredtiger/test/suite/test_nsnap01.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_nsnap02.py b/src/third_party/wiredtiger/test/suite/test_nsnap02.py
index 689c704c97e..0d3266c4476 100644
--- a/src/third_party/wiredtiger/test/suite/test_nsnap02.py
+++ b/src/third_party/wiredtiger/test/suite/test_nsnap02.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_nsnap03.py b/src/third_party/wiredtiger/test/suite/test_nsnap03.py
index 7be6557d458..4f8663d0112 100644
--- a/src/third_party/wiredtiger/test/suite/test_nsnap03.py
+++ b/src/third_party/wiredtiger/test/suite/test_nsnap03.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_nsnap04.py b/src/third_party/wiredtiger/test/suite/test_nsnap04.py
index f53c9b5b3cd..ed373fc033b 100644
--- a/src/third_party/wiredtiger/test/suite/test_nsnap04.py
+++ b/src/third_party/wiredtiger/test/suite/test_nsnap04.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_overwrite.py b/src/third_party/wiredtiger/test/suite/test_overwrite.py
index 0929db549b2..b875ec7d89a 100644
--- a/src/third_party/wiredtiger/test/suite/test_overwrite.py
+++ b/src/third_party/wiredtiger/test/suite/test_overwrite.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_pack.py b/src/third_party/wiredtiger/test/suite/test_pack.py
index 6e5614f1a01..99b1480069f 100644
--- a/src/third_party/wiredtiger/test/suite/test_pack.py
+++ b/src/third_party/wiredtiger/test/suite/test_pack.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_readonly01.py b/src/third_party/wiredtiger/test/suite/test_readonly01.py
index cd769bc4e88..b05a0d5bd4a 100644
--- a/src/third_party/wiredtiger/test/suite/test_readonly01.py
+++ b/src/third_party/wiredtiger/test/suite/test_readonly01.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_readonly02.py b/src/third_party/wiredtiger/test/suite/test_readonly02.py
index 5fceb9e2ea8..a8868d25163 100644
--- a/src/third_party/wiredtiger/test/suite/test_readonly02.py
+++ b/src/third_party/wiredtiger/test/suite/test_readonly02.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_readonly03.py b/src/third_party/wiredtiger/test/suite/test_readonly03.py
index e3e92edd8fc..d20a8907119 100644
--- a/src/third_party/wiredtiger/test/suite/test_readonly03.py
+++ b/src/third_party/wiredtiger/test/suite/test_readonly03.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_rebalance.py b/src/third_party/wiredtiger/test/suite/test_rebalance.py
index 867d71b6d35..4d55225e17a 100644
--- a/src/third_party/wiredtiger/test/suite/test_rebalance.py
+++ b/src/third_party/wiredtiger/test/suite/test_rebalance.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_reconfig01.py b/src/third_party/wiredtiger/test/suite/test_reconfig01.py
index 646b8622a72..9c34f96c13e 100644
--- a/src/third_party/wiredtiger/test/suite/test_reconfig01.py
+++ b/src/third_party/wiredtiger/test/suite/test_reconfig01.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_reconfig02.py b/src/third_party/wiredtiger/test/suite/test_reconfig02.py
index 0694f3621d8..2508017fd9b 100644
--- a/src/third_party/wiredtiger/test/suite/test_reconfig02.py
+++ b/src/third_party/wiredtiger/test/suite/test_reconfig02.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_reconfig03.py b/src/third_party/wiredtiger/test/suite/test_reconfig03.py
index 3ab21735bf0..6ebaf8cd662 100644
--- a/src/third_party/wiredtiger/test/suite/test_reconfig03.py
+++ b/src/third_party/wiredtiger/test/suite/test_reconfig03.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_reconfig04.py b/src/third_party/wiredtiger/test/suite/test_reconfig04.py
index 37288150d35..d5fa606c2e4 100644
--- a/src/third_party/wiredtiger/test/suite/test_reconfig04.py
+++ b/src/third_party/wiredtiger/test/suite/test_reconfig04.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_rename.py b/src/third_party/wiredtiger/test/suite/test_rename.py
index 0e55a445cd4..4977cc3e07b 100644
--- a/src/third_party/wiredtiger/test/suite/test_rename.py
+++ b/src/third_party/wiredtiger/test/suite/test_rename.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_reserve.py b/src/third_party/wiredtiger/test/suite/test_reserve.py
index 23159ed7f8a..4b81a47c1c9 100644
--- a/src/third_party/wiredtiger/test/suite/test_reserve.py
+++ b/src/third_party/wiredtiger/test/suite/test_reserve.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_salvage.py b/src/third_party/wiredtiger/test/suite/test_salvage.py
index 14045afa21e..e1a2349b6b4 100644
--- a/src/third_party/wiredtiger/test/suite/test_salvage.py
+++ b/src/third_party/wiredtiger/test/suite/test_salvage.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_schema01.py b/src/third_party/wiredtiger/test/suite/test_schema01.py
index 983593dad83..066a708faf5 100644
--- a/src/third_party/wiredtiger/test/suite/test_schema01.py
+++ b/src/third_party/wiredtiger/test/suite/test_schema01.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_schema02.py b/src/third_party/wiredtiger/test/suite/test_schema02.py
index e34063aa66b..dc50d0e8737 100644
--- a/src/third_party/wiredtiger/test/suite/test_schema02.py
+++ b/src/third_party/wiredtiger/test/suite/test_schema02.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_schema03.py b/src/third_party/wiredtiger/test/suite/test_schema03.py
index ce6e3684980..12d35d3b949 100644
--- a/src/third_party/wiredtiger/test/suite/test_schema03.py
+++ b/src/third_party/wiredtiger/test/suite/test_schema03.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_schema04.py b/src/third_party/wiredtiger/test/suite/test_schema04.py
index 765040ae73f..5987176e7c6 100644
--- a/src/third_party/wiredtiger/test/suite/test_schema04.py
+++ b/src/third_party/wiredtiger/test/suite/test_schema04.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_schema05.py b/src/third_party/wiredtiger/test/suite/test_schema05.py
index 98044cdca09..0837851e123 100644
--- a/src/third_party/wiredtiger/test/suite/test_schema05.py
+++ b/src/third_party/wiredtiger/test/suite/test_schema05.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_schema06.py b/src/third_party/wiredtiger/test/suite/test_schema06.py
index ef8434a1eaa..f1352a8b87c 100644
--- a/src/third_party/wiredtiger/test/suite/test_schema06.py
+++ b/src/third_party/wiredtiger/test/suite/test_schema06.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_schema07.py b/src/third_party/wiredtiger/test/suite/test_schema07.py
index 8de0c477157..1fa92dbbc36 100644
--- a/src/third_party/wiredtiger/test/suite/test_schema07.py
+++ b/src/third_party/wiredtiger/test/suite/test_schema07.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_shared_cache01.py b/src/third_party/wiredtiger/test/suite/test_shared_cache01.py
index 5b348a0ca87..b6ed2289639 100644
--- a/src/third_party/wiredtiger/test/suite/test_shared_cache01.py
+++ b/src/third_party/wiredtiger/test/suite/test_shared_cache01.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_shared_cache02.py b/src/third_party/wiredtiger/test/suite/test_shared_cache02.py
index c6e5209ff8a..05f080b3323 100644
--- a/src/third_party/wiredtiger/test/suite/test_shared_cache02.py
+++ b/src/third_party/wiredtiger/test/suite/test_shared_cache02.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_split.py b/src/third_party/wiredtiger/test/suite/test_split.py
index b3de91d3cdb..7dc7edb7ed8 100644
--- a/src/third_party/wiredtiger/test/suite/test_split.py
+++ b/src/third_party/wiredtiger/test/suite/test_split.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_stat01.py b/src/third_party/wiredtiger/test/suite/test_stat01.py
index 03f0507ced4..e106bf63c51 100644
--- a/src/third_party/wiredtiger/test/suite/test_stat01.py
+++ b/src/third_party/wiredtiger/test/suite/test_stat01.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_stat02.py b/src/third_party/wiredtiger/test/suite/test_stat02.py
index d7f66424c5d..5c093fcc697 100644
--- a/src/third_party/wiredtiger/test/suite/test_stat02.py
+++ b/src/third_party/wiredtiger/test/suite/test_stat02.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_stat03.py b/src/third_party/wiredtiger/test/suite/test_stat03.py
index d486cbda0b6..ffe5dc1a110 100644
--- a/src/third_party/wiredtiger/test/suite/test_stat03.py
+++ b/src/third_party/wiredtiger/test/suite/test_stat03.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_stat04.py b/src/third_party/wiredtiger/test/suite/test_stat04.py
index af5f0e282bf..6b98b9d0bb8 100644
--- a/src/third_party/wiredtiger/test/suite/test_stat04.py
+++ b/src/third_party/wiredtiger/test/suite/test_stat04.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_stat05.py b/src/third_party/wiredtiger/test/suite/test_stat05.py
index 6478bb5e58c..f78004ae55e 100644
--- a/src/third_party/wiredtiger/test/suite/test_stat05.py
+++ b/src/third_party/wiredtiger/test/suite/test_stat05.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_stat06.py b/src/third_party/wiredtiger/test/suite/test_stat06.py
index fb8110624c4..75ab41594f1 100644
--- a/src/third_party/wiredtiger/test/suite/test_stat06.py
+++ b/src/third_party/wiredtiger/test/suite/test_stat06.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_stat_log01.py b/src/third_party/wiredtiger/test/suite/test_stat_log01.py
index 8f17be042d6..a82d8338ee4 100644
--- a/src/third_party/wiredtiger/test/suite/test_stat_log01.py
+++ b/src/third_party/wiredtiger/test/suite/test_stat_log01.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_stat_log02.py b/src/third_party/wiredtiger/test/suite/test_stat_log02.py
index 96f4ccf3da8..c0395baff11 100644
--- a/src/third_party/wiredtiger/test/suite/test_stat_log02.py
+++ b/src/third_party/wiredtiger/test/suite/test_stat_log02.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_sweep01.py b/src/third_party/wiredtiger/test/suite/test_sweep01.py
index ac6150262ad..4939c270635 100644
--- a/src/third_party/wiredtiger/test/suite/test_sweep01.py
+++ b/src/third_party/wiredtiger/test/suite/test_sweep01.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_sweep02.py b/src/third_party/wiredtiger/test/suite/test_sweep02.py
index 76931ecbfbd..e50cfb949bb 100644
--- a/src/third_party/wiredtiger/test/suite/test_sweep02.py
+++ b/src/third_party/wiredtiger/test/suite/test_sweep02.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_sweep03.py b/src/third_party/wiredtiger/test/suite/test_sweep03.py
index 5ff747b1056..356d270ddea 100644
--- a/src/third_party/wiredtiger/test/suite/test_sweep03.py
+++ b/src/third_party/wiredtiger/test/suite/test_sweep03.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_timestamp01.py b/src/third_party/wiredtiger/test/suite/test_timestamp01.py
index 09a264e2afd..0610b8aea7b 100644
--- a/src/third_party/wiredtiger/test/suite/test_timestamp01.py
+++ b/src/third_party/wiredtiger/test/suite/test_timestamp01.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_timestamp02.py b/src/third_party/wiredtiger/test/suite/test_timestamp02.py
index 60a6eef3a55..ab1572a7c06 100644
--- a/src/third_party/wiredtiger/test/suite/test_timestamp02.py
+++ b/src/third_party/wiredtiger/test/suite/test_timestamp02.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_timestamp03.py b/src/third_party/wiredtiger/test/suite/test_timestamp03.py
index c340d258d62..db1d97365d7 100644
--- a/src/third_party/wiredtiger/test/suite/test_timestamp03.py
+++ b/src/third_party/wiredtiger/test/suite/test_timestamp03.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_timestamp04.py b/src/third_party/wiredtiger/test/suite/test_timestamp04.py
index f7052448208..17aea80a1ee 100644
--- a/src/third_party/wiredtiger/test/suite/test_timestamp04.py
+++ b/src/third_party/wiredtiger/test/suite/test_timestamp04.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_timestamp05.py b/src/third_party/wiredtiger/test/suite/test_timestamp05.py
index e8433c27a1e..be369c3fa69 100644
--- a/src/third_party/wiredtiger/test/suite/test_timestamp05.py
+++ b/src/third_party/wiredtiger/test/suite/test_timestamp05.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_timestamp06.py b/src/third_party/wiredtiger/test/suite/test_timestamp06.py
index ab4440656df..37e3d0da2d2 100644
--- a/src/third_party/wiredtiger/test/suite/test_timestamp06.py
+++ b/src/third_party/wiredtiger/test/suite/test_timestamp06.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_timestamp07.py b/src/third_party/wiredtiger/test/suite/test_timestamp07.py
index 214cc2ee164..e4d281f2038 100644
--- a/src/third_party/wiredtiger/test/suite/test_timestamp07.py
+++ b/src/third_party/wiredtiger/test/suite/test_timestamp07.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
@@ -191,6 +191,7 @@ class test_timestamp07(wttest.WiredTigerTestCase, suite_subprocess):
c2 = self.session.open_cursor(uri2)
self.session.create(uri3, 'key_format=i,value_format=S')
c3 = self.session.open_cursor(uri3)
+ # print "tables created"
# Insert keys 1..nkeys each with timestamp=key, in some order.
orig_keys = range(1, self.nkeys+1)
@@ -204,6 +205,8 @@ class test_timestamp07(wttest.WiredTigerTestCase, suite_subprocess):
c3[k] = self.value
self.session.commit_transaction('commit_timestamp=' + timestamp_str(k))
+ # print "value inserted in all tables, reading..."
+
# Now check that we see the expected state when reading at each
# timestamp.
for k in orig_keys:
@@ -212,6 +215,8 @@ class test_timestamp07(wttest.WiredTigerTestCase, suite_subprocess):
self.check(self.session, 'read_timestamp=' + timestamp_str(k),
k + 1, None)
+ # print "all values read, updating timestamps"
+
# Bump the oldest timestamp, we're not going back...
self.assertTimestampsEqual(self.conn.query_timestamp(), timestamp_str(self.nkeys))
self.oldts = self.stablets = timestamp_str(self.nkeys)
@@ -219,6 +224,8 @@ class test_timestamp07(wttest.WiredTigerTestCase, suite_subprocess):
self.conn.set_timestamp('stable_timestamp=' + self.stablets)
# print "Oldest " + self.oldts
+ # print "inserting value2 in all tables"
+
# Update them and retry.
random.shuffle(keys)
count = 0
@@ -241,6 +248,7 @@ class test_timestamp07(wttest.WiredTigerTestCase, suite_subprocess):
# Take a checkpoint using the given configuration. Then verify
# whether value2 appears in a copy of that data or not.
+ # print "check_stable 1"
self.check_stable(self.value2, 0, self.nkeys, self.nkeys if self.using_log else 0)
# Update the stable timestamp to the latest, but not the oldest
@@ -248,6 +256,7 @@ class test_timestamp07(wttest.WiredTigerTestCase, suite_subprocess):
# timestamp is moved we should see all keys with value2.
self.stablets = timestamp_str(self.nkeys*2)
self.conn.set_timestamp('stable_timestamp=' + self.stablets)
+ # print "check_stable 2"
self.check_stable(self.value2, self.nkeys, self.nkeys, self.nkeys)
# If we're not using the log we're done.
@@ -281,6 +290,7 @@ class test_timestamp07(wttest.WiredTigerTestCase, suite_subprocess):
# of that data or not. Both tables that are logged should see
# all the data regardless of timestamps. The table that is not
# logged should not see any of it.
+ # print "check_stable 3"
self.check_stable(self.value3, 0, self.nkeys, self.nkeys)
if __name__ == '__main__':
diff --git a/src/third_party/wiredtiger/test/suite/test_timestamp08.py b/src/third_party/wiredtiger/test/suite/test_timestamp08.py
index 3dfc3b65bc8..e72e3c62b58 100644
--- a/src/third_party/wiredtiger/test/suite/test_timestamp08.py
+++ b/src/third_party/wiredtiger/test/suite/test_timestamp08.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_timestamp09.py b/src/third_party/wiredtiger/test/suite/test_timestamp09.py
index 0e3a6b8dab3..5000eb4e854 100644
--- a/src/third_party/wiredtiger/test/suite/test_timestamp09.py
+++ b/src/third_party/wiredtiger/test/suite/test_timestamp09.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_truncate01.py b/src/third_party/wiredtiger/test/suite/test_truncate01.py
index 88d29d8443a..b26c9cf8fe1 100644
--- a/src/third_party/wiredtiger/test/suite/test_truncate01.py
+++ b/src/third_party/wiredtiger/test/suite/test_truncate01.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_truncate02.py b/src/third_party/wiredtiger/test/suite/test_truncate02.py
index 06fa6bfc94f..cb68d90d9ff 100644
--- a/src/third_party/wiredtiger/test/suite/test_truncate02.py
+++ b/src/third_party/wiredtiger/test/suite/test_truncate02.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_truncate03.py b/src/third_party/wiredtiger/test/suite/test_truncate03.py
index 613ab772571..2344234b38a 100644
--- a/src/third_party/wiredtiger/test/suite/test_truncate03.py
+++ b/src/third_party/wiredtiger/test/suite/test_truncate03.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_txn01.py b/src/third_party/wiredtiger/test/suite/test_txn01.py
index e0030909331..78c334db62f 100644
--- a/src/third_party/wiredtiger/test/suite/test_txn01.py
+++ b/src/third_party/wiredtiger/test/suite/test_txn01.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_txn02.py b/src/third_party/wiredtiger/test/suite/test_txn02.py
index 6e54270d3ad..94b939596d1 100644
--- a/src/third_party/wiredtiger/test/suite/test_txn02.py
+++ b/src/third_party/wiredtiger/test/suite/test_txn02.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_txn03.py b/src/third_party/wiredtiger/test/suite/test_txn03.py
index 53e9b8e6206..c5f9a38f904 100644
--- a/src/third_party/wiredtiger/test/suite/test_txn03.py
+++ b/src/third_party/wiredtiger/test/suite/test_txn03.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_txn04.py b/src/third_party/wiredtiger/test/suite/test_txn04.py
index 470e37d6a9c..26b71c1af74 100644
--- a/src/third_party/wiredtiger/test/suite/test_txn04.py
+++ b/src/third_party/wiredtiger/test/suite/test_txn04.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_txn05.py b/src/third_party/wiredtiger/test/suite/test_txn05.py
index 045cd570d8a..52e27f14612 100644
--- a/src/third_party/wiredtiger/test/suite/test_txn05.py
+++ b/src/third_party/wiredtiger/test/suite/test_txn05.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_txn06.py b/src/third_party/wiredtiger/test/suite/test_txn06.py
index 21d5d886a6a..b9e88088707 100644
--- a/src/third_party/wiredtiger/test/suite/test_txn06.py
+++ b/src/third_party/wiredtiger/test/suite/test_txn06.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_txn07.py b/src/third_party/wiredtiger/test/suite/test_txn07.py
index fe1bdd346a0..58a3e2093ce 100644
--- a/src/third_party/wiredtiger/test/suite/test_txn07.py
+++ b/src/third_party/wiredtiger/test/suite/test_txn07.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_txn08.py b/src/third_party/wiredtiger/test/suite/test_txn08.py
index 5ba0a529a31..41122be58ef 100644
--- a/src/third_party/wiredtiger/test/suite/test_txn08.py
+++ b/src/third_party/wiredtiger/test/suite/test_txn08.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_txn09.py b/src/third_party/wiredtiger/test/suite/test_txn09.py
index cc5771ef681..421c4e69887 100644
--- a/src/third_party/wiredtiger/test/suite/test_txn09.py
+++ b/src/third_party/wiredtiger/test/suite/test_txn09.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_txn10.py b/src/third_party/wiredtiger/test/suite/test_txn10.py
index d27f83bf2e4..32cf13e0ea4 100644
--- a/src/third_party/wiredtiger/test/suite/test_txn10.py
+++ b/src/third_party/wiredtiger/test/suite/test_txn10.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_txn11.py b/src/third_party/wiredtiger/test/suite/test_txn11.py
index 0cb2dfd615a..4e689bac1b3 100644
--- a/src/third_party/wiredtiger/test/suite/test_txn11.py
+++ b/src/third_party/wiredtiger/test/suite/test_txn11.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_txn12.py b/src/third_party/wiredtiger/test/suite/test_txn12.py
index 21065083633..f94f116abe8 100644
--- a/src/third_party/wiredtiger/test/suite/test_txn12.py
+++ b/src/third_party/wiredtiger/test/suite/test_txn12.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_txn13.py b/src/third_party/wiredtiger/test/suite/test_txn13.py
index ec6f2813457..1c1224a545d 100644
--- a/src/third_party/wiredtiger/test/suite/test_txn13.py
+++ b/src/third_party/wiredtiger/test/suite/test_txn13.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_txn14.py b/src/third_party/wiredtiger/test/suite/test_txn14.py
index 2245f49ae85..104db8a9da2 100644
--- a/src/third_party/wiredtiger/test/suite/test_txn14.py
+++ b/src/third_party/wiredtiger/test/suite/test_txn14.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_txn15.py b/src/third_party/wiredtiger/test/suite/test_txn15.py
index 762c0613735..ddc78678c01 100644
--- a/src/third_party/wiredtiger/test/suite/test_txn15.py
+++ b/src/third_party/wiredtiger/test/suite/test_txn15.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_txn16.py b/src/third_party/wiredtiger/test/suite/test_txn16.py
index 921b67e3f6b..916b735a9d9 100644
--- a/src/third_party/wiredtiger/test/suite/test_txn16.py
+++ b/src/third_party/wiredtiger/test/suite/test_txn16.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_txn17.py b/src/third_party/wiredtiger/test/suite/test_txn17.py
index 213dd67ff53..a15acb4aed3 100644
--- a/src/third_party/wiredtiger/test/suite/test_txn17.py
+++ b/src/third_party/wiredtiger/test/suite/test_txn17.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_txn18.py b/src/third_party/wiredtiger/test/suite/test_txn18.py
index e139ebe60b5..30bf0070325 100644
--- a/src/third_party/wiredtiger/test/suite/test_txn18.py
+++ b/src/third_party/wiredtiger/test/suite/test_txn18.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_unicode01.py b/src/third_party/wiredtiger/test/suite/test_unicode01.py
index 21d6a714268..06d7381d353 100644
--- a/src/third_party/wiredtiger/test/suite/test_unicode01.py
+++ b/src/third_party/wiredtiger/test/suite/test_unicode01.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_upgrade.py b/src/third_party/wiredtiger/test/suite/test_upgrade.py
index 6672daf11d6..40cc1c50b1e 100644
--- a/src/third_party/wiredtiger/test/suite/test_upgrade.py
+++ b/src/third_party/wiredtiger/test/suite/test_upgrade.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_util01.py b/src/third_party/wiredtiger/test/suite/test_util01.py
index a181acd5568..19ac54af821 100644
--- a/src/third_party/wiredtiger/test/suite/test_util01.py
+++ b/src/third_party/wiredtiger/test/suite/test_util01.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_util02.py b/src/third_party/wiredtiger/test/suite/test_util02.py
index b9bc3bd26c1..7d2ea5aca9d 100644
--- a/src/third_party/wiredtiger/test/suite/test_util02.py
+++ b/src/third_party/wiredtiger/test/suite/test_util02.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_util03.py b/src/third_party/wiredtiger/test/suite/test_util03.py
index e5e4f624991..908cd11bbf5 100644
--- a/src/third_party/wiredtiger/test/suite/test_util03.py
+++ b/src/third_party/wiredtiger/test/suite/test_util03.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_util04.py b/src/third_party/wiredtiger/test/suite/test_util04.py
index cbfd63b6b65..fde92a6a629 100644
--- a/src/third_party/wiredtiger/test/suite/test_util04.py
+++ b/src/third_party/wiredtiger/test/suite/test_util04.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_util07.py b/src/third_party/wiredtiger/test/suite/test_util07.py
index 7d3d6ec5f37..f6efdea8830 100644
--- a/src/third_party/wiredtiger/test/suite/test_util07.py
+++ b/src/third_party/wiredtiger/test/suite/test_util07.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_util08.py b/src/third_party/wiredtiger/test/suite/test_util08.py
index 3c4561da263..8f209e6c5af 100644
--- a/src/third_party/wiredtiger/test/suite/test_util08.py
+++ b/src/third_party/wiredtiger/test/suite/test_util08.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_util09.py b/src/third_party/wiredtiger/test/suite/test_util09.py
index 3138ea087a2..8cd283628ba 100644
--- a/src/third_party/wiredtiger/test/suite/test_util09.py
+++ b/src/third_party/wiredtiger/test/suite/test_util09.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_util11.py b/src/third_party/wiredtiger/test/suite/test_util11.py
index 68cb751d364..1a07535108d 100644
--- a/src/third_party/wiredtiger/test/suite/test_util11.py
+++ b/src/third_party/wiredtiger/test/suite/test_util11.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_util12.py b/src/third_party/wiredtiger/test/suite/test_util12.py
index 6f4638e93aa..ea66b7678a3 100644
--- a/src/third_party/wiredtiger/test/suite/test_util12.py
+++ b/src/third_party/wiredtiger/test/suite/test_util12.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_util13.py b/src/third_party/wiredtiger/test/suite/test_util13.py
index 79dc232f5ef..9d6391f029c 100644
--- a/src/third_party/wiredtiger/test/suite/test_util13.py
+++ b/src/third_party/wiredtiger/test/suite/test_util13.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_util14.py b/src/third_party/wiredtiger/test/suite/test_util14.py
index e2a9f41f0d4..194d64147a5 100644
--- a/src/third_party/wiredtiger/test/suite/test_util14.py
+++ b/src/third_party/wiredtiger/test/suite/test_util14.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_util15.py b/src/third_party/wiredtiger/test/suite/test_util15.py
index 33096e71bee..0c2bb4061fe 100644
--- a/src/third_party/wiredtiger/test/suite/test_util15.py
+++ b/src/third_party/wiredtiger/test/suite/test_util15.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_util16.py b/src/third_party/wiredtiger/test/suite/test_util16.py
index 00e68c1017a..1f32e4beb4a 100644
--- a/src/third_party/wiredtiger/test/suite/test_util16.py
+++ b/src/third_party/wiredtiger/test/suite/test_util16.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_util17.py b/src/third_party/wiredtiger/test/suite/test_util17.py
index decc1fabf1d..ea669e58983 100644
--- a/src/third_party/wiredtiger/test/suite/test_util17.py
+++ b/src/third_party/wiredtiger/test/suite/test_util17.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_verify.py b/src/third_party/wiredtiger/test/suite/test_verify.py
index 615b8e278ac..16ba49ef4a7 100644
--- a/src/third_party/wiredtiger/test/suite/test_verify.py
+++ b/src/third_party/wiredtiger/test/suite/test_verify.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_version.py b/src/third_party/wiredtiger/test/suite/test_version.py
index c854a393c2b..7738af985da 100644
--- a/src/third_party/wiredtiger/test/suite/test_version.py
+++ b/src/third_party/wiredtiger/test/suite/test_version.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/wtdataset.py b/src/third_party/wiredtiger/test/suite/wtdataset.py
index 3093f550e8b..04dd5315919 100644
--- a/src/third_party/wiredtiger/test/suite/wtdataset.py
+++ b/src/third_party/wiredtiger/test/suite/wtdataset.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/wtscenario.py b/src/third_party/wiredtiger/test/suite/wtscenario.py
index 7bdfc4f23bc..76824e428df 100644
--- a/src/third_party/wiredtiger/test/suite/wtscenario.py
+++ b/src/third_party/wiredtiger/test/suite/wtscenario.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/wttest.py b/src/third_party/wiredtiger/test/suite/wttest.py
index f6d81d88b86..40d8bd689cd 100644
--- a/src/third_party/wiredtiger/test/suite/wttest.py
+++ b/src/third_party/wiredtiger/test/suite/wttest.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/wtthread.py b/src/third_party/wiredtiger/test/suite/wtthread.py
index 54fc4a1961e..77408b57c5e 100644
--- a/src/third_party/wiredtiger/test/suite/wtthread.py
+++ b/src/third_party/wiredtiger/test/suite/wtthread.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/syscall/syscall.py b/src/third_party/wiredtiger/test/syscall/syscall.py
index 1caa718b4fc..5567db9cc6b 100644
--- a/src/third_party/wiredtiger/test/syscall/syscall.py
+++ b/src/third_party/wiredtiger/test/syscall/syscall.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/syscall/wt2336_base/base.run b/src/third_party/wiredtiger/test/syscall/wt2336_base/base.run
index db455c97474..328d5b8b7dd 100644
--- a/src/third_party/wiredtiger/test/syscall/wt2336_base/base.run
+++ b/src/third_party/wiredtiger/test/syscall/wt2336_base/base.run
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/syscall/wt2336_base/main.c b/src/third_party/wiredtiger/test/syscall/wt2336_base/main.c
index f22af235c19..54f9999a126 100644
--- a/src/third_party/wiredtiger/test/syscall/wt2336_base/main.c
+++ b/src/third_party/wiredtiger/test/syscall/wt2336_base/main.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/thread/file.c b/src/third_party/wiredtiger/test/thread/file.c
index 16488259d4d..716931c58df 100644
--- a/src/third_party/wiredtiger/test/thread/file.c
+++ b/src/third_party/wiredtiger/test/thread/file.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/thread/rw.c b/src/third_party/wiredtiger/test/thread/rw.c
index bda54d388b5..dc46e9b595d 100644
--- a/src/third_party/wiredtiger/test/thread/rw.c
+++ b/src/third_party/wiredtiger/test/thread/rw.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/thread/stats.c b/src/third_party/wiredtiger/test/thread/stats.c
index 9eadcce2214..675a1bcfd87 100644
--- a/src/third_party/wiredtiger/test/thread/stats.c
+++ b/src/third_party/wiredtiger/test/thread/stats.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/thread/t.c b/src/third_party/wiredtiger/test/thread/t.c
index 3dc196eef5d..f509b6d73e2 100644
--- a/src/third_party/wiredtiger/test/thread/t.c
+++ b/src/third_party/wiredtiger/test/thread/t.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/thread/thread.h b/src/third_party/wiredtiger/test/thread/thread.h
index bcba442b4c1..27d5287d30e 100644
--- a/src/third_party/wiredtiger/test/thread/thread.h
+++ b/src/third_party/wiredtiger/test/thread/thread.h
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/utility/misc.c b/src/third_party/wiredtiger/test/utility/misc.c
index 9d8fa28d3d7..a632e832f53 100644
--- a/src/third_party/wiredtiger/test/utility/misc.c
+++ b/src/third_party/wiredtiger/test/utility/misc.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
@@ -148,6 +148,24 @@ testutil_make_work_dir(const char *dir)
}
/*
+ * testutil_progress --
+ * Print a progress message to the progress file.
+ */
+void
+testutil_progress(TEST_OPTS *opts, const char *message)
+{
+ FILE *fp;
+ time_t now;
+
+ if ((fp = fopen(opts->progress_file_name, "a")) == NULL)
+ testutil_die(errno, "fopen");
+ (void)time(&now);
+ fprintf(fp, "[%" PRIuMAX "] %s\n", (uintmax_t)now, message);
+ if (fclose(fp) != 0)
+ testutil_die(errno, "fclose");
+}
+
+/*
* testutil_cleanup --
* Delete the existing work directory and free the options structure.
*/
@@ -161,6 +179,7 @@ testutil_cleanup(TEST_OPTS *opts)
testutil_clean_work_dir(opts->home);
free(opts->uri);
+ free(opts->progress_file_name);
free(opts->home);
}
diff --git a/src/third_party/wiredtiger/test/utility/parse_opts.c b/src/third_party/wiredtiger/test/utility/parse_opts.c
index bcdd7d3f7bd..9e4f309615e 100644
--- a/src/third_party/wiredtiger/test/utility/parse_opts.c
+++ b/src/third_party/wiredtiger/test/utility/parse_opts.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
@@ -119,6 +119,14 @@ testutil_parse_opts(int argc, char * const *argv, TEST_OPTS *opts)
opts->home, len, "WT_TEST.%s", opts->progname));
}
+ /*
+ * Setup the progress file name.
+ */
+ len = strlen(opts->home) + 20;
+ opts->progress_file_name = dmalloc(len);
+ testutil_check(__wt_snprintf(opts->progress_file_name, len,
+ "%s/progress.txt", opts->home));
+
/* Setup the default URI string */
len = strlen("table:") + strlen(opts->progname) + 10;
opts->uri = dmalloc(len);
diff --git a/src/third_party/wiredtiger/test/utility/test_util.h b/src/third_party/wiredtiger/test/utility/test_util.h
index 7500df8d5e5..1054412adfe 100644
--- a/src/third_party/wiredtiger/test/utility/test_util.h
+++ b/src/third_party/wiredtiger/test/utility/test_util.h
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
@@ -48,6 +48,7 @@
/* Generic option parsing structure shared by all test cases. */
typedef struct {
char *home;
+ char *progress_file_name;
const char *progname;
enum { TABLE_COL=1, /* Fixed-length column store */
TABLE_FIX=2, /* Variable-length column store */
@@ -240,6 +241,7 @@ void testutil_cleanup(TEST_OPTS *);
bool testutil_is_flag_set(const char *);
void testutil_make_work_dir(const char *);
int testutil_parse_opts(int, char * const *, TEST_OPTS *);
+void testutil_progress(TEST_OPTS *, const char *);
void testutil_work_dir_from_path(char *, size_t, const char *);
WT_THREAD_RET thread_append(void *);
diff --git a/src/third_party/wiredtiger/test/utility/thread.c b/src/third_party/wiredtiger/test/utility/thread.c
index ed8c7e5ae73..1e1bd0bf575 100644
--- a/src/third_party/wiredtiger/test/utility/thread.c
+++ b/src/third_party/wiredtiger/test/utility/thread.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/windows/windows_shim.c b/src/third_party/wiredtiger/test/windows/windows_shim.c
index 8986c1a5ae1..b40a9e01a42 100644
--- a/src/third_party/wiredtiger/test/windows/windows_shim.c
+++ b/src/third_party/wiredtiger/test/windows/windows_shim.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/windows/windows_shim.h b/src/third_party/wiredtiger/test/windows/windows_shim.h
index 5a065ed8a79..2f46be9daee 100644
--- a/src/third_party/wiredtiger/test/windows/windows_shim.h
+++ b/src/third_party/wiredtiger/test/windows/windows_shim.h
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2017 MongoDB, Inc.
+ * Public Domain 2014-2018 MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/wtperf/test_conf_dump.py b/src/third_party/wiredtiger/test/wtperf/test_conf_dump.py
index bbfb8e819e9..e0063eb3a0a 100644
--- a/src/third_party/wiredtiger/test/wtperf/test_conf_dump.py
+++ b/src/third_party/wiredtiger/test/wtperf/test_conf_dump.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/tools/wt_ckpt_decode.py b/src/third_party/wiredtiger/tools/wt_ckpt_decode.py
index 0d45a652063..082387f5622 100644
--- a/src/third_party/wiredtiger/tools/wt_ckpt_decode.py
+++ b/src/third_party/wiredtiger/tools/wt_ckpt_decode.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/tools/wt_optrack_decode.py b/src/third_party/wiredtiger/tools/wt_optrack_decode.py
index 1e063d1887c..ebfd4af05b7 100755
--- a/src/third_party/wiredtiger/tools/wt_optrack_decode.py
+++ b/src/third_party/wiredtiger/tools/wt_optrack_decode.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2017 MongoDB, Inc.
+# Public Domain 2014-2018 MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.