From 0c75d0dadce26edf9c74970d703114194885e9b8 Mon Sep 17 00:00:00 2001 From: Yechi Ma <2662511702@qq.com> Date: Sun, 5 Jan 2025 15:07:36 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- db/db_impl.h | 2 +- db/vlog_set.cpp | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/db/db_impl.h b/db/db_impl.h index 68c8320..a74fe7b 100644 --- a/db/db_impl.h +++ b/db/db_impl.h @@ -120,7 +120,7 @@ class DBImpl : public DB { }; Status get_slot_num(const ReadOptions& options, const Slice& key, - size_t *slot_num); + size_t *slot_num) override; Iterator* NewInternalIterator(const ReadOptions&, SequenceNumber* latest_snapshot, diff --git a/db/vlog_set.cpp b/db/vlog_set.cpp index 755b594..b4b3133 100644 --- a/db/vlog_set.cpp +++ b/db/vlog_set.cpp @@ -103,7 +103,6 @@ VlogSet::~VlogSet() { vlog_file_handler.flush(); vlog_file_handler.close(); - // FIXME: SIGSEGV std::cout << "vlog_set.cpp line 102" << std::endl; vlog_handler->vlog_latch_.hard_unlock(); }