Add btree_map and btree_multimap implementations; update .gitignore and .gitmodules for rapidjson submodule. Learning by code was a little difficult ngl.

2025-06-07 18:02:42 +08:00 · 2025-03-16 09:16:47 +00:00 · 2025-03-16 09:16:47 +00:00 · df4d2b00b0
commit df4d2b00b0
parent ac691084fd
7 changed files with 2970 additions and 183 deletions
--- a/.gitignore
+++ b/.gitignore
@ -2,6 +2,7 @@
 *.sw*
 .vscode
 .DS_Store
+.cache

 # Build directory.
 build/
--- a/.gitmodules
+++ b/.gitmodules
@ -4,3 +4,6 @@
 [submodule "third_party/benchmark"]
 	path = third_party/benchmark
 	url = https://github.com/google/benchmark
+[submodule "third_party/rapidjson"]
+	path = third_party/rapidjson
+	url = https://github.com/Tencent/rapidjson.git
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -3,8 +3,10 @@
 # found in the LICENSE file. See the AUTHORS file for names of contributors.

 cmake_minimum_required(VERSION 3.9)
+
 # Keep the version below in sync with the one in db.h
 project(leveldb VERSION 1.23.0 LANGUAGES C CXX)
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)

 # C standard can be overridden when this is used as a sub-project.
 if(NOT CMAKE_C_STANDARD)
@ -22,13 +24,14 @@ if(NOT CMAKE_CXX_STANDARD)
  set(CMAKE_CXX_EXTENSIONS OFF)
 endif(NOT CMAKE_CXX_STANDARD)

-if (WIN32)
+if(WIN32)
  set(LEVELDB_PLATFORM_NAME LEVELDB_PLATFORM_WINDOWS)
+
  # TODO(cmumford): Make UNICODE configurable for Windows.
  add_definitions(-D_UNICODE -DUNICODE)
-else (WIN32)
+else(WIN32)
  set(LEVELDB_PLATFORM_NAME LEVELDB_PLATFORM_POSIX)
-endif (WIN32)
+endif(WIN32)

 option(LEVELDB_BUILD_TESTS "Build LevelDB's unit tests" ON)
 option(LEVELDB_BUILD_BENCHMARKS "Build LevelDB's benchmarks" ON)
@ -44,6 +47,7 @@ check_library_exists(zstd zstd_compress "" HAVE_ZSTD)
 check_library_exists(tcmalloc malloc "" HAVE_TCMALLOC)

 include(CheckCXXSymbolExists)
+
 # Using check_cxx_symbol_exists() instead of check_c_symbol_exists() because
 # we're including the header from C++, and feature detection should use the same
 # compiler language that the project will use later. Principles aside, some
@ -84,7 +88,7 @@ check_cxx_compiler_flag(-Wthread-safety HAVE_CLANG_THREAD_SAFETY)

 # Used by googletest.
 check_cxx_compiler_flag(-Wno-missing-field-initializers
-                        LEVELDB_HAVE_NO_MISSING_FIELD_INITIALIZERS)
+  LEVELDB_HAVE_NO_MISSING_FIELD_INITIALIZERS)

 include(CheckCXXSourceCompiles)

