Integrate roachlib with storage/engine.

.dockerignore

@@ -1,6 +1,4 @@
 _vendor
-roachlib/*.o
-roachlib/*.a
 proto/*.pb.go
 proto/lib/*
 proto/lib/github.com/gogo/protobuf/gogoproto/*

Makefile

@@ -34,7 +34,6 @@ export CPLUS_INCLUDE_PATH := $(CURDIR)/_vendor/usr/include:$(CPLUS_INCLUDE_PATH)
 export LIBRARY_PATH := $(CURDIR)/_vendor/usr/lib:$(LIBRARY_PATH)
 
 ROACH_PROTO := proto
-ROACH_LIB   := roachlib
 SQL_PARSER  := sql/parser
 
 PKG        := "./..."
@@ -59,7 +58,7 @@ endif
 
 all: build test
 
-auxiliary: storage/engine/engine.pc roach_proto roach_lib sqlparser
+auxiliary: storage/engine/engine.pc roach_proto sqlparser
 
 build: auxiliary
 	cd _vendor/src/github.com/coreos/etcd/raft ; $(GO) install $(GOFLAGS)
@@ -71,9 +70,6 @@ storage/engine/engine.pc: storage/engine/engine.pc.in
 roach_proto:
 	make -C $(ROACH_PROTO) static_lib
 
-roach_lib: roach_proto
-	make -C $(ROACH_LIB) static_lib
-
 sqlparser:
 	make -C $(SQL_PARSER)
 
@@ -117,11 +113,10 @@ acceptance:
 	  ./local-cluster.sh stop)
 
 clean:
-	$(GO) clean
+	$(GO) clean -i -r ./...
 	find . -name '*.test' -type f -exec rm -f {} \;
 	rm -f storage/engine/engine.pc
 	make -C $(ROACH_PROTO) clean
-	make -C $(ROACH_LIB) clean
 	make -C $(SQL_PARSER) clean
 
 # The gopath target outputs the GOPATH that should be used for building this

githooks/post-checkout

@@ -1,4 +1,3 @@
 #!/bin/bash
 cd "$(git rev-parse --show-toplevel)"
 (cd proto; make clean) > /dev/null 2>&1
-(cd roachlib; make clean) > /dev/null 2>&1

proto/internal.proto

@@ -163,7 +163,7 @@ message InternalTruncateLogResponse {
 
 // A ReadWriteCmdResponse is a union type containing instances of all
 // mutating commands. Note that any entry added here must be handled
-// in roachlib/db.cc in GetResponseHeader().
+// in storage/engine/db.cc in GetResponseHeader().
 message ReadWriteCmdResponse {
   option (gogoproto.onlyone) = true;
   optional PutResponse put = 1;

storage/engine/engine.go

@@ -101,8 +101,7 @@ type Engine interface {
 	// (stored as byte slices with a special tag on the proto.Value) are
 	// combined with specialized logic beyond that of simple byte slices.
 	//
-	// The logic for merges is written in our C++ "roachlib" library in order to
-	// be compatible with RocksDB.
+	// The logic for merges is written in db.cc in order to be compatible with RocksDB.
 	Merge(key proto.EncodedKey, value []byte) error
 	// Capacity returns capacity details for the engine's available storage.
 	Capacity() (StoreCapacity, error)

storage/engine/engine.pc.in

@@ -4,5 +4,5 @@ Name: Cockroach
 Description: Cockroach Engine Dependencies
 Version: 0.1
 Requires: 
-Libs: -L${prefix}/_vendor/usr/lib -L${prefix}/_vendor/rocksdb  -L${prefix}/proto/lib -L${prefix}/roachlib -lroach -lrocksdb -lstdc++ -lm -lz -lbz2 -lsnappy -lroachproto -lprotobuf @LDEXTRA@
-Cflags: -I${prefix}/_vendor/usr/include -I${prefix}/_vendor/rocksdb/include -I${prefix}/proto/lib -I${prefix}/roachlib
+Libs: -L${prefix}/_vendor/usr/lib -L${prefix}/_vendor/rocksdb  -L${prefix}/proto/lib -lrocksdb -lstdc++ -lm -lz -lbz2 -lsnappy -lroachproto -lprotobuf @LDEXTRA@
+Cflags: -I${prefix}/_vendor/usr/include -I${prefix}/_vendor/rocksdb/include -I${prefix}/proto/lib

storage/engine/keys.go

@@ -345,7 +345,7 @@ var (
 	// command responses used to guarantee idempotency (see
 	// ResponseCache).
 	// NOTE: if this value changes, it must be updated in C++
-	// (roachlib/db.cc).
+	// (storage/engine/db.cc).
 	KeyLocalResponseCacheSuffix = proto.Key("res-")
 
 	// KeyLocalRangeKeyPrefix is the prefix identifying per-range data
@@ -364,7 +364,7 @@ var (
 	// KeyLocalTransactionSuffix specifies the key suffix for
 	// transaction records. The additional detail is the transaction id.
 	// NOTE: if this value changes, it must be updated in C++
-	// (roachlib/db.cc).
+	// (storage/engine/db.cc).
 	KeyLocalTransactionSuffix = proto.Key("txn-")
 
 	// KeyLocalMax is the end of the local key range.

storage/engine/rocksdb.go

@@ -20,6 +20,7 @@
 
 package engine
 
+// #cgo CXXFLAGS: -std=c++11
 // #cgo pkg-config: ./engine.pc
 // #include <stdlib.h>
 // #include "db.h"