Rename consensus directory to raftex (vesoft-inc#17)

tong-hao · Sep 18, 2018 · d441031 · d441031
1 parent 809d9b8
commit d441031
Show file tree

Hide file tree

Showing 11 changed files with 33 additions and 198 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -105,10 +105,10 @@ add_subdirectory(interface)
 add_subdirectory(common)
 add_subdirectory(dataman)
 add_subdirectory(client)
-#add_subdirectory(storage)
 add_subdirectory(server)
 add_subdirectory(console)
-add_subdirectory(consensus)
+add_subdirectory(raftex)
+#add_subdirectory(storage)
 
 add_dependencies(common third-party)
 #add_dependencies(storage_engines common)

diff --git a/consensus/CMakeLists.txt b/consensus/CMakeLists.txt
diff --git a/consensus/Replica.cpp b/consensus/Replica.cpp
diff --git a/consensus/Replica.h b/consensus/Replica.h
diff --git a/raftex/CMakeLists.txt b/raftex/CMakeLists.txt
@@ -0,0 +1,8 @@
+add_library(
+    raftex_obj OBJECT
+    FileBasedWal.cpp
+)
+add_dependencies(raftex_obj common)
+
+add_subdirectory(test)
+
diff --git a/consensus/FileBasedWal.cpp → raftex/FileBasedWal.cpp b/consensus/FileBasedWal.cpp → raftex/FileBasedWal.cpp
@@ -4,12 +4,12 @@
  *  (found in the LICENSE.Apache file in the root directory)
  */
 
-#include "consensus/FileBasedWal.h"
+#include "raftex/FileBasedWal.h"
 #include "fs/FileUtils.h"
 
 namespace vesoft {
 namespace vgraph {
-namespace consensus {
+namespace raftex {
 
 using WalFileInfoPair = FileBasedWal::WalFiles::value_type;
 using namespace vesoft::fs;
@@ -721,7 +721,7 @@ std::unique_ptr<LogIterator> FileBasedWal::iterator(LogID firstLogId) {
         new internal::FileBasedWalIterator(shared_from_this(), firstLogId));
 }
 
-}  // namespace consensus
+}  // namespace raftex
 }  // namespace vgraph
 }  // namespace vesoft
 
diff --git a/consensus/FileBasedWal.h → raftex/FileBasedWal.h b/consensus/FileBasedWal.h → raftex/FileBasedWal.h
@@ -4,16 +4,16 @@
  *  (found in the LICENSE.Apache file in the root directory)
  */
 
-#ifndef CONSENSUS_WAL_FILEBASEDWAL_H_
-#define CONSENSUS_WAL_FILEBASEDWAL_H_
+#ifndef RAFTEX_WAL_FILEBASEDWAL_H_
+#define RAFTEX_WAL_FILEBASEDWAL_H_
 
 #include "base/Base.h"
 #include "base/Cord.h"
-#include "consensus/Wal.h"
+#include "raftex/Wal.h"
 
 namespace vesoft {
 namespace vgraph {
-namespace consensus {
+namespace raftex {
 
 struct FileBasedWalPolicy {
     // The life span of the log messages (number of seconds)
@@ -179,8 +179,8 @@ class FileBasedWal final : public Wal,
                            std::string msg);
 };
 
-}  // namespace consensus
+}  // namespace raftex
 }  // namespace vgraph
 }  // namespace vesoft
-#endif  // CONSENSUS_WAL_FILEBASEDWAL_H_
+#endif  // RAFTEX_WAL_FILEBASEDWAL_H_
 
diff --git a/consensus/LogIterator.h → raftex/LogIterator.h b/consensus/LogIterator.h → raftex/LogIterator.h
@@ -4,14 +4,14 @@
  *  (found in the LICENSE.Apache file in the root directory)
  */
 
-#ifndef CONSENSUS_LOGITERATOR_H_
-#define CONSENSUS_LOGITERATOR_H_
+#ifndef RAFTEX_LOGITERATOR_H_
+#define RAFTEX_LOGITERATOR_H_
 
 #include "base/Base.h"
 
 namespace vesoft {
 namespace vgraph {
-namespace consensus {
+namespace raftex {
 
 class LogIterator {
 public:
@@ -28,8 +28,8 @@ class LogIterator {
     virtual std::string logMsg() const = 0;
 };
 
-}  // namespace consensus
+}  // namespace raftex
 }  // namespace vgraph
 }  // namespace vesoft
-#endif  // CONSENSUS_LOGITERATOR_H_
+#endif  // RAFTEX_LOGITERATOR_H_
 
diff --git a/consensus/Wal.h → raftex/Wal.h b/consensus/Wal.h → raftex/Wal.h
@@ -4,15 +4,15 @@
  *  (found in the LICENSE.Apache file in the root directory)
  */
 
-#ifndef CONSENSUS_WAL_WAL_H_
-#define CONSENSUS_WAL_WAL_H_
+#ifndef RAFTEX_WAL_WAL_H_
+#define RAFTEX_WAL_WAL_H_
 
 #include "base/Base.h"
-#include "consensus/LogIterator.h"
+#include "raftex/LogIterator.h"
 
 namespace vesoft {
 namespace vgraph {
-namespace consensus {
+namespace raftex {
 
 /**
  * Base class for all WAL implementations
@@ -34,8 +34,8 @@ class Wal {
     virtual std::unique_ptr<LogIterator> iterator(int64_t firstLogId) = 0;
 };
 
-}  // namespace consensus
+}  // namespace raftex
 }  // namespace vgraph
 }  // namespace vesoft
-#endif  // CONSENSUS_WAL_WAL_H_
+#endif  // RAFTEX_WAL_WAL_H_
 
diff --git a/consensus/test/CMakeLists.txt → raftex/test/CMakeLists.txt b/consensus/test/CMakeLists.txt → raftex/test/CMakeLists.txt
@@ -1,7 +1,7 @@
 add_executable(
     file_based_wal_test
     FileBasedWalTest.cpp
-    $<TARGET_OBJECTS:consensus_obj>
+    $<TARGET_OBJECTS:raftex_obj>
     $<TARGET_OBJECTS:base_obj>
     $<TARGET_OBJECTS:thread_obj>
     $<TARGET_OBJECTS:fs_obj>

diff --git a/consensus/test/FileBasedWalTest.cpp → raftex/test/FileBasedWalTest.cpp b/consensus/test/FileBasedWalTest.cpp → raftex/test/FileBasedWalTest.cpp
@@ -6,12 +6,12 @@
 
 #include "base/Base.h"
 #include <gtest/gtest.h>
-#include "consensus/FileBasedWal.h"
+#include "raftex/FileBasedWal.h"
 #include "fs/TempDir.h"
 
 namespace vesoft {
 namespace vgraph {
-namespace consensus {
+namespace raftex {
 
 using namespace vesoft::fs;