@ -120,121 +124,121 @@ include(GNUInstallDirs)
 add_library(leveldb "")
 target_sources(leveldb
  PRIVATE
-    "${PROJECT_BINARY_DIR}/${LEVELDB_PORT_CONFIG_DIR}/port_config.h"
-    "db/builder.cc"
-    "db/builder.h"
-    "db/c.cc"
-    "db/db_impl.cc"
-    "db/db_impl.h"
-    "db/db_iter.cc"
-    "db/db_iter.h"
-    "db/dbformat.cc"
-    "db/dbformat.h"
-    "db/dumpfile.cc"
-    "db/filename.cc"
-    "db/filename.h"
-    "db/log_format.h"
-    "db/log_reader.cc"
-    "db/log_reader.h"
-    "db/log_writer.cc"
-    "db/log_writer.h"
-    "db/memtable.cc"
-    "db/memtable.h"
-    "db/repair.cc"
-    "db/skiplist.h"
-    "db/snapshot.h"
-    "db/table_cache.cc"
-    "db/table_cache.h"
-    "db/version_edit.cc"
-    "db/version_edit.h"
-    "db/version_set.cc"
-    "db/version_set.h"
-    "db/write_batch_internal.h"
-    "db/write_batch.cc"
-    "port/port_stdcxx.h"
-    "port/port.h"
-    "port/thread_annotations.h"
-    "table/block_builder.cc"
-    "table/block_builder.h"
-    "table/block.cc"
-    "table/block.h"
-    "table/filter_block.cc"
-    "table/filter_block.h"
-    "table/format.cc"
-    "table/format.h"
-    "table/iterator_wrapper.h"
-    "table/iterator.cc"
-    "table/merger.cc"
-    "table/merger.h"
-    "table/table_builder.cc"
-    "table/table.cc"
-    "table/two_level_iterator.cc"
-    "table/two_level_iterator.h"
-    "util/arena.cc"
-    "util/arena.h"
-    "util/bloom.cc"
-    "util/cache.cc"
-    "util/coding.cc"
-    "util/coding.h"
-    "util/comparator.cc"
-    "util/crc32c.cc"
-    "util/crc32c.h"
-    "util/env.cc"
-    "util/filter_policy.cc"
-    "util/hash.cc"
-    "util/hash.h"
-    "util/logging.cc"
-    "util/logging.h"
-    "util/mutexlock.h"
-    "util/no_destructor.h"
-    "util/options.cc"
-    "util/random.h"
-    "util/status.cc"
+  "${PROJECT_BINARY_DIR}/${LEVELDB_PORT_CONFIG_DIR}/port_config.h"
+  "db/builder.cc"
+  "db/builder.h"
+  "db/c.cc"
+  "db/db_impl.cc"
+  "db/db_impl.h"
+  "db/db_iter.cc"
+  "db/db_iter.h"
+  "db/dbformat.cc"
+  "db/dbformat.h"
+  "db/dumpfile.cc"
+  "db/filename.cc"
+  "db/filename.h"
+  "db/log_format.h"
+  "db/log_reader.cc"
+  "db/log_reader.h"
+  "db/log_writer.cc"
+  "db/log_writer.h"
+  "db/memtable.cc"
+  "db/memtable.h"
+  "db/repair.cc"
+  "db/skiplist.h"
+  "db/snapshot.h"
+  "db/table_cache.cc"
+  "db/table_cache.h"
+  "db/version_edit.cc"
+  "db/version_edit.h"
+  "db/version_set.cc"
+  "db/version_set.h"
+  "db/write_batch_internal.h"
+  "db/write_batch.cc"
+  "port/port_stdcxx.h"
+  "port/port.h"
+  "port/thread_annotations.h"
+  "table/block_builder.cc"
+  "table/block_builder.h"
+  "table/block.cc"
+  "table/block.h"
+  "table/filter_block.cc"
+  "table/filter_block.h"
+  "table/format.cc"
+  "table/format.h"
+  "table/iterator_wrapper.h"
+  "table/iterator.cc"
+  "table/merger.cc"
+  "table/merger.h"
+  "table/table_builder.cc"
+  "table/table.cc"
+  "table/two_level_iterator.cc"
+  "table/two_level_iterator.h"
+  "util/arena.cc"
+  "util/arena.h"
+  "util/bloom.cc"
+  "util/cache.cc"
+  "util/coding.cc"
+  "util/coding.h"
+  "util/comparator.cc"
+  "util/crc32c.cc"
+  "util/crc32c.h"
+  "util/env.cc"
+  "util/filter_policy.cc"
+  "util/hash.cc"
+  "util/hash.h"
+  "util/logging.cc"
+  "util/logging.h"
+  "util/mutexlock.h"
+  "util/no_destructor.h"
+  "util/options.cc"
+  "util/random.h"
+  "util/status.cc"

  # Only CMake 3.3+ supports PUBLIC sources in targets exported by "install".
  $<$<VERSION_GREATER:CMAKE_VERSION,3.2>:PUBLIC>
-    "${LEVELDB_PUBLIC_INCLUDE_DIR}/c.h"
-    "${LEVELDB_PUBLIC_INCLUDE_DIR}/cache.h"
-    "${LEVELDB_PUBLIC_INCLUDE_DIR}/comparator.h"
-    "${LEVELDB_PUBLIC_INCLUDE_DIR}/db.h"
-    "${LEVELDB_PUBLIC_INCLUDE_DIR}/dumpfile.h"
-    "${LEVELDB_PUBLIC_INCLUDE_DIR}/env.h"
-    "${LEVELDB_PUBLIC_INCLUDE_DIR}/export.h"
-    "${LEVELDB_PUBLIC_INCLUDE_DIR}/filter_policy.h"
-    "${LEVELDB_PUBLIC_INCLUDE_DIR}/iterator.h"
-    "${LEVELDB_PUBLIC_INCLUDE_DIR}/options.h"
-    "${LEVELDB_PUBLIC_INCLUDE_DIR}/slice.h"
-    "${LEVELDB_PUBLIC_INCLUDE_DIR}/status.h"
-    "${LEVELDB_PUBLIC_INCLUDE_DIR}/table_builder.h"
-    "${LEVELDB_PUBLIC_INCLUDE_DIR}/table.h"
-    "${LEVELDB_PUBLIC_INCLUDE_DIR}/write_batch.h"
+  "${LEVELDB_PUBLIC_INCLUDE_DIR}/c.h"
+  "${LEVELDB_PUBLIC_INCLUDE_DIR}/cache.h"
+  "${LEVELDB_PUBLIC_INCLUDE_DIR}/comparator.h"
+  "${LEVELDB_PUBLIC_INCLUDE_DIR}/db.h"
+  "${LEVELDB_PUBLIC_INCLUDE_DIR}/dumpfile.h"
+  "${LEVELDB_PUBLIC_INCLUDE_DIR}/env.h"
+  "${LEVELDB_PUBLIC_INCLUDE_DIR}/export.h"
+  "${LEVELDB_PUBLIC_INCLUDE_DIR}/filter_policy.h"
+  "${LEVELDB_PUBLIC_INCLUDE_DIR}/iterator.h"
+  "${LEVELDB_PUBLIC_INCLUDE_DIR}/options.h"
+  "${LEVELDB_PUBLIC_INCLUDE_DIR}/slice.h"
+  "${LEVELDB_PUBLIC_INCLUDE_DIR}/status.h"
+  "${LEVELDB_PUBLIC_INCLUDE_DIR}/table_builder.h"
+  "${LEVELDB_PUBLIC_INCLUDE_DIR}/table.h"
+  "${LEVELDB_PUBLIC_INCLUDE_DIR}/write_batch.h"
 )

