Added Sharded Succinct-KV Support

amplab · Aug 26, 2015 · 82b814f · 82b814f
1 parent 655d721
commit 82b814f
Show file tree

Hide file tree

Showing 40 changed files with 18,057 additions and 21 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -20,8 +20,9 @@ set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake-modules)
 
 # Builds all of Succinct's sub-modules
 add_subdirectory(core)
-add_subdirectory(sharded)
 add_subdirectory(construct)
+add_subdirectory(sharded)
+add_subdirectory(sharded-kv)
 add_subdirectory(bench)
 
 # Testing framework

diff --git a/bench/CMakeLists.txt b/bench/CMakeLists.txt
@@ -21,14 +21,16 @@ set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
 
 file(MAKE_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
 
-set(INCLUDE include ../core/include ../sharded/include)
+set(INCLUDE include ../core/include ../sharded/include ../sharded-kv/include)
 include_directories(${INCLUDE})
 add_executable(fbench src/file_benchmark.cc)
 add_executable(sbench src/shard_benchmark.cc)
 add_executable(surebench src/regex_benchmark.cc)
 add_executable(ssbench src/succinct_benchmark.cc)
+add_executable(skvbench src/succinctkv_benchmark.cc)
 
 target_link_libraries(fbench succinct)
 target_link_libraries(sbench succinct)
 target_link_libraries(surebench succinct)
 target_link_libraries(ssbench sclient ${THRIFT_LIBRARIES})
+target_link_libraries(skvbench skvclient ${THRIFT_LIBRARIES})
diff --git a/bench/include/succinct_benchmark.h b/bench/include/succinct_benchmark.h
@@ -1,10 +1,8 @@
-#ifndef SUCCINCT_SERVER_BENCHMARK_H
-#define SUCCINCT_SERVER_BENCHMARK_H
+#ifndef SUCCINCT_BENCHMARK_H_
+#define SUCCINCT_BENCHMARK_H_
 
-#include "succinct_shard.h"
 #include "benchmark.h"
 #include "succinct_client.h"
-#include "ports.h"
 
 class SuccinctBenchmark : public Benchmark {
  public: