Import wiredtiger: 7dfd9391862bc9a6d84868c4dc51689c45a3aacf from branch mongodb-4.4

ref: c809757d8b..7dfd939186
for: 4.3.1

WT-4658       Apply Clang Format
WT-4810       Adding WT_ERR_ASSERT and WT_RET_ASSERT macros
WT-5046       Prepared transactions aren't properly cleared from global table with WT_CONN_LOG_DEBUG_MODE enabled

1 files changed, 149 insertions, 149 deletions

diff --git a/src/third_party/wiredtiger/src/include/wt_internal.h b/src/third_party/wiredtiger/src/include/wt_internal.h
index 5d2205f7718..3bc4f02c258 100644
--- a/src/third_party/wiredtiger/src/include/wt_internal.h
+++ b/src/third_party/wiredtiger/src/include/wt_internal.h
@@ -7,7 +7,7 @@
  */
 
 #ifndef __WT_INTERNAL_H
-#define	__WT_INTERNAL_H
+#define __WT_INTERNAL_H
 
 #if defined(__cplusplus)
 extern "C" {
@@ -57,7 +57,7 @@ extern "C" {
 #endif
 #include <time.h>
 #ifdef _WIN32
-#define	WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #endif
 
@@ -66,267 +66,267 @@ extern "C" {
  * Forward type declarations for internal types: BEGIN
  */
 struct __wt_addr;
-    typedef struct __wt_addr WT_ADDR;
+typedef struct __wt_addr WT_ADDR;
 struct __wt_async;
-    typedef struct __wt_async WT_ASYNC;
+typedef struct __wt_async WT_ASYNC;
 struct __wt_async_cursor;
-    typedef struct __wt_async_cursor WT_ASYNC_CURSOR;
+typedef struct __wt_async_cursor WT_ASYNC_CURSOR;
 struct __wt_async_format;
-    typedef struct __wt_async_format WT_ASYNC_FORMAT;
+typedef struct __wt_async_format WT_ASYNC_FORMAT;
 struct __wt_async_op_impl;
-    typedef struct __wt_async_op_impl WT_ASYNC_OP_IMPL;
+typedef struct __wt_async_op_impl WT_ASYNC_OP_IMPL;
 struct __wt_async_worker_state;
-    typedef struct __wt_async_worker_state WT_ASYNC_WORKER_STATE;
+typedef struct __wt_async_worker_state WT_ASYNC_WORKER_STATE;
 struct __wt_block;
-    typedef struct __wt_block WT_BLOCK;
+typedef struct __wt_block WT_BLOCK;
 struct __wt_block_ckpt;
-    typedef struct __wt_block_ckpt WT_BLOCK_CKPT;
+typedef struct __wt_block_ckpt WT_BLOCK_CKPT;
 struct __wt_block_desc;
-    typedef struct __wt_block_desc WT_BLOCK_DESC;
+typedef struct __wt_block_desc WT_BLOCK_DESC;
 struct __wt_block_header;
-    typedef struct __wt_block_header WT_BLOCK_HEADER;
+typedef struct __wt_block_header WT_BLOCK_HEADER;
 struct __wt_bloom;
-    typedef struct __wt_bloom WT_BLOOM;
+typedef struct __wt_bloom WT_BLOOM;
 struct __wt_bloom_hash;
-    typedef struct __wt_bloom_hash WT_BLOOM_HASH;
+typedef struct __wt_bloom_hash WT_BLOOM_HASH;
 struct __wt_bm;
-    typedef struct __wt_bm WT_BM;
+typedef struct __wt_bm WT_BM;
 struct __wt_btree;
-    typedef struct __wt_btree WT_BTREE;
+typedef struct __wt_btree WT_BTREE;
 struct __wt_cache;
-    typedef struct __wt_cache WT_CACHE;
+typedef struct __wt_cache WT_CACHE;
 struct __wt_cache_pool;
-    typedef struct __wt_cache_pool WT_CACHE_POOL;
+typedef struct __wt_cache_pool WT_CACHE_POOL;
 struct __wt_capacity;
-    typedef struct __wt_capacity WT_CAPACITY;
+typedef struct __wt_capacity WT_CAPACITY;
 struct __wt_cell;
-    typedef struct __wt_cell WT_CELL;
+typedef struct __wt_cell WT_CELL;
 struct __wt_cell_unpack;
-    typedef struct __wt_cell_unpack WT_CELL_UNPACK;
+typedef struct __wt_cell_unpack WT_CELL_UNPACK;
 struct __wt_ckpt;
-    typedef struct __wt_ckpt WT_CKPT;
+typedef struct __wt_ckpt WT_CKPT;
 struct __wt_col;
-    typedef struct __wt_col WT_COL;
+typedef struct __wt_col WT_COL;
 struct __wt_col_rle;
-    typedef struct __wt_col_rle WT_COL_RLE;
+typedef struct __wt_col_rle WT_COL_RLE;
 struct __wt_col_var_repeat;
-    typedef struct __wt_col_var_repeat WT_COL_VAR_REPEAT;
+typedef struct __wt_col_var_repeat WT_COL_VAR_REPEAT;
 struct __wt_colgroup;
-    typedef struct __wt_colgroup WT_COLGROUP;
+typedef struct __wt_colgroup WT_COLGROUP;
 struct __wt_compact_state;
-    typedef struct __wt_compact_state WT_COMPACT_STATE;
+typedef struct __wt_compact_state WT_COMPACT_STATE;
 struct __wt_condvar;
-    typedef struct __wt_condvar WT_CONDVAR;
+typedef struct __wt_condvar WT_CONDVAR;
 struct __wt_config;
-    typedef struct __wt_config WT_CONFIG;
+typedef struct __wt_config WT_CONFIG;
 struct __wt_config_check;
-    typedef struct __wt_config_check WT_CONFIG_CHECK;
+typedef struct __wt_config_check WT_CONFIG_CHECK;
 struct __wt_config_entry;
-    typedef struct __wt_config_entry WT_CONFIG_ENTRY;
+typedef struct __wt_config_entry WT_CONFIG_ENTRY;
 struct __wt_config_parser_impl;
-    typedef struct __wt_config_parser_impl WT_CONFIG_PARSER_IMPL;
+typedef struct __wt_config_parser_impl WT_CONFIG_PARSER_IMPL;
 struct __wt_connection_impl;
-    typedef struct __wt_connection_impl WT_CONNECTION_IMPL;
+typedef struct __wt_connection_impl WT_CONNECTION_IMPL;
 struct __wt_connection_stats;
-    typedef struct __wt_connection_stats WT_CONNECTION_STATS;
+typedef struct __wt_connection_stats WT_CONNECTION_STATS;
 struct __wt_cursor_backup;
-    typedef struct __wt_cursor_backup WT_CURSOR_BACKUP;
+typedef struct __wt_cursor_backup WT_CURSOR_BACKUP;
 struct __wt_cursor_btree;
-    typedef struct __wt_cursor_btree WT_CURSOR_BTREE;
+typedef struct __wt_cursor_btree WT_CURSOR_BTREE;
 struct __wt_cursor_bulk;
-    typedef struct __wt_cursor_bulk WT_CURSOR_BULK;
+typedef struct __wt_cursor_bulk WT_CURSOR_BULK;
 struct __wt_cursor_config;
-    typedef struct __wt_cursor_config WT_CURSOR_CONFIG;
+typedef struct __wt_cursor_config WT_CURSOR_CONFIG;
 struct __wt_cursor_data_source;
-    typedef struct __wt_cursor_data_source WT_CURSOR_DATA_SOURCE;
+typedef struct __wt_cursor_data_source WT_CURSOR_DATA_SOURCE;
 struct __wt_cursor_dump;
-    typedef struct __wt_cursor_dump WT_CURSOR_DUMP;
+typedef struct __wt_cursor_dump WT_CURSOR_DUMP;
 struct __wt_cursor_index;
-    typedef struct __wt_cursor_index WT_CURSOR_INDEX;
+typedef struct __wt_cursor_index WT_CURSOR_INDEX;
 struct __wt_cursor_join;
-    typedef struct __wt_cursor_join WT_CURSOR_JOIN;
+typedef struct __wt_cursor_join WT_CURSOR_JOIN;
 struct __wt_cursor_join_endpoint;
-    typedef struct __wt_cursor_join_endpoint WT_CURSOR_JOIN_ENDPOINT;
+typedef struct __wt_cursor_join_endpoint WT_CURSOR_JOIN_ENDPOINT;
 struct __wt_cursor_join_entry;
-    typedef struct __wt_cursor_join_entry WT_CURSOR_JOIN_ENTRY;
+typedef struct __wt_cursor_join_entry WT_CURSOR_JOIN_ENTRY;
 struct __wt_cursor_join_iter;
-    typedef struct __wt_cursor_join_iter WT_CURSOR_JOIN_ITER;
+typedef struct __wt_cursor_join_iter WT_CURSOR_JOIN_ITER;
 struct __wt_cursor_json;
-    typedef struct __wt_cursor_json WT_CURSOR_JSON;
+typedef struct __wt_cursor_json WT_CURSOR_JSON;
 struct __wt_cursor_log;
-    typedef struct __wt_cursor_log WT_CURSOR_LOG;
+typedef struct __wt_cursor_log WT_CURSOR_LOG;
 struct __wt_cursor_lsm;
-    typedef struct __wt_cursor_lsm WT_CURSOR_LSM;
+typedef struct __wt_cursor_lsm WT_CURSOR_LSM;
 struct __wt_cursor_metadata;
-    typedef struct __wt_cursor_metadata WT_CURSOR_METADATA;
+typedef struct __wt_cursor_metadata WT_CURSOR_METADATA;
 struct __wt_cursor_stat;
-    typedef struct __wt_cursor_stat WT_CURSOR_STAT;
+typedef struct __wt_cursor_stat WT_CURSOR_STAT;
 struct __wt_cursor_table;
-    typedef struct __wt_cursor_table WT_CURSOR_TABLE;
+typedef struct __wt_cursor_table WT_CURSOR_TABLE;
 struct __wt_data_handle;
-    typedef struct __wt_data_handle WT_DATA_HANDLE;
+typedef struct __wt_data_handle WT_DATA_HANDLE;
 struct __wt_data_handle_cache;
-    typedef struct __wt_data_handle_cache WT_DATA_HANDLE_CACHE;
+typedef struct __wt_data_handle_cache WT_DATA_HANDLE_CACHE;
 struct __wt_dlh;
-    typedef struct __wt_dlh WT_DLH;
+typedef struct __wt_dlh WT_DLH;
 struct __wt_dsrc_stats;
-    typedef struct __wt_dsrc_stats WT_DSRC_STATS;
+typedef struct __wt_dsrc_stats WT_DSRC_STATS;
 struct __wt_evict_entry;
-    typedef struct __wt_evict_entry WT_EVICT_ENTRY;
+typedef struct __wt_evict_entry WT_EVICT_ENTRY;
 struct __wt_evict_queue;
-    typedef struct __wt_evict_queue WT_EVICT_QUEUE;
+typedef struct __wt_evict_queue WT_EVICT_QUEUE;
 struct __wt_ext;
-    typedef struct __wt_ext WT_EXT;
+typedef struct __wt_ext WT_EXT;
 struct __wt_extlist;
-    typedef struct __wt_extlist WT_EXTLIST;
+typedef struct __wt_extlist WT_EXTLIST;
 struct __wt_fh;
-    typedef struct __wt_fh WT_FH;
+typedef struct __wt_fh WT_FH;
 struct __wt_file_handle_inmem;
-    typedef struct __wt_file_handle_inmem WT_FILE_HANDLE_INMEM;
+typedef struct __wt_file_handle_inmem WT_FILE_HANDLE_INMEM;
 struct __wt_file_handle_posix;
-    typedef struct __wt_file_handle_posix WT_FILE_HANDLE_POSIX;
+typedef struct __wt_file_handle_posix WT_FILE_HANDLE_POSIX;
 struct __wt_file_handle_win;
-    typedef struct __wt_file_handle_win WT_FILE_HANDLE_WIN;
+typedef struct __wt_file_handle_win WT_FILE_HANDLE_WIN;
 struct __wt_fstream;
-    typedef struct __wt_fstream WT_FSTREAM;
+typedef struct __wt_fstream WT_FSTREAM;
 struct __wt_hazard;
-    typedef struct __wt_hazard WT_HAZARD;
+typedef struct __wt_hazard WT_HAZARD;
 struct __wt_ikey;
-    typedef struct __wt_ikey WT_IKEY;
+typedef struct __wt_ikey WT_IKEY;
 struct __wt_index;
-    typedef struct __wt_index WT_INDEX;
+typedef struct __wt_index WT_INDEX;
 struct __wt_insert;
-    typedef struct __wt_insert WT_INSERT;
+typedef struct __wt_insert WT_INSERT;
 struct __wt_insert_head;
-    typedef struct __wt_insert_head WT_INSERT_HEAD;
+typedef struct __wt_insert_head WT_INSERT_HEAD;
 struct __wt_join_stats;
-    typedef struct __wt_join_stats WT_JOIN_STATS;
+typedef struct __wt_join_stats WT_JOIN_STATS;
 struct __wt_join_stats_group;
-    typedef struct __wt_join_stats_group WT_JOIN_STATS_GROUP;
+typedef struct __wt_join_stats_group WT_JOIN_STATS_GROUP;
 struct __wt_keyed_encryptor;
-    typedef struct __wt_keyed_encryptor WT_KEYED_ENCRYPTOR;
+typedef struct __wt_keyed_encryptor WT_KEYED_ENCRYPTOR;
 struct __wt_log;
-    typedef struct __wt_log WT_LOG;
+typedef struct __wt_log WT_LOG;
 struct __wt_log_desc;
-    typedef struct __wt_log_desc WT_LOG_DESC;
+typedef struct __wt_log_desc WT_LOG_DESC;
 struct __wt_log_op_desc;
-    typedef struct __wt_log_op_desc WT_LOG_OP_DESC;
+typedef struct __wt_log_op_desc WT_LOG_OP_DESC;
 struct __wt_log_rec_desc;
-    typedef struct __wt_log_rec_desc WT_LOG_REC_DESC;
+typedef struct __wt_log_rec_desc WT_LOG_REC_DESC;
 struct __wt_log_record;
-    typedef struct __wt_log_record WT_LOG_RECORD;
+typedef struct __wt_log_record WT_LOG_RECORD;
 struct __wt_logslot;
-    typedef struct __wt_logslot WT_LOGSLOT;
+typedef struct __wt_logslot WT_LOGSLOT;
 struct __wt_lsm_chunk;
-    typedef struct __wt_lsm_chunk WT_LSM_CHUNK;
+typedef struct __wt_lsm_chunk WT_LSM_CHUNK;
 struct __wt_lsm_cursor_chunk;
-    typedef struct __wt_lsm_cursor_chunk WT_LSM_CURSOR_CHUNK;
+typedef struct __wt_lsm_cursor_chunk WT_LSM_CURSOR_CHUNK;
 struct __wt_lsm_data_source;
-    typedef struct __wt_lsm_data_source WT_LSM_DATA_SOURCE;
+typedef struct __wt_lsm_data_source WT_LSM_DATA_SOURCE;
 struct __wt_lsm_manager;
-    typedef struct __wt_lsm_manager WT_LSM_MANAGER;
+typedef struct __wt_lsm_manager WT_LSM_MANAGER;
 struct __wt_lsm_tree;
-    typedef struct __wt_lsm_tree WT_LSM_TREE;
+typedef struct __wt_lsm_tree WT_LSM_TREE;
 struct __wt_lsm_work_unit;
-    typedef struct __wt_lsm_work_unit WT_LSM_WORK_UNIT;
+typedef struct __wt_lsm_work_unit WT_LSM_WORK_UNIT;
 struct __wt_lsm_worker_args;
-    typedef struct __wt_lsm_worker_args WT_LSM_WORKER_ARGS;
+typedef struct __wt_lsm_worker_args WT_LSM_WORKER_ARGS;
 struct __wt_lsm_worker_cookie;
-    typedef struct __wt_lsm_worker_cookie WT_LSM_WORKER_COOKIE;
+typedef struct __wt_lsm_worker_cookie WT_LSM_WORKER_COOKIE;
 struct __wt_multi;
-    typedef struct __wt_multi WT_MULTI;
+typedef struct __wt_multi WT_MULTI;
 struct __wt_myslot;
-    typedef struct __wt_myslot WT_MYSLOT;
+typedef struct __wt_myslot WT_MYSLOT;
 struct __wt_named_collator;
-    typedef struct __wt_named_collator WT_NAMED_COLLATOR;
+typedef struct __wt_named_collator WT_NAMED_COLLATOR;
 struct __wt_named_compressor;
-    typedef struct __wt_named_compressor WT_NAMED_COMPRESSOR;
+typedef struct __wt_named_compressor WT_NAMED_COMPRESSOR;
 struct __wt_named_data_source;
-    typedef struct __wt_named_data_source WT_NAMED_DATA_SOURCE;
+typedef struct __wt_named_data_source WT_NAMED_DATA_SOURCE;
 struct __wt_named_encryptor;
-    typedef struct __wt_named_encryptor WT_NAMED_ENCRYPTOR;
+typedef struct __wt_named_encryptor WT_NAMED_ENCRYPTOR;
 struct __wt_named_extractor;
-    typedef struct __wt_named_extractor WT_NAMED_EXTRACTOR;
+typedef struct __wt_named_extractor WT_NAMED_EXTRACTOR;
 struct __wt_named_snapshot;
-    typedef struct __wt_named_snapshot WT_NAMED_SNAPSHOT;
+typedef struct __wt_named_snapshot WT_NAMED_SNAPSHOT;
 struct __wt_optrack_header;
-    typedef struct __wt_optrack_header WT_OPTRACK_HEADER;
+typedef struct __wt_optrack_header WT_OPTRACK_HEADER;
 struct __wt_optrack_record;
-    typedef struct __wt_optrack_record WT_OPTRACK_RECORD;
+typedef struct __wt_optrack_record WT_OPTRACK_RECORD;
 struct __wt_ovfl_reuse;
-    typedef struct __wt_ovfl_reuse WT_OVFL_REUSE;
+typedef struct __wt_ovfl_reuse WT_OVFL_REUSE;
 struct __wt_ovfl_track;
-    typedef struct __wt_ovfl_track WT_OVFL_TRACK;
+typedef struct __wt_ovfl_track WT_OVFL_TRACK;
 struct __wt_page;
-    typedef struct __wt_page WT_PAGE;
+typedef struct __wt_page WT_PAGE;
 struct __wt_page_deleted;
-    typedef struct __wt_page_deleted WT_PAGE_DELETED;
+typedef struct __wt_page_deleted WT_PAGE_DELETED;
 struct __wt_page_header;
-    typedef struct __wt_page_header WT_PAGE_HEADER;
+typedef struct __wt_page_header WT_PAGE_HEADER;
 struct __wt_page_index;
-    typedef struct __wt_page_index WT_PAGE_INDEX;
+typedef struct __wt_page_index WT_PAGE_INDEX;
 struct __wt_page_lookaside;
-    typedef struct __wt_page_lookaside WT_PAGE_LOOKASIDE;
+typedef struct __wt_page_lookaside WT_PAGE_LOOKASIDE;
 struct __wt_page_modify;
-    typedef struct __wt_page_modify WT_PAGE_MODIFY;
+typedef struct __wt_page_modify WT_PAGE_MODIFY;
 struct __wt_process;
-    typedef struct __wt_process WT_PROCESS;
+typedef struct __wt_process WT_PROCESS;
 struct __wt_rec_chunk;
-    typedef struct __wt_rec_chunk WT_REC_CHUNK;
+typedef struct __wt_rec_chunk WT_REC_CHUNK;
 struct __wt_rec_dictionary;
-    typedef struct __wt_rec_dictionary WT_REC_DICTIONARY;
+typedef struct __wt_rec_dictionary WT_REC_DICTIONARY;
 struct __wt_rec_kv;
-    typedef struct __wt_rec_kv WT_REC_KV;
+typedef struct __wt_rec_kv WT_REC_KV;
 struct __wt_reconcile;
-    typedef struct __wt_reconcile WT_RECONCILE;
+typedef struct __wt_reconcile WT_RECONCILE;
 struct __wt_ref;
-    typedef struct __wt_ref WT_REF;
+typedef struct __wt_ref WT_REF;
 struct __wt_ref_hist;
-    typedef struct __wt_ref_hist WT_REF_HIST;
+typedef struct __wt_ref_hist WT_REF_HIST;
 struct __wt_row;
-    typedef struct __wt_row WT_ROW;
+typedef struct __wt_row WT_ROW;
 struct __wt_rwlock;
-    typedef struct __wt_rwlock WT_RWLOCK;
+typedef struct __wt_rwlock WT_RWLOCK;
 struct __wt_salvage_cookie;
-    typedef struct __wt_salvage_cookie WT_SALVAGE_COOKIE;
+typedef struct __wt_salvage_cookie WT_SALVAGE_COOKIE;
 struct __wt_save_upd;
-    typedef struct __wt_save_upd WT_SAVE_UPD;
+typedef struct __wt_save_upd WT_SAVE_UPD;
 struct __wt_scratch_track;
-    typedef struct __wt_scratch_track WT_SCRATCH_TRACK;
+typedef struct __wt_scratch_track WT_SCRATCH_TRACK;
 struct __wt_session_impl;
-    typedef struct __wt_session_impl WT_SESSION_IMPL;
+typedef struct __wt_session_impl WT_SESSION_IMPL;
 struct __wt_session_stash;
-    typedef struct __wt_session_stash WT_SESSION_STASH;
+typedef struct __wt_session_stash WT_SESSION_STASH;
 struct __wt_session_stats;
-    typedef struct __wt_session_stats WT_SESSION_STATS;
+typedef struct __wt_session_stats WT_SESSION_STATS;
 struct __wt_size;
-    typedef struct __wt_size WT_SIZE;
+typedef struct __wt_size WT_SIZE;
 struct __wt_spinlock;
-    typedef struct __wt_spinlock WT_SPINLOCK;
+typedef struct __wt_spinlock WT_SPINLOCK;
 struct __wt_stash;
-    typedef struct __wt_stash WT_STASH;
+typedef struct __wt_stash WT_STASH;
 struct __wt_table;
-    typedef struct __wt_table WT_TABLE;
+typedef struct __wt_table WT_TABLE;
 struct __wt_thread;
-    typedef struct __wt_thread WT_THREAD;
+typedef struct __wt_thread WT_THREAD;
 struct __wt_thread_group;
-    typedef struct __wt_thread_group WT_THREAD_GROUP;
+typedef struct __wt_thread_group WT_THREAD_GROUP;
 struct __wt_txn;
-    typedef struct __wt_txn WT_TXN;
+typedef struct __wt_txn WT_TXN;
 struct __wt_txn_global;
-    typedef struct __wt_txn_global WT_TXN_GLOBAL;
+typedef struct __wt_txn_global WT_TXN_GLOBAL;
 struct __wt_txn_op;
-    typedef struct __wt_txn_op WT_TXN_OP;
+typedef struct __wt_txn_op WT_TXN_OP;
 struct __wt_txn_printlog_args;
-    typedef struct __wt_txn_printlog_args WT_TXN_PRINTLOG_ARGS;
+typedef struct __wt_txn_printlog_args WT_TXN_PRINTLOG_ARGS;
 struct __wt_txn_state;
-    typedef struct __wt_txn_state WT_TXN_STATE;
+typedef struct __wt_txn_state WT_TXN_STATE;
 struct __wt_update;
-    typedef struct __wt_update WT_UPDATE;
+typedef struct __wt_update WT_UPDATE;
 union __wt_lsn;
-    typedef union __wt_lsn WT_LSN;
+typedef union __wt_lsn WT_LSN;
 union __wt_rand_state;
-    typedef union __wt_rand_state WT_RAND_STATE;
+typedef union __wt_rand_state WT_RAND_STATE;
 
 typedef uint64_t wt_timestamp_t;
 
@@ -346,12 +346,12 @@ typedef uint64_t wt_timestamp_t;
 #include "msvc.h"
 #endif
 /*
- * GLIBC 2.26 and later use the openat syscall to implement open.
- * Set this flag so that our strace tests know to expect this.
+ * GLIBC 2.26 and later use the openat syscall to implement open. Set this flag so that our strace
+ * tests know to expect this.
  */
 #ifdef __GLIBC_PREREQ
 #if __GLIBC_PREREQ(2, 26)
-#define	WT_USE_OPENAT 1
+#define WT_USE_OPENAT 1
 #endif
 #endif
 
@@ -369,8 +369,8 @@ typedef uint64_t wt_timestamp_t;
 #include "misc.h"
 #include "mutex.h"
 
-#include "stat.h"			/* required by dhandle.h */
-#include "dhandle.h"			/* required by btree.h */
+#include "stat.h"    /* required by dhandle.h */
+#include "dhandle.h" /* required by btree.h */
 
 #include "api.h"
 #include "async.h"
@@ -396,7 +396,7 @@ typedef uint64_t wt_timestamp_t;
 #include "thread_group.h"
 #include "txn.h"
 
-#include "session.h"			/* required by connection.h */
+#include "session.h" /* required by connection.h */
 #include "connection.h"
 
 #include "extern.h"
@@ -407,19 +407,19 @@ typedef uint64_t wt_timestamp_t;
 #endif
 #include "verify_build.h"
 
-#include "cache.i"			/* required by misc.i */
-#include "ctype.i"			/* required by packing.i */
-#include "intpack.i"			/* required by cell.i, packing.i */
-#include "misc.i"			/* required by mutex.i */
+#include "cache.i"   /* required by misc.i */
+#include "ctype.i"   /* required by packing.i */
+#include "intpack.i" /* required by cell.i, packing.i */
+#include "misc.i"    /* required by mutex.i */
 
-#include "buf.i"                        /* required by cell.i */
-#include "cell.i"			/* required by btree.i */
-#include "mutex.i"			/* required by btree.i */
-#include "txn.i"			/* required by btree.i */
+#include "buf.i"   /* required by cell.i */
+#include "cell.i"  /* required by btree.i */
+#include "mutex.i" /* required by btree.i */
+#include "txn.i"   /* required by btree.i */
 
 #include "bitstring.i"
 #include "block.i"
-#include "btree.i"			/* required by cursor.i */
+#include "btree.i" /* required by cursor.i */
 #include "btree_cmp.i"
 #include "column.i"
 #include "cursor.i"
@@ -434,4 +434,4 @@ typedef uint64_t wt_timestamp_t;
 #if defined(__cplusplus)
 }
 #endif
-#endif					/* !__WT_INTERNAL_H */
+#endif /* !__WT_INTERNAL_H */