-if (WIN32)
+if(WIN32)
  target_sources(leveldb
    PRIVATE
-      "util/env_windows.cc"
-      "util/windows_logger.h"
+    "util/env_windows.cc"
+    "util/windows_logger.h"
  )
-else (WIN32)
+else(WIN32)
  target_sources(leveldb
    PRIVATE
-      "util/env_posix.cc"
-      "util/posix_logger.h"
+    "util/env_posix.cc"
+    "util/posix_logger.h"
  )
-endif (WIN32)
+endif(WIN32)

 # MemEnv is not part of the interface and could be pulled to a separate library.
 target_sources(leveldb
  PRIVATE
-    "helpers/memenv/memenv.cc"
-    "helpers/memenv/memenv.h"
+  "helpers/memenv/memenv.cc"
+  "helpers/memenv/memenv.h"
 )

 target_include_directories(leveldb
  PUBLIC
-    $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
-    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
+  $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
+  $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
 )

 set_target_properties(leveldb
@ -242,41 +246,48 @@ set_target_properties(leveldb

 target_compile_definitions(leveldb
  PRIVATE
-    # Used by include/export.h when building shared libraries.
-    LEVELDB_COMPILE_LIBRARY
-    # Used by port/port.h.
-    ${LEVELDB_PLATFORM_NAME}=1
+
+  # Used by include/export.h when building shared libraries.
+  LEVELDB_COMPILE_LIBRARY
+
+  # Used by port/port.h.
+  ${LEVELDB_PLATFORM_NAME}=1
 )
-if (NOT HAVE_CXX17_HAS_INCLUDE)
+
+if(NOT HAVE_CXX17_HAS_INCLUDE)
  target_compile_definitions(leveldb
    PRIVATE
-      LEVELDB_HAS_PORT_CONFIG_H=1
+    LEVELDB_HAS_PORT_CONFIG_H=1
  )
 endif(NOT HAVE_CXX17_HAS_INCLUDE)

 if(BUILD_SHARED_LIBS)
  target_compile_definitions(leveldb
    PUBLIC
-      # Used by include/export.h.
-      LEVELDB_SHARED_LIBRARY
+
+    # Used by include/export.h.
+    LEVELDB_SHARED_LIBRARY
  )
 endif(BUILD_SHARED_LIBS)

 if(HAVE_CLANG_THREAD_SAFETY)
  target_compile_options(leveldb
    PUBLIC
-      -Werror -Wthread-safety)
+    -Werror -Wthread-safety)
 endif(HAVE_CLANG_THREAD_SAFETY)

 if(HAVE_CRC32C)
  target_link_libraries(leveldb crc32c)
 endif(HAVE_CRC32C)
+
 if(HAVE_SNAPPY)
  target_link_libraries(leveldb snappy)
 endif(HAVE_SNAPPY)
+
 if(HAVE_ZSTD)
  target_link_libraries(leveldb zstd)
 endif(HAVE_ZSTD)
+
 if(HAVE_TCMALLOC)
  target_link_libraries(leveldb tcmalloc)
 endif(HAVE_TCMALLOC)
@ -305,60 +316,65 @@ if(LEVELDB_BUILD_TESTS)
  # GoogleTest triggers a missing field initializers warning.
  if(LEVELDB_HAVE_NO_MISSING_FIELD_INITIALIZERS)
    set_property(TARGET gtest
-        APPEND PROPERTY COMPILE_OPTIONS -Wno-missing-field-initializers)
+      APPEND PROPERTY COMPILE_OPTIONS -Wno-missing-field-initializers)
    set_property(TARGET gmock
-        APPEND PROPERTY COMPILE_OPTIONS -Wno-missing-field-initializers)
+      APPEND PROPERTY COMPILE_OPTIONS -Wno-missing-field-initializers)
  endif(LEVELDB_HAVE_NO_MISSING_FIELD_INITIALIZERS)

  add_executable(leveldb_tests "")
  target_sources(leveldb_tests
    PRIVATE
-      # "db/fault_injection_test.cc"
-      # "issues/issue178_test.cc"
-      # "issues/issue200_test.cc"
-      # "issues/issue320_test.cc"
-      "${PROJECT_BINARY_DIR}/${LEVELDB_PORT_CONFIG_DIR}/port_config.h"
-      # "util/env_test.cc"
-      "util/status_test.cc"
-      "util/no_destructor_test.cc"
-      "util/testutil.cc"
-      "util/testutil.h"
+
+    # "db/fault_injection_test.cc"
+    # "issues/issue178_test.cc"
+    # "issues/issue200_test.cc"
+    # "issues/issue320_test.cc"
+    "${PROJECT_BINARY_DIR}/${LEVELDB_PORT_CONFIG_DIR}/port_config.h"
+
+    # "util/env_test.cc"
+    "util/status_test.cc"
+    "util/no_destructor_test.cc"
+    "util/testutil.cc"
+    "util/testutil.h"
  )
