Import wiredtiger: ef9a7983ea47cea78400a4472a3d4e46735385c5 from branch mongodb-3.4

ref: 6a31c2118c..ef9a7983ea
for: 3.4.0-rc2

WT-1592       Add ability to dump detailed cache information via statistics
WT-2403       Enhance random cursor implementation for LSM trees
WT-2880       Add support for Zstandard compression
WT-2904       Fix a bug where the reported checkpoint size could be many times data size
WT-2949       Add an option to wtperf to not close connection on shutdown
WT-2954       Inserting multi-megabyte values can cause large in-memory pages
WT-2955       Add statistics tracking the amount of time threads spend waiting for high level locks
WT-2956       utility tests -h option is always overridden by the default setup
WT-2959       Ensure WT_SESSION_IMPL is never used before it's initialized
WT-2963       Race setting max_entries during eviction
WT-2965       test_wt2323_join_visibility can hang on OSX
WT-2974       lint
WT-2976       Add a statistic tracking how long application threads spend doing I/O
WT-2977       Csuite LSM Random test can occasionally fail
WT-2985       Race during checkpoint can cause a core dump
WT-2987       Fix a bug where opening a cursor on an incomplete table drops core
WT-2988       Fix a bug where __wt_epoch potentially returns garbage values.

3 files changed, 37 insertions, 1 deletions

diff --git a/src/third_party/wiredtiger/build_posix/Make.base b/src/third_party/wiredtiger/build_posix/Make.base
index 4efbe3f76c3..5b945aca5e0 100644
--- a/src/third_party/wiredtiger/build_posix/Make.base
+++ b/src/third_party/wiredtiger/build_posix/Make.base
@@ -77,6 +77,9 @@ endif
 if HAVE_BUILTIN_EXTENSION_ZLIB
 libwiredtiger_la_LIBADD += ext/compressors/zlib/libwiredtiger_zlib.la
 endif
+if HAVE_BUILTIN_EXTENSION_ZSTD
+libwiredtiger_la_LIBADD += ext/compressors/zstd/libwiredtiger_zstd.la
+endif
 
 libwiredtiger_static_la_LIBADD=$(libwiredtiger_la_LIBADD)
 libwiredtiger_static_la_SOURCES=$(libwiredtiger_la_SOURCES)
diff --git a/src/third_party/wiredtiger/build_posix/Make.subdirs b/src/third_party/wiredtiger/build_posix/Make.subdirs
index 0b5175e4196..55941837249 100644
--- a/src/third_party/wiredtiger/build_posix/Make.subdirs
+++ b/src/third_party/wiredtiger/build_posix/Make.subdirs
@@ -11,6 +11,7 @@ ext/compressors/lz4 LZ4
 ext/compressors/nop
 ext/compressors/snappy SNAPPY
 ext/compressors/zlib ZLIB
+ext/compressors/zstd ZSTD
 ext/datasources/helium HAVE_HELIUM
 ext/encryptors/nop
 ext/encryptors/rotn
diff --git a/src/third_party/wiredtiger/build_posix/aclocal/options.m4 b/src/third_party/wiredtiger/build_posix/aclocal/options.m4
index 1f6a1690279..7043430a6d6 100644
--- a/src/third_party/wiredtiger/build_posix/aclocal/options.m4
+++ b/src/third_party/wiredtiger/build_posix/aclocal/options.m4
@@ -19,10 +19,12 @@ AH_TEMPLATE(HAVE_BUILTIN_EXTENSION_SNAPPY,
 	    [Snappy support automatically loaded.])
 AH_TEMPLATE(HAVE_BUILTIN_EXTENSION_ZLIB,
 	    [Zlib support automatically loaded.])
+AH_TEMPLATE(HAVE_BUILTIN_EXTENSION_ZSTD,
+	    [ZSTD support automatically loaded.])
 AC_MSG_CHECKING(if --with-builtins option specified)
 AC_ARG_WITH(builtins,
 	[AS_HELP_STRING([--with-builtins],
-	    [builtin extension names (lz4, snappy, zlib).])],
+	    [builtin extension names (lz4, snappy, zlib, zstd).])],
 	    [with_builtins=$withval],
 	    [with_builtins=])
 
@@ -36,6 +38,8 @@ for builtin_i in $builtin_list; do
 		wt_cv_with_builtin_extension_snappy=yes;;
 	zlib)	AC_DEFINE(HAVE_BUILTIN_EXTENSION_ZLIB)
 		wt_cv_with_builtin_extension_zlib=yes;;
+	zstd)	AC_DEFINE(HAVE_BUILTIN_EXTENSION_ZSTD)
+		wt_cv_with_builtin_extension_zstd=yes;;
 	*)	AC_MSG_ERROR([Unknown builtin extension "$builtin_i"]);;
 	esac
 done
@@ -45,6 +49,8 @@ AM_CONDITIONAL([HAVE_BUILTIN_EXTENSION_SNAPPY],
     [test "$wt_cv_with_builtin_extension_snappy" = "yes"])
 AM_CONDITIONAL([HAVE_BUILTIN_EXTENSION_ZLIB],
     [test "$wt_cv_with_builtin_extension_zlib" = "yes"])
+AM_CONDITIONAL([HAVE_BUILTIN_EXTENSION_ZSTD],
+    [test "$wt_cv_with_builtin_extension_zstd" = "yes"])
 AC_MSG_RESULT($with_builtins)
 
 AH_TEMPLATE(
@@ -276,4 +282,30 @@ if test "$wt_cv_enable_zlib" = "yes"; then
 fi
 AM_CONDITIONAL([ZLIB], [test "$wt_cv_enable_zlib" = "yes"])
 
+AC_MSG_CHECKING(if --enable-zstd option specified)
+AC_ARG_ENABLE(zstd,
+	[AS_HELP_STRING([--enable-zstd],
+	    [Build the zstd compressor extension.])], r=$enableval, r=no)
+case "$r" in
+no)	if test "$wt_cv_with_builtin_extension_zstd" = "yes"; then
+		wt_cv_enable_zstd=yes
+	else
+		wt_cv_enable_zstd=no
+	fi
+	;;
+*)	if test "$wt_cv_with_builtin_extension_zstd" = "yes"; then
+		AC_MSG_ERROR(
+		   [Only one of --enable-zstd --with-builtins=zstd allowed])
+	fi
+	wt_cv_enable_zstd=yes;;
+esac
+AC_MSG_RESULT($wt_cv_enable_zstd)
+if test "$wt_cv_enable_zstd" = "yes"; then
+	AC_CHECK_HEADER(zstd.h,,
+	    [AC_MSG_ERROR([--enable-zstd requires zstd.h])])
+	AC_CHECK_LIB(zstd, ZSTD_compress,,
+	    [AC_MSG_ERROR([--enable-zstd requires Zstd library])])
+fi
+AM_CONDITIONAL([ZSTD], [test "$wt_cv_enable_zstd" = "yes"])
+
 ])