@nxtedition/rocksdb 8.2.0 → 8.2.2

package/deps/rocksdb/rocksdb/db/db_block_cache_test.cc

@@ -620,9 +620,9 @@ class MockCache : public LRUCache {
   static uint32_t low_pri_insert_count;
 
   MockCache()
-      : LRUCache((size_t)1 << 25 /*capacity*/, 0 /*num_shard_bits*/,
-                 false /*strict_capacity_limit*/, 0.0 /*high_pri_pool_ratio*/,
-                 0.0 /*low_pri_pool_ratio*/) {}
+      : LRUCache(LRUCacheOptions(
+            size_t{1} << 25 /*capacity*/, 0 /*num_shard_bits*/,
+            false /*strict_capacity_limit*/, 0.0 /*high_pri_pool_ratio*/)) {}
 
   using ShardedCache::Insert;
 
@@ -979,12 +979,14 @@ TEST_F(DBBlockCacheTest, CacheEntryRoleStats) {
   const size_t capacity = size_t{1} << 25;
   int iterations_tested = 0;
   for (bool partition : {false, true}) {
+    SCOPED_TRACE("Partition? " + std::to_string(partition));
     for (std::shared_ptr<Cache> cache :
          {NewLRUCache(capacity),
           HyperClockCacheOptions(
               capacity,
               BlockBasedTableOptions().block_size /*estimated_value_size*/)
               .MakeSharedCache()}) {
+      SCOPED_TRACE(std::string("Cache: ") + cache->Name());
       ++iterations_tested;
 
       Options options = CurrentOptions();
@@ -1278,6 +1280,7 @@ TEST_F(DBBlockCacheTest, HyperClockCacheReportProblems) {
   HyperClockCacheOptions hcc_opts{capacity, value_size_est};
   hcc_opts.num_shard_bits = 2;  // 4 shards
   hcc_opts.metadata_charge_policy = kDontChargeCacheMetadata;
+  hcc_opts.hash_seed = 0;  // deterministic hashing
   std::shared_ptr<Cache> cache = hcc_opts.MakeSharedCache();
   std::shared_ptr<CountingLogger> logger = std::make_shared<CountingLogger>();