Import wiredtiger-wiredtiger-mongodb-3.0-rc9-3-g1229d30.tar.gz from wiredtiger branch mongodb-3.0

8 files changed, 40 insertions, 20 deletions

diff --git a/src/third_party/wiredtiger/dist/api_data.py b/src/third_party/wiredtiger/dist/api_data.py
index 65af833c4a2..82335e3f831 100644
--- a/src/third_party/wiredtiger/dist/api_data.py
+++ b/src/third_party/wiredtiger/dist/api_data.py
@@ -88,6 +88,12 @@ lsm_config = [
             create a bloom filter on the oldest LSM tree chunk. Only
             supported if bloom filters are enabled''',
             type='boolean'),
+        Config('chunk_count_limit', '0', r'''
+            the maximum number of chunks to allow in an LSM tree. This
+            option automatically times out old data. As new chunks are
+            added old chunks will be removed. Enabling this option
+            disables LSM background merges''',
+            type='int'),
         Config('chunk_max', '5GB', r'''
             the maximum size a single chunk can be. Chunks larger than this
             size are not considered for further merges. This is a soft
diff --git a/src/third_party/wiredtiger/dist/log.py b/src/third_party/wiredtiger/dist/log.py
index 9091754ba0b..57b8fdc0f23 100644
--- a/src/third_party/wiredtiger/dist/log.py
+++ b/src/third_party/wiredtiger/dist/log.py
@@ -260,7 +260,7 @@ __wt_logop_%(name)s_print(
 \t%(arg_init)sWT_RET(__wt_logop_%(name)s_unpack(
 \t    session, pp, end%(arg_addrs)s));
 
-\tfprintf(out, "    \\"optype\\": \\"%(name)s\\",\\n");
+\tfprintf(out, " \\"optype\\": \\"%(name)s\\",\\n");
 \t%(print_args)s
 \t%(arg_fini)sreturn (0);
 }
@@ -274,10 +274,10 @@ __wt_logop_%(name)s_print(
     if has_escape(optype.fields) else ''),
     'arg_addrs' : ''.join(', &%s' % f[1] for f in optype.fields),
     'print_args' : '\n\t'.join(
-        '%sfprintf(out, "    \\"%s\\": \\"%s\\",\\n",%s);' %
+        '%sfprintf(out, "        \\"%s\\": \\"%s\\",\\n",%s);' %
         (printf_setup(f), f[1], printf_fmt(f), printf_arg(f))
         for f in optype.fields[:-1]) + str(
-        '\n\t%sfprintf(out, "    \\"%s\\": \\"%s\\"",%s);' %
+        '\n\t%sfprintf(out, "        \\"%s\\": \\"%s\\"",%s);' %
         (printf_setup(last_field), last_field[1],
             printf_fmt(last_field), printf_arg(last_field))),
 })
diff --git a/src/third_party/wiredtiger/dist/s_copyright b/src/third_party/wiredtiger/dist/s_copyright
index a0e3d588e18..73f45ffc4aa 100755
--- a/src/third_party/wiredtiger/dist/s_copyright
+++ b/src/third_party/wiredtiger/dist/s_copyright
@@ -83,7 +83,7 @@ for i in `cd .. &&
         -e '/api\/leveldb\/leveldb\//d' \
         -e '/api\/leveldb\/rocksdb\//d' \
         -e '/test\/3rdparty\//d' \
-        -e '/tools\/3rdparty\//d' \
+        -e '/tools\/wtperf_stats\/3rdparty\//d' \
 	-e 's/^\.\///'`
 do
 	check $i
diff --git a/src/third_party/wiredtiger/dist/s_copyright.list b/src/third_party/wiredtiger/dist/s_copyright.list
index 8e25f931e94..c6a5910087b 100644
--- a/src/third_party/wiredtiger/dist/s_copyright.list
+++ b/src/third_party/wiredtiger/dist/s_copyright.list
@@ -36,5 +36,7 @@ skip	src/support/stat.c
 skip	test/packing/intpack-test.c
 skip	test/packing/intpack-test2.c
 skip	test/packing/packing-test.c
-skip	tools/stat_data.py
+skip	tools/wtperf_stats/wt_nvd3_util.py
+skip	tools/wtperf_stats/wtperf_stats.py
+skip	tools/wtstats/stat_data.py
 skip	wiredtiger_config.h
diff --git a/src/third_party/wiredtiger/dist/s_release.list b/src/third_party/wiredtiger/dist/s_release.list
index 4f67e4cdb5b..232336c43e7 100644
--- a/src/third_party/wiredtiger/dist/s_release.list
+++ b/src/third_party/wiredtiger/dist/s_release.list
@@ -1,5 +1,5 @@
 # Exclusions from release packages.
