diff options
7 files changed, 32 insertions, 20 deletions
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data index 4d495dfce0f..b1c100dfb74 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": "cde57ba4b7aac0a955e6c35f503229e3809a1560" + "commit": "919286975f5efe7383095d1dc3c8447c81152638" } diff --git a/src/third_party/wiredtiger/src/docs/command-line.dox b/src/third_party/wiredtiger/src/docs/command-line.dox index 813377be455..4432ae32054 100644 --- a/src/third_party/wiredtiger/src/docs/command-line.dox +++ b/src/third_party/wiredtiger/src/docs/command-line.dox @@ -324,12 +324,13 @@ By default, the \c loadtext command reads from the standard input; the <hr> @section util_printlog wt printlog -Display the database log. +Display the database log. By default any operations in the log containing user +data are redacted. The \c printlog command outputs the database log. @subsection util_printlog_synopsis Synopsis -<code>wt [-RrVv] [-C config] [-E secretkey ] [-h directory] printlog [-mx] [-f output]</code> +<code>wt [-RrVv] [-C config] [-E secretkey ] [-h directory] printlog [-mux] [-f output]</code> @subsection util_printlog_options Options The following are command-specific options for the \c printlog command: @@ -341,6 +342,9 @@ output; the \c -f option re-directs the output to the specified file. @par <code>-m</code> Print only message-type log records. +@par <code>-u</code> +Display user data. + @par <code>-x</code> Keys and value items in the log are printed in hex format in addition to the default string format. diff --git a/src/third_party/wiredtiger/src/docs/spell.ok b/src/third_party/wiredtiger/src/docs/spell.ok index ed4609e2bfe..5aa47215ace 100644 --- a/src/third_party/wiredtiger/src/docs/spell.ok +++ b/src/third_party/wiredtiger/src/docs/spell.ok @@ -405,8 +405,8 @@ multiversion mutex mutexes mutexing +mux mvcc -mx mygcc mytable namespace diff --git a/src/third_party/wiredtiger/test/cppsuite/test_harness/test_harness.h b/src/third_party/wiredtiger/test/cppsuite/test_harness/test_harness.h index b489c84b8ec..35ddd2209b9 100644 --- a/src/third_party/wiredtiger/test/cppsuite/test_harness/test_harness.h +++ b/src/third_party/wiredtiger/test/cppsuite/test_harness/test_harness.h @@ -15,16 +15,21 @@ namespace test_harness { class test { public: configuration *_configuration; - static const std::string _name; + static const char *_name; /* * All tests will implement this initially, the return value from it will indicate whether the * test was successful or not. */ virtual int run() = 0; - test(std::string config) + test(const char *config) { - _configuration = new configuration(_name.c_str(), config.c_str()); + _configuration = new configuration(_name, config); + } + + ~test() + { + delete _configuration; } }; } // namespace test_harness diff --git a/src/third_party/wiredtiger/test/cppsuite/tests/poc.cxx b/src/third_party/wiredtiger/test/cppsuite/tests/poc.cxx index d41ff8dfa6b..c58ed9a1119 100644 --- a/src/third_party/wiredtiger/test/cppsuite/tests/poc.cxx +++ b/src/third_party/wiredtiger/test/cppsuite/tests/poc.cxx @@ -24,10 +24,10 @@ class poc_test : public test_harness::test { return (ret); } - poc_test(std::string config) : test(config) {} + poc_test(const char *config) : test(config) {} }; -const std::string poc_test::test::_name = "poc_test"; +const char *poc_test::test::_name = "poc_test"; int main(int argc, char *argv[]) { const char *cfg = "collection_count=1,key_size=5"; diff --git a/src/third_party/wiredtiger/test/evergreen.yml b/src/third_party/wiredtiger/test/evergreen.yml index 127c99ea040..111c717c8d8 100755 --- a/src/third_party/wiredtiger/test/evergreen.yml +++ b/src/third_party/wiredtiger/test/evergreen.yml @@ -2615,10 +2615,10 @@ buildvariants: - name: ".unit_test" - name: fops -- name: macos-1012 - display_name: OS X 10.12 +- name: macos-1014 + display_name: OS X 10.14 run_on: - - macos-1012 + - macos-1014 expansions: configure_env_vars: PATH=/opt/mongodbtoolchain/v3/bin:$PATH ADD_CFLAGS="-ggdb -fPIC" posix_configure_flags: --enable-silent-rules --enable-diagnostic --enable-python --enable-zlib --enable-strict --enable-static --prefix=$(pwd)/LOCAL_INSTALL diff --git a/src/third_party/wiredtiger/test/evergreen/compatibility_test_for_releases.sh b/src/third_party/wiredtiger/test/evergreen/compatibility_test_for_releases.sh index d9d313e1057..e7c50dfa922 100755 --- a/src/third_party/wiredtiger/test/evergreen/compatibility_test_for_releases.sh +++ b/src/third_party/wiredtiger/test/evergreen/compatibility_test_for_releases.sh @@ -104,6 +104,7 @@ EXT+="]" # arg1: branch name #1 # arg2: branch name #2 # arg3: access methods list +# arg4: backward compatibility ############################################################# verify_branches() { @@ -117,9 +118,11 @@ verify_branches() dir="$2/test/format/RUNDIR.$am" WIREDTIGER_CONFIG="$EXT" ./wt $(bflag $1) -h "../$dir" verify table:wt - echo "$1/wt dump and load $2 access method $am..." - WIREDTIGER_CONFIG="$EXT" ./wt $(bflag $1) -h "../$dir" dump table:wt > dump_wt.txt - WIREDTIGER_CONFIG="$EXT" ./wt $(bflag $1) -h "../$dir" load -f dump_wt.txt + if [ "$4" = true ]; then + echo "$1/wt dump and load $2 access method $am..." + WIREDTIGER_CONFIG="$EXT" ./wt $(bflag $1) -h "../$dir" dump table:wt > dump_wt.txt + WIREDTIGER_CONFIG="$EXT" ./wt $(bflag $1) -h "../$dir" load -f dump_wt.txt + fi done } @@ -270,20 +273,20 @@ fi if [ "$newer" = true ]; then for i in ${!newer_release_branches[@]}; do [[ $((i+1)) < ${#newer_release_branches[@]} ]] && \ - (verify_branches ${newer_release_branches[$i]} ${newer_release_branches[$((i+1))]} "row") + (verify_branches ${newer_release_branches[$i]} ${newer_release_branches[$((i+1))]} "row" true) done fi if [ "$older" = true ]; then for i in ${!older_release_branches[@]}; do [[ $((i+1)) < ${#older_release_branches[@]} ]] && \ - (verify_branches ${older_release_branches[$i]} ${older_release_branches[$((i+1))]} "fix row var") + (verify_branches ${older_release_branches[$i]} ${older_release_branches[$((i+1))]} "fix row var" true) done fi if [ "${wt_standalone}" = true ]; then - (verify_branches develop "$wt1" "row") - (verify_branches "$wt1" "$wt2" "row") + (verify_branches develop "$wt1" "row" true) + (verify_branches "$wt1" "$wt2" "row" true) fi # Verify forward compatibility for supported access methods. @@ -295,7 +298,7 @@ fi if [ "$newer" = true ]; then for i in ${!newer_release_branches[@]}; do [[ $((i+1)) < ${#newer_release_branches[@]} ]] && \ - (verify_branches ${newer_release_branches[$((i+1))]} ${newer_release_branches[$i]} "row") + (verify_branches ${newer_release_branches[$((i+1))]} ${newer_release_branches[$i]} "row" false) done fi |