refactor: remove extra files changes

Author: BorysTheDev

src/core/CMakeLists.txt

@@ -21,7 +21,7 @@ add_subdirectory(json)
 set(SEARCH_LIB query_parser)
 
 add_library(dfly_core allocation_tracker.cc bloom.cc compact_object.cc dense_set.cc
-    dragonfly_core.cc extent_tree.cc huff_coder.cc intrusive_string_list.cc
+    dragonfly_core.cc extent_tree.cc huff_coder.cc
     interpreter.cc glob_matcher.cc mi_memory_resource.cc qlist.cc sds_utils.cc
     segment_allocator.cc score_map.cc small_string.cc sorted_map.cc task_queue.cc
     tx_queue.cc string_set.cc string_map.cc top_keys.cc detail/bitpacking.cc)

src/core/compact_object.cc

@@ -26,7 +26,6 @@ extern "C" {
 #include "core/bloom.h"
 #include "core/detail/bitpacking.h"
 #include "core/huff_coder.h"
-#include "core/intrusive_string_set.h"
 #include "core/qlist.h"
 #include "core/sorted_map.h"
 #include "core/string_map.h"
@@ -67,12 +66,11 @@ size_t UpdateSize(size_t size, int64_t update) {
 
 inline void FreeObjSet(unsigned encoding, void* ptr, MemoryResource* mr) {
   switch (encoding) {
-    case kEncodingStrMap2:
+    case kEncodingStrMap2: {
       CompactObj::DeleteMR<StringSet>(ptr);
       break;
-    case kEncodingIntrusiveSet:
-      CompactObj::DeleteMR<IntrusiveStringSet>(ptr);
-      break;
+    }
+
     case kEncodingIntSet:
       zfree((void*)ptr);
       break;
@@ -100,10 +98,6 @@ size_t MallocUsedSet(unsigned encoding, void* ptr) {
       StringSet* ss = (StringSet*)ptr;
       return ss->ObjMallocUsed() + ss->SetMallocUsed() + zmalloc_usable_size(ptr);
     }
-    case kEncodingIntrusiveSet: {
-      IntrusiveStringSet* ss = (IntrusiveStringSet*)ptr;
-      return ss->ObjMallocUsed() + ss->SetMallocUsed() + zmalloc_usable_size(ptr);
-    }
     case kEncodingIntSet:
       return intsetBlobLen((intset*)ptr);
   }
@@ -330,10 +324,6 @@ pair<void*, bool> DefragSet(unsigned encoding, void* ptr, float ratio) {
     case kEncodingStrMap2: {
       return DefragStrSet((StringSet*)ptr, ratio);
     }
-    case kEncodingIntrusiveSet:
-      // TODO add defrag logic
-      LOG(WARNING) << "DefragSet for IntrusiveSet isn't implemented";
-      return {ptr, false};
 
     default:
       ABSL_UNREACHABLE();
@@ -469,10 +459,6 @@ size_t RobjWrapper::Size() const {
           StringSet* ss = (StringSet*)inner_obj_;
           return ss->UpperBoundSize();
         }
-        case kEncodingIntrusiveSet: {
-          auto* ss = (IntrusiveStringSet*)inner_obj_;
-          return ss->UpperBoundSize();
-        }
         default:
           LOG(FATAL) << "Unexpected encoding " << encoding_;
       };

src/core/compact_object.h

@@ -19,7 +19,6 @@
 namespace dfly {
 
 constexpr unsigned kEncodingIntSet = 0;
-constexpr unsigned kEncodingIntrusiveSet = 1;
 constexpr unsigned kEncodingStrMap2 = 2;  // for set/map encodings of strings using DenseSet
 constexpr unsigned kEncodingQL2 = 1;
 constexpr unsigned kEncodingListPack = 3;

src/core/dense_set.h

@@ -46,7 +46,7 @@ class DenseSet {
   static constexpr size_t kLinkBit = 1ULL << 52;
   static constexpr size_t kDisplaceBit = 1ULL << 53;
   static constexpr size_t kDisplaceDirectionBit = 1ULL << 54;
-  static constexpr size_t kExpiryBit = 1ULL << 55;
+  static constexpr size_t kTtlBit = 1ULL << 55;
   static constexpr size_t kTagMask = 4095ULL << 52;  // we reserve 12 high bits.
 
   class DensePtr {
@@ -74,7 +74,7 @@ class DenseSet {
     }
 
     bool HasTtl() const {
-      return (uptr() & kExpiryBit) != 0;
+      return (uptr() & kTtlBit) != 0;
     }
 
     bool IsEmpty() const {
@@ -111,9 +111,9 @@ class DenseSet {
 
     void SetTtl(bool b) {
       if (b)
-        ptr_ = (void*)(uptr() | kExpiryBit);
+        ptr_ = (void*)(uptr() | kTtlBit);
       else
-        ptr_ = (void*)(uptr() & (~kExpiryBit));
+        ptr_ = (void*)(uptr() & (~kTtlBit));
     }
 
     void Reset() {

src/core/intrusive_string_list.cc

@@ -5,7 +5,6 @@
 
 #include "base/flags.h"
 #include "base/logging.h"
-#include "core/intrusive_string_set.h"
 #include "core/qlist.h"
 #include "core/sorted_map.h"
 #include "core/string_map.h"
@@ -200,20 +199,13 @@ bool IterateSet(const PrimeValue& pv, const IterateFunc& func) {
     while (success && intsetGet(is, ii++, &ival)) {
       success = func(ContainerEntry{ival});
     }
-  } else if (pv.Encoding() == kEncodingStrMap2) {
+  } else {
     for (sds ptr : *static_cast<StringSet*>(pv.RObjPtr())) {
       if (!func(ContainerEntry{ptr, sdslen(ptr)})) {
         success = false;
         break;
       }
     }
-  } else if (pv.Encoding() == kEncodingIntrusiveSet) {
-    for (auto ptr : *static_cast<IntrusiveStringSet*>(pv.RObjPtr())) {
-      if (!func(ContainerEntry{ptr.Key().data(), ptr.Key().size()})) {
-        success = false;
-        break;
-      }
-    }
   }
 
   return success;

src/server/container_utils.cc

@@ -12,7 +12,6 @@ extern "C" {
 
 #include "base/flags.h"
 #include "base/logging.h"
-#include "core/intrusive_string_set.h"
 #include "core/top_keys.h"
 #include "search/doc_index.h"
 #include "server/channel_store.h"
@@ -1675,27 +1674,19 @@ void DbSlice::PerformDeletionAtomic(Iterator del_it, ExpIterator exp_it, DbTable
                       table);                                                // Key
   AccountObjectMemory(del_it.key(), pv.ObjType(), -value_heap_size, table);  // Value
 
-  if (del_it->first.IsAsyncDelete() && pv.ObjType() == OBJ_SET) {
-    if (pv.Encoding() == kEncodingStrMap2) {
-      DenseSet* ds = (DenseSet*)pv.RObjPtr();
-      pv.SetRObjPtr(nullptr);
-      const size_t kClearStepSize = 512;
-
-      uint32_t next = ds->ClearStep(0, kClearStepSize);
-      if (next < ds->BucketCount()) {
-        AsyncDeleter::EnqueDeletion(next, ds);
-      } else {
-        CompactObj::DeleteMR<DenseSet>(ds);
-      }
-    }  // del_it->first.IsAsyncDelete()
-    else if (pv.Encoding() == kEncodingIntrusiveSet) {
-      IntrusiveStringSet* ds = (IntrusiveStringSet*)pv.RObjPtr();
-      pv.SetRObjPtr(nullptr);
+  if (del_it->first.IsAsyncDelete() && pv.ObjType() == OBJ_SET &&
+      pv.Encoding() == kEncodingStrMap2) {
+    DenseSet* ds = (DenseSet*)pv.RObjPtr();
+    pv.SetRObjPtr(nullptr);
+    const size_t kClearStepSize = 512;
 
+    uint32_t next = ds->ClearStep(0, kClearStepSize);
+    if (next < ds->BucketCount()) {
+      AsyncDeleter::EnqueDeletion(next, ds);
+    } else {
       CompactObj::DeleteMR<DenseSet>(ds);
-      LOG(WARNING) << "Implement async deletion for IntrusiveStringSet";
     }
-  }
+  }  // del_it->first.IsAsyncDelete()
 
   if (table->slots_stats) {
     SlotId sid = KeySlot(del_it.key());

src/server/db_slice.cc

@@ -465,8 +465,6 @@ const char* EncodingName(unsigned obj_type, unsigned encoding) {
       switch (encoding) {
         case kEncodingIntSet:
           return "intset";
-        case kEncodingIntrusiveSet:
-          return "intrusive_set";
         case kEncodingStrMap2:
           return "dense_set";
         case OBJ_ENCODING_SKIPLIST:  // we kept the old enum for zset

src/server/debugcmd.cc

@@ -29,7 +29,6 @@ extern "C" {
 #include "base/flags.h"
 #include "base/logging.h"
 #include "core/bloom.h"
-#include "core/intrusive_string_set.h"
 #include "core/json/json_object.h"
 #include "core/qlist.h"
 #include "core/sorted_map.h"
@@ -58,7 +57,6 @@ ABSL_DECLARE_FLAG(int32_t, list_max_listpack_size);
 ABSL_DECLARE_FLAG(int32_t, list_compress_depth);
 ABSL_DECLARE_FLAG(uint32_t, dbnum);
 ABSL_DECLARE_FLAG(bool, list_experimental_v2);
-ABSL_DECLARE_FLAG(bool, stringset_experimental);
 ABSL_FLAG(bool, rdb_load_dry_run, false, "Dry run RDB load without applying changes");
 ABSL_FLAG(bool, rdb_ignore_expiry, false, "Ignore Key Expiry when loding from RDB snapshot");
 
@@ -336,10 +334,8 @@ void RdbLoaderBase::OpaqueObjLoader::CreateSet(const LoadTrace* ltrace) {
     if (inner_obj) {
       if (is_intset) {
         zfree(inner_obj);
-      } else if (!absl::GetFlag(FLAGS_stringset_experimental)) {
-        CompactObj::DeleteMR<StringSet>(inner_obj);
       } else {
-        CompactObj::DeleteMR<IntrusiveStringSet>(inner_obj);
+        CompactObj::DeleteMR<StringSet>(inner_obj);
       }
     }
   });
@@ -359,7 +355,7 @@ void RdbLoaderBase::OpaqueObjLoader::CreateSet(const LoadTrace* ltrace) {
       }
       return true;
     });
-  } else if (!absl::GetFlag(FLAGS_stringset_experimental)) {
+  } else {
     StringSet* set;
     if (config_.append) {
       // Note we always use StringSet when the object is being streamed.
@@ -381,55 +377,6 @@ void RdbLoaderBase::OpaqueObjLoader::CreateSet(const LoadTrace* ltrace) {
       increment = 2;
     }
 
-    for (size_t i = 0; i < ltrace->arr.size(); i += increment) {
-      string_view element = ToSV(ltrace->arr[i].rdb_var);
-
-      uint32_t ttl_sec = UINT32_MAX;
-      if (increment == 2) {
-        int64_t ttl_time = -1;
-        string_view ttl_str = ToSV(ltrace->arr[i + 1].rdb_var);
-        if (!absl::SimpleAtoi(ttl_str, &ttl_time)) {
-          LOG(ERROR) << "Can't parse set TTL " << ttl_str;
-          ec_ = RdbError(errc::rdb_file_corrupted);
-          return;
-        }
-
-        if (ttl_time != -1) {
-          if (ttl_time < set->time_now()) {
-            continue;
-          }
-
-          ttl_sec = ttl_time - set->time_now();
-        }
-      }
-      if (!set->Add(element, ttl_sec)) {
-        LOG(ERROR) << "Duplicate set members detected";
-        ec_ = RdbError(errc::duplicate_key);
-        return;
-      }
-    }
-  } else {
-    IntrusiveStringSet* set;
-    if (config_.append) {
-      // Note we always use StringSet when the object is being streamed.
-      if (!EnsureObjEncoding(OBJ_SET, kEncodingIntrusiveSet)) {
-        return;
-      }
-      set = static_cast<IntrusiveStringSet*>(pv_->RObjPtr());
-    } else {
-      set = CompactObj::AllocateMR<IntrusiveStringSet>();
-      set->set_time(MemberTimeSeconds(GetCurrentTimeMs()));
-      inner_obj = set;
-
-      // Expand the set up front to avoid rehashing.
-      set->Reserve((config_.reserve > len) ? config_.reserve : len);
-    }
-
-    size_t increment = 1;
-    if (rdb_type_ == RDB_TYPE_SET_WITH_EXPIRY) {
-      increment = 2;
-    }
-
     for (size_t i = 0; i < ltrace->arr.size(); i += increment) {
       string_view element = ToSV(ltrace->arr[i].rdb_var);
 
@@ -463,9 +410,7 @@ void RdbLoaderBase::OpaqueObjLoader::CreateSet(const LoadTrace* ltrace) {
     return;
 
   if (!config_.append) {
-    int str_set_encoding =
-        absl::GetFlag(FLAGS_stringset_experimental) ? kEncodingIntrusiveSet : kEncodingStrMap2;
-    pv_->InitRobj(OBJ_SET, is_intset ? kEncodingIntSet : str_set_encoding, inner_obj);
+    pv_->InitRobj(OBJ_SET, is_intset ? kEncodingIntSet : kEncodingStrMap2, inner_obj);
   }
   std::move(cleanup).Cancel();
 }
@@ -932,26 +877,14 @@ void RdbLoaderBase::OpaqueObjLoader::HandleBlob(string_view blob) {
     unsigned len = intsetLen(is);
 
     if (len > SetFamily::MaxIntsetEntries()) {
-      if (!absl::GetFlag(FLAGS_stringset_experimental)) {
-        StringSet* set = SetFamily::ConvertToStrSet(is, len);
+      StringSet* set = SetFamily::ConvertToStrSet(is, len);
 
-        if (!set) {
-          LOG(ERROR) << "OOM in ConvertToStrSet " << len;
-          ec_ = RdbError(errc::out_of_memory);
-          return;
-        }
-        pv_->InitRobj(OBJ_SET, kEncodingStrMap2, set);
-      } else {
-        IntrusiveStringSet* set = SetFamily::ConvertToIntrStrSet(is, len);
-
-        if (!set) {
-          LOG(ERROR) << "OOM in ConvertToStrSet " << len;
-          ec_ = RdbError(errc::out_of_memory);
-          return;
-        }
-        pv_->InitRobj(OBJ_SET, kEncodingIntrusiveSet, set);
+      if (!set) {
+        LOG(ERROR) << "OOM in ConvertToStrSet " << len;
+        ec_ = RdbError(errc::out_of_memory);
+        return;
       }
-
+      pv_->InitRobj(OBJ_SET, kEncodingStrMap2, set);
     } else {
       intset* mine = (intset*)zmalloc(blob.size());
       ::memcpy(mine, blob.data(), blob.size());
@@ -965,39 +898,21 @@ void RdbLoaderBase::OpaqueObjLoader::HandleBlob(string_view blob) {
     }
 
     unsigned char* lp = (unsigned char*)blob.data();
-    if (!absl::GetFlag(FLAGS_stringset_experimental)) {
-      StringSet* set = CompactObj::AllocateMR<StringSet>();
-      for (unsigned char* cur = lpFirst(lp); cur != nullptr; cur = lpNext(lp, cur)) {
-        unsigned char field_buf[LP_INTBUF_SIZE];
-        string_view elem = container_utils::LpGetView(cur, field_buf);
-        if (!set->Add(elem)) {
-          LOG(ERROR) << "Duplicate member " << elem;
-          ec_ = RdbError(errc::duplicate_key);
-          break;
-        }
-      }
-      if (ec_) {
-        CompactObj::DeleteMR<StringSet>(set);
-        return;
-      }
-      pv_->InitRobj(OBJ_SET, kEncodingStrMap2, set);
-    } else {
-      IntrusiveStringSet* set = CompactObj::AllocateMR<IntrusiveStringSet>();
-      for (unsigned char* cur = lpFirst(lp); cur != nullptr; cur = lpNext(lp, cur)) {
-        unsigned char field_buf[LP_INTBUF_SIZE];
-        string_view elem = container_utils::LpGetView(cur, field_buf);
-        if (!set->Add(elem)) {
-          LOG(ERROR) << "Duplicate member " << elem;
-          ec_ = RdbError(errc::duplicate_key);
-          break;
-        }
-      }
-      if (ec_) {
-        CompactObj::DeleteMR<IntrusiveStringSet>(set);
-        return;
+    StringSet* set = CompactObj::AllocateMR<StringSet>();
+    for (unsigned char* cur = lpFirst(lp); cur != nullptr; cur = lpNext(lp, cur)) {
+      unsigned char field_buf[LP_INTBUF_SIZE];
+      string_view elem = container_utils::LpGetView(cur, field_buf);
+      if (!set->Add(elem)) {
+        LOG(ERROR) << "Duplicate member " << elem;
+        ec_ = RdbError(errc::duplicate_key);
+        break;
       }
-      pv_->InitRobj(OBJ_SET, kEncodingIntrusiveSet, set);
     }
+    if (ec_) {
+      CompactObj::DeleteMR<StringSet>(set);
+      return;
+    }
+    pv_->InitRobj(OBJ_SET, kEncodingStrMap2, set);
   } else if (rdb_type_ == RDB_TYPE_HASH_ZIPLIST || rdb_type_ == RDB_TYPE_HASH_LISTPACK) {
     unsigned char* lp = lpNew(blob.size());
     switch (rdb_type_) {