From 861b0d1a496fdb7e77ed8027e34d9a2e0a9a4789 Mon Sep 17 00:00:00 2001 From: Jay Zhuang Date: Mon, 21 Dec 2020 15:20:59 -0800 Subject: [PATCH] Fix Windows build in block_cache_tracer_test (#7795) Summary: The test was added to cmake in https://github.com/facebook/rocksdb/issues/7783 Pull Request resolved: https://github.com/facebook/rocksdb/pull/7795 Reviewed By: akankshamahajan15 Differential Revision: D25671010 Pulled By: jay-zhuang fbshipit-source-id: 2146ff9559cdd7266c4d78476672488c62654a6d --- trace_replay/block_cache_tracer_test.cc | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/trace_replay/block_cache_tracer_test.cc b/trace_replay/block_cache_tracer_test.cc index b29600890..bccf6ef61 100644 --- a/trace_replay/block_cache_tracer_test.cc +++ b/trace_replay/block_cache_tracer_test.cc @@ -52,6 +52,7 @@ class BlockCacheTracerTest : public testing::Test { return TableReaderCaller::kUserIterator; } assert(false); + return TableReaderCaller::kMaxBlockCacheLookupCaller; } void WriteBlockAccess(BlockCacheTraceWriter* writer, uint32_t from_key_id, @@ -200,8 +201,8 @@ TEST_F(BlockCacheTracerTest, AtomicWrite) { BlockCacheTraceReader reader(std::move(trace_reader)); BlockCacheTraceHeader header; ASSERT_OK(reader.ReadHeader(&header)); - ASSERT_EQ(kMajorVersion, header.rocksdb_major_version); - ASSERT_EQ(kMinorVersion, header.rocksdb_minor_version); + ASSERT_EQ(kMajorVersion, static_cast(header.rocksdb_major_version)); + ASSERT_EQ(kMinorVersion, static_cast(header.rocksdb_minor_version)); VerifyAccess(&reader, 0, TraceType::kBlockTraceDataBlock, 1); ASSERT_NOK(reader.ReadAccess(&record)); } @@ -244,8 +245,8 @@ TEST_F(BlockCacheTracerTest, AtomicNoWriteAfterEndTrace) { BlockCacheTraceReader reader(std::move(trace_reader)); BlockCacheTraceHeader header; ASSERT_OK(reader.ReadHeader(&header)); - ASSERT_EQ(kMajorVersion, header.rocksdb_major_version); - ASSERT_EQ(kMinorVersion, header.rocksdb_minor_version); + ASSERT_EQ(kMajorVersion, static_cast(header.rocksdb_major_version)); + ASSERT_EQ(kMinorVersion, static_cast(header.rocksdb_minor_version)); VerifyAccess(&reader, 0, TraceType::kBlockTraceDataBlock, 1); ASSERT_NOK(reader.ReadAccess(&record)); } @@ -307,8 +308,8 @@ TEST_F(BlockCacheTracerTest, MixedBlocks) { BlockCacheTraceReader reader(std::move(trace_reader)); BlockCacheTraceHeader header; ASSERT_OK(reader.ReadHeader(&header)); - ASSERT_EQ(kMajorVersion, header.rocksdb_major_version); - ASSERT_EQ(kMinorVersion, header.rocksdb_minor_version); + ASSERT_EQ(kMajorVersion, static_cast(header.rocksdb_major_version)); + ASSERT_EQ(kMinorVersion, static_cast(header.rocksdb_minor_version)); // Read blocks. VerifyAccess(&reader, 0, TraceType::kBlockTraceUncompressionDictBlock, 10); VerifyAccess(&reader, 10, TraceType::kBlockTraceDataBlock, 10);