diff options
6 files changed, 6 insertions, 18 deletions
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data index f1e8ff63861..9f0f84ec514 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": "f0393bc13fd194ccc8347e066d278849a8aed128" + "commit": "8109d394179d580ec66763becdf2d7eea7405d13" } diff --git a/src/third_party/wiredtiger/src/cursor/cur_json.c b/src/third_party/wiredtiger/src/cursor/cur_json.c index b11cab53fa6..be9016a2159 100644 --- a/src/third_party/wiredtiger/src/cursor/cur_json.c +++ b/src/third_party/wiredtiger/src/cursor/cur_json.c @@ -279,7 +279,7 @@ __wt_json_alloc_unpack(WT_SESSION_IMPL *session, const void *buffer, size_t size } needed = 0; WT_RET(__json_struct_size(session, buffer, size, fmt, names, iskey, &needed)); - WT_RET(__wt_realloc_noclear(session, NULL, needed + 1, json_bufp)); + WT_RET(__wt_realloc(session, NULL, needed + 1, json_bufp)); WT_RET(__json_struct_unpackv( session, buffer, size, fmt, names, (u_char *)*json_bufp, needed + 1, iskey, ap)); diff --git a/src/third_party/wiredtiger/src/cursor/cur_stat.c b/src/third_party/wiredtiger/src/cursor/cur_stat.c index a3899eeac21..388fdad6789 100644 --- a/src/third_party/wiredtiger/src/cursor/cur_stat.c +++ b/src/third_party/wiredtiger/src/cursor/cur_stat.c @@ -496,7 +496,7 @@ __curstat_join_desc(WT_CURSOR_STAT *cst, int slot, const char **resultp) */ WT_PREFIX_SKIP_REQUIRED(session, static_desc, "join: "); len = strlen("join: ") + strlen(sgrp->desc_prefix) + strlen(": ") + strlen(static_desc) + 1; - WT_RET(__wt_realloc_noclear(session, NULL, len, &cst->desc_buf)); + WT_RET(__wt_realloc(session, NULL, len, &cst->desc_buf)); WT_RET(__wt_snprintf(cst->desc_buf, len, "join: %s: %s", sgrp->desc_prefix, static_desc)); *resultp = cst->desc_buf; return (0); diff --git a/src/third_party/wiredtiger/src/os_common/os_alloc.c b/src/third_party/wiredtiger/src/os_common/os_alloc.c index c50acf9c869..7f8ef0c1fb5 100644 --- a/src/third_party/wiredtiger/src/os_common/os_alloc.c +++ b/src/third_party/wiredtiger/src/os_common/os_alloc.c @@ -107,10 +107,6 @@ __realloc_func(WT_SESSION_IMPL *session, size_t *bytes_allocated_ret, size_t byt size_t bytes_allocated; void *p, *tmpp; - WT_ASSERT_ALWAYS(session, !(bytes_allocated_ret == NULL && clear_memory), - "bytes allocated must be passed in if clear_memory is set, otherwise use " - "__wt_realloc_noclear"); - /* * !!! * This function MUST handle a NULL WT_SESSION_IMPL handle. diff --git a/src/third_party/wiredtiger/test/suite/test_jsondump01.py b/src/third_party/wiredtiger/test/suite/test_jsondump01.py index 5e0bd0ff6b8..c115227c1bb 100755 --- a/src/third_party/wiredtiger/test/suite/test_jsondump01.py +++ b/src/third_party/wiredtiger/test/suite/test_jsondump01.py @@ -75,7 +75,7 @@ class test_jsondump01(wttest.WiredTigerTestCase, suite_subprocess): keyfmt = [ ('integer', dict(keyfmt='i')), ('recno', dict(keyfmt='r')), -# ('string', dict(keyfmt='S')) + ('string', dict(keyfmt='S')) ] types = [ ('file', dict(uri='file:', dataset=SimpleDataSet)), @@ -83,8 +83,8 @@ class test_jsondump01(wttest.WiredTigerTestCase, suite_subprocess): ('table-simple', dict(uri='table:', dataset=SimpleDataSet)), ('table-index', dict(uri='table:', dataset=SimpleIndexDataSet)), ('table-simple-lsm', dict(uri='table:', dataset=SimpleLSMDataSet)), -# ('table-complex', dict(uri='table:', dataset=ComplexDataSet)), -# ('table-complex-lsm', dict(uri='table:', dataset=ComplexLSMDataSet)) + ('table-complex', dict(uri='table:', dataset=ComplexDataSet)), + ('table-complex-lsm', dict(uri='table:', dataset=ComplexLSMDataSet)) ] scenarios = make_scenarios(types, keyfmt) diff --git a/src/third_party/wiredtiger/test/suite/test_jsondump02.py b/src/third_party/wiredtiger/test/suite/test_jsondump02.py index e81a8840bf0..7735238c6c5 100755 --- a/src/third_party/wiredtiger/test/suite/test_jsondump02.py +++ b/src/third_party/wiredtiger/test/suite/test_jsondump02.py @@ -87,10 +87,6 @@ class test_jsondump02(wttest.WiredTigerTestCase, suite_subprocess): cursor.close() def test_json_cursor(self): - # FIXME-WT-9986: Re-enable this test after fixing the JSON cursor bug - # triggered by allocator changes. - self.skipTest('Known failure in JSON cursor') - """ Create JSON cursors and test them directly, also test dump/load commands. @@ -345,10 +341,6 @@ class test_jsondump02(wttest.WiredTigerTestCase, suite_subprocess): return result def test_json_all_bytes(self): - # FIXME-WT-9986: Re-enable this test after fixing the JSON cursor bug - # triggered by allocator changes. - self.skipTest('Known failure in JSON cursor') - """ Test the generated JSON for all byte values in byte array and string formats. |