+
  if(NOT BUILD_SHARED_LIBS)
    target_sources(leveldb_tests
      PRIVATE
-        "db/autocompact_test.cc"
-        "db/corruption_test.cc"
-        "db/db_test.cc"
-        "db/dbformat_test.cc"
-        "db/filename_test.cc"
-        "db/log_test.cc"
-        "db/recovery_test.cc"
-        "db/skiplist_test.cc"
-        "db/version_edit_test.cc"
-        "db/version_set_test.cc"
-        "db/write_batch_test.cc"
-        "helpers/memenv/memenv_test.cc"
-        "table/filter_block_test.cc"
-        "table/table_test.cc"
-        "util/arena_test.cc"
-        "util/bloom_test.cc"
-        "util/cache_test.cc"
-        "util/coding_test.cc"
-        "util/crc32c_test.cc"
-        "util/hash_test.cc"
-        "util/logging_test.cc"
+      "db/autocompact_test.cc"
+      "db/corruption_test.cc"
+      "db/db_test.cc"
+      "db/dbformat_test.cc"
+      "db/filename_test.cc"
+      "db/log_test.cc"
+      "db/recovery_test.cc"
+      "db/skiplist_test.cc"
+      "db/version_edit_test.cc"
+      "db/version_set_test.cc"
+      "db/write_batch_test.cc"
+      "helpers/memenv/memenv_test.cc"
+      "table/filter_block_test.cc"
+      "table/table_test.cc"
+      "util/arena_test.cc"
+      "util/bloom_test.cc"
+      "util/cache_test.cc"
+      "util/coding_test.cc"
+      "util/crc32c_test.cc"
+      "util/hash_test.cc"
+      "util/logging_test.cc"
    )
  endif(NOT BUILD_SHARED_LIBS)
+
  target_link_libraries(leveldb_tests leveldb gmock gtest gtest_main)
  target_compile_definitions(leveldb_tests
    PRIVATE
-      ${LEVELDB_PLATFORM_NAME}=1
+    ${LEVELDB_PLATFORM_NAME}=1
  )
-  if (NOT HAVE_CXX17_HAS_INCLUDE)
+
+  if(NOT HAVE_CXX17_HAS_INCLUDE)
    target_compile_definitions(leveldb_tests
      PRIVATE
-        LEVELDB_HAS_PORT_CONFIG_H=1
+      LEVELDB_HAS_PORT_CONFIG_H=1
    )
  endif(NOT HAVE_CXX17_HAS_INCLUDE)

@ -370,21 +386,22 @@ if(LEVELDB_BUILD_TESTS)
    add_executable("${test_target_name}" "")
    target_sources("${test_target_name}"
      PRIVATE
-        "${PROJECT_BINARY_DIR}/${LEVELDB_PORT_CONFIG_DIR}/port_config.h"
-        "util/testutil.cc"
-        "util/testutil.h"
+      "${PROJECT_BINARY_DIR}/${LEVELDB_PORT_CONFIG_DIR}/port_config.h"
+      "util/testutil.cc"
+      "util/testutil.h"

-        "${test_file}"
+      "${test_file}"
    )
    target_link_libraries("${test_target_name}" leveldb gmock gtest)
    target_compile_definitions("${test_target_name}"
      PRIVATE
-        ${LEVELDB_PLATFORM_NAME}=1
+      ${LEVELDB_PLATFORM_NAME}=1
    )
-    if (NOT HAVE_CXX17_HAS_INCLUDE)
+
+    if(NOT HAVE_CXX17_HAS_INCLUDE)
      target_compile_definitions("${test_target_name}"
        PRIVATE
-          LEVELDB_HAS_PORT_CONFIG_H=1
+        LEVELDB_HAS_PORT_CONFIG_H=1
      )
    endif(NOT HAVE_CXX17_HAS_INCLUDE)

@ -395,12 +412,12 @@ if(LEVELDB_BUILD_TESTS)

  if(NOT BUILD_SHARED_LIBS)
    # TODO(costan): This test also uses
-    #               "util/env_{posix|windows}_test_helper.h"
-    if (WIN32)
+    # "util/env_{posix|windows}_test_helper.h"
+    if(WIN32)
      leveldb_test("util/env_windows_test.cc")
-    else (WIN32)
+    else(WIN32)
      leveldb_test("util/env_posix_test.cc")
-    endif (WIN32)
+    endif(WIN32)
  endif(NOT BUILD_SHARED_LIBS)
 endif(LEVELDB_BUILD_TESTS)

@ -416,23 +433,24 @@ if(LEVELDB_BUILD_BENCHMARKS)
    add_executable("${bench_target_name}" "")
    target_sources("${bench_target_name}"
      PRIVATE
-        "${PROJECT_BINARY_DIR}/${LEVELDB_PORT_CONFIG_DIR}/port_config.h"
-        "util/histogram.cc"
-        "util/histogram.h"
-        "util/testutil.cc"
-        "util/testutil.h"
+      "${PROJECT_BINARY_DIR}/${LEVELDB_PORT_CONFIG_DIR}/port_config.h"
+      "util/histogram.cc"
+      "util/histogram.h"
+      "util/testutil.cc"
+      "util/testutil.h"

-        "${bench_file}"
+      "${bench_file}"
    )
    target_link_libraries("${bench_target_name}" leveldb gmock gtest benchmark)
    target_compile_definitions("${bench_target_name}"
      PRIVATE
-        ${LEVELDB_PLATFORM_NAME}=1
+      ${LEVELDB_PLATFORM_NAME}=1
    )