-# Each non-comment line is passed as an "--exclude" argument to "hg archive".
+# Each non-comment line is excluded from the release.
 lang/python/src
 src/server
 test/format
@@ -7,3 +7,5 @@ test/packing
 test/salvage
 test/snapshot
 test/thread
+tools/wtstats/template
+tools/wtstats/test
diff --git a/src/third_party/wiredtiger/dist/s_wtstats b/src/third_party/wiredtiger/dist/s_wtstats
index e55157431f1..834b011110e 100644
--- a/src/third_party/wiredtiger/dist/s_wtstats
+++ b/src/third_party/wiredtiger/dist/s_wtstats
@@ -5,7 +5,6 @@
 t=__wt.$$
 trap 'rm -f $t; exit 0' 0 1 2 3 13 15
 
-out=wtstats.html.template
 # We require npm which may not be installed.
 type npm > /dev/null 2>&1 || {
         echo 's_wtstats: npm not found' >&2
@@ -13,25 +12,33 @@ type npm > /dev/null 2>&1 || {
         exit 1
 }
 
-cd ../tools/template || exit 1
-rm -f ./$out
-# Note: we don't do the npm install here, it downloads files
+cd ../tools/wtstats/template || exit 1
+
+out=wtstats.html.template
+rm -f $out
+
+# Run npm install.
 test -d ./node_modules || {
-        echo 's_wtstats: missing node_modules directory, install by:' >&2
-        echo '    cd ../tools/template; npm install' >&2
-        exit 1
+	echo 'Running: npm install'
+	npm --quiet install >$t 2>&1 || {
+		echo "s_wtstats: npm install failed" >&2
+		cat $t
+		exit 1
+	}
 }
-npm run build >$t 2>&1 || {
-        echo "s_wtstats: npm failed" >&2
+echo 'Running: npm run build'
+npm --quiet run build >$t 2>&1 || {
+        echo "s_wtstats: npm run build failed" >&2
         cat $t
         exit 1
 }
-test -f ./$out || {
+test -f $out || {
         echo "s_wtstats: $out not created" >&2
         cat $t
         exit 1
 }
+
 f=../$out
-cmp ./$out $f > /dev/null 2>&1 ||
-        (echo "Building tools/$out" && rm -f $f && cp ./$out $f)
+cmp $out $f > /dev/null 2>&1 ||
+        (echo "Building $out" && rm -f $f && cp $out $f)
 exit 0
diff --git a/src/third_party/wiredtiger/dist/stat.py b/src/third_party/wiredtiger/dist/stat.py
index 503753ddd01..53cbf30cf16 100644
--- a/src/third_party/wiredtiger/dist/stat.py
+++ b/src/third_party/wiredtiger/dist/stat.py
@@ -191,4 +191,4 @@ f.write(clear_info)
 f.write(prefix_info)
 f.write(group_info)
 f.close()
-compare_srcfile(tmp_file, '../tools/stat_data.py')
+compare_srcfile(tmp_file, '../tools/wtstats/stat_data.py')
diff --git a/src/third_party/wiredtiger/dist/stat_data.py b/src/third_party/wiredtiger/dist/stat_data.py
index bad65528521..5a42f2ff318 100644
--- a/src/third_party/wiredtiger/dist/stat_data.py
+++ b/src/third_party/wiredtiger/dist/stat_data.py
@@ -425,13 +425,16 @@ dsrc_stats = [
     ##########################################
     CacheStat('cache_bytes_read', 'bytes read into cache'),
     CacheStat('cache_bytes_write', 'bytes written from cache'),
-    CacheStat('cache_eviction_clean', 'unmodified pages evicted'),
     CacheStat('cache_eviction_checkpoint', 'checkpoint blocked page eviction'),
+    CacheStat('cache_eviction_clean', 'unmodified pages evicted'),
+    CacheStat('cache_eviction_deepen',
+        'page split during eviction deepened the tree'),
     CacheStat('cache_eviction_dirty', 'modified pages evicted'),
     CacheStat('cache_eviction_fail',
         'data source pages selected for eviction unable to be evicted'),
     CacheStat('cache_eviction_hazard', 'hazard pointer blocked page eviction'),
     CacheStat('cache_eviction_internal', 'internal pages evicted'),
+    CacheStat('cache_eviction_split', 'pages split during eviction'),
     CacheStat('cache_inmem_split', 'in-memory page splits'),
     CacheStat('cache_overflow_value',
         'overflow values cached in memory', 'no_scale'),