summaryrefslogtreecommitdiff
path: root/src/third_party/wiredtiger/examples
diff options
context:
space:
mode:
authorAlex Gorrod <alexander.gorrod@mongodb.com>2016-08-04 16:10:27 +1000
committerAlex Gorrod <alexander.gorrod@mongodb.com>2016-08-04 16:20:01 +1000
commitc4612847ed88c5e0500f0e9ecb2ecdcb49621cf1 (patch)
treeaa58b63ad77ea46be39793aa3d9f94a6b0104163 /src/third_party/wiredtiger/examples
parent5e9b3e958ad96db67a8f4f8790947b1b62b6469e (diff)
downloadmongo-c4612847ed88c5e0500f0e9ecb2ecdcb49621cf1.tar.gz
Import wiredtiger-wiredtiger-2.8.0-589-ga9e9696.tar.gz from wiredtiger branch mongodb-3.4
ref: d8fb874..a9e9696 for: 3.3.11 SERVER-24971 Excessive memory held by sessions when application threads do evictions WT-1162 Add latency to Jenkins wtperf tests and plots WT-2026 Maximum pages size at eviction too large WT-2239 Make sure LSM cursors read up to date dsk_gen, it was racing with compact WT-2353 Failure to create async threads as part of a wiredtiger_open call will cause a hang WT-2380 Make scripts fail if code doesn't match style WT-2486 Update make check so that it runs faster WT-2578 remove write barriers from the TAILQ_INSERT_XXX macros WT-2648 cache-line alignment for new ports WT-2665 Limit allocator fragmentation in WiredTiger WT-2693 Check open_cursor error paths for consistent handling WT-2708 split child-update race with reconciliation/eviction WT-2711 Change statistics log configuration options WT-2728 Don't re-read log file headers during log_flush WT-2729 Focus eviction walks in largest trees WT-2730 cursor next/prev can return the wrong key/value pair when crossing a page boundary WT-2731 Raw compression can create pages that are larger than expected WT-2732 Coverity analysis defect 99665: Redundant test WT-2737 Scrub dirty pages rather than evicting them WT-2738 Remove the ability to change the default checkpoint name WT-2739 pluggable file systems documentation cleanups WT-2743 Thread count statistics always report 0 WT-2744 partial line even with line buffering set WT-2746 track checkpoint I/O separately from eviction I/O WT-2751 column-store statistics incorrectly calculates the number of entries WT-2752 Fixes to zipfian wtperf workload config WT-2755 flexelint configuration treats size_t as 4B type WT-2756 Upgrade the autoconf archive package to check for swig 3.0 WT-2757 Column tables behave differently when column names are provided WT-2759 Releasing the hot-backup lock doesn't require the schema lock. WT-2760 Fix a bug in backup related to directory sync. Change the filesystem API to make durable the default WT-2762 wtstats tool fails if checkpoint runs WT-2763 Unit test test_intpack failing on OSX WT-2764 Optimize checkpoints to reduce throughput disruption WT-2765 wt dump: indices need to be shown in the dump output WT-2767 test suite needs way to run an individual scenario WT-2769 Update documentation to reflect correct limits of memory_page_max WT-2770 Add statistics tracking schema operations WT-2772 Investigate log performance testing weirdness WT-2773 search_near in indexes does not find exact matches WT-2774 minor cleanups/improvements WT-2778 Python test suite: make scenario initialization consistent WT-2779 Raw compression created unexpectedly large pages on disk WT-2781 Enhance bulk cursor option with an option to return immediately on contention WT-2782 Missing a fs_directory_list_free in ex_file_system.c WT-2785 Scrub dirty pages rather than evicting them: single-page reconciliation WT-2791 Enhance OS X Evergreen unit test WT-2793 wtperf config improvements WT-2796 Memory leak in reconciliation uncovered by stress testing WT-2798 Crash vulnerability with nojournal after create during checkpoint WT-2800 Illegal file format in test/format on PPC WT-2801 Crash vulnerability from eviction of metadata during checkpoint WT-2802 Transaction commit causes heap-use-after free WT-2803 Add verbose functionality to WT Evergreen tests WT-2804 Don't read values in a tree without a snapshot WT-2805 Infinite recursion if error streams fail WT-2806 wtperf allocation size off-by-one
Diffstat (limited to 'src/third_party/wiredtiger/examples')
-rw-r--r--src/third_party/wiredtiger/examples/c/ex_all.c27
-rw-r--r--src/third_party/wiredtiger/examples/c/ex_file_system.c39
-rw-r--r--src/third_party/wiredtiger/examples/java/com/wiredtiger/examples/ex_all.java22
3 files changed, 31 insertions, 57 deletions
diff --git a/src/third_party/wiredtiger/examples/c/ex_all.c b/src/third_party/wiredtiger/examples/c/ex_all.c
index dd807922c10..e8727df3f60 100644
--- a/src/third_party/wiredtiger/examples/c/ex_all.c
+++ b/src/third_party/wiredtiger/examples/c/ex_all.c
@@ -1160,34 +1160,27 @@ main(void)
if (ret == 0)
(void)conn->close(conn, NULL);
+#ifdef MIGHT_NOT_RUN
+ /*
+ * Don't run this code, statistics logging doesn't yet support tables.
+ */
/*! [Statistics logging with a table] */
ret = wiredtiger_open(home, NULL,
"create, statistics_log=("
- "sources=(\"lsm:table1\",\"lsm:table2\"), wait=5)",
+ "sources=(\"table:table1\",\"table:table2\"), wait=5)",
&conn);
/*! [Statistics logging with a table] */
if (ret == 0)
(void)conn->close(conn, NULL);
- /*! [Statistics logging with all tables] */
- ret = wiredtiger_open(home, NULL,
- "create, statistics_log=(sources=(\"lsm:\"), wait=5)",
- &conn);
- /*! [Statistics logging with all tables] */
- if (ret == 0)
- (void)conn->close(conn, NULL);
-
-#ifdef MIGHT_NOT_RUN
/*
- * This example code gets run, and a non-existent log file path might
- * cause the open to fail. The documentation requires code snippets,
- * use #ifdef's to avoid running it.
+ * Don't run this code, statistics logging doesn't yet support indexes.
*/
- /*! [Statistics logging with path] */
+ /*! [Statistics logging with a source type] */
ret = wiredtiger_open(home, NULL,
- "create,"
- "statistics_log=(wait=120,path=/log/log.%m.%d.%y)", &conn);
- /*! [Statistics logging with path] */
+ "create, statistics_log=(sources=(\"index:\"), wait=5)",
+ &conn);
+ /*! [Statistics logging with a source type] */
if (ret == 0)
(void)conn->close(conn, NULL);
diff --git a/src/third_party/wiredtiger/examples/c/ex_file_system.c b/src/third_party/wiredtiger/examples/c/ex_file_system.c
index 77e8f40480b..55ee20e9331 100644
--- a/src/third_party/wiredtiger/examples/c/ex_file_system.c
+++ b/src/third_party/wiredtiger/examples/c/ex_file_system.c
@@ -118,18 +118,17 @@ int demo_file_system_create(WT_CONNECTION *, WT_CONFIG_ARG *);
/*
* Forward function declarations for file system API implementation
*/
-static int demo_fs_open(WT_FILE_SYSTEM *,
- WT_SESSION *, const char *, WT_OPEN_FILE_TYPE, uint32_t, WT_FILE_HANDLE **);
+static int demo_fs_open(WT_FILE_SYSTEM *, WT_SESSION *,
+ const char *, WT_FS_OPEN_FILE_TYPE, uint32_t, WT_FILE_HANDLE **);
static int demo_fs_directory_list(WT_FILE_SYSTEM *, WT_SESSION *,
const char *, const char *, char ***, uint32_t *);
static int demo_fs_directory_list_free(
WT_FILE_SYSTEM *, WT_SESSION *, char **, uint32_t);
-static int demo_fs_directory_sync(WT_FILE_SYSTEM *file_system,
- WT_SESSION *session, const char *directory);
static int demo_fs_exist(WT_FILE_SYSTEM *, WT_SESSION *, const char *, bool *);
-static int demo_fs_remove(WT_FILE_SYSTEM *, WT_SESSION *, const char *);
+static int demo_fs_remove(
+ WT_FILE_SYSTEM *, WT_SESSION *, const char *, uint32_t);
static int demo_fs_rename(
- WT_FILE_SYSTEM *, WT_SESSION *, const char *, const char *);
+ WT_FILE_SYSTEM *, WT_SESSION *, const char *, const char *, uint32_t);
static int demo_fs_size(
WT_FILE_SYSTEM *, WT_SESSION *, const char *, wt_off_t *);
static int demo_fs_terminate(WT_FILE_SYSTEM *, WT_SESSION *);
@@ -255,7 +254,6 @@ demo_file_system_create(WT_CONNECTION *conn, WT_CONFIG_ARG *config)
/* Initialize the in-memory jump table. */
file_system->fs_directory_list = demo_fs_directory_list;
file_system->fs_directory_list_free = demo_fs_directory_list_free;
- file_system->fs_directory_sync = demo_fs_directory_sync;
file_system->fs_exist = demo_fs_exist;
file_system->fs_open_file = demo_fs_open;
file_system->fs_remove = demo_fs_remove;
@@ -282,7 +280,7 @@ err: free(demo_fs);
*/
static int
demo_fs_open(WT_FILE_SYSTEM *file_system, WT_SESSION *session,
- const char *name, WT_OPEN_FILE_TYPE file_type, uint32_t flags,
+ const char *name, WT_FS_OPEN_FILE_TYPE file_type, uint32_t flags,
WT_FILE_HANDLE **file_handlep)
{
DEMO_FILE_HANDLE *demo_fh;
@@ -469,21 +467,6 @@ demo_fs_directory_list_free(WT_FILE_SYSTEM *file_system,
}
/*
- * demo_fs_directory_sync --
- * Directory sync for our demo file system, which is a no-op.
- */
-static int
-demo_fs_directory_sync(WT_FILE_SYSTEM *file_system,
- WT_SESSION *session, const char *directory)
-{
- (void)file_system; /* Unused */
- (void)session; /* Unused */
- (void)directory; /* Unused */
-
- return (0);
-}
-
-/*
* demo_fs_exist --
* Return if the file exists.
*/
@@ -507,13 +490,15 @@ demo_fs_exist(WT_FILE_SYSTEM *file_system,
* POSIX remove.
*/
static int
-demo_fs_remove(
- WT_FILE_SYSTEM *file_system, WT_SESSION *session, const char *name)
+demo_fs_remove(WT_FILE_SYSTEM *file_system,
+ WT_SESSION *session, const char *name, uint32_t flags)
{
DEMO_FILE_SYSTEM *demo_fs;
DEMO_FILE_HANDLE *demo_fh;
int ret = 0;
+ (void)flags; /* Unused */
+
demo_fs = (DEMO_FILE_SYSTEM *)file_system;
ret = ENOENT;
@@ -531,13 +516,15 @@ demo_fs_remove(
*/
static int
demo_fs_rename(WT_FILE_SYSTEM *file_system,
- WT_SESSION *session, const char *from, const char *to)
+ WT_SESSION *session, const char *from, const char *to, uint32_t flags)
{
DEMO_FILE_HANDLE *demo_fh;
DEMO_FILE_SYSTEM *demo_fs;
char *copy;
int ret = 0;
+ (void)flags; /* Unused */
+
demo_fs = (DEMO_FILE_SYSTEM *)file_system;
LOCK_FILE_SYSTEM(session, demo_fs);
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 48e85c9fade..83a37e9a6a5 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
@@ -988,6 +988,10 @@ allExample()
/*! [Statistics logging] */
conn.close(null);
+ if (false) { // MIGHT_NOT_RUN
+ /*
+ * Don't run this code, statistics logging doesn't yet support tables.
+ */
/*! [Statistics logging with a table] */
conn = wiredtiger.open(home,
"create," +
@@ -995,23 +999,13 @@ allExample()
/*! [Statistics logging with a table] */
conn.close(null);
- /*! [Statistics logging with all tables] */
- conn = wiredtiger.open(home,
- "create,statistics_log=(sources=(\"table:\"))");
- /*! [Statistics logging with all tables] */
- conn.close(null);
-
- if (false) { // MIGHT_NOT_RUN
/*
- * This example code gets run, and a non-existent log file path might
- * cause the open to fail. The documentation requires code snippets,
- * use if (false) to avoid running it.
+ * Don't run this code, statistics logging doesn't yet support indexes.
*/
- /*! [Statistics logging with path] */
+ /*! [Statistics logging with a source type] */
conn = wiredtiger.open(home,
- "create," +
- "statistics_log=(wait=120,path=/log/log.%m.%d.%y)");
- /*! [Statistics logging with path] */
+ "create,statistics_log=(sources=(\"index:\"))");
+ /*! [Statistics logging with a source type] */
conn.close(null);
/*