Merge branch 'feature/remove-stale-content' into develop

merge back

.gitignore

@@ -33,6 +33,7 @@ Makefile.in
 /stamp-h1
 .deps
 .libs
+tags
 
 src/client/keycleantool
 src/client/manipulate_ds_to_cs
@@ -77,3 +78,4 @@ src/tools/dump_transfer
 src/tools/lens
 src/tools/mtair
 src/tools/parse_admin_conf
+

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT([tair], [3.2.4], [zongdai@taobao.com])
+AC_INIT([tair], [4.0.0], [lotair@hotmail.com])
 dnl 2.3.2.3: ldb balance & split memtable per bucket etc. SVN 1408
 
 AM_INIT_AUTOMAKE([foreign])
@@ -143,18 +143,6 @@ AS_IF([test x$with_diamond = xyes],
   [ CXXFLAGS="${CXXFLAGS} -DWITH_DIAMOND" ],)
 AM_CONDITIONAL([WITH_DIAMOND],[test x$with_diamond = xyes])
 
-AC_ARG_WITH([kdb],
-    AS_HELP_STRING([--with-kdb],
-      [with kdb (default is yes)]),
-    [
-    if test "$withval" = "yes"; then
-    with_kdb=yes
-    fi
-    ],
-    [ with_kdb=yes ]
-     )
-AM_CONDITIONAL([WITH_KDB],[test x$with_kdb = xyes])
-
 AC_ARG_WITH([ldb],
     AS_HELP_STRING([--with-ldb],
       [with ldb (default is YES)]), [
@@ -203,10 +191,7 @@ AC_CONFIG_FILES([\
      src/common/Makefile \
      src/plugin/Makefile \
      src/storage/Makefile \
-     src/storage/fdb/Makefile \
      src/storage/mdb/Makefile \
-     src/storage/kdb/Makefile \
-     src/storage/kdb/kyotocabinet/Makefile \
      src/storage/ldb/Makefile \
      src/storage/ldb/tools/Makefile \
      src/packets/Makefile \

src/dataserver/Makefile.am

@@ -1,8 +1,4 @@
-#SUBDIRS = modules
-if WITH_KDB
-KDB_CPPFLAGS= -DWITH_KDB -I${top_srcdir}/src/storage/kdb -I${top_srcdir}/src/storage/kdb/kyotocabinet
-KDB_LDFLAGS= $(top_builddir)/src/storage/kdb/libkdb.a $(top_builddir)/src/storage/kdb/kyotocabinet/libkyotocabinet.a
-endif
+
 if WITH_LDB
 LDB_CPPFLAGS= -DWITH_LDB -I${top_srcdir}/src/storage/ldb
 LDB_LDFLAGS= $(top_builddir)/src/storage/ldb/libldb.a \
@@ -14,17 +10,14 @@ COMPRESS_LDFLAGS= -lsnappy
 endif
 
 AM_CPPFLAGS= -I/$(easy_dir)/include/easy \
-						 -I$(TBLIB_ROOT)/include/tbsys \
+	     -I$(TBLIB_ROOT)/include/tbsys \
 	     -I${top_srcdir}/src \
-	     -I$(TBLIB_ROOT)/src/configserver \
 	     -I${top_srcdir}/src/storage \
 	     -I${top_srcdir}/src/dataserver \
 	     -I${top_srcdir}/src/common \
 	     -I${top_srcdir}/src/statserver/include \
 	     -I${top_srcdir}/src/packets \
-	     -I${top_srcdir}/src/storage/fdb \
 	     -I${top_srcdir}/src/storage/mdb \
-	     $(KDB_CPPFLAGS) \
 	     $(LDB_CPPFLAGS) \
 	     -I${top_srcdir}/src/plugin \
 	     -I${top_srcdir}/src/client \
@@ -40,13 +33,11 @@ AM_LDFLAGS= -rdynamic ${GCOV_LIB} ${TCMALLOC_LDFLAGS}
 
 LDADD=$(top_builddir)/src/client/.libs/libtairclientapi.a \
 			$(top_builddir)/src/storage/mdb/.libs/libmdb.a \
-			$(KDB_LDFLAGS) \
 			$(LDB_LDFLAGS) \
 			$(COMPRESS_LDFLAGS) \
 			$(top_builddir)/src/plugin/libtair_plugins.a \
 			$(top_builddir)/src/packets/libtair_packets.a \
 			$(top_builddir)/src/statserver/storage/libtair_stat.a \
-			$(top_builddir)/src/storage/libdump.a \
 			$(top_builddir)/src/common/libtair_common.a \
 			$(TBLIB_ROOT)/lib/libtbsys.a \
 			$(easy_dir)/lib64/libeasy.a \
@@ -57,9 +48,10 @@ LDADD=$(top_builddir)/src/client/.libs/libtairclientapi.a \
 sbin_PROGRAMS=tair_server repair_rsync
 
 include_HEADERS=tair_manager.hpp table_manager.hpp duplicate_manager.hpp duplicate_base.hpp \
-		update_log.hpp
+		update_log.hpp dump_filter.hpp dump_manager.hpp file_op.hpp
 
 tair_server_SOURCES=duplicate_manager.cpp stat_processor.cpp request_processor.cpp tair_manager.cpp update_log.cpp \
+				dump_filter.cpp dump_manager.cpp file_op.cpp \
 				heartbeat_thread.cpp migrate_manager.cpp recovery_manager.cpp table_manager.cpp tair_server.cpp \
 				$(top_builddir)/src/common/stat_helper.cpp \
 				$(top_builddir)/src/common/scoped_wrlock.hpp	\
@@ -81,13 +73,13 @@ tair_server_SOURCES=duplicate_manager.cpp stat_processor.cpp request_processor.c
 				tair_server.hpp	\
 				update_log.hpp \
 				prefix_locker.hpp \
-		    modules/rt_collector.cpp \
-		    modules/rt_collector.hpp \
-		    modules/rt_object.cpp \
-		    modules/rt_object.hpp \
-		    modules/hotkey.cpp \
-		    modules/hotkey.hpp \
-		    modules/op_killer.hpp \
+		    		modules/rt_collector.cpp \
+		    		modules/rt_collector.hpp \
+		    		modules/rt_object.cpp \
+		    		modules/rt_object.hpp \
+		    		modules/hotkey.cpp \
+		    		modules/hotkey.hpp \
+		    		modules/op_killer.hpp \
 				cluster_handler.hpp \
 				cluster_handler.cpp \
 				i_remote_sync_manager.hpp \
@@ -101,3 +93,4 @@ tair_server_SOURCES=duplicate_manager.cpp stat_processor.cpp request_processor.c
 
 
 repair_rsync_SOURCES=repair_rsync.cpp cluster_handler.cpp
+

src/storage/dump_filter.hpp → src/dataserver/dump_filter.hpp

@@ -15,7 +15,7 @@
 #ifndef TAIR_DUMP_FILTER
 #define TAIR_DUMP_FILTER
 #include "data_entry.hpp"
-#include "fdb/file_op.hpp"
+#include "dataserver/file_op.hpp"
 namespace tair {
   namespace storage {
     using namespace tair::common;
@@ -42,7 +42,7 @@ namespace tair {
       int32_t area;                //-1 means all
       std::string out_data_dir;
     private:
-      fdb::file_operation file_op;
+      tair::file_operation file_op;
       std::string file_name;
       friend class dump_thread;
     };