Merge branch 'develop' into mongodb-3.6mongodb-3.5.1

9 files changed, 55 insertions, 13 deletions

diff --git a/dist/api_config.py b/dist/api_config.py
index 1069a7037ce..d83a632321e 100644
--- a/dist/api_config.py
+++ b/dist/api_config.py
@@ -198,7 +198,8 @@ def get_default(c):
         return 'false'
     elif c.default == 'true':
         return 'true'
-    elif t == 'string' and c.default == 'none':
+    elif t == 'string' and c.default == 'none' and \
+        not c.flags.get('choices', []):
         return ''
     elif t == 'category':
         return '(%s)' % (','.join('%s=%s' % (subc.name, get_default(subc))
diff --git a/dist/api_data.py b/dist/api_data.py
index 5a81e8dd080..2b7ef4a94e1 100644
--- a/dist/api_data.py
+++ b/dist/api_data.py
@@ -120,6 +120,14 @@ lsm_config = [
 
 # Per-file configuration
 file_config = format_meta + [
+    Config('access_pattern_hint', 'none', r'''
+        It is recommended that workloads that consist primarily of
+        updates and/or point queries specify \c random.  Workloads that
+        do many cursor scans through large ranges of data specify
+        \c sequential and other workloads specify \c none.  The
+        option leads to an advisory call to an appropriate operating
+        system API where available''',
+        choices=['none', 'random', 'sequential']),
     Config('block_allocation', 'best', r'''
         configure block allocation. Permitted values are \c "first" or
         \c "best"; the \c "first" configuration uses a first-available
@@ -847,9 +855,10 @@ methods = {
 
 'WT_SESSION.drop' : Method([
     Config('checkpoint_wait', 'true', r'''
-        wait for the checkpoint lock, if \c checkpoint_wait=false, perform
-        the drop operation without taking a lock, returning EBUSY if the
-        operation conflicts with a running checkpoint''',
+        wait for concurrent checkpoints to complete before attempting the drop
+        operation. If \c checkpoint_wait=false, attempt the drop operation
+        without waiting, returning EBUSY if the operation conflicts with a
+        running checkpoint''',
         type='boolean', undoc=True),
     Config('force', 'false', r'''
         return success if the object does not exist''',
@@ -1119,6 +1128,10 @@ methods = {
         Config('to', '', r'''
             drop all snapshots up to and including the specified name'''),
     ]),
+    Config('include_updates', 'false', r'''
+        make updates from the current transaction visible to users of the
+        named snapshot.  Transactions started with such a named snapshot are
+        restricted to being read-only''', type='boolean'),
     Config('name', '', r'''specify a name for the snapshot'''),
 ]),
 
diff --git a/dist/flags.py b/dist/flags.py
index 676f224cbb6..320bd8f6fb9 100644
--- a/dist/flags.py
+++ b/dist/flags.py
@@ -114,8 +114,6 @@ flags = {
     'session' : [
         'SESSION_CAN_WAIT',
         'SESSION_INTERNAL',
-        'SESSION_IN_SPLIT',
-        'SESSION_LOCK_NO_WAIT',
         'SESSION_LOCKED_CHECKPOINT',
         'SESSION_LOCKED_HANDLE_LIST',
         'SESSION_LOCKED_METADATA',
diff --git a/dist/package/wiredtiger.spec b/dist/package/wiredtiger.spec
index 365c330d86a..ca88f76b06b 100644
--- a/dist/package/wiredtiger.spec
+++ b/dist/package/wiredtiger.spec
@@ -1,5 +1,5 @@
 Name:		wiredtiger
-Version:	2.8.1
+Version:	2.9.1
 Release:	1%{?dist}
 Summary:	WiredTiger data storage engine
 
diff --git a/dist/s_define.list b/dist/s_define.list
index 7b11d665de5..372a251bf01 100644
--- a/dist/s_define.list
+++ b/dist/s_define.list
@@ -54,7 +54,7 @@ WT_STAT_INCRV_BASE
 WT_STAT_WRITE
 WT_TIMEDIFF_US
 WT_TRET_ERROR_OK
-WT_WITH_LOCK
+WT_WITH_LOCK_NOWAIT
 WT_WITH_LOCK_WAIT
 __F
 __WIREDTIGER_EXT_H_
diff --git a/dist/s_prototypes b/dist/s_prototypes
index 4c07b9aa160..d6228866f08 100755
--- a/dist/s_prototypes
+++ b/dist/s_prototypes
@@ -39,9 +39,12 @@ proto()
 		-e H \
 		-e x \
 	    -e '}' \
-	    -e '# Add the gcc warn_unused_result attribute to any external' \
+	    -e '# Add the warn_unused_result attribute to any external' \
 	    -e '# functions that return an int.' \
 	    -e '/^extern int /s/$/ WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result))/' \
+	    -e '# Add the hidden attribute to any external functions without' \
+	    -e '# an explicit visibility.' \
+	    -e '/visibility/!s/$/ WT_GCC_FUNC_DECL_ATTRIBUTE((visibility("hidden")))/' \
 	    -e 's/$/;/' \
 	    -e p < $1
 }
diff --git a/dist/s_python b/dist/s_python
index b8aa5848637..bfe3ba57783 100755
--- a/dist/s_python
+++ b/dist/s_python
@@ -17,10 +17,10 @@ test -s $t && {
 	echo '[tab] characters appear in Python scripts:'
 	cat $t
 }
-# Check Python coding standards: check for trailing semi-colons.
+# Check Python coding standards: check for uncommented trailing semi-colons.
 # Don't check too widely, there are third-party tools that fail this test as
 # well as scripts in this directory that output C code, and so fail the test.
-egrep ';$' `find lang test -name '*.py'`> $t
+egrep '^[^#]*;$' `find lang test -name '*.py'`> $t
 test -s $t && {
 	echo 'trailing semi-colons in selected Python code:'
 	cat $t
diff --git a/dist/s_string.ok b/dist/s_string.ok
index d19c05e802b..f2429237f21 100644
--- a/dist/s_string.ok
+++ b/dist/s_string.ok
@@ -38,6 +38,7 @@ BTREE
 BUF
 BZ
 Barack
+BerkeleyDB
 Bitfield
 Bitwise
 Brueckner
@@ -88,6 +89,7 @@ DNE
 DOI
 DONTNEED
 DUPLICATEV
+DataSet
 DbCursor
 DbEnv
 Decrement
@@ -126,6 +128,7 @@ FNV
 FORALL
 FOREACH
 FS
+FTRUNCATE
 FULLFSYNC
 Facebook
 FindClose
@@ -156,6 +159,7 @@ HHHHLL
 HHHLL
 Hendrik
 HyperLevelDB
+ID's
 IEC
 IEEE
 IKEY
@@ -167,6 +171,7 @@ INITIALIZER
 INMEM
 INSN
 INTL
+INULL
 ISA
 ITEMs
 ITER
@@ -247,6 +252,7 @@ NONINFRINGEMENT
 NOTFOUND
 NOTREACHED
 NOVALUE
+NOWAIT
 NUL
 NUM
 NetBSD
@@ -269,6 +275,7 @@ PRIu
 PRNG
 PTHREAD
 PTR
+PackInputStream
 Pandis
 Phong
 PlatformSDK
@@ -300,6 +307,7 @@ Readonly
 Rebalance
 RedHat
 Redistributions
+Refactor
 Resize
 RocksDB
 SIMD
@@ -397,14 +405,18 @@ WiredTigerPreplog
 WiredTigerTmplog
 WiredTigerTxn
 WithSeeds
+Wpedantic
 WriteFile
 Wuninitialized
 Wunused
 XP
+Xcode
+Xcode/
 Yann
 ZSTD
 Zlib
 Zlib's
+Zstandard
 Zstd
 Zstd's
 abcdef
@@ -428,6 +440,7 @@ argc
 args
 argv
 asm
+aspell
 assertfmt
 async
 asyncopp
@@ -547,6 +560,7 @@ create's
 createCStream
 crypto
 cryptobad
+csuite
 csv
 ctime
 ctype
@@ -598,6 +612,7 @@ dequeue
 dequeued
 der
 dereference
+dereferenced
 desc
 designator
 dest
@@ -610,6 +625,7 @@ difftime
 dir
 dirlist
 disjunction
+disjunctions
 dlclose
 dlh
 dll
@@ -633,6 +649,7 @@ dumpcmp
 dumpfile
 dup
 eg
+egrep
 emp
 encodings
 encryptor
@@ -723,6 +740,7 @@ gettime
 gettimeofday
 getv
 github
+gitignore
 gobare
 goesc
 gostring
@@ -834,6 +852,7 @@ libdatasource
 libs
 libtool
 libwiredtiger
+linkers
 llll
 llu
 loadtext
@@ -935,6 +954,7 @@ nowait
 nset
 nsnap
 nul
+nullptr
 nuls
 numSymbols
 numbare
@@ -948,6 +968,7 @@ oo
 opcode
 opendir
 openfile
+oplog
 optimizations
 optype
 ori
@@ -969,6 +990,7 @@ pclose
 pcpu
 perf
 pfx
+pluggable
 popen
 poptable
 popthreads
@@ -1117,6 +1139,7 @@ subtree
 sunique
 superset
 sw
+sx
 sy
 sys
 sz
@@ -1225,6 +1248,7 @@ walk's
 warmup
 wb
 wcursor
+whitespace
 wiredTiger
 wiredtiger
 workFactor
@@ -1238,6 +1262,7 @@ ws
 wtbench
 wti
 wtperf
+wtperf's
 wts
 wtstats
 xF
@@ -1250,6 +1275,7 @@ zf
 zfree
 zlib
 zlib's
+zseries
 zstd
 zstd's
 zu
diff --git a/dist/s_void b/dist/s_void
index 16684e962e6..06111245fe2 100755
--- a/dist/s_void
+++ b/dist/s_void
@@ -5,7 +5,8 @@ trap 'rm -f $t' 0 1 2 3 13 15
 
 cd ..
 
-# Turn a C file into a line per function that returns an int.
+# Parse a C file, discarding functions that don't return an int, and formatting
+# the remaining functions as a single line.
 file_parse()
 {
 	sed -n \
@@ -109,7 +110,7 @@ func_ok()
 }
 
 # Complain about functions which return an "int" but which don't return except
-# at the end of the function. This script is a kluge and isn't run by default.
+# at the end of the function.
 for f in `find bench ext src test -name '*.[ci]'`; do
 	if expr "$f" : '.*/windows_shim.c' > /dev/null; then
 		continue