summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Chen <luke.chen@mongodb.com>2021-05-04 09:58:16 +1000
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2021-05-04 00:52:35 +0000
commitd7757d755daa3f02295e2d69ad81f5faf193f27c (patch)
tree77c51c094083a8d952919e5eca592493ea630ba9
parent9fde6f9838a46a0ad98e6391bdc1e8d2c845c448 (diff)
downloadmongo-d7757d755daa3f02295e2d69ad81f5faf193f27c.tar.gz
Import wiredtiger: bcb90a271ce721d53ce49f1d805f52111f67a5e2 from branch mongodb-5.0
ref: e3efbee8a3..bcb90a271c for: 5.0.0 WT-7345 Update incorrect copyright notices format
-rw-r--r--src/third_party/wiredtiger/bench/workgen/runner/many-dhandle-stress.py28
-rw-r--r--src/third_party/wiredtiger/build_cmake/configs/compile_test/pthread_cond_monotonic_test.c8
-rw-r--r--src/third_party/wiredtiger/build_cmake/configs/wiredtiger_config.h.in2
-rw-r--r--src/third_party/wiredtiger/dist/s_copyright.list1
-rw-r--r--src/third_party/wiredtiger/examples/c/ex_col_store.c2
-rw-r--r--src/third_party/wiredtiger/ext/storage_sources/local_store/local_store.c2
-rw-r--r--src/third_party/wiredtiger/import.data2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_import10.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_rollback_to_stable16.py1
-rwxr-xr-xsrc/third_party/wiredtiger/test/suite/test_tiered06.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_util21.py2
11 files changed, 45 insertions, 7 deletions
diff --git a/src/third_party/wiredtiger/bench/workgen/runner/many-dhandle-stress.py b/src/third_party/wiredtiger/bench/workgen/runner/many-dhandle-stress.py
index 9d131c16148..4fdd88dd88e 100644
--- a/src/third_party/wiredtiger/bench/workgen/runner/many-dhandle-stress.py
+++ b/src/third_party/wiredtiger/bench/workgen/runner/many-dhandle-stress.py
@@ -1,4 +1,32 @@
#/usr/bin/env python
+#
+# Public Domain 2014-present MongoDB, Inc.
+# Public Domain 2008-2014 WiredTiger, Inc.
+#
+# This is free and unencumbered software released into the public domain.
+#
+# Anyone is free to copy, modify, publish, use, compile, sell, or
+# distribute this software, either in source code form or as a compiled
+# binary, for any purpose, commercial or non-commercial, and by any
+# means.
+#
+# In jurisdictions that recognize copyright laws, the author or authors
+# of this software dedicate any and all copyright interest in the
+# software to the public domain. We make this dedication for the benefit
+# of the public at large and to the detriment of our heirs and
+# successors. We intend this dedication to be an overt act of
+# relinquishment in perpetuity of all present and future rights to this
+# software under copyright law.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+# IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+# OTHER DEALINGS IN THE SOFTWARE.
+#
+
# generated from ../wtperf/runners/many-dhandle-stress.wtperf
# The next lines are unneeded if this script is in the runner directory.
import sys
diff --git a/src/third_party/wiredtiger/build_cmake/configs/compile_test/pthread_cond_monotonic_test.c b/src/third_party/wiredtiger/build_cmake/configs/compile_test/pthread_cond_monotonic_test.c
index 94a842dc450..64645ec889f 100644
--- a/src/third_party/wiredtiger/build_cmake/configs/compile_test/pthread_cond_monotonic_test.c
+++ b/src/third_party/wiredtiger/build_cmake/configs/compile_test/pthread_cond_monotonic_test.c
@@ -1,3 +1,11 @@
+/*
+ * Copyright (c) 2014-present MongoDB, Inc.
+ * Copyright (c) 2008-2014 WiredTiger, Inc.
+ * All rights reserved.
+ *
+ * See the file LICENSE for redistribution information.
+ */
+
#include <errno.h>
#include <pthread.h>
#include <stdlib.h>
diff --git a/src/third_party/wiredtiger/build_cmake/configs/wiredtiger_config.h.in b/src/third_party/wiredtiger/build_cmake/configs/wiredtiger_config.h.in
index 460a90d0e29..f772594fc45 100644
--- a/src/third_party/wiredtiger/build_cmake/configs/wiredtiger_config.h.in
+++ b/src/third_party/wiredtiger/build_cmake/configs/wiredtiger_config.h.in
@@ -1,7 +1,7 @@
/*-
* Copyright (c) 2014-present MongoDB, Inc.
* Copyright (c) 2008-2014 WiredTiger, Inc.
- * All rights reserved.
+ * All rights reserved.
*
* See the file LICENSE for redistribution information.
*/
diff --git a/src/third_party/wiredtiger/dist/s_copyright.list b/src/third_party/wiredtiger/dist/s_copyright.list
index a869daa8835..f1c879a555b 100644
--- a/src/third_party/wiredtiger/dist/s_copyright.list
+++ b/src/third_party/wiredtiger/dist/s_copyright.list
@@ -1,5 +1,6 @@
skip bench/workgen/workgen/workgen.py
skip bench/workgen/workgen_wrap.cxx
+skip build_cmake/install/wiredtiger.pc.in
skip build_win/wiredtiger_config.h
skip dist/api_config.py
skip dist/api_config_gen.py
diff --git a/src/third_party/wiredtiger/examples/c/ex_col_store.c b/src/third_party/wiredtiger/examples/c/ex_col_store.c
index a1d90ba3698..fba9a68f0b4 100644
--- a/src/third_party/wiredtiger/examples/c/ex_col_store.c
+++ b/src/third_party/wiredtiger/examples/c/ex_col_store.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2020 MongoDB, Inc.
+ * Public Domain 2014-present MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/ext/storage_sources/local_store/local_store.c b/src/third_party/wiredtiger/ext/storage_sources/local_store/local_store.c
index f4ddc9165e6..bd8275e2a1c 100644
--- a/src/third_party/wiredtiger/ext/storage_sources/local_store/local_store.c
+++ b/src/third_party/wiredtiger/ext/storage_sources/local_store/local_store.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2014-2020 MongoDB, Inc.
+ * Public Domain 2014-present MongoDB, Inc.
* Public Domain 2008-2014 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data
index f9487984ffb..2207b8aad92 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-5.0",
- "commit": "e3efbee8a31d9802b20f96f67a2f0f6191aeedb0"
+ "commit": "bcb90a271ce721d53ce49f1d805f52111f67a5e2"
}
diff --git a/src/third_party/wiredtiger/test/suite/test_import10.py b/src/third_party/wiredtiger/test/suite/test_import10.py
index 640cf6ba2cd..7715a2754ad 100644
--- a/src/third_party/wiredtiger/test/suite/test_import10.py
+++ b/src/third_party/wiredtiger/test/suite/test_import10.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2021 MongoDB, Inc.
+# Public Domain 2014-present MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable16.py b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable16.py
index 2539a4b88d0..0c0a3235e94 100644
--- a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable16.py
+++ b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable16.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
#
# Public Domain 2014-present MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
diff --git a/src/third_party/wiredtiger/test/suite/test_tiered06.py b/src/third_party/wiredtiger/test/suite/test_tiered06.py
index 7a1cb25bdb0..01591dafd88 100755
--- a/src/third_party/wiredtiger/test/suite/test_tiered06.py
+++ b/src/third_party/wiredtiger/test/suite/test_tiered06.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2020 MongoDB, Inc.
+# Public Domain 2014-present MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
diff --git a/src/third_party/wiredtiger/test/suite/test_util21.py b/src/third_party/wiredtiger/test/suite/test_util21.py
index cdd117649db..2271ad8b312 100644
--- a/src/third_party/wiredtiger/test/suite/test_util21.py
+++ b/src/third_party/wiredtiger/test/suite/test_util21.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2014-2021 MongoDB, Inc.
+# Public Domain 2014-present MongoDB, Inc.
# Public Domain 2008-2014 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.