#374: batch scan

.gitignore

@@ -1,5 +1,6 @@
 *.o
 *.a
+*.pyc
 
 #protobuf auto-gen code
 src/proto/*.pb.*

.travis.yml

@@ -13,9 +13,9 @@ install:
     - git clone https://github.com/BaiduPS/sofa-pbrpc
     - ( cd sofa-pbrpc && make -j4 && make install )
 
-    - wget http://www.us.apache.org/dist/zookeeper/stable/zookeeper-3.4.6.tar.gz
-    - tar zxvf zookeeper-3.4.6.tar.gz
-    - ( cd zookeeper-3.4.6/src/c && ./configure --disable-shared --with-pic && make -j4 && sudo make install )
+    - wget http://www.us.apache.org/dist/zookeeper/stable/zookeeper-3.4.7.tar.gz
+    - tar zxvf zookeeper-3.4.7.tar.gz
+    - ( cd zookeeper-3.4.7/src/c && ./configure --disable-shared --with-pic && make -j4 && sudo make install )
 
     - wget https://github.com/gflags/gflags/archive/v2.1.2.tar.gz
     - tar xf v2.1.2.tar.gz

Makefile

@@ -11,7 +11,7 @@ SHARED_CFLAGS = -fPIC
 SHARED_LDFLAGS = -shared -Wl,-soname -Wl,
 
 INCPATH += -I./src -I./include -I./src/leveldb/include -I./src/leveldb \
-		   -I./src/sdk/java/native-src $(DEPS_INCPATH) 
+		   -I./src/sdk/java/native-src $(DEPS_INCPATH)
 CFLAGS += $(OPT) $(SHARED_CFLAGS) $(INCPATH)
 CXXFLAGS += $(OPT) $(SHARED_CFLAGS) $(INCPATH)
 LDFLAGS += -rdynamic $(DEPS_LDPATH) $(DEPS_LDFLAGS) -lpthread -lrt -lz -ldl
@@ -33,6 +33,7 @@ COMMON_SRC := $(wildcard src/common/base/*.cc) $(wildcard src/common/net/*.cc) \
               $(wildcard src/common/file/*.cc) $(wildcard src/common/file/recordio/*.cc)
 SERVER_SRC := src/tera_main.cc src/tera_entry.cc
 CLIENT_SRC := src/teracli_main.cc
+TERA_C_SRC := src/tera_c.cc
 MONITOR_SRC := src/monitor/teramo_main.cc
 MARK_SRC := src/benchmark/mark.cc src/benchmark/mark_main.cc
 TEST_SRC := src/utils/test/prop_tree_test.cc src/utils/test/tprinter_test.cc src/io/test/tablet_io_test.cc
@@ -50,28 +51,31 @@ OTHER_OBJ := $(OTHER_SRC:.cc=.o)
 COMMON_OBJ := $(COMMON_SRC:.cc=.o)
 SERVER_OBJ := $(SERVER_SRC:.cc=.o)
 CLIENT_OBJ := $(CLIENT_SRC:.cc=.o)
+TERA_C_OBJ := $(TERA_C_SRC:.cc=.o)
 MONITOR_OBJ := $(MONITOR_SRC:.cc=.o)
 MARK_OBJ := $(MARK_SRC:.cc=.o)
 TEST_OBJ := $(TEST_SRC:.cc=.o)
 ALL_OBJ := $(MASTER_OBJ) $(TABLETNODE_OBJ) $(IO_OBJ) $(SDK_OBJ) $(PROTO_OBJ) \
            $(JNI_TERA_OBJ) $(OTHER_OBJ) $(COMMON_OBJ) $(SERVER_OBJ) $(CLIENT_OBJ) \
-           $(MONITOR_OBJ) $(MARK_OBJ) $(TEST_OBJ)
+           $(TERA_C_OBJ) $(MONITOR_OBJ) $(MARK_OBJ) $(TEST_OBJ)
 LEVELDB_LIB := src/leveldb/libleveldb.a
+TERA_C_SO = libtera_c.so
 
 PROGRAM = tera_main teracli teramo
 LIBRARY = libtera.a
 JNILIBRARY = libjni_tera.so
 BENCHMARK = tera_bench tera_mark
-TESTS = prop_tree_test tprinter_test
+TESTS = prop_tree_test tprinter_test string_util_test
+
 
 .PHONY: all clean cleanall test
 
-all: $(PROGRAM) $(LIBRARY) $(JNILIBRARY) $(BENCHMARK) $(TESTS)
+all: $(PROGRAM) $(LIBRARY) $(TERA_C_SO) $(JNILIBRARY) $(BENCHMARK) $(TESTS)
 	mkdir -p build/include build/lib build/bin build/log build/benchmark
 	mkdir -p $(UNITTEST_OUTPUT)
 	mv $(TESTS) $(UNITTEST_OUTPUT)
 	cp $(PROGRAM) build/bin
-	cp $(LIBRARY) $(JNILIBRARY) build/lib
+	cp $(LIBRARY) $(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
@@ -81,12 +85,12 @@ all: $(PROGRAM) $(LIBRARY) $(JNILIBRARY) $(BENCHMARK) $(TESTS)
 check: $(TESTS)
 	( cd $(UNITTEST_OUTPUT); \
 	for t in $(TESTS); do echo "***** Running $$t"; ./$$t || exit 1; done )
-	$(MAKE) check -C src/leveldb 
+	$(MAKE) check -C src/leveldb
 
 clean:
 	rm -rf $(ALL_OBJ) $(PROTO_OUT_CC) $(PROTO_OUT_H) $(TEST_OUTPUT)
 	$(MAKE) clean -C src/leveldb
-	rm -rf $(PROGRAM) $(LIBRARY) $(JNILIBRARY) $(BENCHMARK) $(TESTS)
+	rm -rf $(PROGRAM) $(LIBRARY) $(TERA_C_SO) $(JNILIBRARY) $(BENCHMARK) $(TESTS)
 
 cleanall:
 	$(MAKE) clean
@@ -100,6 +104,10 @@ tera_main: $(SERVER_OBJ) $(LEVELDB_LIB) $(MASTER_OBJ) $(TABLETNODE_OBJ) \
 libtera.a: $(SDK_OBJ) $(PROTO_OBJ) $(OTHER_OBJ) $(COMMON_OBJ)
 	$(AR) -rs $@ $(SDK_OBJ) $(PROTO_OBJ) $(OTHER_OBJ) $(COMMON_OBJ)
 
+libtera_c.so: $(TERA_C_OBJ) $(SDK_OBJ) $(PROTO_OBJ) $(OTHER_OBJ) $(COMMON_OBJ)
+	$(CXX) -o $@ $(TERA_C_OBJ) $(SDK_OBJ) $(PROTO_OBJ) $(OTHER_OBJ) $(COMMON_OBJ) $(SHARED_LDFLAGS) \
+	-Xlinker "-(" $(LDFLAGS) -Xlinker "-)"
+
 teracli: $(CLIENT_OBJ) $(LIBRARY)
 	$(CXX) -o $@ $(CLIENT_OBJ) $(LIBRARY) $(LDFLAGS)
 
@@ -108,9 +116,9 @@ teramo: $(MONITOR_OBJ) $(LIBRARY)
 
 tera_mark: $(MARK_OBJ) $(LIBRARY) $(LEVELDB_LIB)
 	$(CXX) -o $@ $(MARK_OBJ) $(LIBRARY) $(LEVELDB_LIB) $(LDFLAGS)
- 
-libjni_tera.so: $(JNI_TERA_OBJ) $(LIBRARY) 
-	$(CXX) -shared $(JNI_TERA_OBJ) -Xlinker "-(" $(LIBRARY) $(LDFLAGS) -Xlinker "-)" -o $@ 
+
+libjni_tera.so: $(JNI_TERA_OBJ) $(LIBRARY)
+	$(CXX) -shared $(JNI_TERA_OBJ) -Xlinker "-(" $(LIBRARY) $(LDFLAGS) -Xlinker "-)" -o $@
 
 src/leveldb/libleveldb.a: FORCE
 	$(MAKE) -C src/leveldb
@@ -119,10 +127,13 @@ tera_bench:
 
 # unit test
 prop_tree_test: src/utils/test/prop_tree_test.o $(LIBRARY)
-	$(CXX) -o $@ $^ $(LDFLAGS) 
+	$(CXX) -o $@ $^ $(LDFLAGS)
 
 tprinter_test: src/utils/test/tprinter_test.o $(LIBRARY)
-	$(CXX) -o $@ $^ $(LDFLAGS) 
+	$(CXX) -o $@ $^ $(LDFLAGS)
+
+string_util_test: src/utils/test/string_util_test.o $(LIBRARY)
+	$(CXX) -o $@ $^ $(LDFLAGS)
 
 tablet_io_test: src/io/test/tablet_io_test.o src/tabletnode/tabletnode_sysinfo.o\
 		$(IO_OBJ) $(PROTO_OBJ) $(OTHER_OBJ) $(COMMON_OBJ) $(LEVELDB_LIB)
@@ -139,8 +150,8 @@ FORCE:
 
 .PHONY: proto
 proto: $(PROTO_OUT_CC) $(PROTO_OUT_H)
- 
+
 %.pb.cc %.pb.h: %.proto
 	$(PROTOC) --proto_path=./src/proto/ --proto_path=$(PROTOBUF_INCDIR) \
                   --proto_path=$(SOFA_PBRPC_INCDIR) \
-                  --cpp_out=./src/proto/ $< 
+                  --cpp_out=./src/proto/ $<

README.md

@@ -43,13 +43,16 @@ sh ./build.sh
 
 [通过docker体验Tera](https://github.com/baidu/tera/blob/master/example/docker)
 
-[主要API使用方法](https://github.com/baidu/tera/wiki/%E4%B8%BB%E8%A6%81API%E4%BD%BF%E7%94%A8%E6%96%B9%E6%B3%95)
+[SDK 开发入门](https://github.com/baidu/tera/blob/master/doc/sdk_dev_guide.md)
 
-[命令行工具使用手册](https://github.com/baidu/tera/blob/master/doc/teracli.md)
+[teracli 使用手册](https://github.com/baidu/tera/blob/master/doc/teracli.md)
 
 #反馈与技术支持
 [email protected]
 
+#成为贡献者
+完成[5个小任务](https://github.com/baidu/tera/blob/master/doc/to_be_a_contributor.md),帮你一步步成为tera贡献者.
+
 #欢迎加入
 如果你热爱开源，热爱分布式技术，请将简历发送至： 
 [email protected]