From 61687c883a8df23c6740f16d9f448c352b46a6f5 Mon Sep 17 00:00:00 2001
From: Luke Chen <luke.chen@mongodb.com>
Date: Tue, 11 Dec 2018 10:34:04 +1100
Subject: Import wiredtiger: 5812c92f5fb2ed3b58d0398e5cbe1cb33380d450 from
 branch mongodb-4.2

ref: fcb59a43a4..5812c92f5f
for: 4.1.7

WT-4383       Update session statistics to reflect the operation statistics.
WT-4384       Add documentation about session statistics cursor
WT-4438       Use more accurate statistics for cursor cache totals
WT-4454       Auto-generate Evergreen configuration when adding new 'make check' or csuite tests
WT-4470       Minimize testing that requires TESTUTIL_ENABLE_LONG_TESTS
WT-4479       Remove schema lock wait assertion from the test
WT-4480       Fix duplicate backup cursor and archiving check
WT-4481       Evergreen script cleanups
---
 src/third_party/wiredtiger/examples/c/ex_all.c         |  5 +++++
 src/third_party/wiredtiger/examples/c/ex_stat.c        | 17 +++++++++++++++++
 .../examples/java/com/wiredtiger/examples/ex_all.java  |  5 +++++
 .../examples/java/com/wiredtiger/examples/ex_stat.java | 18 ++++++++++++++++++
 4 files changed, 45 insertions(+)

(limited to 'src/third_party/wiredtiger/examples')

diff --git a/src/third_party/wiredtiger/examples/c/ex_all.c b/src/third_party/wiredtiger/examples/c/ex_all.c
index 8a5efca4ab3..d9be2299833 100644
--- a/src/third_party/wiredtiger/examples/c/ex_all.c
+++ b/src/third_party/wiredtiger/examples/c/ex_all.c
@@ -578,6 +578,11 @@ cursor_statistics(WT_SESSION *session)
 	    "statistics:table:mytable",
 	    NULL, "statistics=(all,clear)", &cursor));
 	/*! [Statistics cursor clear configuration] */
+
+	/*! [Statistics cursor session] */
+	error_check(session->open_cursor(
+	    session, "statistics:session", NULL, NULL, &cursor));
+	/*! [Statistics cursor session] */
 }
 
 static void
diff --git a/src/third_party/wiredtiger/examples/c/ex_stat.c b/src/third_party/wiredtiger/examples/c/ex_stat.c
index bc13197038a..fb9e9d07c98 100644
--- a/src/third_party/wiredtiger/examples/c/ex_stat.c
+++ b/src/third_party/wiredtiger/examples/c/ex_stat.c
@@ -37,6 +37,7 @@ void print_derived_stats(WT_SESSION *);
 void print_file_stats(WT_SESSION *);
 void print_join_cursor_stats(WT_SESSION *);
 void print_overflow_pages(WT_SESSION *);
+void print_session_stats(WT_SESSION *);
 
 static const char *home;
 
@@ -113,6 +114,20 @@ print_join_cursor_stats(WT_SESSION *session)
 	error_check(idx_cursor->close(idx_cursor));
 }
 
+void
+print_session_stats(WT_SESSION *session)
+{
+	WT_CURSOR *stat_cursor;
+
+	/*! [statistics session function] */
+	error_check(session->open_cursor(session,
+	    "statistics:session", NULL, NULL, &stat_cursor));
+
+	print_cursor(stat_cursor);
+	error_check(stat_cursor->close(stat_cursor));
+	/*! [statistics session function] */
+}
+
 void
 print_overflow_pages(WT_SESSION *session)
 {
@@ -217,6 +232,8 @@ main(int argc, char *argv[])
 
 	print_join_cursor_stats(session);
 
+	print_session_stats(session);
+
 	print_overflow_pages(session);
 
 	print_derived_stats(session);
diff --git a/src/third_party/wiredtiger/examples/java/com/wiredtiger/examples/ex_all.java b/src/third_party/wiredtiger/examples/java/com/wiredtiger/examples/ex_all.java
index 6649e14bd05..6485aeff566 100644
--- a/src/third_party/wiredtiger/examples/java/com/wiredtiger/examples/ex_all.java
+++ b/src/third_party/wiredtiger/examples/java/com/wiredtiger/examples/ex_all.java
@@ -492,6 +492,11 @@ cursor_statistics(Session session)
         null, "statistics=(all,clear)");
     /*! [Statistics cursor clear configuration] */
 
+    /*! [Statistics cursor session] */
+    cursor = session.open_cursor(
+        "statistics:session", null, null);
+    /*! [Statistics cursor session] */
+
     return (true);
 }
 
diff --git a/src/third_party/wiredtiger/examples/java/com/wiredtiger/examples/ex_stat.java b/src/third_party/wiredtiger/examples/java/com/wiredtiger/examples/ex_stat.java
index 9e7cc723bab..fb5082516cc 100644
--- a/src/third_party/wiredtiger/examples/java/com/wiredtiger/examples/ex_stat.java
+++ b/src/third_party/wiredtiger/examples/java/com/wiredtiger/examples/ex_stat.java
@@ -118,6 +118,22 @@ public class ex_stat {
 	return (ret);
     }
 
+    int
+    print_session_stats(Session session)
+        throws WiredTigerException
+    {
+        Cursor cursor;
+        int ret;
+
+        /*! [statistics session function] */
+        cursor = session.open_cursor("statistics:session", null, null);
+        ret = print_cursor(cursor);
+        ret = cursor.close();
+        /*! [statistics session function] */
+
+        return (ret);
+    }
+
     int
     print_overflow_pages(Session session)
         throws WiredTigerException
@@ -264,6 +280,8 @@ public class ex_stat {
 
         ret = print_join_cursor_stats(session);
 
+        ret = print_session_stats(session);
+
         ret = print_overflow_pages(session);
 
         ret = print_derived_stats(session);
-- 
cgit v1.2.1