fix conflict

.github/workflows/import_braft.yml

@@ -0,0 +1,58 @@
+name: Import BRaft Actions (Temporary)
+
+on:
+  push:
+  pull_request:
+    branches: [ "import-braft" ]
+
+jobs:
+  check_format:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Build
+        run: bash ci/build.sh
+
+      - name: Check Format
+        working-directory: ${{ github.workspace }}/build
+        run: make check-format
+
+  build_on_macos:
+    runs-on: macos-latest
+    needs: check_format
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Build
+        env: 
+          CPLUS_INCLUDE_PATH: /usr/local/opt/openssl/include
+        run: |
+          sh build.sh
+
+      - name: Run Go E2E Tests
+        working-directory: ${{ github.workspace }}/build
+        run: |
+          cd ../tests
+          go mod tidy
+          go test ./pikiwidb_suite_test.go ./consistency_test.go -v
+
+  build_on_ubuntu:
+    runs-on: ubuntu-latest
+    needs: check_format
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Build
+        run: |
+          bash build.sh
+
+      - name: Run Go E2E Tests
+        working-directory: ${{ github.workspace }}/build
+        run: |
+          cd ../tests
+          go mod tidy
+          go test ./pikiwidb_suite_test.go ./consistency_test.go -v

cmake/braft.cmake

@@ -16,8 +16,8 @@ ExternalProject_Add(
         extern_braft
         ${EXTERNAL_PROJECT_LOG_ARGS}
         DEPENDS brpc
-        URL "https://github.com/baidu/braft/archive/v1.1.2.tar.gz"
-        URL_HASH SHA256=bb3705f61874f8488e616ae38464efdec1a20610ddd6cd82468adc814488f14e
+        URL "https://github.com/pikiwidb/braft/archive/refs/heads/stable.zip"
+        URL_HASH SHA256=e73831f9768ac57d07f01ed81a11c8368e259c25315a960c29a6422f31f42fd1
         PREFIX ${BRAFT_SOURCES_DIR}
         UPDATE_COMMAND ""
         CMAKE_ARGS -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}

src/client.h

@@ -102,7 +102,6 @@ enum ClientFlag {
   kClientFlagMaster = (1 << 3),
 };
 
-class DB;
 struct PSlaveInfo;
 
 class PClient : public std::enable_shared_from_this<PClient>, public CmdRes {
@@ -250,4 +249,4 @@ class PClient : public std::enable_shared_from_this<PClient>, public CmdRes {
 
   static thread_local PClient* s_current;
 };
-}  // namespace pikiwidb
+}  // namespace pikiwidb

src/cmd_admin.cc

@@ -5,9 +5,10 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-#include "cmd_admin.h"
 #include "braft/raft.h"
-#include "praft.h"
+
+#include "cmd_admin.h"
+#include "praft/praft.h"
 #include "store.h"
 
 namespace pikiwidb {
@@ -154,4 +155,4 @@ void InfoCmd::DoCmd(PClient* client) {
   }
 }
 
-}  // namespace pikiwidb
+}  // namespace pikiwidb

src/cmd_raft.cc

@@ -5,17 +5,19 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
+#include "cmd_raft.h"
+
 #include <cstdint>
 #include <optional>
 #include <string>
 
+#include "net/event_loop.h"
+#include "praft/praft.h"
+#include "pstd/log.h"
+#include "pstd/pstd_string.h"
+
 #include "client.h"
-#include "cmd_raft.h"
-#include "event_loop.h"
-#include "log.h"
 #include "pikiwidb.h"
-#include "praft.h"
-#include "pstd_string.h"
 
 namespace pikiwidb {
 
@@ -36,10 +38,10 @@ void RaftNodeCmd::DoCmd(PClient* client) {
     DoCmdAdd(client);
   } else if (!strcasecmp(cmd.c_str(), "REMOVE")) {
     DoCmdRemove(client);
-  } else if (!strcasecmp(cmd.c_str(), "DSS")) {
+  } else if (!strcasecmp(cmd.c_str(), "DOSNAPSHOT")) {
     DoCmdSnapshot(client);
   } else {
-    client->SetRes(CmdRes::kErrOther, "RAFT.NODE supports ADD / REMOVE only");
+    client->SetRes(CmdRes::kErrOther, "RAFT.NODE supports ADD / REMOVE / DOSNAPSHOT only");
   }
 }
 
@@ -180,4 +182,4 @@ void RaftClusterCmd::DoCmdJoin(PClient* client) {
   client->Clear();
 }
 
-}  // namespace pikiwidb
+}  // namespace pikiwidb

src/cmd_raft.h

@@ -79,4 +79,4 @@ class RaftClusterCmd : public BaseCmd {
   static constexpr std::string_view kJoinCmd = "JOIN";
 };
 
-}  // namespace pikiwidb
+}  // namespace pikiwidb

src/cmd_table_manager.cc

@@ -5,6 +5,8 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
+#include "cmd_table_manager.h"
+
 #include <memory>
 
 #include "cmd_admin.h"
@@ -14,7 +16,6 @@
 #include "cmd_list.h"
 #include "cmd_raft.h"
 #include "cmd_set.h"
-#include "cmd_table_manager.h"
 #include "cmd_zset.h"
 
 namespace pikiwidb {

src/db.cc

@@ -7,11 +7,10 @@
 
 #include "db.h"
 
-#include "praft/praft.h"
-#include "pstd/log.h"
-
 #include "checkpoint_manager.h"
 #include "config.h"
+#include "praft/praft.h"
+#include "pstd/log.h"
 
 extern pikiwidb::PConfig g_config;
 

src/pikiwidb.cc

@@ -8,6 +8,8 @@
 //
 //  PikiwiDB.cc
 
+#include "pikiwidb.h"
+
 #include <sys/fcntl.h>
 #include <sys/wait.h>
 #include <unistd.h>
@@ -21,7 +23,6 @@
 #include "client.h"
 #include "config.h"
 #include "helper.h"
-#include "pikiwidb.h"
 #include "pikiwidb_logo.h"
 #include "slow_log.h"
 #include "store.h"

src/praft/praft.h

@@ -9,7 +9,6 @@
 
 #include <filesystem>
 #include <future>
-#include <memory>
 #include <mutex>
 #include <string>
 #include <tuple>

src/storage/src/log_index.h

@@ -7,6 +7,7 @@
 
 #pragma once
 
+#include <array>
 #include <atomic>
 #include <deque>
 #include <functional>

src/storage/src/storage.cc

@@ -125,7 +125,7 @@ Status Storage::CreateCheckpoint(const std::string& dump_path, int i) {
 
   // 3) Create a checkpoint
   std::unique_ptr<rocksdb::Checkpoint> checkpoint_guard(checkpoint);
-  s = checkpoint->CreateCheckpoint(tmp_dir, kFlush, nullptr);
+  s = checkpoint->CreateCheckpoint(tmp_dir, kNoFlush, nullptr);
   if (!s.ok()) {
     WARN("DB{}'s RocksDB {} create checkpoint failed!. Error: {}", db_id_, i, s.ToString());
     return s;

src/store.h

@@ -10,9 +10,9 @@
 #define GLOG_NO_ABBREVIATED_SEVERITIES
 
 #include <map>
-#include <memory>
 #include <shared_mutex>
 #include <vector>
+
 #include "db.h"
 
 namespace pikiwidb {