Merge 29fb4fe into 64814a4

vinniefalco · Sep 2, 2016 · 8bd4f6d · 8bd4f6d
2 parents 64814a4 + 29fb4fe
commit 8bd4f6d
Show file tree

Hide file tree

Showing 55 changed files with 2,624 additions and 1,321 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+bin/
+bin64/
diff --git a/.travis.yml b/.travis.yml
@@ -27,6 +27,8 @@ packages: &gcc5_pkgs
   - automake
   - autotools-dev
   - libc6-dbg
+  # Needed to build rocksdb
+  - libsnappy-dev
 
 matrix:
   include:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,17 @@
+1.0.0-b4
+
+* Improved test coverage
+* Use master branch for codecov badge
+* Throw on API calls when no database open
+* Benchmarks vs. RocksDB
+
+### API Changes:
+
+* `insert` sets `error::key_exists` instead of returning `false`
+* `fetch` sets `error::key_not_found` instead of returning `false`
+
+---
+
 1.0.0-b3
 
 * Tune buffer sizes for performance

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -68,16 +68,19 @@ include_directories (
     extras/beast/extras
     )
 
-file (GLOB_RECURSE NUDB_INCLUDES
-    ${PROJECT_SOURCE_DIR}/include/nudb/*.hpp
-    ${PROJECT_SOURCE_DIR}/include/nudb/*.ipp
-    ${PROJECT_SOURCE_DIR}/extras/nudb/*.hpp
-)
-
 file (GLOB_RECURSE BEAST_INCLUDES
     ${PROJECT_SOURCE_DIR}/extras/beast/extras/beast/unit_test/*.hpp
     ${PROJECT_SOURCE_DIR}/extras/beast/extras/beast/unit_test/*.ipp
 )
 
-add_subdirectory (tool)
+file (GLOB_RECURSE EXTRAS_INCLUDES
+    ${PROJECT_SOURCE_DIR}/extras/nudb/*
+)
+
+file (GLOB_RECURSE NUDB_INCLUDES
+    ${PROJECT_SOURCE_DIR}/include/nudb/*
+)
+
+add_subdirectory (bench)
 add_subdirectory (test)
+add_subdirectory (tools)
diff --git a/Jamroot b/Jamroot
@@ -87,5 +87,6 @@ project nudb
     build-dir bin
   ;
 
+build-project bench ;
 build-project test ;
-#build-project tool ;
+build-project tools ;
diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 
 [![Join the chat at https://gitter.im/vinniefalco/NuDB](https://badges.gitter.im/vinniefalco/NuDB.svg)](https://gitter.im/vinniefalco/NuDB?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Build Status]
 (https://travis-ci.org/vinniefalco/NuDB.svg?branch=master)](https://travis-ci.org/vinniefalco/NuDB) [![codecov]
-(https://codecov.io/gh/vinniefalco/NuDB/branch/develop/graph/badge.svg)](https://codecov.io/gh/vinniefalco/NuDB) [![coveralls]
+(https://codecov.io/gh/vinniefalco/NuDB/branch/master/graph/badge.svg)](https://codecov.io/gh/vinniefalco/NuDB) [![coveralls]
 (https://coveralls.io/repos/github/vinniefalco/NuDB/badge.svg?branch=master)](https://coveralls.io/github/vinniefalco/NuDB?branch=master) [![Documentation]
 (https://img.shields.io/badge/documentation-master-brightgreen.svg)](http://vinniefalco.github.io/nudb/) [![License]
 (https://img.shields.io/badge/license-boost-brightgreen.svg)](LICENSE_1_0.txt)
@@ -102,12 +102,14 @@ The files in the repository are laid out thusly:
 
 ```
 ./
+    bench/          Holds the benchmark sources and scripts
     bin/            Holds executables and project files
     bin64/          Holds 64-bit Windows executables and project files
     include/        Add this to your compiler includes
         nudb/
     extras/         Additional APIs, may change
     test/           Unit tests and benchmarks
+    tools/          Holds the command line tool sources
 ```
 
 ## Algorithm