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

1 files changed, 7 insertions, 7 deletions

diff --git a/src/third_party/wiredtiger/src/include/block.h b/src/third_party/wiredtiger/src/include/block.h
index b8a982e1713..2006be2f9f4 100644
--- a/src/third_party/wiredtiger/src/include/block.h
+++ b/src/third_party/wiredtiger/src/include/block.h
@@ -51,7 +51,7 @@ struct __wt_extlist {
     uint64_t bytes;   /* Byte count */
     uint32_t entries; /* Entry count */
 
-    uint32_t logid;    /* Written log ID */
+    uint32_t objectid; /* Written object ID */
     wt_off_t offset;   /* Written extent offset */
     uint32_t checksum; /* Written extent checksum */
     uint32_t size;     /* Written extent size */
@@ -141,7 +141,7 @@ struct __wt_size {
 struct __wt_block_ckpt {
     uint8_t version; /* Version */
 
-    uint32_t root_logid;
+    uint32_t root_objectid;
     wt_off_t root_offset; /* The root */
     uint32_t root_checksum, root_size;
 
@@ -239,17 +239,17 @@ struct __wt_block {
     /* Configuration information, set when the file is opened. */
     uint32_t allocfirst; /* Allocation is first-fit */
     uint32_t allocsize;  /* Allocation size */
-    bool log_structured; /* Write checkpoint as separate files */
+    bool has_objects;    /* Address cookies contain object id */
     size_t os_cache;     /* System buffer cache flush max */
     size_t os_cache_max;
     size_t os_cache_dirty_max;
 
     u_int block_header; /* Header length */
 
-    /* Log-structured tracking. */
-    uint32_t file_flags, logid, max_logid;
-    WT_FH **lfh;
-    size_t lfh_alloc;
+    /* Object file tracking. */
+    uint32_t file_flags, objectid, max_objectid;
+    WT_FH **ofh;
+    size_t ofh_alloc;
 
     /*
      * There is only a single checkpoint in a file that can be written. The information could