diff --git a/db/db_test2.cc b/db/db_test2.cc index a4c5b5aa3..746966bda 100644 --- a/db/db_test2.cc +++ b/db/db_test2.cc @@ -3987,6 +3987,46 @@ TEST_F(DBTest2, CloseWithUnreleasedSnapshot) { db_ = nullptr; } +TEST_F(DBTest2, PrefixBloomReseek) { + Options options = CurrentOptions(); + options.create_if_missing = true; + options.prefix_extractor.reset(NewCappedPrefixTransform(3)); + BlockBasedTableOptions bbto; + bbto.filter_policy.reset(NewBloomFilterPolicy(10, false)); + bbto.whole_key_filtering = false; + options.table_factory.reset(NewBlockBasedTableFactory(bbto)); + DestroyAndReopen(options); + + // Construct two L1 files with keys: + // f1:[aaa1 ccc1] f2:[ddd0] + ASSERT_OK(Put("aaa1", "")); + ASSERT_OK(Put("ccc1", "")); + ASSERT_OK(Flush()); + ASSERT_OK(Put("ddd0", "")); + ASSERT_OK(Flush()); + CompactRangeOptions cro; + cro.bottommost_level_compaction = BottommostLevelCompaction::kSkip; + ASSERT_OK(db_->CompactRange(cro, nullptr, nullptr)); + + ASSERT_OK(Put("bbb1", "")); + + Iterator* iter = db_->NewIterator(ReadOptions()); + + // Seeking into f1, the iterator will check bloom filter which returns the + // file iterator ot be invalidate, and the cursor will put into f2, with + // the next key to be "ddd0". + iter->Seek("bbb1"); + ASSERT_TRUE(iter->Valid()); + ASSERT_EQ("bbb1", iter->key().ToString()); + + // Reseek ccc1, the L1 iterator needs to go back to f1 and reseek. + iter->Seek("ccc1"); + ASSERT_TRUE(iter->Valid()); + ASSERT_EQ("ccc1", iter->key().ToString()); + + delete iter; +} + #ifndef ROCKSDB_LITE TEST_F(DBTest2, RowCacheSnapshot) { Options options = CurrentOptions(); diff --git a/table/merging_iterator.cc b/table/merging_iterator.cc index 82329ae8a..62d5ce1ee 100644 --- a/table/merging_iterator.cc +++ b/table/merging_iterator.cc @@ -111,7 +111,7 @@ class MergingIterator : public InternalIterator { void Seek(const Slice& target) override { bool is_increasing_reseek = false; if (current_ != nullptr && direction_ == kForward && status_.ok() && - comparator_->Compare(target, key()) >= 0) { + !prefix_seek_mode_ && comparator_->Compare(target, key()) >= 0) { is_increasing_reseek = true; } ClearHeaps();