tdb/journal: rollback & restore multiple journal files

source/libs/tdb/src/db/tdbPager.c

@@ -832,12 +832,12 @@ static int tdbPagerPWritePageToDB(SPager *pPager, SPage *pPage) {
   return 0;
 }
 
-int tdbPagerRestore(SPager *pPager, SBTree *pBt) {
+static int tdbPagerRestore(SPager *pPager, SBTree *pBt, const char *jFileName) {
   int   ret = 0;
   SPgno journalSize = 0;
   u8   *pageBuf = NULL;
 
-  tdb_fd_t jfd = tdbOsOpen(pPager->jFileName, TDB_O_RDWR, 0755);
+  tdb_fd_t jfd = tdbOsOpen(jFileName, TDB_O_RDWR, 0755);
   if (jfd == NULL) {
     return 0;
   }
@@ -910,12 +910,50 @@ int tdbPagerRestore(SPager *pPager, SBTree *pBt) {
   return 0;
 }
 
+int tdbPagerRestoreJournals(SPager *pPager, SBTree *pBt) {
+  tdbDirEntryPtr pDirEntry;
+  tdbDirPtr      pDir = taosOpenDir(pPager->pEnv->dbName);
+  if (pDir == NULL) {
+    tdbError("failed to open %s since %s", pPager->pEnv->dbName, strerror(errno));
+    return -1;
+  }
+
+  while ((pDirEntry = tdbReadDir(pDir)) != NULL) {
+    char *name = tdbDirEntryBaseName(tdbGetDirEntryName(pDirEntry));
+    if (strncmp(TDB_MAINDB_NAME "-journal", name, 16) == 0) {
+      if (tdbPagerRestore(pPager, pBt, name) < 0) {
+        tdbError("failed to restore file due to %s. jFileName:%s", strerror(errno), name);
+        return -1;
+      }
+    }
+  }
+
+  tdbCloseDir(&pDir);
+
+  return 0;
+}
+
 int tdbPagerRollback(SPager *pPager) {
-  if (tdbOsRemove(pPager->jFileName) < 0 && errno != ENOENT) {
-    tdbError("failed to remove file due to %s. jFileName:%s", strerror(errno), pPager->jFileName);
-    terrno = TAOS_SYSTEM_ERROR(errno);
+  tdbDirEntryPtr pDirEntry;
+  tdbDirPtr      pDir = taosOpenDir(pPager->pEnv->dbName);
+  if (pDir == NULL) {
+    tdbError("failed to open %s since %s", pPager->pEnv->dbName, strerror(errno));
     return -1;
   }
 
+  while ((pDirEntry = tdbReadDir(pDir)) != NULL) {
+    char *name = tdbDirEntryBaseName(tdbGetDirEntryName(pDirEntry));
+
+    if (strncmp(TDB_MAINDB_NAME "-journal", name, 16) == 0) {
+      if (tdbOsRemove(name) < 0 && errno != ENOENT) {
+        tdbError("failed to remove file due to %s. jFileName:%s", strerror(errno), name);
+        terrno = TAOS_SYSTEM_ERROR(errno);
+        return -1;
+      }
+    }
+  }
+
+  tdbCloseDir(&pDir);
+
   return 0;
 }

source/libs/tdb/src/db/tdbTable.c

@@ -117,7 +117,7 @@ int tdbTbOpen(const char *tbname, int keyLen, int valLen, tdb_cmpr_fn_t keyCmprF
   if (rollback) {
     tdbPagerRollback(pPager);
   } else {
-    ret = tdbPagerRestore(pPager, pTb->pBt);
+    ret = tdbPagerRestoreJournals(pPager, pTb->pBt);
     if (ret < 0) {
       tdbOsFree(pTb);
       return -1;

source/libs/tdb/src/inc/tdbInt.h

@@ -197,7 +197,7 @@ int  tdbPagerFetchPage(SPager *pPager, SPgno *ppgno, SPage **ppPage, int (*initP
                        TXN *pTxn);
 void tdbPagerReturnPage(SPager *pPager, SPage *pPage, TXN *pTxn);
 int  tdbPagerAllocPage(SPager *pPager, SPgno *ppgno);
-int  tdbPagerRestore(SPager *pPager, SBTree *pBt);
+int  tdbPagerRestoreJournals(SPager *pPager, SBTree *pBt);
 int  tdbPagerRollback(SPager *pPager);
 
 // tdbPCache.c ====================================

source/libs/tdb/src/inc/tdbOs.h

@@ -47,16 +47,21 @@ typedef TdFilePtr tdb_fd_t;
 #define TDB_O_RDWR   (TD_FILE_WRITE) | (TD_FILE_READ)
 
 #define tdbOsOpen(PATH, OPTION, MODE) taosOpenFile((PATH), (OPTION))
-
-#define tdbOsClose(FD)           taosCloseFile(&(FD))
-#define tdbOsRead                taosReadFile
-#define tdbOsPRead               taosPReadFile
-#define tdbOsWrite               taosWriteFile
-#define tdbOsPWrite              taosPWriteFile
-#define tdbOsFSync               taosFsyncFile
-#define tdbOsLSeek               taosLSeekFile
-#define tdbOsRemove              remove
-#define tdbOsFileSize(FD, PSIZE) taosFStatFile(FD, PSIZE, NULL)
+#define tdbOsClose(FD)                taosCloseFile(&(FD))
+#define tdbOsRead                     taosReadFile
+#define tdbOsPRead                    taosPReadFile
+#define tdbOsWrite                    taosWriteFile
+#define tdbOsPWrite                   taosPWriteFile
+#define tdbOsFSync                    taosFsyncFile
+#define tdbOsLSeek                    taosLSeekFile
+#define tdbDirPtr                     TdDirPtr
+#define tdbDirEntryPtr                TdDirEntryPtr
+#define tdbReadDir                    taosReadDir
+#define tdbGetDirEntryName            taosGetDirEntryName
+#define tdbDirEntryBaseName           taosDirEntryBaseName
+#define tdbCloseDir                   taosCloseDir
+#define tdbOsRemove                   remove
+#define tdbOsFileSize(FD, PSIZE)      taosFStatFile(FD, PSIZE, NULL)
 
 /* directory */
 #define tdbOsMkdir taosMkDir