-    if (NOT HAVE_CXX17_HAS_INCLUDE)
+
+    if(NOT HAVE_CXX17_HAS_INCLUDE)
      target_compile_definitions("${bench_target_name}"
        PRIVATE
-          LEVELDB_HAS_PORT_CONFIG_H=1
+        LEVELDB_HAS_PORT_CONFIG_H=1
      )
    endif(NOT HAVE_CXX17_HAS_INCLUDE)
  endfunction(leveldb_benchmark)
@ -442,6 +460,7 @@ if(LEVELDB_BUILD_BENCHMARKS)
  endif(NOT BUILD_SHARED_LIBS)

  check_library_exists(sqlite3 sqlite3_open "" HAVE_SQLITE3)
+
  if(HAVE_SQLITE3)
    leveldb_benchmark("benchmarks/db_bench_sqlite3.cc")
    target_link_libraries(db_bench_sqlite3 sqlite3)
@ -460,14 +479,25 @@ int main() {
  delete db;
  return 0;
 }
-  "  HAVE_KYOTOCABINET)
+  " HAVE_KYOTOCABINET)
  set(CMAKE_REQUIRED_LIBRARIES ${OLD_CMAKE_REQURED_LIBRARIES})
+
  if(HAVE_KYOTOCABINET)
    leveldb_benchmark("benchmarks/db_bench_tree_db.cc")
    target_link_libraries(db_bench_tree_db kyotocabinet)
  endif(HAVE_KYOTOCABINET)
 endif(LEVELDB_BUILD_BENCHMARKS)

+# RapidJSON support
+option(LEVELDB_USE_RAPIDJSON "Use RapidJSON for JSON parsing/serialization" ON)
+
+if(LEVELDB_USE_RAPIDJSON)
+  include_directories(
+    "third_party/rapidjson/include"
+  )
+  add_compile_definitions(LEVELDB_RAPIDJSON)
+endif(LEVELDB_USE_RAPIDJSON)
+
 if(LEVELDB_INSTALL)
  install(TARGETS leveldb
    EXPORT leveldbTargets
@ -477,21 +507,21 @@ if(LEVELDB_INSTALL)
  )
  install(
    FILES
-      "${LEVELDB_PUBLIC_INCLUDE_DIR}/c.h"
-      "${LEVELDB_PUBLIC_INCLUDE_DIR}/cache.h"
-      "${LEVELDB_PUBLIC_INCLUDE_DIR}/comparator.h"
-      "${LEVELDB_PUBLIC_INCLUDE_DIR}/db.h"
-      "${LEVELDB_PUBLIC_INCLUDE_DIR}/dumpfile.h"
-      "${LEVELDB_PUBLIC_INCLUDE_DIR}/env.h"
-      "${LEVELDB_PUBLIC_INCLUDE_DIR}/export.h"
-      "${LEVELDB_PUBLIC_INCLUDE_DIR}/filter_policy.h"
-      "${LEVELDB_PUBLIC_INCLUDE_DIR}/iterator.h"
-      "${LEVELDB_PUBLIC_INCLUDE_DIR}/options.h"
-      "${LEVELDB_PUBLIC_INCLUDE_DIR}/slice.h"
-      "${LEVELDB_PUBLIC_INCLUDE_DIR}/status.h"
-      "${LEVELDB_PUBLIC_INCLUDE_DIR}/table_builder.h"
-      "${LEVELDB_PUBLIC_INCLUDE_DIR}/table.h"
-      "${LEVELDB_PUBLIC_INCLUDE_DIR}/write_batch.h"
+    "${LEVELDB_PUBLIC_INCLUDE_DIR}/c.h"
+    "${LEVELDB_PUBLIC_INCLUDE_DIR}/cache.h"
+    "${LEVELDB_PUBLIC_INCLUDE_DIR}/comparator.h"
+    "${LEVELDB_PUBLIC_INCLUDE_DIR}/db.h"
+    "${LEVELDB_PUBLIC_INCLUDE_DIR}/dumpfile.h"
+    "${LEVELDB_PUBLIC_INCLUDE_DIR}/env.h"
+    "${LEVELDB_PUBLIC_INCLUDE_DIR}/export.h"
+    "${LEVELDB_PUBLIC_INCLUDE_DIR}/filter_policy.h"
+    "${LEVELDB_PUBLIC_INCLUDE_DIR}/iterator.h"
+    "${LEVELDB_PUBLIC_INCLUDE_DIR}/options.h"
+    "${LEVELDB_PUBLIC_INCLUDE_DIR}/slice.h"
+    "${LEVELDB_PUBLIC_INCLUDE_DIR}/status.h"
+    "${LEVELDB_PUBLIC_INCLUDE_DIR}/table_builder.h"
+    "${LEVELDB_PUBLIC_INCLUDE_DIR}/table.h"
+    "${LEVELDB_PUBLIC_INCLUDE_DIR}/write_batch.h"
    DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/leveldb"
  )

