From de1e56ca35d3f20caf25921fb8b867115db74340 Mon Sep 17 00:00:00 2001 From: neethuhaneesha Date: Tue, 28 Mar 2023 14:25:28 -0700 Subject: [PATCH] RocksDB 7.10.2 version upgrade --- cmake/CompileRocksDB.cmake | 6 +- .../release-notes/release-notes-710.rst | 2 + fdbserver/KeyValueStoreRocksDB.actor.cpp | 38 +++--- .../KeyValueStoreShardedRocksDB.actor.cpp | 38 +++--- fdbserver/RocksDBCheckpointUtils.actor.cpp | 22 +-- .../fdbserver/RocksDBCheckpointUtils.actor.h | 127 +++++++++++------- 6 files changed, 141 insertions(+), 92 deletions(-) diff --git a/cmake/CompileRocksDB.cmake b/cmake/CompileRocksDB.cmake index 47a125db07e..cd9941d707b 100644 --- a/cmake/CompileRocksDB.cmake +++ b/cmake/CompileRocksDB.cmake @@ -1,6 +1,6 @@ # FindRocksDB -find_package(RocksDB 7.7.3) +find_package(RocksDB 7.10.2) include(ExternalProject) @@ -52,8 +52,8 @@ if(ROCKSDB_FOUND) ${BINARY_DIR}/librocksdb.a) else() ExternalProject_Add(rocksdb - URL https://github.com/facebook/rocksdb/archive/refs/tags/v7.7.3.tar.gz - URL_HASH SHA256=b8ac9784a342b2e314c821f6d701148912215666ac5e9bdbccd93cf3767cb611 + URL https://github.com/facebook/rocksdb/archive/refs/tags/v7.10.2.tar.gz + URL_HASH SHA256=4619ae7308cd3d11cdd36f0bfad3fb03a1ad399ca333f192b77b6b95b08e2f78 CMAKE_ARGS ${RocksDB_CMAKE_ARGS} BUILD_BYPRODUCTS /librocksdb.a INSTALL_COMMAND "" diff --git a/documentation/sphinx/source/release-notes/release-notes-710.rst b/documentation/sphinx/source/release-notes/release-notes-710.rst index 50fb031ef22..60d72055763 100644 --- a/documentation/sphinx/source/release-notes/release-notes-710.rst +++ b/documentation/sphinx/source/release-notes/release-notes-710.rst @@ -13,6 +13,8 @@ Release Notes * Fixed unnecessary transaction system recovery when excluding the servers that are already excluded/failed. `(PR #9809) `_ * Fixed the exclusion of stateless processes by skipping the free capacity check. `(PR #9789) `_ * Fixed an issue where the new worker cannot get ServerDBInfo update. `(PR #9778) `_ +* Added RocksDB bloom filter knobs. `(PR #9770) `_ +* Upgraded RocksDB to version 7.10.2. `(PR #9829) `_ 7.1.29 ====== diff --git a/fdbserver/KeyValueStoreRocksDB.actor.cpp b/fdbserver/KeyValueStoreRocksDB.actor.cpp index 384663d03e9..243a4278261 100644 --- a/fdbserver/KeyValueStoreRocksDB.actor.cpp +++ b/fdbserver/KeyValueStoreRocksDB.actor.cpp @@ -69,9 +69,9 @@ #ifdef SSD_ROCKSDB_EXPERIMENTAL -// Enforcing rocksdb version to be 7.7.3. -static_assert((ROCKSDB_MAJOR == 7 && ROCKSDB_MINOR == 7 && ROCKSDB_PATCH == 3), - "Unsupported rocksdb version. Update the rocksdb to 7.7.3 version"); +// Enforcing rocksdb version to be 7.10.2 +static_assert((ROCKSDB_MAJOR == 7 && ROCKSDB_MINOR == 10 && ROCKSDB_PATCH == 2), + "Unsupported rocksdb version. Update the rocksdb to 7.10.2 version"); namespace { using rocksdb::BackgroundErrorReason; @@ -360,10 +360,14 @@ rocksdb::ExportImportFilesMetaData getMetaData(const CheckpointMetaData& checkpo for (const LiveFileMetaData& fileMetaData : rocksCF.sstFiles) { rocksdb::LiveFileMetaData liveFileMetaData; - liveFileMetaData.size = fileMetaData.size; - liveFileMetaData.name = fileMetaData.name; + liveFileMetaData.relative_filename = fileMetaData.relative_filename; + liveFileMetaData.directory = fileMetaData.directory; liveFileMetaData.file_number = fileMetaData.file_number; - liveFileMetaData.db_path = fileMetaData.db_path; + liveFileMetaData.file_type = static_cast(fileMetaData.file_type); + liveFileMetaData.size = fileMetaData.size; + liveFileMetaData.temperature = static_cast(fileMetaData.temperature); + liveFileMetaData.file_checksum = fileMetaData.file_checksum; + liveFileMetaData.file_checksum_func_name = fileMetaData.file_checksum_func_name; liveFileMetaData.smallest_seqno = fileMetaData.smallest_seqno; liveFileMetaData.largest_seqno = fileMetaData.largest_seqno; liveFileMetaData.smallestkey = fileMetaData.smallestkey; @@ -372,12 +376,12 @@ rocksdb::ExportImportFilesMetaData getMetaData(const CheckpointMetaData& checkpo liveFileMetaData.being_compacted = fileMetaData.being_compacted; liveFileMetaData.num_entries = fileMetaData.num_entries; liveFileMetaData.num_deletions = fileMetaData.num_deletions; - liveFileMetaData.temperature = static_cast(fileMetaData.temperature); liveFileMetaData.oldest_blob_file_number = fileMetaData.oldest_blob_file_number; liveFileMetaData.oldest_ancester_time = fileMetaData.oldest_ancester_time; liveFileMetaData.file_creation_time = fileMetaData.file_creation_time; - liveFileMetaData.file_checksum = fileMetaData.file_checksum; - liveFileMetaData.file_checksum_func_name = fileMetaData.file_checksum_func_name; + liveFileMetaData.epoch_number = fileMetaData.epoch_number; + liveFileMetaData.name = fileMetaData.name; + liveFileMetaData.db_path = fileMetaData.db_path; liveFileMetaData.column_family_name = fileMetaData.column_family_name; liveFileMetaData.level = fileMetaData.level; metaData.files.push_back(liveFileMetaData); @@ -391,10 +395,14 @@ void populateMetaData(CheckpointMetaData* checkpoint, const rocksdb::ExportImpor rocksCF.dbComparatorName = metaData.db_comparator_name; for (const rocksdb::LiveFileMetaData& fileMetaData : metaData.files) { LiveFileMetaData liveFileMetaData; - liveFileMetaData.size = fileMetaData.size; - liveFileMetaData.name = fileMetaData.name; + liveFileMetaData.relative_filename = fileMetaData.relative_filename; + liveFileMetaData.directory = fileMetaData.directory; liveFileMetaData.file_number = fileMetaData.file_number; - liveFileMetaData.db_path = fileMetaData.db_path; + liveFileMetaData.file_type = static_cast(fileMetaData.file_type); + liveFileMetaData.size = fileMetaData.size; + liveFileMetaData.temperature = static_cast(fileMetaData.temperature); + liveFileMetaData.file_checksum = fileMetaData.file_checksum; + liveFileMetaData.file_checksum_func_name = fileMetaData.file_checksum_func_name; liveFileMetaData.smallest_seqno = fileMetaData.smallest_seqno; liveFileMetaData.largest_seqno = fileMetaData.largest_seqno; liveFileMetaData.smallestkey = fileMetaData.smallestkey; @@ -403,12 +411,12 @@ void populateMetaData(CheckpointMetaData* checkpoint, const rocksdb::ExportImpor liveFileMetaData.being_compacted = fileMetaData.being_compacted; liveFileMetaData.num_entries = fileMetaData.num_entries; liveFileMetaData.num_deletions = fileMetaData.num_deletions; - liveFileMetaData.temperature = static_cast(fileMetaData.temperature); liveFileMetaData.oldest_blob_file_number = fileMetaData.oldest_blob_file_number; liveFileMetaData.oldest_ancester_time = fileMetaData.oldest_ancester_time; liveFileMetaData.file_creation_time = fileMetaData.file_creation_time; - liveFileMetaData.file_checksum = fileMetaData.file_checksum; - liveFileMetaData.file_checksum_func_name = fileMetaData.file_checksum_func_name; + liveFileMetaData.epoch_number = fileMetaData.epoch_number; + liveFileMetaData.name = fileMetaData.name; + liveFileMetaData.db_path = fileMetaData.db_path; liveFileMetaData.column_family_name = fileMetaData.column_family_name; liveFileMetaData.level = fileMetaData.level; rocksCF.sstFiles.push_back(liveFileMetaData); diff --git a/fdbserver/KeyValueStoreShardedRocksDB.actor.cpp b/fdbserver/KeyValueStoreShardedRocksDB.actor.cpp index d4eb46f2ece..6a512a5e02b 100644 --- a/fdbserver/KeyValueStoreShardedRocksDB.actor.cpp +++ b/fdbserver/KeyValueStoreShardedRocksDB.actor.cpp @@ -44,9 +44,9 @@ #ifdef SSD_ROCKSDB_EXPERIMENTAL -// Enforcing rocksdb version to be 7.7.3. -static_assert((ROCKSDB_MAJOR == 7 && ROCKSDB_MINOR == 7 && ROCKSDB_PATCH == 3), - "Unsupported rocksdb version. Update the rocksdb to 7.7.3 version"); +// Enforcing rocksdb version to be 7.10.2 +static_assert((ROCKSDB_MAJOR == 7 && ROCKSDB_MINOR == 10 && ROCKSDB_PATCH == 2), + "Unsupported rocksdb version. Update the rocksdb to 7.10.2 version"); const std::string rocksDataFolderSuffix = "-data"; const std::string METADATA_SHARD_ID = "kvs-metadata"; @@ -168,10 +168,14 @@ rocksdb::ExportImportFilesMetaData getMetaData(const CheckpointMetaData& checkpo for (const LiveFileMetaData& fileMetaData : rocksCF.sstFiles) { rocksdb::LiveFileMetaData liveFileMetaData; - liveFileMetaData.size = fileMetaData.size; - liveFileMetaData.name = fileMetaData.name; + liveFileMetaData.relative_filename = fileMetaData.relative_filename; + liveFileMetaData.directory = fileMetaData.directory; liveFileMetaData.file_number = fileMetaData.file_number; - liveFileMetaData.db_path = fileMetaData.db_path; + liveFileMetaData.file_type = static_cast(fileMetaData.file_type); + liveFileMetaData.size = fileMetaData.size; + liveFileMetaData.temperature = static_cast(fileMetaData.temperature); + liveFileMetaData.file_checksum = fileMetaData.file_checksum; + liveFileMetaData.file_checksum_func_name = fileMetaData.file_checksum_func_name; liveFileMetaData.smallest_seqno = fileMetaData.smallest_seqno; liveFileMetaData.largest_seqno = fileMetaData.largest_seqno; liveFileMetaData.smallestkey = fileMetaData.smallestkey; @@ -180,12 +184,12 @@ rocksdb::ExportImportFilesMetaData getMetaData(const CheckpointMetaData& checkpo liveFileMetaData.being_compacted = fileMetaData.being_compacted; liveFileMetaData.num_entries = fileMetaData.num_entries; liveFileMetaData.num_deletions = fileMetaData.num_deletions; - liveFileMetaData.temperature = static_cast(fileMetaData.temperature); liveFileMetaData.oldest_blob_file_number = fileMetaData.oldest_blob_file_number; liveFileMetaData.oldest_ancester_time = fileMetaData.oldest_ancester_time; liveFileMetaData.file_creation_time = fileMetaData.file_creation_time; - liveFileMetaData.file_checksum = fileMetaData.file_checksum; - liveFileMetaData.file_checksum_func_name = fileMetaData.file_checksum_func_name; + liveFileMetaData.epoch_number = fileMetaData.epoch_number; + liveFileMetaData.name = fileMetaData.name; + liveFileMetaData.db_path = fileMetaData.db_path; liveFileMetaData.column_family_name = fileMetaData.column_family_name; liveFileMetaData.level = fileMetaData.level; metaData.files.push_back(liveFileMetaData); @@ -199,10 +203,14 @@ void populateMetaData(CheckpointMetaData* checkpoint, const rocksdb::ExportImpor rocksCF.dbComparatorName = metaData.db_comparator_name; for (const rocksdb::LiveFileMetaData& fileMetaData : metaData.files) { LiveFileMetaData liveFileMetaData; - liveFileMetaData.size = fileMetaData.size; - liveFileMetaData.name = fileMetaData.name; + liveFileMetaData.relative_filename = fileMetaData.relative_filename; + liveFileMetaData.directory = fileMetaData.directory; liveFileMetaData.file_number = fileMetaData.file_number; - liveFileMetaData.db_path = fileMetaData.db_path; + liveFileMetaData.file_type = static_cast(fileMetaData.file_type); + liveFileMetaData.size = fileMetaData.size; + liveFileMetaData.temperature = static_cast(fileMetaData.temperature); + liveFileMetaData.file_checksum = fileMetaData.file_checksum; + liveFileMetaData.file_checksum_func_name = fileMetaData.file_checksum_func_name; liveFileMetaData.smallest_seqno = fileMetaData.smallest_seqno; liveFileMetaData.largest_seqno = fileMetaData.largest_seqno; liveFileMetaData.smallestkey = fileMetaData.smallestkey; @@ -211,12 +219,12 @@ void populateMetaData(CheckpointMetaData* checkpoint, const rocksdb::ExportImpor liveFileMetaData.being_compacted = fileMetaData.being_compacted; liveFileMetaData.num_entries = fileMetaData.num_entries; liveFileMetaData.num_deletions = fileMetaData.num_deletions; - liveFileMetaData.temperature = static_cast(fileMetaData.temperature); liveFileMetaData.oldest_blob_file_number = fileMetaData.oldest_blob_file_number; liveFileMetaData.oldest_ancester_time = fileMetaData.oldest_ancester_time; liveFileMetaData.file_creation_time = fileMetaData.file_creation_time; - liveFileMetaData.file_checksum = fileMetaData.file_checksum; - liveFileMetaData.file_checksum_func_name = fileMetaData.file_checksum_func_name; + liveFileMetaData.epoch_number = fileMetaData.epoch_number; + liveFileMetaData.name = fileMetaData.name; + liveFileMetaData.db_path = fileMetaData.db_path; liveFileMetaData.column_family_name = fileMetaData.column_family_name; liveFileMetaData.level = fileMetaData.level; rocksCF.sstFiles.push_back(liveFileMetaData); diff --git a/fdbserver/RocksDBCheckpointUtils.actor.cpp b/fdbserver/RocksDBCheckpointUtils.actor.cpp index fe719b4f7a0..d4a6d8323c8 100644 --- a/fdbserver/RocksDBCheckpointUtils.actor.cpp +++ b/fdbserver/RocksDBCheckpointUtils.actor.cpp @@ -45,9 +45,9 @@ #include "flow/actorcompiler.h" // has to be last include #ifdef SSD_ROCKSDB_EXPERIMENTAL -// Enforcing rocksdb version to be 7.7.3. -static_assert((ROCKSDB_MAJOR == 7 && ROCKSDB_MINOR == 7 && ROCKSDB_PATCH == 3), - "Unsupported rocksdb version. Update the rocksdb to 7.7.3 version"); +// Enforcing rocksdb version to be 7.10.2 +static_assert((ROCKSDB_MAJOR == 7 && ROCKSDB_MINOR == 10 && ROCKSDB_PATCH == 2), + "Unsupported rocksdb version. Update the rocksdb to 7.10.2 version"); namespace { @@ -71,10 +71,14 @@ rocksdb::ExportImportFilesMetaData getMetaData(const CheckpointMetaData& checkpo for (const LiveFileMetaData& fileMetaData : rocksCF.sstFiles) { rocksdb::LiveFileMetaData liveFileMetaData; - liveFileMetaData.size = fileMetaData.size; - liveFileMetaData.name = fileMetaData.name; + liveFileMetaData.relative_filename = fileMetaData.relative_filename; + liveFileMetaData.directory = fileMetaData.directory; liveFileMetaData.file_number = fileMetaData.file_number; - liveFileMetaData.db_path = fileMetaData.db_path; + liveFileMetaData.file_type = static_cast(fileMetaData.file_type); + liveFileMetaData.size = fileMetaData.size; + liveFileMetaData.temperature = static_cast(fileMetaData.temperature); + liveFileMetaData.file_checksum = fileMetaData.file_checksum; + liveFileMetaData.file_checksum_func_name = fileMetaData.file_checksum_func_name; liveFileMetaData.smallest_seqno = fileMetaData.smallest_seqno; liveFileMetaData.largest_seqno = fileMetaData.largest_seqno; liveFileMetaData.smallestkey = fileMetaData.smallestkey; @@ -83,12 +87,12 @@ rocksdb::ExportImportFilesMetaData getMetaData(const CheckpointMetaData& checkpo liveFileMetaData.being_compacted = fileMetaData.being_compacted; liveFileMetaData.num_entries = fileMetaData.num_entries; liveFileMetaData.num_deletions = fileMetaData.num_deletions; - liveFileMetaData.temperature = static_cast(fileMetaData.temperature); liveFileMetaData.oldest_blob_file_number = fileMetaData.oldest_blob_file_number; liveFileMetaData.oldest_ancester_time = fileMetaData.oldest_ancester_time; liveFileMetaData.file_creation_time = fileMetaData.file_creation_time; - liveFileMetaData.file_checksum = fileMetaData.file_checksum; - liveFileMetaData.file_checksum_func_name = fileMetaData.file_checksum_func_name; + liveFileMetaData.epoch_number = fileMetaData.epoch_number; + liveFileMetaData.name = fileMetaData.name; + liveFileMetaData.db_path = fileMetaData.db_path; liveFileMetaData.column_family_name = fileMetaData.column_family_name; liveFileMetaData.level = fileMetaData.level; metaData.files.push_back(liveFileMetaData); diff --git a/fdbserver/include/fdbserver/RocksDBCheckpointUtils.actor.h b/fdbserver/include/fdbserver/RocksDBCheckpointUtils.actor.h index b7118db2ee1..17333f54a4c 100644 --- a/fdbserver/include/fdbserver/RocksDBCheckpointUtils.actor.h +++ b/fdbserver/include/fdbserver/RocksDBCheckpointUtils.actor.h @@ -77,41 +77,65 @@ struct CheckpointFile { struct SstFileMetaData { constexpr static FileIdentifier file_identifier = 3804347; SstFileMetaData() - : size(0), file_number(0), smallest_seqno(0), largest_seqno(0), num_reads_sampled(0), being_compacted(false), - num_entries(0), num_deletions(0), temperature(0), oldest_blob_file_number(0), oldest_ancester_time(0), - file_creation_time(0) {} + : file_number(0), file_type(2), size(0), temperature(0), smallest_seqno(0), largest_seqno(0), + num_reads_sampled(0), being_compacted(false), num_entries(0), num_deletions(0), oldest_blob_file_number(0), + oldest_ancester_time(0), file_creation_time(0), epoch_number(0) {} - SstFileMetaData(const std::string& _file_name, + SstFileMetaData(const std::string& _relative_filename, + const std::string& _directory, uint64_t _file_number, - const std::string& _path, - size_t _size, + int _file_type, + uint64_t _size, + int _temperature, + std::string& _file_checksum, + std::string& _file_checksum_func_name, uint64_t _smallest_seqno, uint64_t _largest_seqno, const std::string& _smallestkey, const std::string& _largestkey, uint64_t _num_reads_sampled, bool _being_compacted, - int _temperature, + uint64_t _num_entries, + uint64_t _num_deletions, uint64_t _oldest_blob_file_number, uint64_t _oldest_ancester_time, uint64_t _file_creation_time, - std::string& _file_checksum, - std::string& _file_checksum_func_name) - : size(_size), name(_file_name), file_number(_file_number), db_path(_path), smallest_seqno(_smallest_seqno), + uint64_t _epoch_number, + const std::string& _name, + const std::string& _db_path) + : relative_filename(_relative_filename), directory(_directory), file_number(_file_number), file_type(_file_type), + size(_size), temperature(_temperature), file_checksum(_file_checksum), + file_checksum_func_name(_file_checksum_func_name), smallest_seqno(_smallest_seqno), largest_seqno(_largest_seqno), smallestkey(_smallestkey), largestkey(_largestkey), - num_reads_sampled(_num_reads_sampled), being_compacted(_being_compacted), num_entries(0), num_deletions(0), - temperature(_temperature), oldest_blob_file_number(_oldest_blob_file_number), + num_reads_sampled(_num_reads_sampled), being_compacted(_being_compacted), num_entries(_num_entries), + num_deletions(_num_deletions), oldest_blob_file_number(_oldest_blob_file_number), oldest_ancester_time(_oldest_ancester_time), file_creation_time(_file_creation_time), - file_checksum(_file_checksum), file_checksum_func_name(_file_checksum_func_name) {} - - // File size in bytes. - size_t size; - // The name of the file. - std::string name; - // The id of the file. + epoch_number(_epoch_number), name(_name), db_path(_db_path) {} + + // The name of the file within its directory (e.g. "123456.sst") + std::string relative_filename; + // The directory containing the file, without a trailing '/'. This could be + // a DB path, wal_dir, etc. + std::string directory; + // The id of the file within a single DB. Set to 0 if the file does not have + // a number (e.g. CURRENT) uint64_t file_number; - // The full path where the file locates. - std::string db_path; + // The type of the file as part of a DB. + int file_type; + // File size in bytes. See also `trim_to_size`. + uint64_t size; + // This feature is experimental and subject to change. + int temperature; + // The checksum of a SST file, the value is decided by the file content and + // the checksum algorithm used for this SST file. The checksum function is + // identified by the file_checksum_func_name. If the checksum function is + // not specified, file_checksum is "0" by default. + std::string file_checksum; + // The name of the checksum function used to generate the file checksum + // value. If file checksum is not enabled (e.g., sst_file_checksum_func is + // null), file_checksum_func_name is UnknownFileChecksumFuncName, which is + // "Unknown". + std::string file_checksum_func_name; uint64_t smallest_seqno; // Smallest sequence number in file. uint64_t largest_seqno; // Largest sequence number in file. @@ -119,13 +143,8 @@ struct SstFileMetaData { std::string largestkey; // Largest user defined key in the file. uint64_t num_reads_sampled; // How many times the file is read. bool being_compacted; // true if the file is currently being compacted. - uint64_t num_entries; uint64_t num_deletions; - - // This feature is experimental and subject to change. - int temperature; - uint64_t oldest_blob_file_number; // The id of the oldest blob file // referenced by the file. // An SST file may be generated by compactions whose input files may @@ -139,26 +158,30 @@ struct SstFileMetaData { // Timestamp when the SST file is created, provided by // SystemClock::GetCurrentTime(). 0 if the information is not available. uint64_t file_creation_time; - - // The checksum of a SST file, the value is decided by the file content and - // the checksum algorithm used for this SST file. The checksum function is - // identified by the file_checksum_func_name. If the checksum function is - // not specified, file_checksum is "0" by default. - std::string file_checksum; - - // The name of the checksum function used to generate the file checksum - // value. If file checksum is not enabled (e.g., sst_file_checksum_func is - // null), file_checksum_func_name is UnknownFileChecksumFuncName, which is - // "Unknown". - std::string file_checksum_func_name; + // The order of a file being flushed or ingested/imported. + // Compaction output file will be assigned with the minimum `epoch_number` + // among input files'. + // For L0, larger `epoch_number` indicates newer L0 file. + // 0 if the information is not available. + uint64_t epoch_number; + // DEPRECATED: The name of the file within its directory with a + // leading slash (e.g. "/123456.sst"). Use relative_filename from base struct + // instead. + std::string name; + // DEPRECATED: replaced by `directory` in base struct + std::string db_path; template void serialize(Ar& ar) { serializer(ar, - size, - name, + relative_filename, + directory, file_number, - db_path, + file_type, + size, + temperature, + file_checksum, + file_checksum_func_name, smallest_seqno, largest_seqno, smallestkey, @@ -167,12 +190,12 @@ struct SstFileMetaData { being_compacted, num_entries, num_deletions, - temperature, oldest_blob_file_number, oldest_ancester_time, file_creation_time, - file_checksum, - file_checksum_func_name); + epoch_number, + name, + db_path); } }; @@ -187,10 +210,14 @@ struct LiveFileMetaData : public SstFileMetaData { template void serialize(Ar& ar) { serializer(ar, - SstFileMetaData::size, - SstFileMetaData::name, + SstFileMetaData::relative_filename, + SstFileMetaData::directory, SstFileMetaData::file_number, - SstFileMetaData::db_path, + SstFileMetaData::file_type, + SstFileMetaData::size, + SstFileMetaData::temperature, + SstFileMetaData::file_checksum, + SstFileMetaData::file_checksum_func_name, SstFileMetaData::smallest_seqno, SstFileMetaData::largest_seqno, SstFileMetaData::smallestkey, @@ -199,12 +226,12 @@ struct LiveFileMetaData : public SstFileMetaData { SstFileMetaData::being_compacted, SstFileMetaData::num_entries, SstFileMetaData::num_deletions, - SstFileMetaData::temperature, SstFileMetaData::oldest_blob_file_number, SstFileMetaData::oldest_ancester_time, SstFileMetaData::file_creation_time, - SstFileMetaData::file_checksum, - SstFileMetaData::file_checksum_func_name, + SstFileMetaData::epoch_number, + SstFileMetaData::name, + SstFileMetaData::db_path, column_family_name, level, fetched);