Revert "[Features] integrating skiplist (#37)" (#39)

This reverts commit 781c4eb.

CMakeLists.txt

@@ -51,7 +51,6 @@ add_library(bliss OBJECT
     ${CMAKE_SOURCE_DIR}/src/bliss/bench_lipp.h
     ${CMAKE_SOURCE_DIR}/src/bliss/bench_alex.h
     ${CMAKE_SOURCE_DIR}/src/bliss/bench_btree.h
-    ${CMAKE_SOURCE_DIR}/src/bliss/bench_skiplist.h
 )
 
 target_compile_features(bliss PUBLIC
@@ -64,7 +63,6 @@ target_link_libraries(bliss PUBLIC
     alex
     lipp
     tlx
-    skiplist
 )
 
 target_include_directories(bliss PUBLIC

external/CMakeLists.txt

@@ -33,7 +33,7 @@ FetchContent_MakeAvailable(cxxopts)
 
 FetchContent_Declare(
     alex
-    GIT_REPOSITORY https://github.com/microsoft/ALEX
+    GIT_REPOSITORY https://github.com/microsoft/ALEX.git
     GIT_TAG master
 )
 FetchContent_GetProperties(alex)
@@ -70,18 +70,4 @@ if (NOT tlx_POPULATED)
 endif()
 
 add_library(tlx INTERFACE)
-target_include_directories(tlx INTERFACE ${tlx_SOURCE_DIR}/)
-
-
-FetchContent_Declare(
-    skiplist
-    GIT_REPOSITORY https://github.com/Samyak2/skip-list.git
-    GIT_TAG main
-)
-FetchContent_GetProperties(skiplist)
-if (NOT skiplist_POPULATED)
-    FetchContent_Populate(skiplist)
-endif()
-
-add_library(skiplist INTERFACE)
-target_include_directories(skiplist INTERFACE ${skiplist_SOURCE_DIR}/skiplist)
+target_include_directories(tlx INTERFACE ${tlx_SOURCE_DIR}/)

src/bliss_bench.cpp

@@ -1,6 +1,5 @@
 #include <alex.h>
 #include <lipp.h>
-#include "skiplist_map.hpp"
 #include <spdlog/common.h>
 
 #include <cxxopts.hpp>
@@ -10,7 +9,6 @@
 #include "bliss/bench_alex.h"
 #include "bliss/bench_btree.h"
 #include "bliss/bench_lipp.h"
-#include "bliss/bench_skiplist.h"
 #include "bliss/bliss_index.h"
 #include "bliss/util/args.h"
 #include "bliss/util/config.h"
@@ -170,8 +168,6 @@ int main(int argc, char *argv[]) {
         index.reset(new bliss::BlissLippIndex<key_type, value_type>());
     } else if (config.index == "btree") {
         index.reset(new bliss::BlissBTreeIndex<key_type, value_type>());
-    } else if (config.index == "skiplist") {
-        index.reset(new bliss::BlissSkipListIndex<key_type, value_type>());
     } else {
         spdlog::error(config.index + " not implemented yet", 1);
     }

tests/CMakeLists.txt

@@ -16,5 +16,4 @@ target_include_directories(bliss_test_infra PUBLIC
 
 add_subdirectory(test_alex)
 add_subdirectory(test_lipp)
-add_subdirectory(test_btree)
-add_subdirectory(test_skiplist)
+add_subdirectory(test_btree)

tests/bliss_index_tests.h

@@ -8,13 +8,10 @@
 #include <cxxopts.hpp>
 #include <iostream>
 #include <string>
-#include <algorithm>
-#include <random>
 
 #include "bliss/bench_alex.h"
 #include "bliss/bench_btree.h"
 #include "bliss/bench_lipp.h"
-#include "bliss/bench_skiplist.h"
 #include "bliss/bliss_index.h"
 #include "bliss/util/args.h"
 #include "bliss/util/config.h"
@@ -30,7 +27,7 @@ using value_type = unsigned long;
 class BlissIndexTest : public testing::Test {
    protected:
     std::unique_ptr<bliss::BlissIndex<key_type, value_type>> index;
-    std::string indexes[4] = {"alex", "lipp", "btree", "skiplist"};
+    std::string indexes[3] = {"alex", "lipp", "btree"};
     int num_keys = 100000;
 
     void SetUp() {}
@@ -41,9 +38,7 @@ class BlissIndexTest : public testing::Test {
             data.push_back(i);
         }
         if (!sorted) {
-            std::random_device rd;
-            std::mt19937 g(rd());
-            std::shuffle(data.begin(), data.end(), g);
+            std::random_shuffle(data.begin(), data.end());
         }
     }
 };

tests/test_lipp/lipp_tests.cpp

@@ -17,7 +17,7 @@ TEST_F(LippTest, TestLipp_Sorted) {
 }
 
 TEST_F(LippTest, TestLipp_Random) {
-    index.reset(new bliss::BlissLippIndex<key_type, key_type>());
+    index.reset(new bliss::BlissAlexIndex<key_type, key_type>());
     std::vector<key_type> data;
     GenerateData(data, num_keys, false);