diff options
author | Chenhao Qu <chenhao.qu@mongodb.com> | 2021-06-16 05:46:34 +0000 |
---|---|---|
committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2021-06-16 06:08:31 +0000 |
commit | ce3290347bf15009ce45a941a263b3ac42dd7e46 (patch) | |
tree | 3d573f17745596fcb798c0cac9daf1a766ebbb3e | |
parent | b4a551757c45ff8dc98f64fddaf016ab0a123bdd (diff) | |
download | mongo-ce3290347bf15009ce45a941a263b3ac42dd7e46.tar.gz |
Import wiredtiger: ba0c36ccbb5c4b00d9a83603d08020a5c9865e21 from branch mongodb-5.0
ref: 3410b846ee..ba0c36ccbb
for: 5.0.0-rc2
WT-7646 Remove unneeded uses of WT_WITH_BUCKET_STORAGE macro
-rw-r--r-- | src/third_party/wiredtiger/import.data | 2 | ||||
-rw-r--r-- | src/third_party/wiredtiger/src/btree/bt_io.c | 16 | ||||
-rw-r--r-- | src/third_party/wiredtiger/src/meta/meta_turtle.c | 4 |
3 files changed, 6 insertions, 16 deletions
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data index 311536f76b0..f2f615eaa9d 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": "3410b846ee10481e83906569e2ffdb89d5e12e32" + "commit": "ba0c36ccbb5c4b00d9a83603d08020a5c9865e21" } diff --git a/src/third_party/wiredtiger/src/btree/bt_io.c b/src/third_party/wiredtiger/src/btree/bt_io.c index 3b763a68172..48bf82865b3 100644 --- a/src/third_party/wiredtiger/src/btree/bt_io.c +++ b/src/third_party/wiredtiger/src/btree/bt_io.c @@ -35,16 +35,12 @@ __wt_bt_read(WT_SESSION_IMPL *session, WT_ITEM *buf, const uint8_t *addr, size_t * into the caller's buffer. Else, read directly into the caller's buffer. */ if (btree->compressor == NULL && btree->kencryptor == NULL) { - WT_WITH_BUCKET_STORAGE( - btree->bstorage, session, { ret = bm->read(bm, session, buf, addr, addr_size); }); - WT_RET(ret); + WT_RET(bm->read(bm, session, buf, addr, addr_size)); dsk = buf->data; ip = NULL; } else { WT_RET(__wt_scr_alloc(session, 0, &tmp)); - WT_WITH_BUCKET_STORAGE( - btree->bstorage, session, { ret = bm->read(bm, session, tmp, addr, addr_size); }); - WT_ERR(ret); + WT_ERR(bm->read(bm, session, tmp, addr, addr_size)); dsk = tmp->data; ip = tmp; } @@ -333,13 +329,9 @@ __wt_bt_write(WT_SESSION_IMPL *session, WT_ITEM *buf, uint8_t *addr, size_t *add if (timer) time_start = __wt_clock(session); - WT_WITH_BUCKET_STORAGE(btree->bstorage, session, { - /* Call the block manager to write the block. */ - ret = - (checkpoint ? bm->checkpoint(bm, session, ip, btree->ckpt, data_checksum) : + /* Call the block manager to write the block. */ + WT_ERR(checkpoint ? bm->checkpoint(bm, session, ip, btree->ckpt, data_checksum) : bm->write(bm, session, ip, addr, addr_sizep, data_checksum, checkpoint_io)); - }); - WT_ERR(ret); /* Update some statistics now that the write is done */ if (timer) { diff --git a/src/third_party/wiredtiger/src/meta/meta_turtle.c b/src/third_party/wiredtiger/src/meta/meta_turtle.c index 6c0b432a067..aa2e93623c9 100644 --- a/src/third_party/wiredtiger/src/meta/meta_turtle.c +++ b/src/third_party/wiredtiger/src/meta/meta_turtle.c @@ -129,9 +129,7 @@ __metadata_load_bulk(WT_SESSION_IMPL *session) WT_ERR(cursor->get_value(cursor, &value)); filecfg[1] = value; WT_ERR(__wt_direct_io_size_check(session, filecfg, "allocation_size", &allocsize)); - WT_WITH_BUCKET_STORAGE( - NULL, session, ret = __wt_block_manager_create(session, key, allocsize)); - WT_ERR(ret); + WT_ERR(__wt_block_manager_create(session, key, allocsize)); } WT_ERR_NOTFOUND_OK(ret, false); |