outdated code/comment

Author: cbi42

db/convenience.cc

@@ -64,8 +64,6 @@ Status VerifySstFileChecksum(const Options& options,
       options.block_protection_bytes_per_key, false /* skip_filters */,
       !kImmortal, false /* force_direct_prefetch */, -1 /* level */);
   reader_options.largest_seqno = largest_seqno;
-  reader_options.block_protection_bytes_per_key =
-      options.block_protection_bytes_per_key;
   s = ioptions.table_factory->NewTableReader(
       reader_options, std::move(file_reader), file_size, &table_reader,
       false /* prefetch_index_and_filter_in_cache */);

db/external_sst_file_ingestion_job.cc

@@ -683,8 +683,7 @@ Status ExternalSstFileIngestionJob::GetIngestedFileInfo(
           /*force_direct_prefetch*/ false, /*level*/ -1,
           /*block_cache_tracer*/ nullptr,
           /*max_file_size_for_l0_meta_pin*/ 0, versions_->DbSessionId(),
-          /*cur_file_num*/ new_file_number, /*unique_id*/ {},
-          /*largest_seqno*/ 0),
+          /*cur_file_num*/ new_file_number),
       std::move(sst_file_reader), file_to_ingest->file_size, &table_reader);
   if (!status.ok()) {
     return status;

db/kv_checksum.h

@@ -427,7 +427,7 @@ void ProtectionInfoKVOS<T>::UpdateS(SequenceNumber old_sequence_number,
 }
 
 inline void EncodeKVChecksum(uint64_t checksum,
-                             uint32_t protection_bytes_per_key, char* dst) {
+                             uint8_t protection_bytes_per_key, char* dst) {
   switch (protection_bytes_per_key) {
     case 1:
       dst[0] = static_cast<uint8_t>(checksum);

db/memtable.cc

@@ -674,7 +674,9 @@ void MemTable::UpdateEntryChecksum(const ProtectionInfoKVOS64* kv_prot_info,
   } else {
     checksum = kv_prot_info->GetVal();
   }
-  EncodeKVChecksum(checksum, moptions_.protection_bytes_per_key, checksum_ptr);
+  EncodeKVChecksum(checksum,
+                   static_cast<uint8_t>(moptions_.protection_bytes_per_key),
+                   checksum_ptr);
 }
 
 Status MemTable::Add(SequenceNumber s, ValueType type,

table/block_based/block.cc

@@ -396,6 +396,9 @@ bool DataBlockIter::SeekForGetImpl(const Slice& target) {
       // we stop at the first potential matching user key.
       break;
     }
+    // If the loop exits due to CompareCurrentKey(target) >= 0, then current key
+    // exists, and its checksum verification will be done in UpdateKey() called
+    // in SeekForGet().
     TEST_SYNC_POINT_CALLBACK("DataBlockIter::SeekForGetImpl::value",
                              (void*)value_.data());
     if (!Block::VerifyChecksum(
@@ -405,9 +408,6 @@ bool DataBlockIter::SeekForGetImpl(const Slice& target) {
       PerKVChecksumCorruptionError();
       return true;
     }
-    // If the loop exits due to CompareCurrentKey(target) >= 0, then current key
-    // exists, and its checksum verification will be done in UpdateKey() called
-    // in SeekForGet().
   }
 
   if (current_ == restarts_) {

table/block_based/block.h

@@ -273,13 +273,13 @@ class Block {
     return VerifyKVChecksum(checksum_len, checksum_ptr, expected);
   }
 
-  static void GenerateKVChecksum(char* checksum_ptr, uint32_t checksum_len,
+  static void GenerateKVChecksum(char* checksum_ptr, uint8_t checksum_len,
                                  const Slice& key, const Slice& value) {
     uint64_t checksum = ProtectionInfo64().ProtectKV(key, value).GetVal();
     EncodeKVChecksum(checksum, checksum_len, checksum_ptr);
   }
 
-  [[nodiscard]] const char* TEST_GetKVChecksum() const { return kv_checksum_; }
+  const char* TEST_GetKVChecksum() const { return kv_checksum_; }
 
  private:
   BlockContents contents_;

table/block_based/block_test.cc

@@ -1290,8 +1290,8 @@ TEST_P(DataBlockKVChecksumCorruptionTest, CorruptInUpdateKey) {
     }
 
     // Test checksum verification in SeekForGetImpl()
-    // check kNumRecords == 1 so that data_block_hash_index does not have
-    // kCollision entry in it, and the callback below will be called.
+    // Only test when kNumRecords == 1 since otherwise there could be collision
+    // in data_block_hash_index and the callback below will not be called.
     if (GetDataBlockIndexType() == BlockBasedTableOptions::DataBlockIndexType::
                                        kDataBlockBinaryAndHash &&
         kNumRecords == 1) {