From 5c30e6c088d1671373c22aff48c110eb58736258 Mon Sep 17 00:00:00 2001 From: Zhichao Cao Date: Fri, 13 Mar 2020 11:33:04 -0700 Subject: [PATCH] Separate timestamp related test from db_basic_test (#6516) Summary: In some of the test, db_basic_test may cause time out due to its long running time. Separate the timestamp related test from db_basic_test to avoid the potential issue. Pull Request resolved: https://github.com/facebook/rocksdb/pull/6516 Test Plan: pass make asan_check Differential Revision: D20423922 Pulled By: zhichao-cao fbshipit-source-id: d6306f89a8de55b07bf57233e4554c09ef1fe23a --- .gitignore | 1 + CMakeLists.txt | 2 + Makefile | 4 + TARGETS | 7 + appveyor.yml | 2 +- db/db_basic_test.cc | 771 --------------------------- db/db_with_timestamp_basic_test.cc | 809 +++++++++++++++++++++++++++++ src.mk | 2 + 8 files changed, 826 insertions(+), 772 deletions(-) create mode 100644 db/db_with_timestamp_basic_test.cc diff --git a/.gitignore b/.gitignore index d88ac8442..0238a4ab7 100644 --- a/.gitignore +++ b/.gitignore @@ -34,6 +34,7 @@ manifest_dump sst_dump blob_dump block_cache_trace_analyzer +db_with_timestamp_basic_test tools/block_cache_analyzer/*.pyc column_aware_encoding_exp util/build_version.cc diff --git a/CMakeLists.txt b/CMakeLists.txt index 35ec24dcb..ddee71bf6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -953,6 +953,8 @@ if(WITH_TESTS) db/corruption_test.cc db/cuckoo_table_db_test.cc db/db_basic_test.cc + db/db_with_timestamp_basic_test.cc + db/db_blob_index_test.cc db/db_block_cache_test.cc db/db_bloom_filter_test.cc db/db_compaction_filter_test.cc diff --git a/Makefile b/Makefile index f46e260d7..d3711702c 100644 --- a/Makefile +++ b/Makefile @@ -446,6 +446,7 @@ EXPOBJECTS = $(LIBOBJECTS) $(TESTUTIL) TESTS = \ db_basic_test \ + db_with_timestamp_basic_test \ db_encryption_test \ db_test2 \ external_sst_file_basic_test \ @@ -1307,6 +1308,9 @@ slice_transform_test: util/slice_transform_test.o $(LIBOBJECTS) $(TESTHARNESS) db_basic_test: db/db_basic_test.o db/db_test_util.o $(LIBOBJECTS) $(TESTHARNESS) $(AM_LINK) +db_with_timestamp_basic_test: db/db_with_timestamp_basic_test.o db/db_test_util.o $(LIBOBJECTS) $(TESTHARNESS) + $(AM_LINK) + db_encryption_test: db/db_encryption_test.o db/db_test_util.o $(LIBOBJECTS) $(TESTHARNESS) $(AM_LINK) diff --git a/TARGETS b/TARGETS index 9e5ea51cb..99780e3e0 100644 --- a/TARGETS +++ b/TARGETS @@ -919,6 +919,13 @@ ROCKS_TESTS = [ [], [], ], + [ + "db_with_timestamp_basic_test", + "db/db_with_timestamp_basic_test.cc", + "serial", + [], + [], + ], [ "db_write_test", "db/db_write_test.cc", diff --git a/appveyor.yml b/appveyor.yml index 416b6550d..37ae19ef3 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -68,7 +68,7 @@ build: test: test_script: - - ps: build_tools\run_ci_db_test.ps1 -SuiteRun db_basic_test,db_test2,db_test,env_basic_test,env_test,db_merge_operand_test -Concurrency 8 + - ps: build_tools\run_ci_db_test.ps1 -SuiteRun db_basic_test,db_with_timestamp_basic_test,db_test2,db_test,env_basic_test,env_test,db_merge_operand_test -Concurrency 8 on_failure: - cmd: 7z a build-failed.zip %APPVEYOR_BUILD_FOLDER%\build\ && appveyor PushArtifact build-failed.zip diff --git a/db/db_basic_test.cc b/db/db_basic_test.cc index 393c87aeb..5b88551b6 100644 --- a/db/db_basic_test.cc +++ b/db/db_basic_test.cc @@ -2195,777 +2195,6 @@ INSTANTIATE_TEST_CASE_P( ::testing::Combine(::testing::Bool(), ::testing::Bool(), ::testing::Bool(), ::testing::Bool())); -class DBBasicTestWithTimestampBase : public DBTestBase { - public: - explicit DBBasicTestWithTimestampBase(const std::string& dbname) - : DBTestBase(dbname) {} - - protected: - static std::string Key1(uint64_t k) { - uint32_t x = 1; - const bool is_little_endian = (*reinterpret_cast(&x) != 0); - std::string ret; - if (is_little_endian) { - ret.assign(reinterpret_cast(&k), sizeof(k)); - } else { - ret.resize(sizeof(k)); - ret[0] = k & 0xff; - ret[1] = (k >> 8) & 0xff; - ret[2] = (k >> 16) & 0xff; - ret[3] = (k >> 24) & 0xff; - ret[4] = (k >> 32) & 0xff; - ret[5] = (k >> 40) & 0xff; - ret[6] = (k >> 48) & 0xff; - ret[7] = (k >> 56) & 0xff; - } - std::reverse(ret.begin(), ret.end()); - return ret; - } - - class TestComparator : public Comparator { - private: - const Comparator* cmp_without_ts_; - - public: - explicit TestComparator(size_t ts_sz) - : Comparator(ts_sz), cmp_without_ts_(nullptr) { - cmp_without_ts_ = BytewiseComparator(); - } - - const char* Name() const override { return "TestComparator"; } - - void FindShortSuccessor(std::string*) const override {} - - void FindShortestSeparator(std::string*, const Slice&) const override {} - - int Compare(const Slice& a, const Slice& b) const override { - int r = CompareWithoutTimestamp(a, b); - if (r != 0 || 0 == timestamp_size()) { - return r; - } - return -CompareTimestamp( - Slice(a.data() + a.size() - timestamp_size(), timestamp_size()), - Slice(b.data() + b.size() - timestamp_size(), timestamp_size())); - } - - using Comparator::CompareWithoutTimestamp; - int CompareWithoutTimestamp(const Slice& a, bool a_has_ts, const Slice& b, - bool b_has_ts) const override { - if (a_has_ts) { - assert(a.size() >= timestamp_size()); - } - if (b_has_ts) { - assert(b.size() >= timestamp_size()); - } - Slice lhs = a_has_ts ? StripTimestampFromUserKey(a, timestamp_size()) : a; - Slice rhs = b_has_ts ? StripTimestampFromUserKey(b, timestamp_size()) : b; - return cmp_without_ts_->Compare(lhs, rhs); - } - - int CompareTimestamp(const Slice& ts1, const Slice& ts2) const override { - if (!ts1.data() && !ts2.data()) { - return 0; - } else if (ts1.data() && !ts2.data()) { - return 1; - } else if (!ts1.data() && ts2.data()) { - return -1; - } - assert(ts1.size() == ts2.size()); - uint64_t low1 = 0; - uint64_t low2 = 0; - uint64_t high1 = 0; - uint64_t high2 = 0; - const size_t kSize = ts1.size(); - std::unique_ptr ts1_buf(new char[kSize]); - memcpy(ts1_buf.get(), ts1.data(), ts1.size()); - std::unique_ptr ts2_buf(new char[kSize]); - memcpy(ts2_buf.get(), ts2.data(), ts2.size()); - Slice ts1_copy = Slice(ts1_buf.get(), kSize); - Slice ts2_copy = Slice(ts2_buf.get(), kSize); - auto* ptr1 = const_cast(&ts1_copy); - auto* ptr2 = const_cast(&ts2_copy); - if (!GetFixed64(ptr1, &low1) || !GetFixed64(ptr1, &high1) || - !GetFixed64(ptr2, &low2) || !GetFixed64(ptr2, &high2)) { - assert(false); - } - if (high1 < high2) { - return -1; - } else if (high1 > high2) { - return 1; - } - if (low1 < low2) { - return -1; - } else if (low1 > low2) { - return 1; - } - return 0; - } - }; - - std::string Timestamp(uint64_t low, uint64_t high) { - std::string ts; - PutFixed64(&ts, low); - PutFixed64(&ts, high); - return ts; - } - - void CheckIterUserEntry(const Iterator* it, const Slice& expected_key, - const Slice& expected_value, - const Slice& expected_ts) const { - ASSERT_TRUE(it->Valid()); - ASSERT_OK(it->status()); - ASSERT_EQ(expected_key, it->key()); - ASSERT_EQ(expected_value, it->value()); - ASSERT_EQ(expected_ts, it->timestamp()); - } - - void CheckIterEntry(const Iterator* it, const Slice& expected_ukey, - SequenceNumber expected_seq, ValueType expected_val_type, - const Slice& expected_value, const Slice& expected_ts) { - ASSERT_TRUE(it->Valid()); - ASSERT_OK(it->status()); - std::string ukey_and_ts; - ukey_and_ts.assign(expected_ukey.data(), expected_ukey.size()); - ukey_and_ts.append(expected_ts.data(), expected_ts.size()); - ParsedInternalKey parsed_ikey(ukey_and_ts, expected_seq, expected_val_type); - std::string ikey; - AppendInternalKey(&ikey, parsed_ikey); - ASSERT_EQ(Slice(ikey), it->key()); - if (expected_val_type == kTypeValue) { - ASSERT_EQ(expected_value, it->value()); - } - ASSERT_EQ(expected_ts, it->timestamp()); - } -}; - -class DBBasicTestWithTimestamp : public DBBasicTestWithTimestampBase { - public: - DBBasicTestWithTimestamp() - : DBBasicTestWithTimestampBase("db_basic_test_with_timestamp") {} -}; - -TEST_F(DBBasicTestWithTimestamp, SimpleForwardIterate) { - const int kNumKeysPerFile = 2048; - const uint64_t kMaxKey = 16384; - Options options = CurrentOptions(); - options.env = env_; - // TODO(yanqin) re-enable auto compaction - options.disable_auto_compactions = true; - options.create_if_missing = true; - const size_t kTimestampSize = Timestamp(0, 0).size(); - TestComparator test_cmp(kTimestampSize); - options.comparator = &test_cmp; - options.memtable_factory.reset(new SpecialSkipListFactory(kNumKeysPerFile)); - DestroyAndReopen(options); - const std::vector start_keys = {1, 0}; - const std::vector write_timestamps = {Timestamp(1, 0), - Timestamp(3, 0)}; - const std::vector read_timestamps = {Timestamp(2, 0), - Timestamp(4, 0)}; - for (size_t i = 0; i < write_timestamps.size(); ++i) { - WriteOptions write_opts; - Slice write_ts = write_timestamps[i]; - write_opts.timestamp = &write_ts; - for (uint64_t key = start_keys[i]; key <= kMaxKey; ++key) { - Status s = db_->Put(write_opts, Key1(key), "value" + std::to_string(i)); - ASSERT_OK(s); - } - } - for (size_t i = 0; i < read_timestamps.size(); ++i) { - ReadOptions read_opts; - Slice read_ts = read_timestamps[i]; - read_opts.timestamp = &read_ts; - std::unique_ptr it(db_->NewIterator(read_opts)); - int count = 0; - uint64_t key = 0; - for (it->Seek(Key1(0)), key = start_keys[i]; it->Valid(); - it->Next(), ++count, ++key) { - CheckIterUserEntry(it.get(), Key1(key), "value" + std::to_string(i), - write_timestamps[i]); - } - size_t expected_count = kMaxKey - start_keys[i] + 1; - ASSERT_EQ(expected_count, count); - - // SeekToFirst() with lower bound. - // Then iter with lower and upper bounds. - uint64_t l = 0; - uint64_t r = kMaxKey + 1; - while (l < r) { - std::string lb_str = Key1(l); - Slice lb = lb_str; - std::string ub_str = Key1(r); - Slice ub = ub_str; - read_opts.iterate_lower_bound = &lb; - read_opts.iterate_upper_bound = &ub; - it.reset(db_->NewIterator(read_opts)); - for (it->SeekToFirst(), key = std::max(l, start_keys[i]), count = 0; - it->Valid(); it->Next(), ++key, ++count) { - CheckIterUserEntry(it.get(), Key1(key), "value" + std::to_string(i), - write_timestamps[i]); - } - ASSERT_EQ(r - std::max(l, start_keys[i]), count); - l += (kMaxKey / 100); - r -= (kMaxKey / 100); - } - } - Close(); -} - -TEST_F(DBBasicTestWithTimestamp, ForwardIterateStartSeqnum) { - const int kNumKeysPerFile = 2048; - const uint64_t kMaxKey = 0xffffffffffffffff; - const uint64_t kMinKey = kMaxKey - 16383; - Options options = CurrentOptions(); - options.env = env_; - options.create_if_missing = true; - // TODO(yanqin) re-enable auto compaction - options.disable_auto_compactions = true; - const size_t kTimestampSize = Timestamp(0, 0).size(); - TestComparator test_cmp(kTimestampSize); - options.comparator = &test_cmp; - options.memtable_factory.reset(new SpecialSkipListFactory(kNumKeysPerFile)); - DestroyAndReopen(options); - std::vector start_seqs; - - const int kNumTimestamps = 4; - std::vector write_ts_list; - for (int t = 0; t != kNumTimestamps; ++t) { - write_ts_list.push_back(Timestamp(2 * t, /*do not care*/ 17)); - } - WriteOptions write_opts; - for (size_t i = 0; i != write_ts_list.size(); ++i) { - Slice write_ts = write_ts_list[i]; - write_opts.timestamp = &write_ts; - uint64_t k = kMinKey; - do { - Status s = db_->Put(write_opts, Key1(k), "value" + std::to_string(i)); - ASSERT_OK(s); - if (k == kMaxKey) { - break; - } - ++k; - } while (k != 0); - start_seqs.push_back(db_->GetLatestSequenceNumber()); - } - std::vector read_ts_list; - for (int t = 0; t != kNumTimestamps - 1; ++t) { - read_ts_list.push_back(Timestamp(2 * t + 3, /*do not care*/ 17)); - } - ReadOptions read_opts; - for (size_t i = 0; i != read_ts_list.size(); ++i) { - Slice read_ts = read_ts_list[i]; - read_opts.timestamp = &read_ts; - read_opts.iter_start_seqnum = start_seqs[i]; - std::unique_ptr iter(db_->NewIterator(read_opts)); - SequenceNumber expected_seq = start_seqs[i] + 1; - uint64_t key = kMinKey; - for (iter->Seek(Key1(kMinKey)); iter->Valid(); iter->Next()) { - CheckIterEntry(iter.get(), Key1(key), expected_seq, kTypeValue, - "value" + std::to_string(i + 1), write_ts_list[i + 1]); - ++key; - ++expected_seq; - } - } - Close(); -} - -TEST_F(DBBasicTestWithTimestamp, ReseekToTargetTimestamp) { - Options options = CurrentOptions(); - options.env = env_; - options.create_if_missing = true; - constexpr size_t kNumKeys = 16; - options.max_sequential_skip_in_iterations = kNumKeys / 2; - options.statistics = ROCKSDB_NAMESPACE::CreateDBStatistics(); - // TODO(yanqin) re-enable auto compaction - options.disable_auto_compactions = true; - const size_t kTimestampSize = Timestamp(0, 0).size(); - TestComparator test_cmp(kTimestampSize); - options.comparator = &test_cmp; - DestroyAndReopen(options); - // Insert kNumKeys - WriteOptions write_opts; - Status s; - for (size_t i = 0; i != kNumKeys; ++i) { - std::string ts_str = Timestamp(static_cast(i + 1), 0); - Slice ts = ts_str; - write_opts.timestamp = &ts; - s = db_->Put(write_opts, "foo", "value" + std::to_string(i)); - ASSERT_OK(s); - } - { - ReadOptions read_opts; - std::string ts_str = Timestamp(1, 0); - Slice ts = ts_str; - read_opts.timestamp = &ts; - std::unique_ptr iter(db_->NewIterator(read_opts)); - iter->SeekToFirst(); - CheckIterUserEntry(iter.get(), "foo", "value0", ts_str); - ASSERT_EQ( - 1, options.statistics->getTickerCount(NUMBER_OF_RESEEKS_IN_ITERATION)); - } - Close(); -} - -TEST_F(DBBasicTestWithTimestamp, ReseekToNextUserKey) { - Options options = CurrentOptions(); - options.env = env_; - options.create_if_missing = true; - constexpr size_t kNumKeys = 16; - options.max_sequential_skip_in_iterations = kNumKeys / 2; - options.statistics = ROCKSDB_NAMESPACE::CreateDBStatistics(); - // TODO(yanqin) re-enable auto compaction - options.disable_auto_compactions = true; - const size_t kTimestampSize = Timestamp(0, 0).size(); - TestComparator test_cmp(kTimestampSize); - options.comparator = &test_cmp; - DestroyAndReopen(options); - // Write kNumKeys + 1 keys - WriteOptions write_opts; - Status s; - for (size_t i = 0; i != kNumKeys; ++i) { - std::string ts_str = Timestamp(static_cast(i + 1), 0); - Slice ts = ts_str; - write_opts.timestamp = &ts; - s = db_->Put(write_opts, "a", "value" + std::to_string(i)); - ASSERT_OK(s); - } - { - std::string ts_str = Timestamp(static_cast(kNumKeys + 1), 0); - WriteBatch batch(0, 0, kTimestampSize); - batch.Put("a", "new_value"); - batch.Put("b", "new_value"); - s = batch.AssignTimestamp(ts_str); - ASSERT_OK(s); - s = db_->Write(write_opts, &batch); - ASSERT_OK(s); - } - { - ReadOptions read_opts; - std::string ts_str = Timestamp(static_cast(kNumKeys + 1), 0); - Slice ts = ts_str; - read_opts.timestamp = &ts; - std::unique_ptr iter(db_->NewIterator(read_opts)); - iter->Seek("a"); - iter->Next(); - CheckIterUserEntry(iter.get(), "b", "new_value", ts_str); - ASSERT_EQ( - 1, options.statistics->getTickerCount(NUMBER_OF_RESEEKS_IN_ITERATION)); - } - Close(); -} - -TEST_F(DBBasicTestWithTimestamp, MaxKeysSkipped) { - Options options = CurrentOptions(); - options.env = env_; - options.create_if_missing = true; - const size_t kTimestampSize = Timestamp(0, 0).size(); - TestComparator test_cmp(kTimestampSize); - options.comparator = &test_cmp; - DestroyAndReopen(options); - constexpr size_t max_skippable_internal_keys = 2; - const size_t kNumKeys = max_skippable_internal_keys + 2; - WriteOptions write_opts; - Status s; - { - std::string ts_str = Timestamp(1, 0); - Slice ts = ts_str; - write_opts.timestamp = &ts; - ASSERT_OK(db_->Put(write_opts, "a", "value")); - } - for (size_t i = 0; i < kNumKeys; ++i) { - std::string ts_str = Timestamp(static_cast(i + 1), 0); - Slice ts = ts_str; - write_opts.timestamp = &ts; - s = db_->Put(write_opts, "b", "value" + std::to_string(i)); - ASSERT_OK(s); - } - { - ReadOptions read_opts; - read_opts.max_skippable_internal_keys = max_skippable_internal_keys; - std::string ts_str = Timestamp(1, 0); - Slice ts = ts_str; - read_opts.timestamp = &ts; - std::unique_ptr iter(db_->NewIterator(read_opts)); - iter->SeekToFirst(); - iter->Next(); - ASSERT_TRUE(iter->status().IsIncomplete()); - } - Close(); -} - -class DBBasicTestWithTimestampCompressionSettings - : public DBBasicTestWithTimestampBase, - public testing::WithParamInterface, CompressionType, uint32_t>> { - public: - DBBasicTestWithTimestampCompressionSettings() - : DBBasicTestWithTimestampBase( - "db_basic_test_with_timestamp_compression") {} -}; - -TEST_P(DBBasicTestWithTimestampCompressionSettings, PutAndGet) { - const int kNumKeysPerFile = 8192; - const size_t kNumTimestamps = 6; - Options options = CurrentOptions(); - options.create_if_missing = true; - options.env = env_; - options.memtable_factory.reset(new SpecialSkipListFactory(kNumKeysPerFile)); - size_t ts_sz = Timestamp(0, 0).size(); - TestComparator test_cmp(ts_sz); - options.comparator = &test_cmp; - BlockBasedTableOptions bbto; - bbto.filter_policy = std::get<0>(GetParam()); - bbto.whole_key_filtering = true; - options.table_factory.reset(NewBlockBasedTableFactory(bbto)); - - const CompressionType comp_type = std::get<1>(GetParam()); -#if LZ4_VERSION_NUMBER < 10400 // r124+ - if (comp_type == kLZ4Compression || comp_type == kLZ4HCCompression) { - return; - } -#endif // LZ4_VERSION_NUMBER >= 10400 - if (!ZSTD_Supported() && comp_type == kZSTD) { - return; - } - if (!Zlib_Supported() && comp_type == kZlibCompression) { - return; - } - - options.compression = comp_type; - options.compression_opts.max_dict_bytes = std::get<2>(GetParam()); - if (comp_type == kZSTD) { - options.compression_opts.zstd_max_train_bytes = std::get<2>(GetParam()); - } - options.target_file_size_base = 1 << 26; // 64MB - DestroyAndReopen(options); - CreateAndReopenWithCF({"pikachu"}, options); - size_t num_cfs = handles_.size(); - ASSERT_EQ(2, num_cfs); - std::vector write_ts_list; - std::vector read_ts_list; - - for (size_t i = 0; i != kNumTimestamps; ++i) { - write_ts_list.push_back(Timestamp(i * 2, 0)); - read_ts_list.push_back(Timestamp(1 + i * 2, 0)); - const Slice write_ts = write_ts_list.back(); - WriteOptions wopts; - wopts.timestamp = &write_ts; - for (int cf = 0; cf != static_cast(num_cfs); ++cf) { - for (size_t j = 0; j != (kNumKeysPerFile - 1) / kNumTimestamps; ++j) { - ASSERT_OK(Put(cf, Key1(j), - "value_" + std::to_string(j) + "_" + std::to_string(i), - wopts)); - } - } - } - const auto& verify_db_func = [&]() { - for (size_t i = 0; i != kNumTimestamps; ++i) { - ReadOptions ropts; - const Slice read_ts = read_ts_list[i]; - ropts.timestamp = &read_ts; - for (int cf = 0; cf != static_cast(num_cfs); ++cf) { - ColumnFamilyHandle* cfh = handles_[cf]; - for (size_t j = 0; j != (kNumKeysPerFile - 1) / kNumTimestamps; ++j) { - std::string value; - ASSERT_OK(db_->Get(ropts, cfh, Key1(j), &value)); - ASSERT_EQ("value_" + std::to_string(j) + "_" + std::to_string(i), - value); - } - } - } - }; - verify_db_func(); - Close(); -} - -#ifndef ROCKSDB_LITE -// A class which remembers the name of each flushed file. -class FlushedFileCollector : public EventListener { - public: - FlushedFileCollector() {} - ~FlushedFileCollector() override {} - - void OnFlushCompleted(DB* /*db*/, const FlushJobInfo& info) override { - InstrumentedMutexLock lock(&mutex_); - flushed_files_.push_back(info.file_path); - } - - std::vector GetFlushedFiles() { - std::vector result; - { - InstrumentedMutexLock lock(&mutex_); - result = flushed_files_; - } - return result; - } - - void ClearFlushedFiles() { - InstrumentedMutexLock lock(&mutex_); - flushed_files_.clear(); - } - - private: - std::vector flushed_files_; - InstrumentedMutex mutex_; -}; - -TEST_P(DBBasicTestWithTimestampCompressionSettings, PutAndGetWithCompaction) { - const int kNumKeysPerFile = 8192; - const size_t kNumTimestamps = 2; - const size_t kNumKeysPerTimestamp = (kNumKeysPerFile - 1) / kNumTimestamps; - const size_t kSplitPosBase = kNumKeysPerTimestamp / 2; - Options options = CurrentOptions(); - options.create_if_missing = true; - options.env = env_; - options.memtable_factory.reset(new SpecialSkipListFactory(kNumKeysPerFile)); - - FlushedFileCollector* collector = new FlushedFileCollector(); - options.listeners.emplace_back(collector); - - size_t ts_sz = Timestamp(0, 0).size(); - TestComparator test_cmp(ts_sz); - options.comparator = &test_cmp; - BlockBasedTableOptions bbto; - bbto.filter_policy = std::get<0>(GetParam()); - bbto.whole_key_filtering = true; - options.table_factory.reset(NewBlockBasedTableFactory(bbto)); - - const CompressionType comp_type = std::get<1>(GetParam()); -#if LZ4_VERSION_NUMBER < 10400 // r124+ - if (comp_type == kLZ4Compression || comp_type == kLZ4HCCompression) { - return; - } -#endif // LZ4_VERSION_NUMBER >= 10400 - if (!ZSTD_Supported() && comp_type == kZSTD) { - return; - } - if (!Zlib_Supported() && comp_type == kZlibCompression) { - return; - } - - options.compression = comp_type; - options.compression_opts.max_dict_bytes = std::get<2>(GetParam()); - if (comp_type == kZSTD) { - options.compression_opts.zstd_max_train_bytes = std::get<2>(GetParam()); - } - DestroyAndReopen(options); - CreateAndReopenWithCF({"pikachu"}, options); - - size_t num_cfs = handles_.size(); - ASSERT_EQ(2, num_cfs); - std::vector write_ts_list; - std::vector read_ts_list; - - const auto& verify_record_func = [&](size_t i, size_t k, - ColumnFamilyHandle* cfh) { - std::string value; - std::string timestamp; - - ReadOptions ropts; - const Slice read_ts = read_ts_list[i]; - ropts.timestamp = &read_ts; - std::string expected_timestamp = - std::string(write_ts_list[i].data(), write_ts_list[i].size()); - - ASSERT_OK(db_->Get(ropts, cfh, Key1(k), &value, ×tamp)); - ASSERT_EQ("value_" + std::to_string(k) + "_" + std::to_string(i), value); - ASSERT_EQ(expected_timestamp, timestamp); - }; - - for (size_t i = 0; i != kNumTimestamps; ++i) { - write_ts_list.push_back(Timestamp(i * 2, 0)); - read_ts_list.push_back(Timestamp(1 + i * 2, 0)); - const Slice write_ts = write_ts_list.back(); - WriteOptions wopts; - wopts.timestamp = &write_ts; - for (int cf = 0; cf != static_cast(num_cfs); ++cf) { - size_t memtable_get_start = 0; - for (size_t j = 0; j != kNumKeysPerTimestamp; ++j) { - ASSERT_OK(Put(cf, Key1(j), - "value_" + std::to_string(j) + "_" + std::to_string(i), - wopts)); - if (j == kSplitPosBase + i || j == kNumKeysPerTimestamp - 1) { - for (size_t k = memtable_get_start; k <= j; ++k) { - verify_record_func(i, k, handles_[cf]); - } - memtable_get_start = j + 1; - - // flush all keys with the same timestamp to two sst files, split at - // incremental positions such that lowerlevel[1].smallest.userkey == - // higherlevel[0].largest.userkey - ASSERT_OK(Flush(cf)); - - // compact files (2 at each level) to a lower level such that all keys - // with the same timestamp is at one level, with newer versions at - // higher levels. - CompactionOptions compact_opt; - compact_opt.compression = kNoCompression; - db_->CompactFiles(compact_opt, handles_[cf], - collector->GetFlushedFiles(), - static_cast(kNumTimestamps - i)); - collector->ClearFlushedFiles(); - } - } - } - } - const auto& verify_db_func = [&]() { - for (size_t i = 0; i != kNumTimestamps; ++i) { - ReadOptions ropts; - const Slice read_ts = read_ts_list[i]; - ropts.timestamp = &read_ts; - std::string expected_timestamp(write_ts_list[i].data(), - write_ts_list[i].size()); - for (int cf = 0; cf != static_cast(num_cfs); ++cf) { - ColumnFamilyHandle* cfh = handles_[cf]; - for (size_t j = 0; j != kNumKeysPerTimestamp; ++j) { - verify_record_func(i, j, cfh); - } - } - } - }; - verify_db_func(); - Close(); -} -#endif // !ROCKSDB_LITE - -INSTANTIATE_TEST_CASE_P( - Timestamp, DBBasicTestWithTimestampCompressionSettings, - ::testing::Combine( - ::testing::Values(std::shared_ptr(nullptr), - std::shared_ptr( - NewBloomFilterPolicy(10, false))), - ::testing::Values(kNoCompression, kZlibCompression, kLZ4Compression, - kLZ4HCCompression, kZSTD), - ::testing::Values(0, 1 << 14))); - -class DBBasicTestWithTimestampPrefixSeek - : public DBBasicTestWithTimestampBase, - public testing::WithParamInterface< - std::tuple, - std::shared_ptr, bool>> { - public: - DBBasicTestWithTimestampPrefixSeek() - : DBBasicTestWithTimestampBase( - "/db_basic_test_with_timestamp_prefix_seek") {} -}; - -TEST_P(DBBasicTestWithTimestampPrefixSeek, ForwardIterateWithPrefix) { - const size_t kNumKeysPerFile = 4096; - Options options = CurrentOptions(); - options.env = env_; - options.create_if_missing = true; - // TODO(yanqin): re-enable auto compactions - options.disable_auto_compactions = true; - const size_t kTimestampSize = Timestamp(0, 0).size(); - TestComparator test_cmp(kTimestampSize); - options.comparator = &test_cmp; - options.prefix_extractor = std::get<0>(GetParam()); - options.memtable_factory.reset(new SpecialSkipListFactory(kNumKeysPerFile)); - BlockBasedTableOptions bbto; - bbto.filter_policy = std::get<1>(GetParam()); - options.table_factory.reset(NewBlockBasedTableFactory(bbto)); - DestroyAndReopen(options); - - const uint64_t kMaxKey = 0xffffffffffffffff; - const uint64_t kMinKey = 0xffffffffffff8000; - const std::vector write_ts_list = {Timestamp(3, 0xffffffff), - Timestamp(6, 0xffffffff)}; - WriteOptions write_opts; - { - for (size_t i = 0; i != write_ts_list.size(); ++i) { - Slice write_ts = write_ts_list[i]; - write_opts.timestamp = &write_ts; - uint64_t key = kMinKey; - do { - Status s = db_->Put(write_opts, Key1(key), "value" + std::to_string(i)); - ASSERT_OK(s); - if (key == kMaxKey) { - break; - } - ++key; - } while (true); - } - } - const std::vector read_ts_list = {Timestamp(5, 0xffffffff), - Timestamp(9, 0xffffffff)}; - { - ReadOptions read_opts; - read_opts.total_order_seek = false; - read_opts.prefix_same_as_start = std::get<2>(GetParam()); - fprintf(stdout, "%s %s %d\n", options.prefix_extractor->Name(), - bbto.filter_policy ? bbto.filter_policy->Name() : "null", - static_cast(read_opts.prefix_same_as_start)); - for (size_t i = 0; i != read_ts_list.size(); ++i) { - Slice read_ts = read_ts_list[i]; - read_opts.timestamp = &read_ts; - std::unique_ptr iter(db_->NewIterator(read_opts)); - - // Seek to kMaxKey - iter->Seek(Key1(kMaxKey)); - CheckIterUserEntry(iter.get(), Key1(kMaxKey), "value" + std::to_string(i), - write_ts_list[i]); - iter->Next(); - ASSERT_FALSE(iter->Valid()); - } - const std::vector targets = {kMinKey, kMinKey + 0x10, - kMinKey + 0x100, kMaxKey}; - const SliceTransform* const pe = options.prefix_extractor.get(); - ASSERT_NE(nullptr, pe); - const size_t kPrefixShift = - 8 * (Key1(0).size() - pe->Transform(Key1(0)).size()); - const uint64_t kPrefixMask = - ~((static_cast(1) << kPrefixShift) - 1); - const uint64_t kNumKeysWithinPrefix = - (static_cast(1) << kPrefixShift); - for (size_t i = 0; i != read_ts_list.size(); ++i) { - Slice read_ts = read_ts_list[i]; - read_opts.timestamp = &read_ts; - std::unique_ptr it(db_->NewIterator(read_opts)); - for (size_t j = 0; j != targets.size(); ++j) { - std::string start_key = Key1(targets[j]); - uint64_t expected_ub = - (targets[j] & kPrefixMask) - 1 + kNumKeysWithinPrefix; - uint64_t expected_key = targets[j]; - size_t count = 0; - it->Seek(Key1(targets[j])); - while (it->Valid()) { - std::string saved_prev_key; - saved_prev_key.assign(it->key().data(), it->key().size()); - - // Out of prefix - if (!read_opts.prefix_same_as_start && - pe->Transform(saved_prev_key) != pe->Transform(start_key)) { - break; - } - CheckIterUserEntry(it.get(), Key1(expected_key), - "value" + std::to_string(i), write_ts_list[i]); - ++count; - ++expected_key; - it->Next(); - } - ASSERT_EQ(expected_ub - targets[j] + 1, count); - } - } - } - Close(); -} - -// TODO(yanqin): consider handling non-fixed-length prefix extractors, e.g. -// NoopTransform. -INSTANTIATE_TEST_CASE_P( - Timestamp, DBBasicTestWithTimestampPrefixSeek, - ::testing::Combine( - ::testing::Values( - std::shared_ptr(NewFixedPrefixTransform(4)), - std::shared_ptr(NewFixedPrefixTransform(7)), - std::shared_ptr(NewFixedPrefixTransform(8))), - ::testing::Values(std::shared_ptr(nullptr), - std::shared_ptr( - NewBloomFilterPolicy(10 /*bits_per_key*/, false)), - std::shared_ptr( - NewBloomFilterPolicy(20 /*bits_per_key*/, - false))), - ::testing::Bool())); } // namespace ROCKSDB_NAMESPACE diff --git a/db/db_with_timestamp_basic_test.cc b/db/db_with_timestamp_basic_test.cc new file mode 100644 index 000000000..d8286e13f --- /dev/null +++ b/db/db_with_timestamp_basic_test.cc @@ -0,0 +1,809 @@ +// Copyright (c) 2011-present, Facebook, Inc. All rights reserved. +// This source code is licensed under both the GPLv2 (found in the +// COPYING file in the root directory) and Apache 2.0 License +// (found in the LICENSE.Apache file in the root directory). +// +// Copyright (c) 2011 The LevelDB Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. See the AUTHORS file for names of contributors. + +#include "db/db_test_util.h" +#include "port/stack_trace.h" +#include "rocksdb/perf_context.h" +#include "rocksdb/utilities/debug.h" +#include "table/block_based/block_based_table_reader.h" +#include "table/block_based/block_builder.h" +#include "test_util/fault_injection_test_env.h" +#if !defined(ROCKSDB_LITE) +#include "test_util/sync_point.h" +#endif + +namespace ROCKSDB_NAMESPACE { +class DBBasicTestWithTimestampBase : public DBTestBase { + public: + explicit DBBasicTestWithTimestampBase(const std::string& dbname) + : DBTestBase(dbname) {} + + protected: + static std::string Key1(uint64_t k) { + uint32_t x = 1; + const bool is_little_endian = (*reinterpret_cast(&x) != 0); + std::string ret; + if (is_little_endian) { + ret.assign(reinterpret_cast(&k), sizeof(k)); + } else { + ret.resize(sizeof(k)); + ret[0] = k & 0xff; + ret[1] = (k >> 8) & 0xff; + ret[2] = (k >> 16) & 0xff; + ret[3] = (k >> 24) & 0xff; + ret[4] = (k >> 32) & 0xff; + ret[5] = (k >> 40) & 0xff; + ret[6] = (k >> 48) & 0xff; + ret[7] = (k >> 56) & 0xff; + } + std::reverse(ret.begin(), ret.end()); + return ret; + } + + class TestComparator : public Comparator { + private: + const Comparator* cmp_without_ts_; + + public: + explicit TestComparator(size_t ts_sz) + : Comparator(ts_sz), cmp_without_ts_(nullptr) { + cmp_without_ts_ = BytewiseComparator(); + } + + const char* Name() const override { return "TestComparator"; } + + void FindShortSuccessor(std::string*) const override {} + + void FindShortestSeparator(std::string*, const Slice&) const override {} + + int Compare(const Slice& a, const Slice& b) const override { + int r = CompareWithoutTimestamp(a, b); + if (r != 0 || 0 == timestamp_size()) { + return r; + } + return -CompareTimestamp( + Slice(a.data() + a.size() - timestamp_size(), timestamp_size()), + Slice(b.data() + b.size() - timestamp_size(), timestamp_size())); + } + + using Comparator::CompareWithoutTimestamp; + int CompareWithoutTimestamp(const Slice& a, bool a_has_ts, const Slice& b, + bool b_has_ts) const override { + if (a_has_ts) { + assert(a.size() >= timestamp_size()); + } + if (b_has_ts) { + assert(b.size() >= timestamp_size()); + } + Slice lhs = a_has_ts ? StripTimestampFromUserKey(a, timestamp_size()) : a; + Slice rhs = b_has_ts ? StripTimestampFromUserKey(b, timestamp_size()) : b; + return cmp_without_ts_->Compare(lhs, rhs); + } + + int CompareTimestamp(const Slice& ts1, const Slice& ts2) const override { + if (!ts1.data() && !ts2.data()) { + return 0; + } else if (ts1.data() && !ts2.data()) { + return 1; + } else if (!ts1.data() && ts2.data()) { + return -1; + } + assert(ts1.size() == ts2.size()); + uint64_t low1 = 0; + uint64_t low2 = 0; + uint64_t high1 = 0; + uint64_t high2 = 0; + const size_t kSize = ts1.size(); + std::unique_ptr ts1_buf(new char[kSize]); + memcpy(ts1_buf.get(), ts1.data(), ts1.size()); + std::unique_ptr ts2_buf(new char[kSize]); + memcpy(ts2_buf.get(), ts2.data(), ts2.size()); + Slice ts1_copy = Slice(ts1_buf.get(), kSize); + Slice ts2_copy = Slice(ts2_buf.get(), kSize); + auto* ptr1 = const_cast(&ts1_copy); + auto* ptr2 = const_cast(&ts2_copy); + if (!GetFixed64(ptr1, &low1) || !GetFixed64(ptr1, &high1) || + !GetFixed64(ptr2, &low2) || !GetFixed64(ptr2, &high2)) { + assert(false); + } + if (high1 < high2) { + return -1; + } else if (high1 > high2) { + return 1; + } + if (low1 < low2) { + return -1; + } else if (low1 > low2) { + return 1; + } + return 0; + } + }; + + std::string Timestamp(uint64_t low, uint64_t high) { + std::string ts; + PutFixed64(&ts, low); + PutFixed64(&ts, high); + return ts; + } + + void CheckIterUserEntry(const Iterator* it, const Slice& expected_key, + const Slice& expected_value, + const Slice& expected_ts) const { + ASSERT_TRUE(it->Valid()); + ASSERT_OK(it->status()); + ASSERT_EQ(expected_key, it->key()); + ASSERT_EQ(expected_value, it->value()); + ASSERT_EQ(expected_ts, it->timestamp()); + } + + void CheckIterEntry(const Iterator* it, const Slice& expected_ukey, + SequenceNumber expected_seq, ValueType expected_val_type, + const Slice& expected_value, const Slice& expected_ts) { + ASSERT_TRUE(it->Valid()); + ASSERT_OK(it->status()); + std::string ukey_and_ts; + ukey_and_ts.assign(expected_ukey.data(), expected_ukey.size()); + ukey_and_ts.append(expected_ts.data(), expected_ts.size()); + ParsedInternalKey parsed_ikey(ukey_and_ts, expected_seq, expected_val_type); + std::string ikey; + AppendInternalKey(&ikey, parsed_ikey); + ASSERT_EQ(Slice(ikey), it->key()); + if (expected_val_type == kTypeValue) { + ASSERT_EQ(expected_value, it->value()); + } + ASSERT_EQ(expected_ts, it->timestamp()); + } +}; + +class DBBasicTestWithTimestamp : public DBBasicTestWithTimestampBase { + public: + DBBasicTestWithTimestamp() + : DBBasicTestWithTimestampBase("db_basic_test_with_timestamp") {} +}; + +TEST_F(DBBasicTestWithTimestamp, SimpleForwardIterate) { + const int kNumKeysPerFile = 2048; + const uint64_t kMaxKey = 16384; + Options options = CurrentOptions(); + options.env = env_; + // TODO(yanqin) re-enable auto compaction + options.disable_auto_compactions = true; + options.create_if_missing = true; + const size_t kTimestampSize = Timestamp(0, 0).size(); + TestComparator test_cmp(kTimestampSize); + options.comparator = &test_cmp; + options.memtable_factory.reset(new SpecialSkipListFactory(kNumKeysPerFile)); + DestroyAndReopen(options); + const std::vector start_keys = {1, 0}; + const std::vector write_timestamps = {Timestamp(1, 0), + Timestamp(3, 0)}; + const std::vector read_timestamps = {Timestamp(2, 0), + Timestamp(4, 0)}; + for (size_t i = 0; i < write_timestamps.size(); ++i) { + WriteOptions write_opts; + Slice write_ts = write_timestamps[i]; + write_opts.timestamp = &write_ts; + for (uint64_t key = start_keys[i]; key <= kMaxKey; ++key) { + Status s = db_->Put(write_opts, Key1(key), "value" + std::to_string(i)); + ASSERT_OK(s); + } + } + for (size_t i = 0; i < read_timestamps.size(); ++i) { + ReadOptions read_opts; + Slice read_ts = read_timestamps[i]; + read_opts.timestamp = &read_ts; + std::unique_ptr it(db_->NewIterator(read_opts)); + int count = 0; + uint64_t key = 0; + for (it->Seek(Key1(0)), key = start_keys[i]; it->Valid(); + it->Next(), ++count, ++key) { + CheckIterUserEntry(it.get(), Key1(key), "value" + std::to_string(i), + write_timestamps[i]); + } + size_t expected_count = kMaxKey - start_keys[i] + 1; + ASSERT_EQ(expected_count, count); + + // SeekToFirst() with lower bound. + // Then iter with lower and upper bounds. + uint64_t l = 0; + uint64_t r = kMaxKey + 1; + while (l < r) { + std::string lb_str = Key1(l); + Slice lb = lb_str; + std::string ub_str = Key1(r); + Slice ub = ub_str; + read_opts.iterate_lower_bound = &lb; + read_opts.iterate_upper_bound = &ub; + it.reset(db_->NewIterator(read_opts)); + for (it->SeekToFirst(), key = std::max(l, start_keys[i]), count = 0; + it->Valid(); it->Next(), ++key, ++count) { + CheckIterUserEntry(it.get(), Key1(key), "value" + std::to_string(i), + write_timestamps[i]); + } + ASSERT_EQ(r - std::max(l, start_keys[i]), count); + l += (kMaxKey / 100); + r -= (kMaxKey / 100); + } + } + Close(); +} + +TEST_F(DBBasicTestWithTimestamp, ForwardIterateStartSeqnum) { + const int kNumKeysPerFile = 2048; + const uint64_t kMaxKey = 0xffffffffffffffff; + const uint64_t kMinKey = kMaxKey - 16383; + Options options = CurrentOptions(); + options.env = env_; + options.create_if_missing = true; + // TODO(yanqin) re-enable auto compaction + options.disable_auto_compactions = true; + const size_t kTimestampSize = Timestamp(0, 0).size(); + TestComparator test_cmp(kTimestampSize); + options.comparator = &test_cmp; + options.memtable_factory.reset(new SpecialSkipListFactory(kNumKeysPerFile)); + DestroyAndReopen(options); + std::vector start_seqs; + + const int kNumTimestamps = 4; + std::vector write_ts_list; + for (int t = 0; t != kNumTimestamps; ++t) { + write_ts_list.push_back(Timestamp(2 * t, /*do not care*/ 17)); + } + WriteOptions write_opts; + for (size_t i = 0; i != write_ts_list.size(); ++i) { + Slice write_ts = write_ts_list[i]; + write_opts.timestamp = &write_ts; + uint64_t k = kMinKey; + do { + Status s = db_->Put(write_opts, Key1(k), "value" + std::to_string(i)); + ASSERT_OK(s); + if (k == kMaxKey) { + break; + } + ++k; + } while (k != 0); + start_seqs.push_back(db_->GetLatestSequenceNumber()); + } + std::vector read_ts_list; + for (int t = 0; t != kNumTimestamps - 1; ++t) { + read_ts_list.push_back(Timestamp(2 * t + 3, /*do not care*/ 17)); + } + ReadOptions read_opts; + for (size_t i = 0; i != read_ts_list.size(); ++i) { + Slice read_ts = read_ts_list[i]; + read_opts.timestamp = &read_ts; + read_opts.iter_start_seqnum = start_seqs[i]; + std::unique_ptr iter(db_->NewIterator(read_opts)); + SequenceNumber expected_seq = start_seqs[i] + 1; + uint64_t key = kMinKey; + for (iter->Seek(Key1(kMinKey)); iter->Valid(); iter->Next()) { + CheckIterEntry(iter.get(), Key1(key), expected_seq, kTypeValue, + "value" + std::to_string(i + 1), write_ts_list[i + 1]); + ++key; + ++expected_seq; + } + } + Close(); +} + +TEST_F(DBBasicTestWithTimestamp, ReseekToTargetTimestamp) { + Options options = CurrentOptions(); + options.env = env_; + options.create_if_missing = true; + constexpr size_t kNumKeys = 16; + options.max_sequential_skip_in_iterations = kNumKeys / 2; + options.statistics = ROCKSDB_NAMESPACE::CreateDBStatistics(); + // TODO(yanqin) re-enable auto compaction + options.disable_auto_compactions = true; + const size_t kTimestampSize = Timestamp(0, 0).size(); + TestComparator test_cmp(kTimestampSize); + options.comparator = &test_cmp; + DestroyAndReopen(options); + // Insert kNumKeys + WriteOptions write_opts; + Status s; + for (size_t i = 0; i != kNumKeys; ++i) { + std::string ts_str = Timestamp(static_cast(i + 1), 0); + Slice ts = ts_str; + write_opts.timestamp = &ts; + s = db_->Put(write_opts, "foo", "value" + std::to_string(i)); + ASSERT_OK(s); + } + { + ReadOptions read_opts; + std::string ts_str = Timestamp(1, 0); + Slice ts = ts_str; + read_opts.timestamp = &ts; + std::unique_ptr iter(db_->NewIterator(read_opts)); + iter->SeekToFirst(); + CheckIterUserEntry(iter.get(), "foo", "value0", ts_str); + ASSERT_EQ( + 1, options.statistics->getTickerCount(NUMBER_OF_RESEEKS_IN_ITERATION)); + } + Close(); +} + +TEST_F(DBBasicTestWithTimestamp, ReseekToNextUserKey) { + Options options = CurrentOptions(); + options.env = env_; + options.create_if_missing = true; + constexpr size_t kNumKeys = 16; + options.max_sequential_skip_in_iterations = kNumKeys / 2; + options.statistics = ROCKSDB_NAMESPACE::CreateDBStatistics(); + // TODO(yanqin) re-enable auto compaction + options.disable_auto_compactions = true; + const size_t kTimestampSize = Timestamp(0, 0).size(); + TestComparator test_cmp(kTimestampSize); + options.comparator = &test_cmp; + DestroyAndReopen(options); + // Write kNumKeys + 1 keys + WriteOptions write_opts; + Status s; + for (size_t i = 0; i != kNumKeys; ++i) { + std::string ts_str = Timestamp(static_cast(i + 1), 0); + Slice ts = ts_str; + write_opts.timestamp = &ts; + s = db_->Put(write_opts, "a", "value" + std::to_string(i)); + ASSERT_OK(s); + } + { + std::string ts_str = Timestamp(static_cast(kNumKeys + 1), 0); + WriteBatch batch(0, 0, kTimestampSize); + batch.Put("a", "new_value"); + batch.Put("b", "new_value"); + s = batch.AssignTimestamp(ts_str); + ASSERT_OK(s); + s = db_->Write(write_opts, &batch); + ASSERT_OK(s); + } + { + ReadOptions read_opts; + std::string ts_str = Timestamp(static_cast(kNumKeys + 1), 0); + Slice ts = ts_str; + read_opts.timestamp = &ts; + std::unique_ptr iter(db_->NewIterator(read_opts)); + iter->Seek("a"); + iter->Next(); + CheckIterUserEntry(iter.get(), "b", "new_value", ts_str); + ASSERT_EQ( + 1, options.statistics->getTickerCount(NUMBER_OF_RESEEKS_IN_ITERATION)); + } + Close(); +} + +TEST_F(DBBasicTestWithTimestamp, MaxKeysSkipped) { + Options options = CurrentOptions(); + options.env = env_; + options.create_if_missing = true; + const size_t kTimestampSize = Timestamp(0, 0).size(); + TestComparator test_cmp(kTimestampSize); + options.comparator = &test_cmp; + DestroyAndReopen(options); + constexpr size_t max_skippable_internal_keys = 2; + const size_t kNumKeys = max_skippable_internal_keys + 2; + WriteOptions write_opts; + Status s; + { + std::string ts_str = Timestamp(1, 0); + Slice ts = ts_str; + write_opts.timestamp = &ts; + ASSERT_OK(db_->Put(write_opts, "a", "value")); + } + for (size_t i = 0; i < kNumKeys; ++i) { + std::string ts_str = Timestamp(static_cast(i + 1), 0); + Slice ts = ts_str; + write_opts.timestamp = &ts; + s = db_->Put(write_opts, "b", "value" + std::to_string(i)); + ASSERT_OK(s); + } + { + ReadOptions read_opts; + read_opts.max_skippable_internal_keys = max_skippable_internal_keys; + std::string ts_str = Timestamp(1, 0); + Slice ts = ts_str; + read_opts.timestamp = &ts; + std::unique_ptr iter(db_->NewIterator(read_opts)); + iter->SeekToFirst(); + iter->Next(); + ASSERT_TRUE(iter->status().IsIncomplete()); + } + Close(); +} + +class DBBasicTestWithTimestampCompressionSettings + : public DBBasicTestWithTimestampBase, + public testing::WithParamInterface, CompressionType, uint32_t>> { + public: + DBBasicTestWithTimestampCompressionSettings() + : DBBasicTestWithTimestampBase( + "db_basic_test_with_timestamp_compression") {} +}; + +TEST_P(DBBasicTestWithTimestampCompressionSettings, PutAndGet) { + const int kNumKeysPerFile = 8192; + const size_t kNumTimestamps = 6; + Options options = CurrentOptions(); + options.create_if_missing = true; + options.env = env_; + options.memtable_factory.reset(new SpecialSkipListFactory(kNumKeysPerFile)); + size_t ts_sz = Timestamp(0, 0).size(); + TestComparator test_cmp(ts_sz); + options.comparator = &test_cmp; + BlockBasedTableOptions bbto; + bbto.filter_policy = std::get<0>(GetParam()); + bbto.whole_key_filtering = true; + options.table_factory.reset(NewBlockBasedTableFactory(bbto)); + + const CompressionType comp_type = std::get<1>(GetParam()); +#if LZ4_VERSION_NUMBER < 10400 // r124+ + if (comp_type == kLZ4Compression || comp_type == kLZ4HCCompression) { + return; + } +#endif // LZ4_VERSION_NUMBER >= 10400 + if (!ZSTD_Supported() && comp_type == kZSTD) { + return; + } + if (!Zlib_Supported() && comp_type == kZlibCompression) { + return; + } + + options.compression = comp_type; + options.compression_opts.max_dict_bytes = std::get<2>(GetParam()); + if (comp_type == kZSTD) { + options.compression_opts.zstd_max_train_bytes = std::get<2>(GetParam()); + } + options.target_file_size_base = 1 << 26; // 64MB + DestroyAndReopen(options); + CreateAndReopenWithCF({"pikachu"}, options); + size_t num_cfs = handles_.size(); + ASSERT_EQ(2, num_cfs); + std::vector write_ts_list; + std::vector read_ts_list; + + for (size_t i = 0; i != kNumTimestamps; ++i) { + write_ts_list.push_back(Timestamp(i * 2, 0)); + read_ts_list.push_back(Timestamp(1 + i * 2, 0)); + const Slice write_ts = write_ts_list.back(); + WriteOptions wopts; + wopts.timestamp = &write_ts; + for (int cf = 0; cf != static_cast(num_cfs); ++cf) { + for (size_t j = 0; j != (kNumKeysPerFile - 1) / kNumTimestamps; ++j) { + ASSERT_OK(Put(cf, Key1(j), + "value_" + std::to_string(j) + "_" + std::to_string(i), + wopts)); + } + } + } + const auto& verify_db_func = [&]() { + for (size_t i = 0; i != kNumTimestamps; ++i) { + ReadOptions ropts; + const Slice read_ts = read_ts_list[i]; + ropts.timestamp = &read_ts; + for (int cf = 0; cf != static_cast(num_cfs); ++cf) { + ColumnFamilyHandle* cfh = handles_[cf]; + for (size_t j = 0; j != (kNumKeysPerFile - 1) / kNumTimestamps; ++j) { + std::string value; + ASSERT_OK(db_->Get(ropts, cfh, Key1(j), &value)); + ASSERT_EQ("value_" + std::to_string(j) + "_" + std::to_string(i), + value); + } + } + } + }; + verify_db_func(); + Close(); +} + +#ifndef ROCKSDB_LITE +// A class which remembers the name of each flushed file. +class FlushedFileCollector : public EventListener { + public: + FlushedFileCollector() {} + ~FlushedFileCollector() override {} + + void OnFlushCompleted(DB* /*db*/, const FlushJobInfo& info) override { + InstrumentedMutexLock lock(&mutex_); + flushed_files_.push_back(info.file_path); + } + + std::vector GetFlushedFiles() { + std::vector result; + { + InstrumentedMutexLock lock(&mutex_); + result = flushed_files_; + } + return result; + } + + void ClearFlushedFiles() { + InstrumentedMutexLock lock(&mutex_); + flushed_files_.clear(); + } + + private: + std::vector flushed_files_; + InstrumentedMutex mutex_; +}; + +TEST_P(DBBasicTestWithTimestampCompressionSettings, PutAndGetWithCompaction) { + const int kNumKeysPerFile = 8192; + const size_t kNumTimestamps = 2; + const size_t kNumKeysPerTimestamp = (kNumKeysPerFile - 1) / kNumTimestamps; + const size_t kSplitPosBase = kNumKeysPerTimestamp / 2; + Options options = CurrentOptions(); + options.create_if_missing = true; + options.env = env_; + options.memtable_factory.reset(new SpecialSkipListFactory(kNumKeysPerFile)); + + FlushedFileCollector* collector = new FlushedFileCollector(); + options.listeners.emplace_back(collector); + + size_t ts_sz = Timestamp(0, 0).size(); + TestComparator test_cmp(ts_sz); + options.comparator = &test_cmp; + BlockBasedTableOptions bbto; + bbto.filter_policy = std::get<0>(GetParam()); + bbto.whole_key_filtering = true; + options.table_factory.reset(NewBlockBasedTableFactory(bbto)); + + const CompressionType comp_type = std::get<1>(GetParam()); +#if LZ4_VERSION_NUMBER < 10400 // r124+ + if (comp_type == kLZ4Compression || comp_type == kLZ4HCCompression) { + return; + } +#endif // LZ4_VERSION_NUMBER >= 10400 + if (!ZSTD_Supported() && comp_type == kZSTD) { + return; + } + if (!Zlib_Supported() && comp_type == kZlibCompression) { + return; + } + + options.compression = comp_type; + options.compression_opts.max_dict_bytes = std::get<2>(GetParam()); + if (comp_type == kZSTD) { + options.compression_opts.zstd_max_train_bytes = std::get<2>(GetParam()); + } + DestroyAndReopen(options); + CreateAndReopenWithCF({"pikachu"}, options); + + size_t num_cfs = handles_.size(); + ASSERT_EQ(2, num_cfs); + std::vector write_ts_list; + std::vector read_ts_list; + + const auto& verify_record_func = [&](size_t i, size_t k, + ColumnFamilyHandle* cfh) { + std::string value; + std::string timestamp; + + ReadOptions ropts; + const Slice read_ts = read_ts_list[i]; + ropts.timestamp = &read_ts; + std::string expected_timestamp = + std::string(write_ts_list[i].data(), write_ts_list[i].size()); + + ASSERT_OK(db_->Get(ropts, cfh, Key1(k), &value, ×tamp)); + ASSERT_EQ("value_" + std::to_string(k) + "_" + std::to_string(i), value); + ASSERT_EQ(expected_timestamp, timestamp); + }; + + for (size_t i = 0; i != kNumTimestamps; ++i) { + write_ts_list.push_back(Timestamp(i * 2, 0)); + read_ts_list.push_back(Timestamp(1 + i * 2, 0)); + const Slice write_ts = write_ts_list.back(); + WriteOptions wopts; + wopts.timestamp = &write_ts; + for (int cf = 0; cf != static_cast(num_cfs); ++cf) { + size_t memtable_get_start = 0; + for (size_t j = 0; j != kNumKeysPerTimestamp; ++j) { + ASSERT_OK(Put(cf, Key1(j), + "value_" + std::to_string(j) + "_" + std::to_string(i), + wopts)); + if (j == kSplitPosBase + i || j == kNumKeysPerTimestamp - 1) { + for (size_t k = memtable_get_start; k <= j; ++k) { + verify_record_func(i, k, handles_[cf]); + } + memtable_get_start = j + 1; + + // flush all keys with the same timestamp to two sst files, split at + // incremental positions such that lowerlevel[1].smallest.userkey == + // higherlevel[0].largest.userkey + ASSERT_OK(Flush(cf)); + + // compact files (2 at each level) to a lower level such that all keys + // with the same timestamp is at one level, with newer versions at + // higher levels. + CompactionOptions compact_opt; + compact_opt.compression = kNoCompression; + db_->CompactFiles(compact_opt, handles_[cf], + collector->GetFlushedFiles(), + static_cast(kNumTimestamps - i)); + collector->ClearFlushedFiles(); + } + } + } + } + const auto& verify_db_func = [&]() { + for (size_t i = 0; i != kNumTimestamps; ++i) { + ReadOptions ropts; + const Slice read_ts = read_ts_list[i]; + ropts.timestamp = &read_ts; + std::string expected_timestamp(write_ts_list[i].data(), + write_ts_list[i].size()); + for (int cf = 0; cf != static_cast(num_cfs); ++cf) { + ColumnFamilyHandle* cfh = handles_[cf]; + for (size_t j = 0; j != kNumKeysPerTimestamp; ++j) { + verify_record_func(i, j, cfh); + } + } + } + }; + verify_db_func(); + Close(); +} +#endif // !ROCKSDB_LITE + +INSTANTIATE_TEST_CASE_P( + Timestamp, DBBasicTestWithTimestampCompressionSettings, + ::testing::Combine( + ::testing::Values(std::shared_ptr(nullptr), + std::shared_ptr( + NewBloomFilterPolicy(10, false))), + ::testing::Values(kNoCompression, kZlibCompression, kLZ4Compression, + kLZ4HCCompression, kZSTD), + ::testing::Values(0, 1 << 14))); + +class DBBasicTestWithTimestampPrefixSeek + : public DBBasicTestWithTimestampBase, + public testing::WithParamInterface< + std::tuple, + std::shared_ptr, bool>> { + public: + DBBasicTestWithTimestampPrefixSeek() + : DBBasicTestWithTimestampBase( + "/db_basic_test_with_timestamp_prefix_seek") {} +}; + +TEST_P(DBBasicTestWithTimestampPrefixSeek, ForwardIterateWithPrefix) { + const size_t kNumKeysPerFile = 4096; + Options options = CurrentOptions(); + options.env = env_; + options.create_if_missing = true; + // TODO(yanqin): re-enable auto compactions + options.disable_auto_compactions = true; + const size_t kTimestampSize = Timestamp(0, 0).size(); + TestComparator test_cmp(kTimestampSize); + options.comparator = &test_cmp; + options.prefix_extractor = std::get<0>(GetParam()); + options.memtable_factory.reset(new SpecialSkipListFactory(kNumKeysPerFile)); + BlockBasedTableOptions bbto; + bbto.filter_policy = std::get<1>(GetParam()); + options.table_factory.reset(NewBlockBasedTableFactory(bbto)); + DestroyAndReopen(options); + + const uint64_t kMaxKey = 0xffffffffffffffff; + const uint64_t kMinKey = 0xffffffffffff8000; + const std::vector write_ts_list = {Timestamp(3, 0xffffffff), + Timestamp(6, 0xffffffff)}; + WriteOptions write_opts; + { + for (size_t i = 0; i != write_ts_list.size(); ++i) { + Slice write_ts = write_ts_list[i]; + write_opts.timestamp = &write_ts; + uint64_t key = kMinKey; + do { + Status s = db_->Put(write_opts, Key1(key), "value" + std::to_string(i)); + ASSERT_OK(s); + if (key == kMaxKey) { + break; + } + ++key; + } while (true); + } + } + const std::vector read_ts_list = {Timestamp(5, 0xffffffff), + Timestamp(9, 0xffffffff)}; + { + ReadOptions read_opts; + read_opts.total_order_seek = false; + read_opts.prefix_same_as_start = std::get<2>(GetParam()); + fprintf(stdout, "%s %s %d\n", options.prefix_extractor->Name(), + bbto.filter_policy ? bbto.filter_policy->Name() : "null", + static_cast(read_opts.prefix_same_as_start)); + for (size_t i = 0; i != read_ts_list.size(); ++i) { + Slice read_ts = read_ts_list[i]; + read_opts.timestamp = &read_ts; + std::unique_ptr iter(db_->NewIterator(read_opts)); + + // Seek to kMaxKey + iter->Seek(Key1(kMaxKey)); + CheckIterUserEntry(iter.get(), Key1(kMaxKey), "value" + std::to_string(i), + write_ts_list[i]); + iter->Next(); + ASSERT_FALSE(iter->Valid()); + } + const std::vector targets = {kMinKey, kMinKey + 0x10, + kMinKey + 0x100, kMaxKey}; + const SliceTransform* const pe = options.prefix_extractor.get(); + ASSERT_NE(nullptr, pe); + const size_t kPrefixShift = + 8 * (Key1(0).size() - pe->Transform(Key1(0)).size()); + const uint64_t kPrefixMask = + ~((static_cast(1) << kPrefixShift) - 1); + const uint64_t kNumKeysWithinPrefix = + (static_cast(1) << kPrefixShift); + for (size_t i = 0; i != read_ts_list.size(); ++i) { + Slice read_ts = read_ts_list[i]; + read_opts.timestamp = &read_ts; + std::unique_ptr it(db_->NewIterator(read_opts)); + for (size_t j = 0; j != targets.size(); ++j) { + std::string start_key = Key1(targets[j]); + uint64_t expected_ub = + (targets[j] & kPrefixMask) - 1 + kNumKeysWithinPrefix; + uint64_t expected_key = targets[j]; + size_t count = 0; + it->Seek(Key1(targets[j])); + while (it->Valid()) { + std::string saved_prev_key; + saved_prev_key.assign(it->key().data(), it->key().size()); + + // Out of prefix + if (!read_opts.prefix_same_as_start && + pe->Transform(saved_prev_key) != pe->Transform(start_key)) { + break; + } + CheckIterUserEntry(it.get(), Key1(expected_key), + "value" + std::to_string(i), write_ts_list[i]); + ++count; + ++expected_key; + it->Next(); + } + ASSERT_EQ(expected_ub - targets[j] + 1, count); + } + } + } + Close(); +} + +// TODO(yanqin): consider handling non-fixed-length prefix extractors, e.g. +// NoopTransform. +INSTANTIATE_TEST_CASE_P( + Timestamp, DBBasicTestWithTimestampPrefixSeek, + ::testing::Combine( + ::testing::Values( + std::shared_ptr(NewFixedPrefixTransform(4)), + std::shared_ptr(NewFixedPrefixTransform(7)), + std::shared_ptr(NewFixedPrefixTransform(8))), + ::testing::Values(std::shared_ptr(nullptr), + std::shared_ptr( + NewBloomFilterPolicy(10 /*bits_per_key*/, false)), + std::shared_ptr( + NewBloomFilterPolicy(20 /*bits_per_key*/, + false))), + ::testing::Bool())); + +} // namespace ROCKSDB_NAMESPACE + +#ifdef ROCKSDB_UNITTESTS_WITH_CUSTOM_OBJECTS_FROM_STATIC_LIBS +extern "C" { +void RegisterCustomObjects(int argc, char** argv); +} +#else +void RegisterCustomObjects(int /*argc*/, char** /*argv*/) {} +#endif // !ROCKSDB_UNITTESTS_WITH_CUSTOM_OBJECTS_FROM_STATIC_LIBS + +int main(int argc, char** argv) { + ROCKSDB_NAMESPACE::port::InstallStackTraceHandler(); + ::testing::InitGoogleTest(&argc, argv); + RegisterCustomObjects(argc, argv); + return RUN_ALL_TESTS(); +} diff --git a/src.mk b/src.mk index 08b560942..ba2cb9933 100644 --- a/src.mk +++ b/src.mk @@ -316,6 +316,8 @@ MAIN_SOURCES = \ db/corruption_test.cc \ db/cuckoo_table_db_test.cc \ db/db_basic_test.cc \ + db/db_with_timestamp_basic_test.cc \ + db/db_blob_index_test.cc \ db/db_block_cache_test.cc \ db/db_bloom_filter_test.cc \ db/db_compaction_filter_test.cc \