summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEtienne Petrel <etienne.petrel@mongodb.com>2023-02-07 03:53:12 +0000
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2023-02-07 04:46:39 +0000
commitb281cb0b47188ae91da4184aa74aac5e7b2afbcd (patch)
tree2b30bba4ec83b9aa78ff99817a582fb76a0f53ac
parent17f705c4262afec703d9da0e842718d36798c12f (diff)
downloadmongo-b281cb0b47188ae91da4184aa74aac5e7b2afbcd.tar.gz
Import wiredtiger: feb6de965c15e2ca722ff70094c2f37f46265ebf from branch mongodb-master
ref: 7cef0e9b3e..feb6de965c for: 6.3.0-rc0 WT-10565 Fix the tiered example so it passes on Windows.
-rw-r--r--src/third_party/wiredtiger/examples/c/ex_tiered.c19
-rw-r--r--src/third_party/wiredtiger/import.data2
2 files changed, 20 insertions, 1 deletions
diff --git a/src/third_party/wiredtiger/examples/c/ex_tiered.c b/src/third_party/wiredtiger/examples/c/ex_tiered.c
index 2de6769fcb4..132c4ae0af2 100644
--- a/src/third_party/wiredtiger/examples/c/ex_tiered.c
+++ b/src/third_party/wiredtiger/examples/c/ex_tiered.c
@@ -87,6 +87,20 @@ show_data(WT_SESSION *session, const char *uri, int nentries, const char *commen
}
/*
+ * FIXME-WT-10567 At the moment, this example will not run on Windows, because it requires an
+ * extension module to be loaded that is not yet built or tested on that platform.
+ */
+static bool
+platform_supported(void)
+{
+#ifdef _WIN32
+ return (false);
+#else
+ return (true);
+#endif
+}
+
+/*
* A storage source is a driver that controls access to an underlying object storage (e.g. a
* specific cloud provider). The dir_store storage source stores objects in a directory named by the
* bucket name, relative to the WiredTiger home directory.
@@ -106,6 +120,11 @@ main(int argc, char *argv[])
const char *home;
char buf[1024], config[1024];
+ if (!platform_supported()) {
+ fprintf(stderr, "**** Warning: %s is not supported on this platform\n", argv[0]);
+ return (EXIT_SUCCESS);
+ }
+
home = example_setup(argc, argv);
/*
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data
index c4b91ee05bb..c427ef4a4e1 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": "7cef0e9b3ea2ee63b54b2e0f592cb0a18e25720b"
+ "commit": "feb6de965c15e2ca722ff70094c2f37f46265ebf"
}