@ -512,8 +542,8 @@ if(LEVELDB_INSTALL)
  )
  install(
    FILES
-      "${PROJECT_BINARY_DIR}/cmake/${PROJECT_NAME}Config.cmake"
-      "${PROJECT_BINARY_DIR}/cmake/${PROJECT_NAME}ConfigVersion.cmake"
+    "${PROJECT_BINARY_DIR}/cmake/${PROJECT_NAME}Config.cmake"
+    "${PROJECT_BINARY_DIR}/cmake/${PROJECT_NAME}ConfigVersion.cmake"
    DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}"
  )
 endif(LEVELDB_INSTALL)
--- a/third_party/rapidjson
+++ b/third_party/rapidjson
@ -0,0 +1 @@
+Subproject commit 24b5e7a8b27f42fa16b96fc70aade9106cf7102f
--- a/util/btree.h
+++ b/util/btree.h
--- a/util/btree_container.h
+++ b/util/btree_container.h
@ -0,0 +1,302 @@
+// Copyright 2013 Google Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef UTIL_BTREE_BTREE_CONTAINER_H__
+#define UTIL_BTREE_BTREE_CONTAINER_H__
+
+#include <iosfwd>
+#include <utility>
+
+namespace btree {
+
+// A common base class for btree_set, btree_map, btree_multiset and
+// btree_multimap.
+template <typename Tree>
+class btree_container {
+  typedef btree_container<Tree> self_type;
+
+ public:
+  typedef typename Tree::params_type params_type;
+  typedef typename Tree::key_type key_type;
+  typedef typename Tree::value_type value_type;
+  typedef typename Tree::key_compare key_compare;
+  typedef typename Tree::allocator_type allocator_type;
+  typedef typename Tree::pointer pointer;
+  typedef typename Tree::const_pointer const_pointer;
+  typedef typename Tree::reference reference;
+  typedef typename Tree::const_reference const_reference;
+  typedef typename Tree::size_type size_type;
+  typedef typename Tree::difference_type difference_type;
+  typedef typename Tree::iterator iterator;
+  typedef typename Tree::const_iterator const_iterator;
+  typedef typename Tree::reverse_iterator reverse_iterator;
+  typedef typename Tree::const_reverse_iterator const_reverse_iterator;
+
+ public:
+  // Default constructor.
+  btree_container(const key_compare& comp, const allocator_type& alloc)
+      : tree_(comp, alloc) {}
+
+  // Copy constructor.
+  btree_container(const self_type& x) : tree_(x.tree_) {}
+
+  // Iterator routines.
+  iterator begin() { return tree_.begin(); }
+  const_iterator begin() const { return tree_.begin(); }
+  iterator end() { return tree_.end(); }
+  const_iterator end() const { return tree_.end(); }
+  reverse_iterator rbegin() { return tree_.rbegin(); }
+  const_reverse_iterator rbegin() const { return tree_.rbegin(); }
+  reverse_iterator rend() { return tree_.rend(); }
+  const_reverse_iterator rend() const { return tree_.rend(); }
+
+  // Lookup routines.
+  iterator lower_bound(const key_type& key) { return tree_.lower_bound(key); }
+  const_iterator lower_bound(const key_type& key) const {
+    return tree_.lower_bound(key);
+  }
+  iterator upper_bound(const key_type& key) { return tree_.upper_bound(key); }
+  const_iterator upper_bound(const key_type& key) const {
+    return tree_.upper_bound(key);
+  }
+  std::pair<iterator, iterator> equal_range(const key_type& key) {
+    return tree_.equal_range(key);
+  }
+  std::pair<const_iterator, const_iterator> equal_range(
+      const key_type& key) const {
+    return tree_.equal_range(key);
+  }
+
+  // Utility routines.
+  void clear() { tree_.clear(); }
+  void swap(self_type& x) { tree_.swap(x.tree_); }
+  void dump(std::ostream& os) const { tree_.dump(os); }
+  void verify() const { tree_.verify(); }
+
+  // Size routines.
+  size_type size() const { return tree_.size(); }
+  size_type max_size() const { return tree_.max_size(); }
+  bool empty() const { return tree_.empty(); }
+  size_type height() const { return tree_.height(); }
+  size_type internal_nodes() const { return tree_.internal_nodes(); }
+  size_type leaf_nodes() const { return tree_.leaf_nodes(); }
+  size_type nodes() const { return tree_.nodes(); }
+  size_type bytes_used() const { return tree_.bytes_used(); }
+  static double average_bytes_per_value() {
+    return Tree::average_bytes_per_value();
+  }
+  double fullness() const { return tree_.fullness(); }
+  double overhead() const { return tree_.overhead(); }
+
+  bool operator==(const self_type& x) const {
+    if (size() != x.size()) {
+      return false;
+    }
+    for (const_iterator i = begin(), xi = x.begin(); i != end(); ++i, ++xi) {
+      if (*i != *xi) {
+        return false;
+      }
+    }
+    return true;
+  }
+
+  bool operator!=(const self_type& other) const { return !operator==(other); }
+
+ protected:
+  Tree tree_;
+};
+
+template <typename T>
+inline std::ostream& operator<<(std::ostream& os, const btree_container<T>& b) {
+  b.dump(os);
+  return os;
+}
+
+// A common base class for btree_set and safe_btree_set.
+template <typename Tree>
+class btree_unique_container : public btree_container<Tree> {
+  typedef btree_unique_container<Tree> self_type;
+  typedef btree_container<Tree> super_type;
+
+ public:
+  typedef typename Tree::key_type key_type;
+  typedef typename Tree::value_type value_type;
+  typedef typename Tree::size_type size_type;
+  typedef typename Tree::key_compare key_compare;
+  typedef typename Tree::allocator_type allocator_type;
+  typedef typename Tree::iterator iterator;
+  typedef typename Tree::const_iterator const_iterator;
+
+ public:
+  // Default constructor.
+  btree_unique_container(const key_compare& comp = key_compare(),
+                         const allocator_type& alloc = allocator_type())
+      : super_type(comp, alloc) {}
+
+  // Copy constructor.
+  btree_unique_container(const self_type& x) : super_type(x) {}
+
+  // Range constructor.
+  template <class InputIterator>
+  btree_unique_container(InputIterator b, InputIterator e,
+                         const key_compare& comp = key_compare(),
+                         const allocator_type& alloc = allocator_type())
+      : super_type(comp, alloc) {
+    insert(b, e);
+  }
+
+  // Lookup routines.
+  iterator find(const key_type& key) { return this->tree_.find_unique(key); }
+  const_iterator find(const key_type& key) const {
+    return this->tree_.find_unique(key);
+  }
+  size_type count(const key_type& key) const {
+    return this->tree_.count_unique(key);
+  }
+
+  // Insertion routines.
+  std::pair<iterator, bool> insert(const value_type& x) {
+    return this->tree_.insert_unique(x);
+  }
+  iterator insert(iterator position, const value_type& x) {
+    return this->tree_.insert_unique(position, x);
+  }
+  template <typename InputIterator>
+  void insert(InputIterator b, InputIterator e) {
+    this->tree_.insert_unique(b, e);
+  }
+
+  // Deletion routines.
+  int erase(const key_type& key) { return this->tree_.erase_unique(key); }
+  // Erase the specified iterator from the btree. The iterator must be valid
+  // (i.e. not equal to end()).  Return an iterator pointing to the node after
+  // the one that was erased (or end() if none exists).
+  iterator erase(const iterator& iter) { return this->tree_.erase(iter); }
+  void erase(const iterator& first, const iterator& last) {
+    this->tree_.erase(first, last);
+  }
+};
+
+// A common base class for btree_map and safe_btree_map.
+template <typename Tree>
+class btree_map_container : public btree_unique_container<Tree> {
+  typedef btree_map_container<Tree> self_type;
+  typedef btree_unique_container<Tree> super_type;
+
+ public:
+  typedef typename Tree::key_type key_type;
+  typedef typename Tree::data_type data_type;
+  typedef typename Tree::value_type value_type;
+  typedef typename Tree::mapped_type mapped_type;
+  typedef typename Tree::key_compare key_compare;
+  typedef typename Tree::allocator_type allocator_type;
+
+ private:
+  // A pointer-like object which only generates its value when
+  // dereferenced. Used by operator[] to avoid constructing an empty data_type
+  // if the key already exists in the map.
+  struct generate_value {
+    generate_value(const key_type& k) : key(k) {}
+    value_type operator*() const { return std::make_pair(key, data_type()); }
+    const key_type& key;
+  };
+
+ public:
+  // Default constructor.
+  btree_map_container(const key_compare& comp = key_compare(),
+                      const allocator_type& alloc = allocator_type())
+      : super_type(comp, alloc) {}
+
+  // Copy constructor.
+  btree_map_container(const self_type& x) : super_type(x) {}
+
+  // Range constructor.
+  template <class InputIterator>
+  btree_map_container(InputIterator b, InputIterator e,
+                      const key_compare& comp = key_compare(),
+                      const allocator_type& alloc = allocator_type())
+      : super_type(b, e, comp, alloc) {}
+
+  // Insertion routines.
+  data_type& operator[](const key_type& key) {
+    return this->tree_.insert_unique(key, generate_value(key)).first->second;
+  }
+};
+
+// A common base class for btree_multiset and btree_multimap.
+template <typename Tree>
+class btree_multi_container : public btree_container<Tree> {
+  typedef btree_multi_container<Tree> self_type;
+  typedef btree_container<Tree> super_type;
+
+ public:
+  typedef typename Tree::key_type key_type;
+  typedef typename Tree::value_type value_type;
+  typedef typename Tree::size_type size_type;
+  typedef typename Tree::key_compare key_compare;
+  typedef typename Tree::allocator_type allocator_type;
+  typedef typename Tree::iterator iterator;
+  typedef typename Tree::const_iterator const_iterator;
+
+ public:
+  // Default constructor.
+  btree_multi_container(const key_compare& comp = key_compare(),
+                        const allocator_type& alloc = allocator_type())
+      : super_type(comp, alloc) {}
+
+  // Copy constructor.
+  btree_multi_container(const self_type& x) : super_type(x) {}
+
+  // Range constructor.
+  template <class InputIterator>
+  btree_multi_container(InputIterator b, InputIterator e,
+                        const key_compare& comp = key_compare(),
+                        const allocator_type& alloc = allocator_type())
+      : super_type(comp, alloc) {
+    insert(b, e);
+  }
+
+  // Lookup routines.
+  iterator find(const key_type& key) { return this->tree_.find_multi(key); }
+  const_iterator find(const key_type& key) const {
+    return this->tree_.find_multi(key);
+  }
+  size_type count(const key_type& key) const {
+    return this->tree_.count_multi(key);
+  }
+
+  // Insertion routines.
+  iterator insert(const value_type& x) { return this->tree_.insert_multi(x); }
+  iterator insert(iterator position, const value_type& x) {
+    return this->tree_.insert_multi(position, x);
+  }
+  template <typename InputIterator>
+  void insert(InputIterator b, InputIterator e) {
+    this->tree_.insert_multi(b, e);
+  }
+
+  // Deletion routines.
+  int erase(const key_type& key) { return this->tree_.erase_multi(key); }
+  // Erase the specified iterator from the btree. The iterator must be valid
+  // (i.e. not equal to end()).  Return an iterator pointing to the node after
+  // the one that was erased (or end() if none exists).
+  iterator erase(const iterator& iter) { return this->tree_.erase(iter); }
+  void erase(const iterator& first, const iterator& last) {
+    this->tree_.erase(first, last);
+  }
+};
+
+}  // namespace btree
+
+#endif  // UTIL_BTREE_BTREE_CONTAINER_H__
--- a/util/btree_map.h
+++ b/util/btree_map.h
@ -0,0 +1,117 @@
+// Copyright 2013 Google Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// A btree_map<> implements the STL unique sorted associative container
+// interface and the pair associative container interface (a.k.a map<>) using a
+// btree. A btree_multimap<> implements the STL multiple sorted associative
+// container interface and the pair associtive container interface (a.k.a
+// multimap<>) using a btree. See btree.h for details of the btree
+// implementation and caveats.
+
+#ifndef UTIL_BTREE_BTREE_MAP_H__
+#define UTIL_BTREE_BTREE_MAP_H__
+
+#include <functional>
+#include <memory>
+#include <utility>
+
+#include "btree.h"
+#include "btree_container.h"
+
+namespace btree {
+
+// The btree_map class is needed mainly for its constructors.
+template <typename Key, typename Value, typename Compare = std::less<Key>,
+          typename Alloc = std::allocator<std::pair<const Key, Value> >,
+          int TargetNodeSize = 256>
+class btree_map
+    : public btree_map_container<btree<
+          btree_map_params<Key, Value, Compare, Alloc, TargetNodeSize> > > {
+  typedef btree_map<Key, Value, Compare, Alloc, TargetNodeSize> self_type;
+  typedef btree_map_params<Key, Value, Compare, Alloc, TargetNodeSize>
+      params_type;
+  typedef btree<params_type> btree_type;
+  typedef btree_map_container<btree_type> super_type;
+
+ public:
+  typedef typename btree_type::key_compare key_compare;
+  typedef typename btree_type::allocator_type allocator_type;
+
+ public:
+  // Default constructor.
+  btree_map(const key_compare& comp = key_compare(),
+            const allocator_type& alloc = allocator_type())
+      : super_type(comp, alloc) {}
+
+  // Copy constructor.
+  btree_map(const self_type& x) : super_type(x) {}
+
+  // Range constructor.
+  template <class InputIterator>
+  btree_map(InputIterator b, InputIterator e,
+            const key_compare& comp = key_compare(),
+            const allocator_type& alloc = allocator_type())
+      : super_type(b, e, comp, alloc) {}
+};
+
+template <typename K, typename V, typename C, typename A, int N>
+inline void swap(btree_map<K, V, C, A, N>& x, btree_map<K, V, C, A, N>& y) {
+  x.swap(y);
+}
+
+// The btree_multimap class is needed mainly for its constructors.
+template <typename Key, typename Value, typename Compare = std::less<Key>,
+          typename Alloc = std::allocator<std::pair<const Key, Value> >,
+          int TargetNodeSize = 256>
+class btree_multimap
+    : public btree_multi_container<btree<
+          btree_map_params<Key, Value, Compare, Alloc, TargetNodeSize> > > {
+  typedef btree_multimap<Key, Value, Compare, Alloc, TargetNodeSize> self_type;
+  typedef btree_map_params<Key, Value, Compare, Alloc, TargetNodeSize>
+      params_type;
+  typedef btree<params_type> btree_type;
+  typedef btree_multi_container<btree_type> super_type;
+
+ public:
+  typedef typename btree_type::key_compare key_compare;
+  typedef typename btree_type::allocator_type allocator_type;
+  typedef typename btree_type::data_type data_type;
+  typedef typename btree_type::mapped_type mapped_type;
+
+ public:
+  // Default constructor.
+  btree_multimap(const key_compare& comp = key_compare(),
+                 const allocator_type& alloc = allocator_type())
+      : super_type(comp, alloc) {}
+
+  // Copy constructor.
+  btree_multimap(const self_type& x) : super_type(x) {}
+
+  // Range constructor.
+  template <class InputIterator>
+  btree_multimap(InputIterator b, InputIterator e,
+                 const key_compare& comp = key_compare(),
+                 const allocator_type& alloc = allocator_type())
+      : super_type(b, e, comp, alloc) {}
+};
+
+template <typename K, typename V, typename C, typename A, int N>
+inline void swap(btree_multimap<K, V, C, A, N>& x,
+                 btree_multimap<K, V, C, A, N>& y) {
+  x.swap(y);
+}
+
+}  // namespace btree
+
+#endif  // UTIL_BTREE_BTREE_MAP_H__
				`@ -0,0 +1 @@`
				`Subproject commit 24b5e7a8b27f42fa16b96fc70aade9106cf7102f`