From 24fed5113704781e65a024501abbf41d9b1b56eb Mon Sep 17 00:00:00 2001
From: Benguang Zhao <bgzhao@taosdata.com>
Date: Tue, 18 Jul 2023 13:58:43 +0800
Subject: [PATCH] enh: tfsRename dir on primary disk at last

---
 include/libs/tfs/tfs.h                 |  2 +-
 source/dnode/vnode/src/vnd/vnodeOpen.c |  4 +--
 source/libs/tfs/src/tfs.c              | 34 ++++++++++++++++++++------
 source/libs/tfs/test/tfsTest.cpp       |  6 ++---
 4 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/include/libs/tfs/tfs.h b/include/libs/tfs/tfs.h
index ef8a4cfe1f..509f8dc9e8 100644
--- a/include/libs/tfs/tfs.h
+++ b/include/libs/tfs/tfs.h
@@ -176,7 +176,7 @@ int32_t tfsRmdir(STfs *pTfs, const char *rname);
  * @param nrname The rel name of new file.
  * @return int32_t 0 for success, -1 for failure.
  */
-int32_t tfsRename(STfs *pTfs, const char *orname, const char *nrname);
+int32_t tfsRename(STfs *pTfs, int32_t diskPrimary, const char *orname, const char *nrname);
 
 /**
  * @brief Search fname in level of tfs
diff --git a/source/dnode/vnode/src/vnd/vnodeOpen.c b/source/dnode/vnode/src/vnd/vnodeOpen.c
index 4c30011d89..8f613fd0d8 100644
--- a/source/dnode/vnode/src/vnd/vnodeOpen.c
+++ b/source/dnode/vnode/src/vnd/vnodeOpen.c
@@ -176,7 +176,7 @@ int32_t vnodeRenameVgroupId(const char *srcPath, const char *dstPath, int32_t sr
       snprintf(newRname, TSDB_FILENAME_LEN, "%s%d%s", oldRname, dstVgId, tsdbFileSurfixPos);
       vInfo("vgId:%d, rename file from %s to %s", dstVgId, tsdbFile->rname, newRname);
 
-      ret = tfsRename(pTfs, tsdbFile->rname, newRname);
+      ret = tfsRename(pTfs, diskPrimary, tsdbFile->rname, newRname);
       if (ret != 0) {
         vError("vgId:%d, failed to rename file from %s to %s since %s", dstVgId, tsdbFile->rname, newRname, terrstr());
         tfsClosedir(tsdbDir);
@@ -188,7 +188,7 @@ int32_t vnodeRenameVgroupId(const char *srcPath, const char *dstPath, int32_t sr
   tfsClosedir(tsdbDir);
 
   vInfo("vgId:%d, rename dir from %s to %s", dstVgId, srcPath, dstPath);
-  ret = tfsRename(pTfs, srcPath, dstPath);
+  ret = tfsRename(pTfs, diskPrimary, srcPath, dstPath);
   if (ret != 0) {
     vError("vgId:%d, failed to rename dir from %s to %s since %s", dstVgId, srcPath, dstPath, terrstr());
   }
diff --git a/source/libs/tfs/src/tfs.c b/source/libs/tfs/src/tfs.c
index a0a95114ae..8adaab91a1 100644
--- a/source/libs/tfs/src/tfs.c
+++ b/source/libs/tfs/src/tfs.c
@@ -337,25 +337,43 @@ int32_t tfsRmdir(STfs *pTfs, const char *rname) {
   return 0;
 }
 
-int32_t tfsRename(STfs *pTfs, const char *orname, const char *nrname) {
+static int32_t tfsRenameAt(STfs *pTfs, SDiskID diskId, const char *orname, const char *nrname) {
   char oaname[TMPNAME_LEN] = "\0";
   char naname[TMPNAME_LEN] = "\0";
 
+  int32_t   level = diskId.level;
+  int32_t   id = diskId.id;
+  STfsTier *pTier = TFS_TIER_AT(pTfs, level);
+  STfsDisk *pDisk = pTier->disks[id];
+  snprintf(oaname, TMPNAME_LEN, "%s%s%s", pDisk->path, TD_DIRSEP, orname);
+  snprintf(naname, TMPNAME_LEN, "%s%s%s", pDisk->path, TD_DIRSEP, nrname);
+
+  if (taosRenameFile(oaname, naname) != 0 && errno != ENOENT) {
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    fError("failed to rename %s to %s since %s", oaname, naname, terrstr());
+    return -1;
+  }
+
+  return 0;
+}
+
+int32_t tfsRename(STfs *pTfs, int32_t diskPrimary, const char *orname, const char *nrname) {
   for (int32_t level = pTfs->nlevel - 1; level >= 0; level--) {
     STfsTier *pTier = TFS_TIER_AT(pTfs, level);
     for (int32_t id = pTier->ndisk - 1; id >= 0; id--) {
-      STfsDisk *pDisk = pTier->disks[id];
-      snprintf(oaname, TMPNAME_LEN, "%s%s%s", pDisk->path, TD_DIRSEP, orname);
-      snprintf(naname, TMPNAME_LEN, "%s%s%s", pDisk->path, TD_DIRSEP, nrname);
-      if (taosRenameFile(oaname, naname) != 0 && errno != ENOENT) {
-        terrno = TAOS_SYSTEM_ERROR(errno);
-        fError("failed to rename %s to %s since %s", oaname, naname, terrstr());
+      if (level == 0 && id == diskPrimary) {
+        continue;
+      }
+
+      SDiskID diskId = {.level = level, .id = id};
+      if (tfsRenameAt(pTfs, diskId, orname, nrname)) {
         return -1;
       }
     }
   }
 
-  return 0;
+  SDiskID diskId = {.level = 0, .id = diskPrimary};
+  return tfsRenameAt(pTfs, diskId, orname, nrname);
 }
 
 int32_t tfsSearch(STfs *pTfs, int32_t level, const char *fname) {
diff --git a/source/libs/tfs/test/tfsTest.cpp b/source/libs/tfs/test/tfsTest.cpp
index df37630fd7..9bbf6bc729 100644
--- a/source/libs/tfs/test/tfsTest.cpp
+++ b/source/libs/tfs/test/tfsTest.cpp
@@ -156,7 +156,7 @@ TEST_F(TfsTest, 03_Dir) {
   EXPECT_NE(taosDirExist(ap4), 1);
   EXPECT_EQ(tfsMkdirRecurAt(pTfs, p4, did), 0);
   EXPECT_EQ(taosDirExist(ap4), 1);
-  EXPECT_EQ(tfsRename(pTfs, p44, p45), 0);
+  EXPECT_EQ(tfsRename(pTfs, 0, p44, p45), 0);
   EXPECT_EQ(tfsRmdir(pTfs, p4), 0);
   EXPECT_NE(taosDirExist(ap4), 1);
 
@@ -609,7 +609,7 @@ TEST_F(TfsTest, 05_MultiDisk) {
     EXPECT_NE(taosDirExist(_ap22), 1);
     EXPECT_EQ(tfsMkdirRecurAt(pTfs, p4, did), 0);
     EXPECT_EQ(taosDirExist(_ap22), 1);
-    EXPECT_EQ(tfsRename(pTfs, p44, p45), 0);
+    EXPECT_EQ(tfsRename(pTfs, 0, p44, p45), 0);
     EXPECT_EQ(tfsRmdir(pTfs, p4), 0);
     EXPECT_NE(taosDirExist(_ap22), 1);
   }
@@ -721,4 +721,4 @@ TEST_F(TfsTest, 05_MultiDisk) {
   }
 
   tfsClose(pTfs);
-}
\ No newline at end of file
+}
-- 
GitLab