8 files changed, 36 insertions, 28 deletions
diff --git a/src/third_party/wiredtiger/bench/wtperf/config_opt.h b/src/third_party/wiredtiger/bench/wtperf/config_opt.h
index 731b58d0094..d1571b95a4d 100644
--- a/src/third_party/wiredtiger/bench/wtperf/config_opt.h
+++ b/src/third_party/wiredtiger/bench/wtperf/config_opt.h
@@ -43,7 +43,7 @@ typedef struct __config_queue_entry {
 
 typedef struct { /* Option structure */
 #define OPT_DECLARE_STRUCT
-#include "wtperf_opt.i"
+#include "wtperf_opt_inline.h"
 #undef OPT_DECLARE_STRUCT
 
     /* Queue head to save a copy of the config to be output */
diff --git a/src/third_party/wiredtiger/bench/wtperf/wtperf_config.c b/src/third_party/wiredtiger/bench/wtperf/wtperf_config.c
index 91bfa3ede47..fc487db8e2f 100644
--- a/src/third_party/wiredtiger/bench/wtperf/wtperf_config.c
+++ b/src/third_party/wiredtiger/bench/wtperf/wtperf_config.c
@@ -31,14 +31,14 @@
 static CONFIG_OPT config_opts_desc[] = {
 /* Option descriptions */
 #define OPT_DEFINE_DESC
-#include "wtperf_opt.i"
+#include "wtperf_opt_inline.h"
 #undef OPT_DEFINE_DESC
 };
 
 static CONFIG_OPTS config_opts_default = {
 /* Option defaults */
 #define OPT_DEFINE_DEFAULT
-#include "wtperf_opt.i"
+#include "wtperf_opt_inline.h"
 #undef OPT_DEFINE_DEFAULT
 
   {NULL, NULL} /* config_head */
diff --git a/src/third_party/wiredtiger/bench/wtperf/wtperf_opt.i b/src/third_party/wiredtiger/bench/wtperf/wtperf_opt_inline.h
index 1496185d3e8..ca606aa1564 100644
--- a/src/third_party/wiredtiger/bench/wtperf/wtperf_opt.i
+++ b/src/third_party/wiredtiger/bench/wtperf/wtperf_opt_inline.h
@@ -25,7 +25,7 @@
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
  * OTHER DEALINGS IN THE SOFTWARE.
  *
- * wtperf_opt.i
+ * wtperf_opt_inline.h
  *  List of options for wtperf.  This is included multiple times.
  */
 
@@ -80,8 +80,8 @@
  * The difference between CONFIG_STRING and STRING is that CONFIG_STRING
  * options are appended to existing content, whereas STRING options overwrite.
  */
-DEF_OPT_AS_UINT32(
-  backup_interval, 0, "backup the database every interval seconds during the workload phase, 0 to disable")
+DEF_OPT_AS_UINT32(backup_interval, 0,
+  "backup the database every interval seconds during the workload phase, 0 to disable")
 DEF_OPT_AS_UINT32(
   checkpoint_interval, 120, "checkpoint every interval seconds during the workload phase.")
 DEF_OPT_AS_UINT32(checkpoint_stress_rate, 0,
@@ -143,8 +143,9 @@ DEF_OPT_AS_BOOL(range_partition, 0, "partition data by range (vs hash)")
 DEF_OPT_AS_UINT32(read_range, 0,
   "read a sequential range of keys upon each read operation. This value tells us how many keys "
   "to read each time, or an upper bound on the number of keys read if read_range_random is set.")
-DEF_OPT_AS_BOOL(read_range_random, 0, "if doing range reads, select the number of keys to read "
-   "in a range uniformly at random.")
+DEF_OPT_AS_BOOL(read_range_random, 0,
+  "if doing range reads, select the number of keys to read "
+  "in a range uniformly at random.")
 DEF_OPT_AS_BOOL(readonly, 0,
   "reopen the connection between populate and workload phases in readonly mode.  Requires "
   "reopen_connection turned on (default).  Requires that read be the only workload specified")
@@ -166,8 +167,9 @@ DEF_OPT_AS_UINT32(
 DEF_OPT_AS_UINT32(scan_table_count, 0,
   "number of separate tables to be used for scanning. Zero indicates that tables are shared with "
   "other operations")
-DEF_OPT_AS_BOOL(select_latest, 0, "in workloads that involve inserts and another type of operation,"
-        "select the recently inserted records with higher probability")
+DEF_OPT_AS_BOOL(select_latest, 0,
+  "in workloads that involve inserts and another type of operation,"
+  "select the recently inserted records with higher probability")
 DEF_OPT_AS_CONFIG_STRING(sess_config, "", "session configuration string")
 DEF_OPT_AS_UINT32(session_count_idle, 0, "number of idle sessions to create. Default 0.")
 /* The following table configuration is based on the configuration MongoDB uses for collections. */
@@ -193,14 +195,14 @@ DEF_OPT_AS_STRING(threads, "",
   "'update_delta', 'truncate', 'truncate_pct' and 'truncate_count'. There are also behavior "
   "modifiers, supported modifiers are 'ops_per_txn'")
 /*
- * Note for tiered storage usage, the test expects that the bucket will be specified in the
- * runner's 'conn_config' line. Any bucket or directory listed is assumed to already exist and the
- * test program will just use it. The program does not parse the connection configuration line.
+ * Note for tiered storage usage, the test expects that the bucket will be specified in the runner's
+ * 'conn_config' line. Any bucket or directory listed is assumed to already exist and the test
+ * program will just use it. The program does not parse the connection configuration line.
  */
-DEF_OPT_AS_STRING(tiered, "none",
-  "tiered extension.  Allowed configuration values are: 'none', 'dir_store', 's3'")
-DEF_OPT_AS_UINT32(
-  tiered_flush_interval, 0, "Call flush_tier every interval seconds during the workload phase. "
+DEF_OPT_AS_STRING(
+  tiered, "none", "tiered extension.  Allowed configuration values are: 'none', 'dir_store', 's3'")
+DEF_OPT_AS_UINT32(tiered_flush_interval, 0,
+  "Call flush_tier every interval seconds during the workload phase. "
   "We recommend this value be larger than the checkpoint_interval. 0 to disable. The "
   "'tiered_extension' must be set to something other than 'none'.")
 DEF_OPT_AS_CONFIG_STRING(transaction_config, "",
diff --git a/src/third_party/wiredtiger/dist/s_docs b/src/third_party/wiredtiger/dist/s_docs
index 4ce68e1932f..c69e979dd5d 100755
--- a/src/third_party/wiredtiger/dist/s_docs
+++ b/src/third_party/wiredtiger/dist/s_docs
@@ -29,7 +29,7 @@ wtperf_config()
     # The OS X cpp program injects line number output in the middle of lines
     # and doesn't stringify #XXX entries; use the -E option to the compiler
     # instead.
-    cat ../bench/wtperf/wtperf_opt.i |
+    cat ../bench/wtperf/wtperf_opt_inline.h |
     ${CC:-cc} -E -DOPT_DEFINE_DOXYGEN - | python wtperf_config.py > $t
     (echo '/START_AUTO_GENERATED_WTPERF_CONFIGURATION/+3,/STOP_AUTO_GENERATED_WTPERF_CONFIGURATION/-1d'
      echo 'i'
diff --git a/src/third_party/wiredtiger/dist/s_string.ok b/src/third_party/wiredtiger/dist/s_string.ok
index 8ea03b07941..40cfd8d66a0 100644
--- a/src/third_party/wiredtiger/dist/s_string.ok
+++ b/src/third_party/wiredtiger/dist/s_string.ok
@@ -1164,6 +1164,7 @@ maxObjects
 maxcpu
 maxdbs
 maxdiff
+maxv
 mb
 mbll
 mbss
@@ -1494,6 +1495,7 @@ suboptimal
 subsystem's
 subtest
 subtree
+sumv
 sunique
 supd
 superset
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data
index 91b63795da2..110643949e8 100644
--- a/src/third_party/wiredtiger/import.data
+++ b/src/third_party/wiredtiger/import.data
@@ -2,5 +2,5 @@
     "vendor": "wiredtiger",
     "github": "wiredtiger/wiredtiger.git",
     "branch": "mongodb-master",
-    "commit": "b183ecb40882d967627093766b27bab9eca52db1"
+    "commit": "843032e989c2f01e0da592e50a2bb934b72ebbdd"
 }
diff --git a/src/third_party/wiredtiger/test/format/format.h b/src/third_party/wiredtiger/test/format/format.h
index 46ca6542680..3b43c304435 100644
--- a/src/third_party/wiredtiger/test/format/format.h
+++ b/src/third_party/wiredtiger/test/format/format.h
@@ -452,4 +452,4 @@ void wts_verify_checkpoint(WT_CONNECTION *, const char *);
 
 #define WARN(fmt, ...) fprintf(stderr, "%s: WARNING: " fmt "\n", progname, __VA_ARGS__)
 
-#include "format.i"
+#include "format_inline.h"
diff --git a/src/third_party/wiredtiger/test/format/format.i b/src/third_party/wiredtiger/test/format/format_inline.h
index 8537f3f5bc7..07f33f5319c 100644
--- a/src/third_party/wiredtiger/test/format/format.i
+++ b/src/third_party/wiredtiger/test/format/format_inline.h
@@ -143,6 +143,11 @@ mmrand(WT_RAND_STATE *rnd, u_int min, u_int max)
     return (v);
 }
 
+/*
+ * random_sleep --
+ *     Randomly select a time to sleep between 0 and a maximum number of seconds, favoring shorter
+ *     sleep times.
+ */
 static inline void
 random_sleep(WT_RAND_STATE *rnd, u_int max_seconds)
 {
@@ -167,8 +172,8 @@ random_sleep(WT_RAND_STATE *rnd, u_int max_seconds)
 }
 
 /*
- * tables_apply -
- *	Call an underlying function on all tables.
+ * tables_apply --
+ *     Call an underlying function on all tables.
  */
 static inline void
 tables_apply(void (*func)(TABLE *, void *), void *arg)
@@ -257,8 +262,7 @@ table_select_type(table_type type)
  *     Open a WiredTiger cursor.
  */
 static inline void
-wt_wrap_open_cursor(
-  WT_SESSION *session, const char *uri, const char *config, WT_CURSOR **cursorp)
+wt_wrap_open_cursor(WT_SESSION *session, const char *uri, const char *config, WT_CURSOR **cursorp)
 {
     WT_DECL_RET;
 
@@ -334,8 +338,8 @@ key_gen_insert(TABLE *table, WT_RAND_STATE *rnd, WT_ITEM *key, uint64_t keyno)
 }
 
 /*
- * lock_try_writelock
- *     Try to get exclusive lock.  Fail immediately if not available.
+ * lock_try_writelock --
+ *     Try to get exclusive lock. Fail immediately if not available.
  */
 static inline int
 lock_try_writelock(WT_SESSION *session, RWLOCK *lock)
@@ -385,8 +389,8 @@ lock_readlock(WT_SESSION *session, RWLOCK *lock)
 }
 
 /*
- * lock_writeunlock --
- *     Release an exclusive lock.
+ * lock_readunlock --
+ *     Release a shared lock.
  */
 static inline void
 lock_readunlock(WT_SESSION *session, RWLOCK *lock)