Import wiredtiger: 1a29eac4dc8cf82de437292da546e3f4039268a4 from branch mongodb-3.8

ref: 596a3c7c01..1a29eac4dc
for: 3.7.1

WT-3079       Make sure eviction visits all trees
WT-3133       Detect or track long latency operations
WT-3295       Allow LSM to merge into custom data sources
WT-3587       Remove HAVE_VERBOSE conditional compilation
WT-3654       Fix warning in Windows build on evergreen
WT-3716       Restore the WT_VERB_TEMPORARY verbose flag.
WT-3720       flags macros cast flags to unsigned values, hiding warnings.
WT-3732       Handle adding WT indices while cursors on the table are open
WT-3734       Fix undefined behavior in verbose output
WT-3738       Review internal session allocation accounting
WT-3753       Building on Windows --enable-java
WT-3772       Hot backup causes uncontrolled growth of WiredTigerPreplog files
WT-3774       Enhance Python lookaside testing to cover cursor modify
WT-3776       Cursor remove operation unpins page too early
WT-3780       Improve error messages on invalid WT_CURSOR::modify usage
WT-3783       Fix transaction isolation to use the correct enum
WT-3786       Transactions with timestamps should read their writes
WT-3787       test_compact02 failed as compaction halted due to eviction pressure
WT-3790       Switch statistics to rdtsc from epoch calls
WT-3793       WiredTiger page debug dump functions should unpack integer keys
WT-3794       Coverity 1383547 and lint
WT-3795       lint cleanups for the op-tracking software, reduce record write size.

1 files changed, 31 insertions, 1 deletions

diff --git a/src/third_party/wiredtiger/examples/c/ex_data_source.c b/src/third_party/wiredtiger/examples/c/ex_data_source.c
index 59cfde7313a..f6311adffa6 100644
--- a/src/third_party/wiredtiger/examples/c/ex_data_source.c
+++ b/src/third_party/wiredtiger/examples/c/ex_data_source.c
@@ -489,6 +489,21 @@ my_salvage(WT_DATA_SOURCE *dsrc, WT_SESSION *session,
 	return (0);
 }
 
+/*! [WT_DATA_SOURCE size] */
+static int
+my_size(WT_DATA_SOURCE *dsrc, WT_SESSION *session,
+    const char *uri, wt_off_t *size)
+/*! [WT_DATA_SOURCE size] */
+{
+	/* Unused parameters */
+	(void)dsrc;
+	(void)session;
+	(void)uri;
+	(void)size;
+
+	return (0);
+}
+
 /*! [WT_DATA_SOURCE truncate] */
 static int
 my_truncate(WT_DATA_SOURCE *dsrc, WT_SESSION *session,
@@ -559,6 +574,19 @@ my_terminate(WT_DATA_SOURCE *dsrc, WT_SESSION *session)
 	return (0);
 }
 
+/*! [WT_DATA_SOURCE lsm_pre_merge] */
+static int
+my_lsm_pre_merge(WT_DATA_SOURCE *dsrc, WT_CURSOR *source, WT_CURSOR *dest)
+/*! [WT_DATA_SOURCE lsm_pre_merge] */
+{
+	/* Unused parameters */
+	(void)dsrc;
+	(void)source;
+	(void)dest;
+
+	return (0);
+}
+
 static const char *home;
 
 int
@@ -581,11 +609,13 @@ main(int argc, char *argv[])
 		my_open_cursor,
 		my_rename,
 		my_salvage,
+		my_size,
 		my_truncate,
 		my_range_truncate,
 		my_verify,
 		my_checkpoint,
-		my_terminate
+		my_terminate,
+		my_lsm_pre_merge
 	};
 	error_check(conn->add_data_source(conn, "dsrc:", &my_dsrc, NULL));
 	/*! [WT_DATA_SOURCE register] */