Import wiredtiger: 03eb45ea7fd94d6f241f8668a58d0119c39bbf52 from branch mongodb-4.4

ref: 2b73914cd8..03eb45ea7f
for: 4.4.9

WT-6755       Documentation: populate developer glossary
WT-6902       Metadata subpage for Architecture Guide
WT-6905       Write row-store and column-store subpage for Architecture Guide
WT-6910       Write "history store" subpage for Architecture Guide
WT-6914       Write "database files" subpage for Architecture Guide
WT-7007       Backup architecture guide page
WT-7198       Fix test_backup15 failure with backup mismatch
WT-7352       Fix test_hs01 conflict between concurrent operations in cursor modify
WT-7521       Remove excess ckplist invalidations
WT-7592       Remove log_flush("sync=background") support
WT-7599       Update the CONFIG file based on the release that is about to run for compatibility tests
WT-7607       Add the possibility to use an existing database for many-coll-test
WT-7673       Investigate and fix manydbs test failure on Windows
WT-7703       Fix timeout in test_checkpoint_snapshot04
WT-7732       Add a timeout configuration for flush_tier
WT-7758       Force evict a page when the update chain is too long
WT-7787       Don't read pages for checkpoint cleanup when the cache is in aggressive mode
WT-7789       Change tiered python tests to fail without extension library
WT-7817       Make tiered storage address cookies backward compatible
WT-7830       Migrate the python setup scripts to use cmake
WT-7838       Ability for ordered timestamp assertion to do more than a log message
WT-7842       Remove explicit ulimit -n call in many-collection-test
WT-7860       Improve code coverage reporting
WT-7864       Add support to run.py for running lists/ranges of scenarios in a test
WT-7865       Disable timeout assert while waiting for eviction to quiesce prior to RTS and test
WT-7870       Fix measurement of cyclomatic code complexity
WT-7871       Remove comment that is no longer true
WT-7874       Remove two other stale comments
WT-7876       Update rollback to stable test to use correct boolean values and update statistic checking logic
WT-7882       Fix discrepancy for wiredtiger.in on mongodb-4.4 branch
WT-7883       Remove incorrect wt_free statement
WT-7889       Find/replace existing uses of WT with WiredTiger in reference guide
WT-7890       Fix CMake syntax error in config_lib
WT-7893       Remove ignored message from wiredtiger_open in test_encrypt08
WT-7895       Fix arch-data-file.dox documentation build failure
WT-7897       Enable verbose logging for test_backup15 to aid debugging
WT-7898       Upload many-coll-test artifacts
WT-7900       Fix insertion of new records in test format for column-store
WT-7901       test suite cleanup
WT-7908       Make variable-length column store work again with the static tests
WT-7935       Add arm64 implementation of rdtsc equivalent instruction
WT-7937       Fix s_docs to use sh, not bash syntax
WT-7938       Fix rollback-to-stable memory leak on error

1 files changed, 6 insertions, 19 deletions

diff --git a/src/third_party/wiredtiger/src/block/block_read.c b/src/third_party/wiredtiger/src/block/block_read.c
index 796d071b305..3fec75acfe8 100644
--- a/src/third_party/wiredtiger/src/block/block_read.c
+++ b/src/third_party/wiredtiger/src/block/block_read.c
@@ -29,7 +29,8 @@ __wt_bm_preload(WT_BM *bm, WT_SESSION_IMPL *session, const uint8_t *addr, size_t
     WT_STAT_CONN_INCR(session, block_preload);
 
     /* Crack the cookie. */
-    WT_RET(__wt_block_buffer_to_addr(block, addr, &objectid, &offset, &size, &checksum));
+    WT_RET(__wt_block_addr_unpack(
+      session, block, addr, addr_size, &objectid, &offset, &size, &checksum));
 
     WT_RET(__wt_block_fh(session, block, objectid, &fh));
     handle = fh->handle;
@@ -67,11 +68,11 @@ __wt_bm_read(
     uint32_t checksum, objectid, size;
     bool mapped;
 
-    WT_UNUSED(addr_size);
     block = bm->block;
 
     /* Crack the cookie. */
-    WT_RET(__wt_block_buffer_to_addr(block, addr, &objectid, &offset, &size, &checksum));
+    WT_RET(__wt_block_addr_unpack(
+      session, block, addr, addr_size, &objectid, &offset, &size, &checksum));
 
     /*
      * Map the block if it's possible.
@@ -165,7 +166,8 @@ __wt_bm_corrupt(WT_BM *bm, WT_SESSION_IMPL *session, const uint8_t *addr, size_t
     WT_ERR(__wt_bm_read(bm, session, tmp, addr, addr_size));
 
     /* Crack the cookie, dump the block. */
-    WT_ERR(__wt_block_buffer_to_addr(bm->block, addr, &objectid, &offset, &size, &checksum));
+    WT_ERR(__wt_block_addr_unpack(
+      session, bm->block, addr, addr_size, &objectid, &offset, &size, &checksum));
     WT_ERR(__wt_bm_corrupt_dump(session, tmp, objectid, offset, size, checksum));
 
 err:
@@ -207,21 +209,6 @@ err:
 #endif
 
 /*
- * __wt_block_fh --
- *     Get a block file handle.
- */
-int
-__wt_block_fh(WT_SESSION_IMPL *session, WT_BLOCK *block, uint32_t objectid, WT_FH **fhp)
-{
-    if (!block->has_objects)
-        *fhp = block->fh;
-    else
-        WT_RET(__wt_block_tiered_fh(session, block, objectid, fhp));
-
-    return (0);
-}
-
-/*
  * __wt_block_read_off --
  *     Read an addr/size pair referenced block into a buffer.
  */