add include/tera.h #964

baidu · Aug 16, 2016 · ddff2d0 · ddff2d0
1 parent dd23441
commit ddff2d0
Show file tree

Hide file tree

Showing 33 changed files with 33 additions and 33 deletions.
diff --git a/Makefile b/Makefile
@@ -85,7 +85,7 @@ all: $(PROGRAM) $(LIBRARY) $(SOLIBRARY) $(TERA_C_SO) $(JNILIBRARY) $(BENCHMARK)
 	cp $(LIBRARY) $(SOLIBRARY) $(TERA_C_SO) $(JNILIBRARY) build/lib
 	cp src/leveldb/tera_bench .
 	cp -r benchmark/*.sh $(BENCHMARK) build/benchmark
-	cp src/sdk/tera.h build/include
+	cp -r include build/
 	cp -r conf build
 	echo 'Done'
 

diff --git a/src/sdk/tera.h → include/tera.h b/src/sdk/tera.h → include/tera.h
diff --git a/src/sdk/tera_c.h → include/tera_c.h b/src/sdk/tera_c.h → include/tera_c.h
diff --git a/src/benchmark/mark.h b/src/benchmark/mark.h
@@ -17,7 +17,7 @@
 #include <glog/logging.h>
 
 #include "common/mutex.h"
-#include "sdk/tera.h"
+#include "tera.h"
 #include "utils/counter.h"
 
 DECLARE_int64(pend_size);

diff --git a/src/monitor/teramo_main.cc b/src/monitor/teramo_main.cc
@@ -17,7 +17,7 @@
 #include "common/file/file_path.h"
 #include "proto/monitor.pb.h"
 #include "proto/tabletnode.pb.h"
-#include "sdk/tera.h"
+#include "tera.h"
 #include "utils/utils_cmd.h"
 #include "utils/timer.h"
 

diff --git a/src/sample/tera_row_txn_sample.cc b/src/sample/tera_row_txn_sample.cc
@@ -1,4 +1,4 @@
-#include "sdk/tera.h"
+#include "tera.h"
 
 int main() {
     tera::ErrorCode error_code;

diff --git a/src/sample/tera_sample.cc b/src/sample/tera_sample.cc
@@ -19,7 +19,7 @@
 #include <time.h>
 #include <unistd.h>
 
-#include "sdk/tera.h"
+#include "tera.h"
 
 /// 创建一个表格
 int CreateTable(tera::Client* client) {

diff --git a/src/sdk/client_impl.h b/src/sdk/client_impl.h
@@ -9,7 +9,7 @@
 #include "proto/master_rpc.pb.h"
 #include "proto/tabletnode_client.h"
 #include "sdk/sdk_zk.h"
-#include "sdk/tera.h"
+#include "tera.h"
 #include "utils/timer.h"
 
 using std::string;

diff --git a/src/sdk/http/http.cc b/src/sdk/http/http.cc
@@ -12,7 +12,7 @@
 #include "sofa/pbrpc/pbrpc.h"
 
 #include "proto/http.pb.h"
-#include "sdk/tera.h"
+#include "tera.h"
 #include "utils/counter.h"
 
 DECLARE_int32(tera_http_ctrl_thread_num);

diff --git a/src/sdk/java/native-src/jni_tera_client.cc b/src/sdk/java/native-src/jni_tera_client.cc
@@ -9,8 +9,8 @@
 
 #include "glog/logging.h"
 
-#include "sdk/tera.h"
 #include "sdk/sdk_utils.h"
+#include "tera.h"
 
 #define NativeNewClient \
     JNICALL Java_com_baidu_tera_client_TeraClientImpl_nativeNewClient

diff --git a/src/sdk/java/native-src/jni_tera_common.h b/src/sdk/java/native-src/jni_tera_common.h
@@ -12,7 +12,7 @@
 #include <map>
 #include <string>
 
-#include "sdk/tera.h"
+#include "tera.h"
 
 void SendErrorJ(JNIEnv *env, jobject jobj, std::string msg);
 

diff --git a/src/sdk/java/native-src/jni_tera_mutation.cc b/src/sdk/java/native-src/jni_tera_mutation.cc
@@ -6,7 +6,7 @@
 #include "jni_tera_mutation.h"
 #include "jni_tera_common.h"
 
-#include "sdk/tera.h"
+#include "tera.h"
 
 #define NativeAdd \
     JNICALL Java_com_baidu_tera_client_TeraMutationImpl_nativeAdd

diff --git a/src/sdk/java/native-src/jni_tera_reader.cc b/src/sdk/java/native-src/jni_tera_reader.cc
@@ -6,7 +6,7 @@
 #include "jni_tera_reader.h"
 #include "jni_tera_common.h"
 
-#include "sdk/tera.h"
+#include "tera.h"
 
 #define NativeAddColumn \
     JNICALL Java_com_baidu_tera_client_TeraReaderImpl_nativeAddColumn

diff --git a/src/sdk/java/native-src/jni_tera_result_stream.cc b/src/sdk/java/native-src/jni_tera_result_stream.cc
@@ -6,7 +6,7 @@
 #include "jni_tera_result_stream.h"
 #include "jni_tera_common.h"
 
-#include "sdk/tera.h"
+#include "tera.h"
 
 #define NativeDone \
     JNICALL Java_com_baidu_tera_client_ScanResultStreamImpl_nativeDone

diff --git a/src/sdk/java/native-src/jni_tera_scan.cc b/src/sdk/java/native-src/jni_tera_scan.cc
@@ -6,7 +6,7 @@
 #include "jni_tera_scan.h"
 #include "jni_tera_common.h"
 
-#include "sdk/tera.h"
+#include "tera.h"
 
 #define NativeNewScanDesc \
     JNICALL Java_com_baidu_tera_client_TeraScanImpl_nativeNewScanDesc

diff --git a/src/sdk/java/native-src/jni_tera_table.cc b/src/sdk/java/native-src/jni_tera_table.cc
@@ -10,7 +10,7 @@
 
 #include "glog/logging.h"
 
-#include "sdk/tera.h"
+#include "tera.h"
 
 #define NativePut \
     JNICALL Java_com_baidu_tera_client_TeraTableImpl_nativePut

diff --git a/src/sdk/mutate.cc b/src/sdk/mutate.cc
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include "sdk/mutate_impl.h"
-#include "sdk/tera.h"
+#include "tera.h"
 
 namespace tera {
 

diff --git a/src/sdk/mutate_impl.h b/src/sdk/mutate_impl.h
@@ -11,7 +11,7 @@
 #include "common/mutex.h"
 #include "proto/tabletnode_rpc.pb.h"
 #include "sdk/sdk_task.h"
-#include "sdk/tera.h"
+#include "tera.h"
 #include "types.h"
 #include "utils/timer.h"
 

diff --git a/src/sdk/read.cc b/src/sdk/read.cc
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include "sdk/read_impl.h"
-#include "sdk/tera.h"
+#include "tera.h"
 
 namespace tera {
 

diff --git a/src/sdk/read_impl.h b/src/sdk/read_impl.h
@@ -11,7 +11,7 @@
 #include "common/mutex.h"
 #include "proto/tabletnode_rpc.pb.h"
 #include "sdk/sdk_task.h"
-#include "sdk/tera.h"
+#include "tera.h"
 #include "types.h"
 #include "utils/timer.h"
 

diff --git a/src/sdk/scan.cc b/src/sdk/scan.cc
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include "sdk/scan_impl.h"
-#include "sdk/tera.h"
+#include "tera.h"
 
 namespace tera {
 

diff --git a/src/sdk/scan_impl.h b/src/sdk/scan_impl.h
@@ -14,7 +14,7 @@
 #include "common/thread.h"
 #include "proto/tabletnode_rpc.pb.h"
 #include "sdk/sdk_task.h"
-#include "sdk/tera.h"
+#include "tera.h"
 #include "types.h"
 #include "utils/timer.h"
 

diff --git a/src/sdk/schema.cc b/src/sdk/schema.cc
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include "sdk/schema_impl.h"
-#include "sdk/tera.h"
+#include "tera.h"
 
 namespace tera {
 

diff --git a/src/sdk/schema_impl.h b/src/sdk/schema_impl.h
@@ -8,7 +8,7 @@
 #include <string>
 
 #include "proto/table_meta.pb.h"
-#include "sdk/tera.h"
+#include "tera.h"
 
 namespace tera {
 

diff --git a/src/sdk/sdk_task.h b/src/sdk/sdk_task.h
@@ -17,7 +17,7 @@
 #include "common/thread_pool.h"
 
 #include "proto/table_meta.pb.h"
-#include "sdk/tera.h"
+#include "tera.h"
 
 namespace tera {
 

diff --git a/src/sdk/sdk_utils.h b/src/sdk/sdk_utils.h
@@ -8,7 +8,7 @@
 #define  TERA_SDK_SDK_UTILS_H_
 
 #include "proto/table_meta.pb.h"
-#include "sdk/tera.h"
+#include "tera.h"
 #include "utils/prop_tree.h"
 
 using std::string;

diff --git a/src/sdk/single_row_txn.h b/src/sdk/single_row_txn.h
@@ -8,7 +8,7 @@
 #include <string>
 
 #include "sdk/mutate_impl.h"
-#include "sdk/tera.h"
+#include "tera.h"
 
 namespace common {
 class ThreadPool;

diff --git a/src/sdk/table_impl.cc b/src/sdk/table_impl.cc
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "sdk/table_impl.h"
+#include "table_impl.h"
+#include "tera.h"
 
 #include <errno.h>
 #include <fcntl.h>
@@ -31,7 +32,6 @@
 #include "sdk/scan_impl.h"
 #include "sdk/schema_impl.h"
 #include "sdk/sdk_zk.h"
-#include "sdk/tera.h"
 #include "utils/crypt.h"
 #include "utils/string_util.h"
 #include "utils/timer.h"

diff --git a/src/sdk/table_impl.h b/src/sdk/table_impl.h
@@ -14,7 +14,7 @@
 #include "sdk/client_impl.h"
 #include "sdk/sdk_task.h"
 #include "sdk/sdk_zk.h"
-#include "sdk/tera.h"
+#include "tera.h"
 #include "utils/counter.h"
 
 namespace tera {

diff --git a/src/sdk/tera.cc b/src/sdk/tera.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "sdk/tera.h"
+#include "tera.h"
 
 #include <limits>
 

diff --git a/src/tera_c.cc b/src/tera_c.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "sdk/tera_c.h"
+#include "tera_c.h"
 
 #include <assert.h>
 #include <stdlib.h>
@@ -13,7 +13,7 @@
 
 #include "common/mutex.h"
 
-#include "sdk/tera.h"
+#include "tera.h"
 
 using tera::Client;
 using tera::ErrorCode;

diff --git a/src/tera_test_main.cc b/src/tera_test_main.cc
@@ -21,7 +21,7 @@
 #include "common/mutex.h"
 #include "common/timer.h"
 #include "common/thread_pool.h"
-#include "sdk/tera.h"
+#include "tera.h"
 #include "version.h"
 
 DEFINE_string(table, "", "table name");

diff --git a/src/teracli_main.cc b/src/teracli_main.cc
@@ -34,7 +34,7 @@
 #include "sdk/sdk_utils.h"
 #include "sdk/sdk_zk.h"
 #include "sdk/table_impl.h"
-#include "sdk/tera.h"
+#include "tera.h"
 #include "utils/crypt.h"
 #include "utils/string_util.h"
 #include "utils/tprinter.h"