diff options
| author | Luke Chen <luke.chen@mongodb.com> | 2021-05-21 16:40:54 +1000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2021-05-21 07:15:11 +0000 |
| commit | 10e91f7dc954023e5ff73683e655c7d90e0052bf (patch) | |
| tree | edfc327716ea265e572832000c387c3bddd2f048 /src/third_party/wiredtiger/src/block/block_tiered.c | |
| parent | c29ac114551d425a34409ffb2bee052bfcc36f91 (diff) | |
| download | mongo-10e91f7dc954023e5ff73683e655c7d90e0052bf.tar.gz | |
Import wiredtiger: cb8077e2b6d4c1d60ef71305e36f28c4866693b6 from branch mongodb-5.0
ref: 02da3990fb..cb8077e2b6
for: 5.0.0
WT-7549 clean up block manager identifiers to use object id naming
Diffstat (limited to 'src/third_party/wiredtiger/src/block/block_tiered.c')
| -rw-r--r-- | src/third_party/wiredtiger/src/block/block_tiered.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/third_party/wiredtiger/src/block/block_tiered.c b/src/third_party/wiredtiger/src/block/block_tiered.c index d922a663e03..b275ccd95a7 100644 --- a/src/third_party/wiredtiger/src/block/block_tiered.c +++ b/src/third_party/wiredtiger/src/block/block_tiered.c @@ -34,8 +34,8 @@ __wt_block_tiered_load(WT_SESSION_IMPL *session, WT_BLOCK *block, WT_BLOCK_CKPT * TODO: tiered: this call currently advances the object id, that's probably not appropriate for * readonly opens. Perhaps it's also not appropriate for opening at an older checkpoint? */ - if (block->log_structured) { - block->logid = ci->root_logid; + if (block->has_objects) { + block->objectid = ci->root_objectid; /* Advance to the next file for future changes. */ WT_RET(__wt_block_tiered_newfile(session, block)); @@ -64,8 +64,8 @@ __wt_block_tiered_newfile(WT_SESSION_IMPL *session, WT_BLOCK *block) WT_ERR(__wt_close(session, &block->fh)); /* Bump to a new file ID. */ - ++block->logid; - WT_ERR(__wt_buf_fmt(session, tmp, "%s.%08" PRIu32, block->name, block->logid)); + ++block->objectid; + WT_ERR(__wt_buf_fmt(session, tmp, "%s.%08" PRIu32, block->name, block->objectid)); filename = tmp->data; WT_WITH_BUCKET_STORAGE(session->bucket_storage, session, { |