Skip to content

Commit

Permalink
Move raftex and wal into kvstore
Browse files Browse the repository at this point in the history
  • Loading branch information
heng committed May 23, 2019
1 parent 5d1d994 commit e234cc2
Show file tree
Hide file tree
Showing 33 changed files with 52 additions and 52 deletions.
2 changes: 0 additions & 2 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 2 additions & 0 deletions src/kvstore/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,7 @@ add_library(
)
add_dependencies(kvstore_obj base_obj meta_client)

add_subdirectory(raftex)
add_subdirectory(wal)
add_subdirectory(test)

File renamed without changes.
6 changes: 3 additions & 3 deletions src/raftex/Host.cpp → src/kvstore/raftex/Host.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/

#include "base/Base.h"
#include "raftex/LogStrListIterator.h"
#include "kvstore/raftex/LogStrListIterator.h"

namespace nebula {
namespace raftex {
Expand Down
File renamed without changes.
File renamed without changes.
10 changes: 5 additions & 5 deletions src/raftex/RaftPart.cpp → src/kvstore/raftex/RaftPart.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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,
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
File renamed without changes.
6 changes: 3 additions & 3 deletions src/wal/FileBasedWal.cpp → src/kvstore/wal/FileBasedWal.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions src/wal/FileBasedWal.h → src/kvstore/wal/FileBasedWal.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/

#include "base/Base.h"
#include "wal/InMemoryLogBuffer.h"
#include "kvstore/wal/InMemoryLogBuffer.h"

namespace nebula {
namespace wal {
Expand Down
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions src/wal/WalFileInfo.h → src/kvstore/wal/WalFileInfo.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit e234cc2

Please sign in to comment.