From 0a5412f33d7ae055c251584d38a027d6b1e82be2 Mon Sep 17 00:00:00 2001
From: Minghao Li <castermode@gmail.com>
Date: Tue, 24 May 2022 21:00:14 +0800
Subject: [PATCH] refactor: modify FpSnapshotRead, FpSnapshotApply

---
 include/libs/sync/sync.h              | 13 +++++++++++--
 source/dnode/mnode/impl/src/mndSync.c |  6 +++---
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/include/libs/sync/sync.h b/include/libs/sync/sync.h
index 5ffcbb7a09..4ac4922e80 100644
--- a/include/libs/sync/sync.h
+++ b/include/libs/sync/sync.h
@@ -98,8 +98,17 @@ typedef struct SSyncFSM {
 
   void (*FpRestoreFinishCb)(struct SSyncFSM* pFsm);
   int32_t (*FpGetSnapshot)(struct SSyncFSM* pFsm, SSnapshot* pSnapshot);
-  void* (*FpSnapshotRead)(struct SSyncFSM* pFsm, const SSnapshot* snapshot, void* iter, char** ppBuf, int32_t* len);
-  int32_t (*FpSnapshotApply)(struct SSyncFSM* pFsm, const SSnapshot* snapshot, char* pBuf, int32_t len);
+
+  // if (*ppIter == NULL) 
+  //   *ppIter = new iter;
+  // else 
+  //   *ppIter.next();
+  //
+  // if success, return 0. else return error code
+  int32_t (*FpSnapshotRead)(struct SSyncFSM* pFsm, const SSnapshot* pSnapshot, void** ppIter, char** ppBuf, int32_t* len);
+  
+  // apply data into fsm
+  int32_t (*FpSnapshotApply)(struct SSyncFSM* pFsm, const SSnapshot* pSnapshot, char* pBuf, int32_t len);
 
   void (*FpReConfigCb)(struct SSyncFSM* pFsm, SSyncCfg newCfg, SReConfigCbMeta cbMeta);
 
diff --git a/source/dnode/mnode/impl/src/mndSync.c b/source/dnode/mnode/impl/src/mndSync.c
index 2b4b472c35..0ddb542b38 100644
--- a/source/dnode/mnode/impl/src/mndSync.c
+++ b/source/dnode/mnode/impl/src/mndSync.c
@@ -55,7 +55,7 @@ void mndRestoreFinish(struct SSyncFSM *pFsm) {
   pMnode->syncMgmt.restored = true;
 }
 
-void* mndSnapshotRead(struct SSyncFSM* pFsm, const SSnapshot* snapshot, void* iter, char** ppBuf, int32_t* len) {
+int32_t mndSnapshotRead(struct SSyncFSM* pFsm, const SSnapshot* pSnapshot, void** ppIter, char** ppBuf, int32_t* len) {
   /*
   SMnode *pMnode = pFsm->data;
   SSdbIter *pIter;
@@ -68,10 +68,10 @@ void* mndSnapshotRead(struct SSyncFSM* pFsm, const SSnapshot* snapshot, void* it
   return pIter;
   */
 
-  return NULL;
+  return 0;
 }
 
-int32_t mndSnapshotApply(struct SSyncFSM* pFsm, const SSnapshot* snapshot, char* pBuf, int32_t len) {
+int32_t mndSnapshotApply(struct SSyncFSM* pFsm, const SSnapshot* pSnapshot, char* pBuf, int32_t len) {
   SMnode *pMnode = pFsm->data;
   sdbWrite(pMnode->pSdb, (SSdbRaw*)pBuf);
   return 0;
-- 
GitLab