Merge pull request #128 from cockroachdb/pmattis/roachlib

Provide our own C interface to rocksdb.
cockroachdb · Oct 17, 2014 · c829bc5 · c829bc5
2 parents d46ccc5 + 8be8538
commit c829bc5
Show file tree

Hide file tree

Showing 15 changed files with 934 additions and 876 deletions.
diff --git a/roachlib/Makefile b/roachlib/Makefile
@@ -17,7 +17,7 @@
 # Author: Andrew Bonventre ([email protected])
 
 ROACH_LIB := libroach.a
-SOURCES   := compaction.cc merge.cc
+SOURCES   := db.cc
 OBJECTS   := $(SOURCES:.cc=.o)
 
 CXXFLAGS += -std=c++11 -I../proto/lib -I../_vendor/rocksdb/include

diff --git a/roachlib/compaction.cc b/roachlib/compaction.cc