From ccbc7c5ba04831961db6279ea3b7270c51ce143b Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Wed, 17 May 2023 15:18:08 +0800
Subject: [PATCH] more code

---
 source/dnode/vnode/src/tsdb/dev/tsdbFS.c | 57 ++++++++++++++++++++++--
 1 file changed, 54 insertions(+), 3 deletions(-)

diff --git a/source/dnode/vnode/src/tsdb/dev/tsdbFS.c b/source/dnode/vnode/src/tsdb/dev/tsdbFS.c
index d9d0f8c3fb..44ff89a372 100644
--- a/source/dnode/vnode/src/tsdb/dev/tsdbFS.c
+++ b/source/dnode/vnode/src/tsdb/dev/tsdbFS.c
@@ -250,12 +250,63 @@ _exit:
   return code;
 }
 
-static int32_t apply_commit(STFileSystem *fs) {
-  int32_t i1 = 0, i2 = 0;
-
+static int32_t apply_commit_add_fset(STFileSystem *fs, const STFileSet *fset) {
   // TODO
   return 0;
 }
+static int32_t apply_commit_del_fset(STFileSystem *fs, const STFileSet *fset) {
+  // TODO
+  return 0;
+}
+static int32_t apply_commit_upd_fset(STFileSystem *fs, STFileSet *fset_from, const STFileSet *fset_to) {
+  // TODO
+  return 0;
+}
+static int32_t apply_commit(STFileSystem *fs) {
+  int32_t code = 0;
+  int32_t i1 = 0, i2 = 0;
+  int32_t n1 = taosArrayGetSize(fs->cstate);
+  int32_t n2 = taosArrayGetSize(fs->nstate);
+
+  while (i1 < n1 || i2 < n2) {
+    STFileSet *fset1 = i1 < n1 ? (STFileSet *)taosArrayGet(fs->cstate, i1) : NULL;
+    STFileSet *fset2 = i2 < n2 ? (STFileSet *)taosArrayGet(fs->nstate, i2) : NULL;
+
+    if (fset1 && fset2) {
+      if (fset1->fid < fset2->fid) {
+        // delete fset1
+        code = apply_commit_del_fset(fs, fset1);
+        if (code) return code;
+        n1--;
+      } else if (fset1->fid > fset2->fid) {
+        // create new file set with fid of fset2->fid
+        code = apply_commit_add_fset(fs, fset2);
+        if (code) return code;
+        i1++;
+        n1++;
+      } else {
+        // edit
+        code = apply_commit_upd_fset(fs, fset1, fset2);
+        if (code) return code;
+        i1++;
+        i2++;
+      }
+    } else if (fset1) {
+      // delete fset1
+      code = apply_commit_del_fset(fs, fset1);
+      if (code) return code;
+      n1--;
+    } else {
+      // create new file set with fid of fset2->fid
+      code = apply_commit_add_fset(fs, fset2);
+      if (code) return code;
+      i1++;
+      n1++;
+    }
+  }
+
+  return 0;
+}
 
 static int32_t commit_edit(STFileSystem *fs) {
   char current[TSDB_FILENAME_LEN];