Support rocksdb alternative.

CMakeLists.txt

@@ -30,7 +30,7 @@ option(JSONRPC "Build with jsonprc. default on" ON)
 option(FATDB "Build with ability to list entries in the Trie. Doubles DB size, slows everything down, but good for looking at state diffs and trie contents." OFF)
 option(USENPM "Use npm to recompile ethereum.js if it was changed" OFF)
 option(PROFILING "Build in support for profiling" OFF)
-
+option(ROCKSDB "Use rocksdb rather than leveldb" OFF)
 
 set(BUNDLE "none" CACHE STRING "Predefined bundle of software to build (none, full, user, tests, minimal).")
 option(MINER "Build the CLI miner component" ON)
@@ -196,6 +196,7 @@ eth_format_option(MINER)
 eth_format_option(USENPM)
 eth_format_option(PROFILING)
 eth_format_option(SOLIDITY)
+eth_format_option(ROCKSDB)
 eth_format_option(GUI)
 eth_format_option(TESTS)
 eth_format_option(NOBOOST)
@@ -311,6 +312,7 @@ message("-- PROFILING        Profiling support                        ${PROFILIN
 message("-- FATDB            Full database exploring                  ${FATDB}")
 message("-- JSONRPC          JSON-RPC support                         ${JSONRPC}")
 message("-- USENPM           Javascript source building               ${USENPM}")
+message("-- ROCKSDB          Prefer rocksdb to leveldb                ${ROCKSDB}")
 message("------------------------------------------------------------- components")
 message("-- MINER            Build miner                              ${MINER}")
 message("-- ETHKEY           Build wallet tools                       ${ETHKEY}")
@@ -337,6 +339,15 @@ include(EthExecutableHelper)
 
 createBuildInfo()
 
+if (ROCKSDB AND ROCKSDB_FOUND)
+	set(DB_INCLUDE_DIRS ${ROCKSDB_INCLUDE_DIRS})
+	set(DB_LIBRARIES ${ROCKSDB_LIBRARIES})
+	add_definitions(-DETH_ROCKSDB)
+else()
+	set(DB_INCLUDE_DIRS ${LEVELDB_INCLUDE_DIRS})
+	set(DB_LIBRARIES ${LEVELDB_LIBRARIES})
+endif()
+
 if (EVMJIT)
 	set(EVMJIT_CPP TRUE) # include CPP-JIT connector
 	add_subdirectory(evmjit)

abi/CMakeLists.txt

@@ -4,7 +4,7 @@ set(CMAKE_AUTOMOC OFF)
 aux_source_directory(. SRC_LIST)
 
 include_directories(BEFORE ..)
-include_directories(${LEVELDB_INCLUDE_DIRS})
+include_directories(${DB_INCLUDE_DIRS})
 
 set(EXECUTABLE abi)
 

alethzero/NatspecHandler.h

@@ -22,16 +22,11 @@
 
 #pragma once
 
-#pragma warning(push)
+#include <libdevcore/db.h>
-#pragma warning(disable: 4100 4267)
-#include <leveldb/db.h>
-#pragma warning(pop)
 #include <json/json.h>
 #include <libdevcore/FixedHash.h>
 #include "Context.h"
 
-namespace ldb = leveldb;
-
 class NatspecHandler: public NatSpecFace
 {
   public:

cmake/EthDependencies.cmake

@@ -49,6 +49,12 @@ find_package (LevelDB REQUIRED)
 message(" - LevelDB header: ${LEVELDB_INCLUDE_DIRS}")
 message(" - LevelDB lib: ${LEVELDB_LIBRARIES}")
 
+find_package (RocksDB)
+if (ROCKSDB_FOUND)
+	message(" - RocksDB header: ${ROCKSDB_INCLUDE_DIRS}")
+	message(" - RocksDB lib: ${ROCKSDB_LIBRARIES}")
+endif()
+
 if (JSCONSOLE)
 	find_package (v8 REQUIRED)
 	message(" - v8 header: ${V8_INCLUDE_DIRS}")

cmake/FindRocksDB.cmake

@@ -0,0 +1,49 @@
+# Find rocksdb
+#
+# Find the rocksdb includes and library
+#
+# if you nee to add a custom library search path, do it via via CMAKE_PREFIX_PATH
+#
+# This module defines
+#  ROCKSDB_INCLUDE_DIRS, where to find header, etc.
+#  ROCKSDB_LIBRARIES, the libraries needed to use rocksdb.
+#  ROCKSDB_FOUND, If false, do not try to use rocksdb.
+
+# only look in default directories
+find_path(
+	ROCKSDB_INCLUDE_DIR
+	NAMES rocksdb/db.h
+	DOC "rocksdb include dir"
+)
+
+find_library(
+	ROCKSDB_LIBRARY
+	NAMES rocksdb
+	DOC "rocksdb library"
+)
+
+set(ROCKSDB_INCLUDE_DIRS ${ROCKSDB_INCLUDE_DIR})
+set(ROCKSDB_LIBRARIES ${ROCKSDB_LIBRARY})
+
+# debug library on windows
+# same naming convention as in qt (appending debug library with d)
+# boost is using the same "hack" as us with "optimized" and "debug"
+if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
+
+	find_library(
+		ROCKSDB_LIBRARY_DEBUG
+		NAMES rocksdbd
+		DOC "rocksdb debug library"
+	)
+
+	set(ROCKSDB_LIBRARIES optimized ${ROCKSDB_LIBRARIES} debug ${ROCKSDB_LIBRARY_DEBUG})
+
+endif()
+
+# handle the QUIETLY and REQUIRED arguments and set ROCKSDB_FOUND to TRUE
+# if all listed variables are TRUE, hide their existence from configuration view
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(rocksdb DEFAULT_MSG
+	ROCKSDB_INCLUDE_DIR ROCKSDB_LIBRARY)
+mark_as_advanced (ROCKSDB_INCLUDE_DIR ROCKSDB_LIBRARY)
+

ethvm/CMakeLists.txt

@@ -4,7 +4,7 @@ set(CMAKE_AUTOMOC OFF)
 aux_source_directory(. SRC_LIST)
 
 include_directories(BEFORE ..)
-include_directories(${LEVELDB_INCLUDE_DIRS})
+include_directories(${DB_INCLUDE_DIRS})
 
 set(EXECUTABLE ethvm)
 

exp/CMakeLists.txt

@@ -5,7 +5,7 @@ aux_source_directory(. SRC_LIST)
 
 include_directories(BEFORE ${JSONCPP_INCLUDE_DIRS})
 include_directories(BEFORE ..)
-include_directories(${LEVELDB_INCLUDE_DIRS})
+include_directories(${DB_INCLUDE_DIRS})
 
 set(EXECUTABLE exp)
 

libdevcore/CMakeLists.txt

@@ -15,6 +15,7 @@ aux_source_directory(. SRC_LIST)
 include_directories(BEFORE ${JSONCPP_INCLUDE_DIRS})
 include_directories(BEFORE ..)
 include_directories(${Boost_INCLUDE_DIRS})
+include_directories(${DB_INCLUDE_DIRS})
 
 set(EXECUTABLE devcore)
 
@@ -26,6 +27,7 @@ target_link_libraries(${EXECUTABLE} ${Boost_THREAD_LIBRARIES})
 target_link_libraries(${EXECUTABLE} ${Boost_SYSTEM_LIBRARIES})
 target_link_libraries(${EXECUTABLE} ${Boost_FILESYSTEM_LIBRARIES})
 target_link_libraries(${EXECUTABLE} ${JSONCPP_LIBRARIES})
+target_link_libraries(${EXECUTABLE} ${DB_LIBRARIES})
 
 # transitive dependencies for windows executables
 if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")

libdevcore/TrieDB.h

@@ -21,19 +21,14 @@
 
 #pragma once
 
-#pragma warning(push)
-#pragma warning(disable: 4100 4267)
-#include <leveldb/db.h>
-#pragma warning(pop)
-
 #include <memory>
-#include <libdevcore/Common.h>
+#include "db.h"
-#include <libdevcore/Log.h>
+#include "Common.h"
-#include <libdevcore/Exceptions.h>
+#include "Log.h"
-#include <libdevcore/SHA3.h>
+#include "Exceptions.h"
+#include "SHA3.h"
 #include "MemoryDB.h"
 #include "TrieCommon.h"
-namespace ldb = leveldb;
 
 namespace dev
 {

libdevcore/db.h

@@ -0,0 +1,36 @@
+/*
+	This file is part of cpp-ethereum.
+
+	cpp-ethereum 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.
+
+	cpp-ethereum 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 cpp-ethereum.  If not, see <http://www.gnu.org/licenses/>.
+*/
+/** @file DB.h
+ * @author Gav Wood <i@gavwood.com>
+ * @date 2014
+ */
+
+#pragma once
+
+#pragma warning(push)
+#pragma warning(disable: 4100 4267)
+#if ETH_ROCKSDB || !ETH_TRUE
+#include <rocksdb/db.h>
+#include <rocksdb/write_batch.h>
+namespace ldb = rocksdb;
+#else
+#include <leveldb/db.h>
+#include <leveldb/write_batch.h>
+namespace ldb = leveldb;
+#endif
+#pragma warning(pop)
+#define DEV_LDB 1

libdevcore/vector_ref.h

@@ -31,8 +31,8 @@ public:
 	vector_ref(typename std::conditional<std::is_const<_T>::value, std::vector<typename std::remove_const<_T>::type> const*, std::vector<_T>*>::type _data): m_data(_data->data()), m_count(_data->size()) {}
 	/// Creates a new vector_ref pointing to the data part of a string (given as reference).
 	vector_ref(typename std::conditional<std::is_const<_T>::value, std::string const&, std::string&>::type _data): m_data(reinterpret_cast<_T*>(_data.data())), m_count(_data.size() / sizeof(_T)) {}
-#ifdef STORAGE_LEVELDB_INCLUDE_DB_H_
+#if DEV_LDB
-	vector_ref(leveldb::Slice const& _s): m_data(reinterpret_cast<_T*>(_s.data())), m_count(_s.size() / sizeof(_T)) {}
+	vector_ref(ldb::Slice const& _s): m_data(reinterpret_cast<_T*>(_s.data())), m_count(_s.size() / sizeof(_T)) {}
 #endif
 	explicit operator bool() const { return m_data && m_count; }
 
@@ -77,8 +77,8 @@ public:
 	bool operator==(vector_ref<_T> const& _cmp) const { return m_data == _cmp.m_data && m_count == _cmp.m_count; }
 	bool operator!=(vector_ref<_T> const& _cmp) const { return !operator==(_cmp); }
 
-#ifdef STORAGE_LEVELDB_INCLUDE_DB_H_
+#if DEV_LDB
-	operator leveldb::Slice() const { return leveldb::Slice((char const*)m_data, m_count * sizeof(_T)); }
+	operator ldb::Slice() const { return ldb::Slice((char const*)m_data, m_count * sizeof(_T)); }
 #endif
 
 	void reset() { m_data = nullptr; m_count = 0; }

libdevcrypto/CMakeLists.txt

@@ -12,7 +12,7 @@ aux_source_directory(. SRC_LIST)
 include_directories(BEFORE ..) 
 include_directories(${Boost_INCLUDE_DIRS})
 include_directories(${CRYPTOPP_INCLUDE_DIRS})
-include_directories(${LEVELDB_INCLUDE_DIRS})
+include_directories(${DB_INCLUDE_DIRS})
 
 set(EXECUTABLE devcrypto)
 
@@ -20,7 +20,7 @@ file(GLOB HEADERS "*.h")
 add_library(${EXECUTABLE} ${SRC_LIST} ${HEADERS})
 
 target_link_libraries(${EXECUTABLE} ${Boost_FILESYSTEM_LIBRARIES})
-target_link_libraries(${EXECUTABLE} ${LEVELDB_LIBRARIES})
+target_link_libraries(${EXECUTABLE} ${DB_LIBRARIES})
 target_link_libraries(${EXECUTABLE} ${CRYPTOPP_LIBRARIES})
 target_link_libraries(${EXECUTABLE} scrypt)
 target_link_libraries(${EXECUTABLE} devcore)

libdevcrypto/OverlayDB.cpp

@@ -20,8 +20,7 @@
  */
 
 #include <thread>
-#include <leveldb/db.h>
+#include <libdevcore/db.h>
-#include <leveldb/write_batch.h>
 #include <libdevcore/Common.h>
 #include "OverlayDB.h"
 using namespace std;

libdevcrypto/OverlayDB.h

@@ -21,16 +21,11 @@
 
 #pragma once
 
-#pragma warning(push)
-#pragma warning(disable: 4100 4267)
-#include <leveldb/db.h>
-#pragma warning(pop)
-
 #include <memory>
+#include <libdevcore/db.h>
 #include <libdevcore/Common.h>
 #include <libdevcore/Log.h>
 #include <libdevcore/MemoryDB.h>
-namespace ldb = leveldb;
 
 namespace dev
 {

libethereum/BlockChain.cpp

@@ -24,8 +24,6 @@
 #if ETH_PROFILING_GPERF
 #include <gperftools/profiler.h>
 #endif
-#include <leveldb/db.h>
-#include <leveldb/write_batch.h>
 #include <boost/timer.hpp>
 #include <boost/filesystem.hpp>
 #include <test/JsonSpiritHeaders.h>

libethereum/BlockChain.h

@@ -21,15 +21,11 @@
 
 #pragma once
 
-#pragma warning(push)
-#pragma warning(disable: 4100 4267)
-#include <leveldb/db.h>
-#pragma warning(pop)
-
 #include <deque>
 #include <chrono>
 #include <unordered_map>
 #include <unordered_set>
+#include <libdevcore/db.h>
 #include <libdevcore/Log.h>
 #include <libdevcore/Exceptions.h>
 #include <libdevcore/Guards.h>
@@ -41,7 +37,6 @@
 #include "Transaction.h"
 #include "BlockQueue.h"
 #include "VerifiedBlock.h"
-namespace ldb = leveldb;
 
 namespace std
 {

libethereum/BlockDetails.h

@@ -22,15 +22,10 @@
 #pragma once
 
 #include <unordered_map>
-#pragma warning(push)
+#include <libdevcore/db.h>
-#pragma warning(disable: 4100 4267)
-#include <leveldb/db.h>
-#pragma warning(pop)
-
 #include <libdevcore/Log.h>
 #include <libdevcore/RLP.h>
 #include "TransactionReceipt.h"
-namespace ldb = leveldb;
 
 namespace dev
 {

libethereum/CMakeLists.txt

@@ -12,7 +12,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSTATICLIB")
 aux_source_directory(. SRC_LIST)
 
 include_directories(BEFORE ..)
-include_directories(${LEVELDB_INCLUDE_DIRS})
+include_directories(${DB_INCLUDE_DIRS})
 include_directories(${Boost_INCLUDE_DIRS})
 if (JSONRPC)
 include_directories(BEFORE ${JSONCPP_INCLUDE_DIRS})
@@ -31,7 +31,6 @@ target_link_libraries(${EXECUTABLE} whisper)
 target_link_libraries(${EXECUTABLE} p2p)
 target_link_libraries(${EXECUTABLE} devcrypto)
 target_link_libraries(${EXECUTABLE} ethcore)
-target_link_libraries(${EXECUTABLE} ${LEVELDB_LIBRARIES})
 target_link_libraries(${EXECUTABLE} ${Boost_REGEX_LIBRARIES})
 target_link_libraries(${EXECUTABLE} secp256k1)
 if (JSONRPC)

libethereum/CanonBlockChain.h

@@ -21,11 +21,6 @@
 
 #pragma once
 
-#pragma warning(push)
-#pragma warning(disable: 4100 4267)
-#include <leveldb/db.h>
-#pragma warning(pop)
-
 #include <mutex>
 #include <libdevcore/Log.h>
 #include <libdevcore/Exceptions.h>
@@ -35,7 +30,6 @@
 #include "BlockDetails.h"
 #include "Account.h"
 #include "BlockChain.h"
-namespace ldb = leveldb;
 
 namespace dev
 {

libp2p/CMakeLists.txt

@@ -14,7 +14,7 @@ aux_source_directory(. SRC_LIST)
 include_directories(BEFORE ..)
 # we may not use it in libp2p, but one of our dependecies is including leveldb in header file
 # and windows is failing to build without that
-include_directories(${LEVELDB_INCLUDE_DIRS})
+include_directories(${DB_INCLUDE_DIRS})
 include_directories(${Boost_INCLUDE_DIRS})
 
 if (MINIUPNPC_FOUND)

libweb3jsonrpc/CMakeLists.txt

@@ -13,7 +13,7 @@ include_directories(BEFORE ${JSONCPP_INCLUDE_DIRS})
 include_directories(BEFORE ..)
 include_directories(${MHD_INCLUDE_DIRS})
 include_directories(${JSON_RPC_CPP_INCLUDE_DIRS})
-include_directories(${LEVELDB_INCLUDE_DIRS})
+include_directories(${DB_INCLUDE_DIRS})
 include_directories(${Boost_INCLUDE_DIRS})
 
 set(EXECUTABLE web3jsonrpc)
@@ -22,7 +22,6 @@ file(GLOB HEADERS "*.h")
 
 add_library(${EXECUTABLE} ${SRC_LIST} ${HEADERS})
 
-target_link_libraries(${EXECUTABLE} ${LEVELDB_LIBRARIES})
 target_link_libraries(${EXECUTABLE} ${JSONCPP_LIBRARIES})
 target_link_libraries(${EXECUTABLE} ${JSON_RPC_CPP_SERVER_LIBRARIES})
 target_link_libraries(${EXECUTABLE} ${MHD_LIBRARIES})

libweb3jsonrpc/WebThreeStubServer.h

@@ -23,11 +23,7 @@
 
 #pragma once
 
-#pragma warning(push)
+#include <libdevcore/db.h>
-#pragma warning(disable: 4100 4267)
-#include <leveldb/db.h>
-#pragma warning(pop)
-
 #include "WebThreeStubServerBase.h"
 
 namespace dev
@@ -99,9 +95,9 @@ private:
 	dev::WebThreeDirect& m_web3;
 	dev::eth::KeyManager& m_keyMan;
 	dev::eth::TrivialGasPricer& m_gp;
-	leveldb::ReadOptions m_readOptions;
+	ldb::ReadOptions m_readOptions;
-	leveldb::WriteOptions m_writeOptions;
+	ldb::WriteOptions m_writeOptions;
-	leveldb::DB* m_db;
+	ldb::DB* m_db;
 
 	std::function<void(Address const&)> m_setMiningBenefactor;
 	std::unordered_map<std::string, SessionPermissions> m_sessions;

libwebthree/CMakeLists.txt

@@ -12,7 +12,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSTATICLIB")
 aux_source_directory(. SRC_LIST)
 
 include_directories(BEFORE ..)
-include_directories(${LEVELDB_INCLUDE_DIRS})
+include_directories(${DB_INCLUDE_DIRS})
 include_directories(${Boost_INCLUDE_DIRS})
 
 set(EXECUTABLE webthree)
@@ -21,8 +21,6 @@ file(GLOB HEADERS "*.h")
 
 add_library(${EXECUTABLE} ${SRC_LIST} ${HEADERS})
 
-target_link_libraries(${EXECUTABLE} ${LEVELDB_LIBRARIES})
-
 target_link_libraries(${EXECUTABLE} ethereum)
 target_link_libraries(${EXECUTABLE} evm)
 target_link_libraries(${EXECUTABLE} lll)

libwhisper/CMakeLists.txt

@@ -12,7 +12,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSTATICLIB")
 aux_source_directory(. SRC_LIST)
 
 include_directories(BEFORE ..)
-include_directories(${LEVELDB_INCLUDE_DIRS})
+include_directories(${DB_INCLUDE_DIRS})
 include_directories(${Boost_INCLUDE_DIRS})
 
 set(EXECUTABLE whisper)
@@ -21,8 +21,6 @@ file(GLOB HEADERS "*.h")
 
 add_library(${EXECUTABLE} ${SRC_LIST} ${HEADERS})
 
-target_link_libraries(${EXECUTABLE} ${LEVELDB_LIBRARIES})
-
 target_link_libraries(${EXECUTABLE} ethcore)
 target_link_libraries(${EXECUTABLE} devcrypto)
 target_link_libraries(${EXECUTABLE} devcore)

neth/CMakeLists.txt

@@ -4,7 +4,7 @@ aux_source_directory(. SRC_LIST)
 
 include_directories(BEFORE ..)
 include_directories(${JSON_RPC_CPP_INCLUDE_DIRS})
-include_directories(${LEVELDB_INCLUDE_DIRS})
+include_directories(${DB_INCLUDE_DIRS})
 include_directories(${Boost_INCLUDE_DIRS})
 
 set(EXECUTABLE neth)
@@ -13,8 +13,6 @@ add_executable(${EXECUTABLE} ${SRC_LIST})
 
 add_dependencies(${EXECUTABLE} BuildInfo.h)
 
-target_link_libraries(${EXECUTABLE} ${LEVELDB_LIBRARIES})
-
 if (JSONRPC)
 	target_link_libraries(${EXECUTABLE} web3jsonrpc)
 endif()

rlp/CMakeLists.txt

@@ -4,13 +4,14 @@ set(CMAKE_AUTOMOC OFF)
 aux_source_directory(. SRC_LIST)
 
 include_directories(BEFORE ..)
-include_directories(${LEVELDB_INCLUDE_DIRS})
+include_directories(${DB_INCLUDE_DIRS})
 
 set(EXECUTABLE rlp)
 
 add_executable(${EXECUTABLE} ${SRC_LIST})
 
 target_link_libraries(${EXECUTABLE} devcrypto)
+target_link_libraries(${EXECUTABLE} ${DB_LIBRARIES})
 
 if (APPLE)
 	install(TARGETS ${EXECUTABLE} DESTINATION bin)