import quincy beta 17.1.0

[ceph.git] / ceph / src / rocksdb / table / cuckoo / cuckoo_table_builder_test.cc

diff --git a/ceph/src/rocksdb/table/cuckoo/cuckoo_table_builder_test.cc b/ceph/src/rocksdb/table/cuckoo/cuckoo_table_builder_test.cc
index 005ce717d5b63a180b60a75969be0e7dd9528f6a..2f6db70d9f170f4486cf5ce9d89bd2a1807ece0b 100644 (file)
--- a/ceph/src/rocksdb/table/cuckoo/cuckoo_table_builder_test.cc
+++ b/ceph/src/rocksdb/table/cuckoo/cuckoo_table_builder_test.cc
@@ -47,7 +47,9 @@ class CuckooBuilderTest : public testing::Test {
     uint64_t num_deletions = 0;
     for (const auto& key : keys) {
       ParsedInternalKey parsed;
-      if (ParseInternalKey(key, &parsed) && parsed.type == kTypeDeletion) {
+      Status pik_status =
+          ParseInternalKey(key, &parsed, true /* log_err_key */);
+      if (pik_status.ok() && parsed.type == kTypeDeletion) {
         num_deletions++;
       }
     }
@@ -57,10 +59,9 @@ class CuckooBuilderTest : public testing::Test {
     uint64_t read_file_size;
     ASSERT_OK(env_->GetFileSize(fname, &read_file_size));
 
-   // @lint-ignore TXT2 T25377293 Grandfathered in
-         Options options;
-         options.allow_mmap_reads = true;
-         ImmutableCFOptions ioptions(options);
+    Options options;
+    options.allow_mmap_reads = true;
+    ImmutableCFOptions ioptions(options);
 
     // Assert Table Properties.
     TableProperties* props = nullptr;
@@ -111,10 +112,10 @@ class CuckooBuilderTest : public testing::Test {
     // Check contents of the bucket.
     std::vector<bool> keys_found(keys.size(), false);
     size_t bucket_size = expected_unused_bucket.size();
-    for (uint32_t i = 0; i < table_size + cuckoo_block_size - 1; ++i) {
+    for (uint32_t i = 0; i + 1 < table_size + cuckoo_block_size; ++i) {
       Slice read_slice;
-      ASSERT_OK(file_reader->Read(i * bucket_size, bucket_size, &read_slice,
-                                  nullptr));
+      ASSERT_OK(file_reader->Read(IOOptions(), i * bucket_size, bucket_size,
+                                  &read_slice, nullptr, nullptr));
       size_t key_idx =
           std::find(expected_locations.begin(), expected_locations.end(), i) -
           expected_locations.begin();