api/leveldb: Bug fix

Author: rockeet

Makefile

@@ -153,11 +153,11 @@ override CXXFLAGS += ${extf}
 #override CXXFLAGS += -g3
 #CXXFLAGS += -fnothrow-opt
 
-override INCS += -I${BDB_HOME}/include
-override INCS += -I/opt/include
 override INCS += -Iapi/leveldb/leveldb/include
 override INCS += -Iapi/leveldb/leveldb
 override INCS += -Iapi/leveldb
+override INCS += -I${BDB_HOME}/include
+override INCS += -I/opt/include
 override LIBS += -L${BDB_HOME}/lib
 override LIBS += -L/opt/lib
 
@@ -249,6 +249,7 @@ pkg: ${TerarkDB_d} ${TerarkDB_r}
 	mkdir -p ${TarBall}/include/terark/io
 	mkdir -p ${TarBall}/include/terark/thread
 	mkdir -p ${TarBall}/include/terark/util
+	mkdir -p ${TarBall}/api/leveldb/include
 ifeq (${PKG_WITH_DBG},1)
 	cp    ${TerarkDB_d} ${TarBall}/lib
 	ln -s lib${TerarkDB_lib}-${COMPILER}-d${DLL_SUFFIX} ${TarBall}/lib/lib${TerarkDB_lib}-d${DLL_SUFFIX}
@@ -268,6 +269,7 @@ endif
 	cp    terark-base/src/terark/io/*.hpp     ${TarBall}/include/terark/io
 	cp    terark-base/src/terark/thread/*.hpp ${TarBall}/include/terark/thread
 	cp    terark-base/src/terark/util/*.hpp   ${TarBall}/include/terark/util
+	cp -r api/leveldb/leveldb/include/*.h     ${TarBall}/api/leveldb/include
 	ln -s lib${TerarkDB_lib}-${COMPILER}-r${DLL_SUFFIX} ${TarBall}/lib/lib${TerarkDB_lib}-r${DLL_SUFFIX}
 	ln -s libterark-fsa_all-${COMPILER}-r${DLL_SUFFIX}  ${TarBall}/lib/libterark-fsa_all-r${DLL_SUFFIX}
 	echo $(shell date "+%Y-%m-%d %H:%M:%S") > ${TarBall}/package.buildtime.txt

api/leveldb/basho/perf_count.h

@@ -23,7 +23,7 @@
 #ifndef STORAGE_LEVELDB_INCLUDE_PERF_COUNT_H_
 #define STORAGE_LEVELDB_INCLUDE_PERF_COUNT_H_
 
-#include "leveldb_terark_config.h"
+#include <leveldb/leveldb_terark_config.h>
 
 #include <stdint.h>
 #include <string>

api/leveldb/hyperleveldb/replay_iterator.h

@@ -5,7 +5,7 @@
 #ifndef STORAGE_LEVELDB_INCLUDE_REPLAY_ITERATOR_H_
 #define STORAGE_LEVELDB_INCLUDE_REPLAY_ITERATOR_H_
 
-#include "leveldb_terark_config.h"
+#include <leveldb/leveldb_terark_config.h>
 
 #include "slice.h"
 #include "status.h"

api/leveldb/leveldb/include/leveldb_terark_config.h api/leveldb/leveldb/include/leveldb/leveldb_terark_config.h

@@ -242,7 +242,7 @@ encodeKeyVal(terark::valvec<unsigned char>& buf,
 	buf.erase_all();
 	aligned_save(buf.grow_no_init(4), uint32_t(key.size()));
 	buf.append((unsigned char*)key.begin(), key.size());
-	unaligned_save(buf.grow_no_init(4), uint32_t(val.size()));
+//	unaligned_save(buf.grow_no_init(4), uint32_t(val.size()));
 	buf.append((unsigned char*)val.begin(), val.size());
 };
 
@@ -350,6 +350,9 @@ DbImpl::Get(const ReadOptions& options, const Slice& key, std::string* value) {
 	  auto recId = ctx->exactMatchRecIdvec[0];
 	  try {
 		  ctx->selectOneColgroup(recId, 1, &ctx->userBuf);
+	//	  fprintf(stderr
+	//		, "DEBUG: recId=%lld, colgroup[1]={size=%zd, content=%.*s}\n"
+	//		, recId, ctx->userBuf.size(), (int)ctx->userBuf.size(), ctx->userBuf.data());
 		  value->resize(0);
 		  value->append((char*)ctx->userBuf.data(), ctx->userBuf.size());
 		  return Status::OK();
@@ -535,6 +538,7 @@ terark::db::DbContext* DbImpl::GetDbContext() {
 
 IteratorImpl::IteratorImpl(terark::db::CompositeTable *db) {
 	m_tab = db;
+	m_ctx = db->createDbContext();
 	m_recId = -1;
 	m_valid = false;
 	m_direction = Direction::forward;

api/leveldb/leveldb_terark.cc

@@ -28,7 +28,7 @@
 #ifndef _INCLUDE_LEVELDB_WT_H
 #define _INCLUDE_LEVELDB_WT_H 1
 
-#include "leveldb_terark_config.h"
+#include <leveldb/leveldb_terark_config.h>
 
 #include <thread>
 #include "leveldb/cache.h"

api/leveldb/leveldb_terark.h

@@ -22,6 +22,7 @@ cp ../../src/terark/db/db_index.hpp          ${TarBall}/include/terark/db
 cp ../../src/terark/db/db_store.hpp          ${TarBall}/include/terark/db
 cp ../../src/terark/db/db_segment.hpp        ${TarBall}/include/terark/db
 cp ../../src/terark/db/db_table.hpp          ${TarBall}/include/terark/db
+cp ../../src/terark/db/db_dll_decl.hpp       ${TarBall}/include/terark/db
 cp ../../terark-base/src/terark/*.hpp        ${TarBall}/include/terark
 cp ../../terark-base/src/terark/io/*.hpp     ${TarBall}/include/terark/io
 cp ../../terark-base/src/terark/thread/*.hpp ${TarBall}/include/terark/thread