Move raftex and wal into kvstore (#421)

* Move raftex and wal into kvstore * Rebase on master
vesoft-inc · Jun 10, 2019 · c4fedff · c4fedff
1 parent d85c160
commit c4fedff
Show file tree

Hide file tree

Showing 35 changed files with 54 additions and 54 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -3,8 +3,6 @@ add_subdirectory(interface)
 add_subdirectory(client)
 add_subdirectory(meta)
 add_subdirectory(console)
-add_subdirectory(wal)
-add_subdirectory(raftex)
 add_subdirectory(kvstore)
 add_subdirectory(parser)
 add_subdirectory(dataman)

diff --git a/src/kvstore/CMakeLists.txt b/src/kvstore/CMakeLists.txt
@@ -9,5 +9,7 @@ add_library(
 )
 add_dependencies(kvstore_obj base_obj meta_client)
 
+add_subdirectory(raftex)
+add_subdirectory(wal)
 add_subdirectory(test)
 
diff --git a/src/kvstore/NebulaStore.h b/src/kvstore/NebulaStore.h
@@ -10,7 +10,7 @@
 #include "base/Base.h"
 #include <gtest/gtest_prod.h>
 #include <folly/RWSpinLock.h>
-#include "raftex/RaftexService.h"
+#include "kvstore/raftex/RaftexService.h"
 #include "kvstore/KVStore.h"
 #include "kvstore/PartManager.h"
 #include "kvstore/Part.h"

diff --git a/src/kvstore/Part.cpp b/src/kvstore/Part.cpp
@@ -5,7 +5,7 @@
  */
 
 #include "kvstore/Part.h"
-#include "wal/BufferFlusher.h"
+#include "kvstore/wal/BufferFlusher.h"
 #include "kvstore/LogEncoder.h"
 
 DEFINE_int32(cluster_id, 0, "A unique id for each cluster");

diff --git a/src/raftex/CMakeLists.txt → src/kvstore/raftex/CMakeLists.txt b/src/raftex/CMakeLists.txt → src/kvstore/raftex/CMakeLists.txt
diff --git a/src/raftex/Host.cpp → src/kvstore/raftex/Host.cpp b/src/raftex/Host.cpp → src/kvstore/raftex/Host.cpp
@@ -5,9 +5,9 @@
  */
 
 #include "base/Base.h"
-#include "raftex/Host.h"
-#include "raftex/RaftPart.h"
-#include "wal/FileBasedWal.h"
+#include "kvstore/raftex/Host.h"
+#include "kvstore/raftex/RaftPart.h"
+#include "kvstore/wal/FileBasedWal.h"
 #include <folly/io/async/EventBase.h>
 #include "network/NetworkUtils.h"
 

diff --git a/src/raftex/Host.h → src/kvstore/raftex/Host.h b/src/raftex/Host.h → src/kvstore/raftex/Host.h
diff --git a/src/raftex/LogStrListIterator.cpp → src/kvstore/raftex/LogStrListIterator.cpp b/src/raftex/LogStrListIterator.cpp → src/kvstore/raftex/LogStrListIterator.cpp
@@ -5,7 +5,7 @@
  */
 
 #include "base/Base.h"
-#include "raftex/LogStrListIterator.h"
+#include "kvstore/raftex/LogStrListIterator.h"
 
 namespace nebula {
 namespace raftex {

diff --git a/src/raftex/LogStrListIterator.h → src/kvstore/raftex/LogStrListIterator.h b/src/raftex/LogStrListIterator.h → src/kvstore/raftex/LogStrListIterator.h
diff --git a/src/raftex/README.md → src/kvstore/raftex/README.md b/src/raftex/README.md → src/kvstore/raftex/README.md
diff --git a/src/raftex/RaftPart.cpp → src/kvstore/raftex/RaftPart.cpp b/src/raftex/RaftPart.cpp → src/kvstore/raftex/RaftPart.cpp
@@ -5,7 +5,7 @@
  */
 
 #include "base/Base.h"
-#include "raftex/RaftPart.h"
+#include "kvstore/raftex/RaftPart.h"
 #include <folly/io/async/EventBaseManager.h>
 #include <folly/executors/IOThreadPoolExecutor.h>
 #include <folly/gen/Base.h>
@@ -14,10 +14,10 @@
 #include "thrift/ThriftClientManager.h"
 #include "network/NetworkUtils.h"
 #include "thread/NamedThread.h"
-#include "wal/FileBasedWal.h"
-#include "wal/BufferFlusher.h"
-#include "raftex/LogStrListIterator.h"
-#include "raftex/Host.h"
+#include "kvstore/wal/FileBasedWal.h"
+#include "kvstore/wal/BufferFlusher.h"
+#include "kvstore/raftex/LogStrListIterator.h"
+#include "kvstore/raftex/Host.h"
 
 
 DEFINE_bool(accept_log_append_during_pulling, false,

diff --git a/src/raftex/RaftPart.h → src/kvstore/raftex/RaftPart.h b/src/raftex/RaftPart.h → src/kvstore/raftex/RaftPart.h
diff --git a/src/raftex/RaftexService.cpp → src/kvstore/raftex/RaftexService.cpp b/src/raftex/RaftexService.cpp → src/kvstore/raftex/RaftexService.cpp
@@ -5,9 +5,9 @@
  */
 
 #include "base/Base.h"
-#include "raftex/RaftexService.h"
+#include "kvstore/raftex/RaftexService.h"
 #include <folly/ScopeGuard.h>
-#include "raftex/RaftPart.h"
+#include "kvstore/raftex/RaftPart.h"
 
 namespace nebula {
 namespace raftex {

diff --git a/src/raftex/RaftexService.h → src/kvstore/raftex/RaftexService.h b/src/raftex/RaftexService.h → src/kvstore/raftex/RaftexService.h
diff --git a/src/raftex/test/CMakeLists.txt → src/kvstore/raftex/test/CMakeLists.txt b/src/raftex/test/CMakeLists.txt → src/kvstore/raftex/test/CMakeLists.txt
diff --git a/src/raftex/test/LeaderElectionTest.cpp → ...vstore/raftex/test/LeaderElectionTest.cpp b/src/raftex/test/LeaderElectionTest.cpp → ...vstore/raftex/test/LeaderElectionTest.cpp
@@ -11,10 +11,10 @@
 #include "fs/FileUtils.h"
 #include "thread/GenericThreadPool.h"
 #include "network/NetworkUtils.h"
-#include "wal/BufferFlusher.h"
-#include "raftex/RaftexService.h"
-#include "raftex/test/RaftexTestBase.h"
-#include "raftex/test/TestShard.h"
+#include "kvstore/wal/BufferFlusher.h"
+#include "kvstore/raftex/RaftexService.h"
+#include "kvstore/raftex/test/RaftexTestBase.h"
+#include "kvstore/raftex/test/TestShard.h"
 
 namespace nebula {
 namespace raftex {

diff --git a/src/raftex/test/LogAppendTest.cpp → src/kvstore/raftex/test/LogAppendTest.cpp b/src/raftex/test/LogAppendTest.cpp → src/kvstore/raftex/test/LogAppendTest.cpp
@@ -11,10 +11,10 @@
 #include "fs/FileUtils.h"
 #include "thread/GenericThreadPool.h"
 #include "network/NetworkUtils.h"
-#include "wal/BufferFlusher.h"
-#include "raftex/RaftexService.h"
-#include "raftex/test/RaftexTestBase.h"
-#include "raftex/test/TestShard.h"
+#include "kvstore/wal/BufferFlusher.h"
+#include "kvstore/raftex/RaftexService.h"
+#include "kvstore/raftex/test/RaftexTestBase.h"
+#include "kvstore/raftex/test/TestShard.h"
 
 DECLARE_uint32(heartbeat_interval);
 

diff --git a/src/raftex/test/LogCASTest.cpp → src/kvstore/raftex/test/LogCASTest.cpp b/src/raftex/test/LogCASTest.cpp → src/kvstore/raftex/test/LogCASTest.cpp
@@ -11,10 +11,10 @@
 #include "fs/FileUtils.h"
 #include "thread/GenericThreadPool.h"
 #include "network/NetworkUtils.h"
-#include "wal/BufferFlusher.h"
-#include "raftex/RaftexService.h"
-#include "raftex/test/RaftexTestBase.h"
-#include "raftex/test/TestShard.h"
+#include "kvstore/wal/BufferFlusher.h"
+#include "kvstore/raftex/RaftexService.h"
+#include "kvstore/raftex/test/RaftexTestBase.h"
+#include "kvstore/raftex/test/TestShard.h"
 
 DECLARE_uint32(heartbeat_interval);
 

diff --git a/src/raftex/test/RaftexTestBase.cpp → src/kvstore/raftex/test/RaftexTestBase.cpp b/src/raftex/test/RaftexTestBase.cpp → src/kvstore/raftex/test/RaftexTestBase.cpp
@@ -5,10 +5,10 @@
  */
 
 #include "base/Base.h"
-#include "raftex/test/RaftexTestBase.h"
-#include "wal/BufferFlusher.h"
-#include "raftex/RaftexService.h"
-#include "raftex/test/TestShard.h"
+#include "kvstore/raftex/test/RaftexTestBase.h"
+#include "kvstore/wal/BufferFlusher.h"
+#include "kvstore/raftex/RaftexService.h"
+#include "kvstore/raftex/test/TestShard.h"
 #include "thrift/ThriftClientManager.h"
 
 namespace nebula {

diff --git a/src/raftex/test/RaftexTestBase.h → src/kvstore/raftex/test/RaftexTestBase.h b/src/raftex/test/RaftexTestBase.h → src/kvstore/raftex/test/RaftexTestBase.h
diff --git a/src/raftex/test/TestShard.cpp → src/kvstore/raftex/test/TestShard.cpp b/src/raftex/test/TestShard.cpp → src/kvstore/raftex/test/TestShard.cpp
@@ -5,10 +5,10 @@
  */
 
 #include "base/Base.h"
-#include "raftex/test/TestShard.h"
-#include "raftex/RaftexService.h"
-#include "wal/FileBasedWal.h"
-#include "wal/BufferFlusher.h"
+#include "kvstore/raftex/test/TestShard.h"
+#include "kvstore/raftex/RaftexService.h"
+#include "kvstore/wal/FileBasedWal.h"
+#include "kvstore/wal/BufferFlusher.h"
 
 namespace nebula {
 namespace raftex {

diff --git a/src/raftex/test/TestShard.h → src/kvstore/raftex/test/TestShard.h b/src/raftex/test/TestShard.h → src/kvstore/raftex/test/TestShard.h
@@ -8,7 +8,7 @@
 #define RAFTEX_TEST_TESTSHARD_H_
 
 #include "base/Base.h"
-#include "raftex/RaftPart.h"
+#include "kvstore/raftex/RaftPart.h"
 
 namespace nebula {
 namespace raftex {

diff --git a/src/wal/BufferFlusher.cpp → src/kvstore/wal/BufferFlusher.cpp b/src/wal/BufferFlusher.cpp → src/kvstore/wal/BufferFlusher.cpp
@@ -5,8 +5,8 @@
  */
 
 #include "base/Base.h"
-#include "wal/BufferFlusher.h"
-#include "wal/FileBasedWal.h"
+#include "kvstore/wal/BufferFlusher.h"
+#include "kvstore/wal/FileBasedWal.h"
 
 namespace nebula {
 namespace wal {

diff --git a/src/wal/BufferFlusher.h → src/kvstore/wal/BufferFlusher.h b/src/wal/BufferFlusher.h → src/kvstore/wal/BufferFlusher.h
@@ -9,7 +9,7 @@
 
 #include "base/Base.h"
 #include "thread/NamedThread.h"
-#include "wal/InMemoryLogBuffer.h"
+#include "kvstore/wal/InMemoryLogBuffer.h"
 
 namespace nebula {
 namespace wal {

diff --git a/src/wal/CMakeLists.txt → src/kvstore/wal/CMakeLists.txt b/src/wal/CMakeLists.txt → src/kvstore/wal/CMakeLists.txt
diff --git a/src/wal/FileBasedWal.cpp → src/kvstore/wal/FileBasedWal.cpp b/src/wal/FileBasedWal.cpp → src/kvstore/wal/FileBasedWal.cpp
@@ -5,9 +5,9 @@
  */
 
 #include "base/Base.h"
-#include "wal/FileBasedWal.h"
-#include "wal/FileBasedWalIterator.h"
-#include "wal/BufferFlusher.h"
+#include "kvstore/wal/FileBasedWal.h"
+#include "kvstore/wal/FileBasedWalIterator.h"
+#include "kvstore/wal/BufferFlusher.h"
 #include "fs/FileUtils.h"
 
 namespace nebula {

diff --git a/src/wal/FileBasedWal.h → src/kvstore/wal/FileBasedWal.h b/src/wal/FileBasedWal.h → src/kvstore/wal/FileBasedWal.h
@@ -9,9 +9,9 @@
 
 #include "base/Base.h"
 #include "base/Cord.h"
-#include "wal/Wal.h"
-#include "wal/InMemoryLogBuffer.h"
-#include "wal/WalFileInfo.h"
+#include "kvstore/wal/Wal.h"
+#include "kvstore/wal/InMemoryLogBuffer.h"
+#include "kvstore/wal/WalFileInfo.h"
 
 namespace nebula {
 namespace wal {

diff --git a/src/wal/FileBasedWalIterator.cpp → src/kvstore/wal/FileBasedWalIterator.cpp b/src/wal/FileBasedWalIterator.cpp → src/kvstore/wal/FileBasedWalIterator.cpp
@@ -5,9 +5,9 @@
  */
 
 #include "base/Base.h"
-#include "wal/FileBasedWalIterator.h"
-#include "wal/FileBasedWal.h"
-#include "wal/WalFileInfo.h"
+#include "kvstore/wal/FileBasedWalIterator.h"
+#include "kvstore/wal/FileBasedWal.h"
+#include "kvstore/wal/WalFileInfo.h"
 
 namespace nebula {
 namespace wal {

diff --git a/src/wal/FileBasedWalIterator.h → src/kvstore/wal/FileBasedWalIterator.h b/src/wal/FileBasedWalIterator.h → src/kvstore/wal/FileBasedWalIterator.h
@@ -9,7 +9,7 @@
 
 #include "base/Base.h"
 #include "base/LogIterator.h"
-#include "wal/InMemoryLogBuffer.h"
+#include "kvstore/wal/InMemoryLogBuffer.h"
 
 namespace nebula {
 namespace wal {

diff --git a/src/wal/InMemoryLogBuffer.cpp → src/kvstore/wal/InMemoryLogBuffer.cpp b/src/wal/InMemoryLogBuffer.cpp → src/kvstore/wal/InMemoryLogBuffer.cpp
@@ -5,7 +5,7 @@
  */
 
 #include "base/Base.h"
-#include "wal/InMemoryLogBuffer.h"
+#include "kvstore/wal/InMemoryLogBuffer.h"
 
 namespace nebula {
 namespace wal {

diff --git a/src/wal/InMemoryLogBuffer.h → src/kvstore/wal/InMemoryLogBuffer.h b/src/wal/InMemoryLogBuffer.h → src/kvstore/wal/InMemoryLogBuffer.h
diff --git a/src/wal/Wal.h → src/kvstore/wal/Wal.h b/src/wal/Wal.h → src/kvstore/wal/Wal.h
diff --git a/src/wal/WalFileInfo.h → src/kvstore/wal/WalFileInfo.h b/src/wal/WalFileInfo.h → src/kvstore/wal/WalFileInfo.h
@@ -9,8 +9,8 @@
 
 #include "base/Base.h"
 #include "base/Cord.h"
-#include "wal/Wal.h"
-#include "wal/InMemoryLogBuffer.h"
+#include "kvstore/wal/Wal.h"
+#include "kvstore/wal/InMemoryLogBuffer.h"
 
 namespace nebula {
 namespace wal {

diff --git a/src/wal/test/CMakeLists.txt → src/kvstore/wal/test/CMakeLists.txt b/src/wal/test/CMakeLists.txt → src/kvstore/wal/test/CMakeLists.txt
diff --git a/src/wal/test/FileBasedWalTest.cpp → src/kvstore/wal/test/FileBasedWalTest.cpp b/src/wal/test/FileBasedWalTest.cpp → src/kvstore/wal/test/FileBasedWalTest.cpp
@@ -6,8 +6,8 @@
 
 #include "base/Base.h"
 #include <gtest/gtest.h>
-#include "wal/FileBasedWal.h"
-#include "wal/BufferFlusher.h"
+#include "kvstore/wal/FileBasedWal.h"
+#include "kvstore/wal/BufferFlusher.h"
 #include "fs/TempDir.h"
 
 namespace nebula {