Package and distribute rocksdb ldb tool

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 ### Improvements
 - Security hardening of the redis parser for unauthenticated clients.
+- Package and distribute ``quarkdb-ldb`` tool based on the one provided by RocksDB.
 
 ## 0.4.1 (2020-01-17)
 

packaging/quarkdb.spec.in

@@ -93,3 +93,4 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/quarkdb-recovery
 %{_bindir}/quarkdb-server
 %{_bindir}/quarkdb-sst-inspect
+%{_bindir}/quarkdb-ldb

src/recovery/RecoveryRunner.cc

@@ -23,6 +23,7 @@
 
 #include "RecoveryRunner.hh"
 #include <rocksdb/sst_dump_tool.h>
+#include <rocksdb/ldb_tool.h>
 
 using namespace quarkdb;
 
@@ -55,3 +56,8 @@ void RecoveryRunner::DumpTool(int argc, char** argv) {
   tool.Run(argc, argv);
 }
 
+void RecoveryRunner::LdbTool(int argc, char** argv) {
+  rocksdb::LDBTool tool;
+  tool.Run(argc, argv);
+}
+

src/recovery/RecoveryRunner.hh

@@ -38,6 +38,7 @@ public:
   RecoveryRunner(const std::string &path, int port);
   static RedisEncodedResponse issueOneOffCommand(const std::string &path, RedisRequest &req);
   static void DumpTool(int argc, char** argv);
+  static void LdbTool(int argc, char** argv);
 
 private:
   RecoveryEditor editor;

tools/CMakeLists.txt

 cmake_minimum_required(VERSION 2.6)
 find_package (Threads)
 
-add_executable(quarkdb-server quarkdb-server.cc)
-target_link_libraries(quarkdb-server jemalloc XrdQuarkDB ${CMAKE_THREAD_LIBS_INIT} )
-
 add_executable(quarkdb-create quarkdb-create.cc)
 target_link_libraries(quarkdb-create XrdQuarkDB)
 
+add_executable(quarkdb-ldb quarkdb-ldb.cc)
+target_link_libraries(quarkdb-ldb XrdQuarkDB ${CMAKE_THREAD_LIBS_INIT})
+
 add_executable(quarkdb-recovery quarkdb-recovery.cc)
 target_link_libraries(quarkdb-recovery XrdQuarkDB ${CMAKE_THREAD_LIBS_INIT} )
 
+add_executable(quarkdb-server quarkdb-server.cc)
+target_link_libraries(quarkdb-server jemalloc XrdQuarkDB ${CMAKE_THREAD_LIBS_INIT} )
+
 add_executable(quarkdb-sst-inspect quarkdb-sst-inspect.cc)
 target_link_libraries(quarkdb-sst-inspect XrdQuarkDB ${CMAKE_THREAD_LIBS_INIT} )
 
@@ -24,6 +27,6 @@ include_directories(
 )
 
 install(
-  TARGETS quarkdb-create quarkdb-recovery quarkdb-sst-inspect quarkdb-server
+  TARGETS quarkdb-create quarkdb-ldb quarkdb-recovery quarkdb-server quarkdb-sst-inspect
   RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR}
 )

tools/quarkdb-ldb.cc

+// ----------------------------------------------------------------------
+// File: quarkdb-ldb.cc
+// Author: Georgios Bitzes - CERN
+// ----------------------------------------------------------------------
+
+/************************************************************************
+ * quarkdb - a redis-like highly available key-value store              *
+ * Copyright (C) 2020 CERN/Switzerland                                  *
+ *                                                                      *
+ * This program is free software: you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation, either version 3 of the License, or    *
+ * (at your option) any later version.                                  *
+ *                                                                      *
+ * This program is distributed in the hope that it will be useful,      *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of       *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        *
+ * GNU General Public License for more details.                         *
+ *                                                                      *
+ * You should have received a copy of the GNU General Public License    *
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.*
+ ************************************************************************/
+
+#include "recovery/RecoveryRunner.hh"
+
+int main(int argc, char** argv) {
+  quarkdb::RecoveryRunner::LdbTool(argc, argv);
+  return 0;
+}