From 24828dd0694555f9c5481543dcc43a3031a2c1d7 Mon Sep 17 00:00:00 2001 From: VirgilZhu <94546750@qq.com> Date: Tue, 29 Oct 2024 08:03:55 +0800 Subject: [PATCH] add TTL version Get() and Put() --- CMakeLists.txt | 13 ++++++++++++- db/db_impl.cc | 47 ++++++++++++++++++++++++++++++++++++++++++++++- db/db_impl.h | 6 ++++++ include/leveldb/db.h | 2 ++ test/test_a.cpp | 26 ++++++++++++++++++++++++++ test/time.cpp | 13 +++++++++++++ test/ttl_test.cc | 4 ++-- 7 files changed, 107 insertions(+), 4 deletions(-) create mode 100644 test/test_a.cpp create mode 100644 test/time.cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index 54b14a1..6ed125b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -521,6 +521,7 @@ endif(LEVELDB_INSTALL) add_executable(db_test2 "${PROJECT_SOURCE_DIR}/test/db_test2.cc" + test/time.cpp ) target_link_libraries(db_test2 PRIVATE leveldb) @@ -528,4 +529,14 @@ target_link_libraries(db_test2 PRIVATE leveldb) add_executable(ttl_test "${PROJECT_SOURCE_DIR}/test/ttl_test.cc" ) -target_link_libraries(ttl_test PRIVATE leveldb gtest) \ No newline at end of file +target_link_libraries(ttl_test PRIVATE leveldb gtest) + +add_executable(test_a + "${PROJECT_SOURCE_DIR}/test/test_a.cpp" +) +target_link_libraries(test_a leveldb) + +add_executable(time + "${PROJECT_SOURCE_DIR}/test/time.cpp" +) +target_link_libraries(time leveldb) \ No newline at end of file diff --git a/db/db_impl.cc b/db/db_impl.cc index f96d245..a08e875 100644 --- a/db/db_impl.cc +++ b/db/db_impl.cc @@ -2,6 +2,8 @@ // 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 + #include "db/db_impl.h" #include @@ -978,7 +980,21 @@ Status DBImpl::DoCompactionWork(CompactionState* compact) { // Therefore this deletion marker is obsolete and can be dropped. drop = true; } - + /* TODO: Add TTL Version Compaction Drop Condition */ + else { + std::string user_value = input->value().ToString(); + uint64_t now = std::chrono::duration_cast(std::chrono::steady_clock::now().time_since_epoch()).count(); + if (user_value.find("_ts_") == std::string::npos) { + input->value() = user_value + "_ts_" + std::to_string(now + 20); + } + else { + uint64_t deadtime = std::stoi(user_value.substr(user_value.find("_ts_") + 4)); + if (now >= deadtime) { + drop = true; + } + } + } + /* ----------------------------------------------- */ last_sequence_for_key = ikey.sequence; } #if 0 @@ -1117,6 +1133,17 @@ int64_t DBImpl::TEST_MaxNextLevelOverlappingBytes() { return versions_->MaxNextLevelOverlappingBytes(); } +/* TODO: Add TTL Version isLive() */ +Status isLive(const Slice& key, std::string* value, Status& s) { + uint64_t now = std::chrono::duration_cast(std::chrono::steady_clock::now().time_since_epoch()).count(); + uint64_t deadtime = std::stoi(value->substr(value->find("_ts_") + 4)); + if (now >= deadtime) { + s = Status::NotFound(key); + } + return s; +} +/* --------------------------- */ + Status DBImpl::Get(const ReadOptions& options, const Slice& key, std::string* value) { Status s; @@ -1144,14 +1171,21 @@ Status DBImpl::Get(const ReadOptions& options, const Slice& key, mutex_.Unlock(); // First look in the memtable, then in the immutable memtable (if any). LookupKey lkey(key, snapshot); + + /* TODO: Add TTL Version Get() */ if (mem->Get(lkey, value, &s)) { + isLive(key, value, s); // Done } else if (imm != nullptr && imm->Get(lkey, value, &s)) { + isLive(key, value, s); // Done } else { s = current->Get(options, lkey, value, &stats); + if (s.ok()) isLive(key, value, s); have_stat_update = true; } + /* --------------------------- */ + mutex_.Lock(); } @@ -1491,6 +1525,17 @@ Status DB::Put(const WriteOptions& opt, const Slice& key, const Slice& value) { return Write(opt, &batch); } +/* TODO: Add TTL Version Put() */ +Status DBImpl::Put(const WriteOptions& opt, const Slice& key, const Slice& value, uint64_t ttl){ + WriteBatch batch; + auto now = std::chrono::duration_cast(std::chrono::steady_clock::now().time_since_epoch()).count(); + auto end = now + ttl; + Slice value_timestamp = Slice(value.ToString() + "_ts_" + std::to_string(end)); + batch.Put(key, value_timestamp); + return Write(opt, &batch); +} +/* --------------------------- */ + Status DB::Delete(const WriteOptions& opt, const Slice& key) { WriteBatch batch; batch.Delete(key); diff --git a/db/db_impl.h b/db/db_impl.h index c7b0172..f245562 100644 --- a/db/db_impl.h +++ b/db/db_impl.h @@ -42,6 +42,12 @@ class DBImpl : public DB { Status Write(const WriteOptions& options, WriteBatch* updates) override; Status Get(const ReadOptions& options, const Slice& key, std::string* value) override; + + /* TODO: Add TTL Version Put() */ + Status Put(const WriteOptions&, const Slice& key, + const Slice& value, uint64_t ttl) override; + /* --------------------------- */ + Iterator* NewIterator(const ReadOptions&) override; const Snapshot* GetSnapshot() override; void ReleaseSnapshot(const Snapshot* snapshot) override; diff --git a/include/leveldb/db.h b/include/leveldb/db.h index bf4eec5..05d9e5f 100644 --- a/include/leveldb/db.h +++ b/include/leveldb/db.h @@ -148,8 +148,10 @@ class LEVELDB_EXPORT DB { // ----------------------------For TTL----------------------------- // 为当前key设置ttl，过期后自动失效 + /* TODO: Add TTL Version Put() */ virtual Status Put(const WriteOptions& options, const Slice& key, const Slice& value, uint64_t ttl) = 0; + /* --------------------------- */ }; // Destroy the contents of the specified database. diff --git a/test/test_a.cpp b/test/test_a.cpp new file mode 100644 index 0000000..424406c --- /dev/null +++ b/test/test_a.cpp @@ -0,0 +1,26 @@ +#include "leveldb/db.h" +#include + +using namespace std; +using namespace leveldb; + +int main() { + DB* db = nullptr; + Options op; + op.create_if_missing = true; + Status status = DB::Open(op, "testdb", &db); + assert(status.ok()); + db->Put(WriteOptions(), "001", "leveldb"); + string s; + db->Get(ReadOptions(), "001", &s); + cout<Put(WriteOptions(), "002", "world"); + string s1; + db->Delete(WriteOptions(), "002"); + db->Get(ReadOptions(), "002", &s1); + cout< +#include + +int main() { + auto now = std::chrono::duration_cast(std::chrono::steady_clock::now().time_since_epoch()).count(); + auto end = now + 5; + + // 输出当前时间点和未来时间点 + std::cout << "Current time point: " << now << std::endl; + std::cout << "Future time point (+5 seconds): " << end << std::endl; + + return 0; +} \ No newline at end of file diff --git a/test/ttl_test.cc b/test/ttl_test.cc index 06f4cda..5c5a4c8 100644 --- a/test/ttl_test.cc +++ b/test/ttl_test.cc @@ -99,9 +99,9 @@ TEST(TestTTL, CompactionTTL) { db->CompactRange(nullptr, nullptr); - leveldb::Range ranges[1]; +// leveldb::Range ranges[1]; ranges[0] = leveldb::Range("-", "A"); - uint64_t sizes[1]; +// uint64_t sizes[1]; db->GetApproximateSizes(ranges, 1, sizes); ASSERT_EQ(sizes[0], 0); }