From eb8f74e9528907d4603dc7ff54569d1ec26a863c Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Thu, 18 Jun 2020 15:49:24 +0000
Subject: [PATCH] TD-353

---
 src/tsdb/src/tsdbFile.c |  3 ++-
 src/tsdb/src/tsdbMain.c |  1 -
 src/util/src/tkvstore.c | 16 ++++++++++++++--
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/tsdb/src/tsdbFile.c b/src/tsdb/src/tsdbFile.c
index b22d5fa834..feec663229 100644
--- a/src/tsdb/src/tsdbFile.c
+++ b/src/tsdb/src/tsdbFile.c
@@ -80,6 +80,7 @@ int tsdbOpenFileH(STsdbRepo *pRepo) {
   char *tDataDir = NULL;
   DIR * dir = NULL;
   int   fid = 0;
+  int   vid = 0;
 
   SFileGroup fileGroup = {0};
   STsdbFileH *pFileH = pRepo->tsdbFileH;
@@ -100,7 +101,7 @@ int tsdbOpenFileH(STsdbRepo *pRepo) {
   struct dirent *dp = NULL;
   while ((dp = readdir(dir)) != NULL) {
     if (strncmp(dp->d_name, ".", 1) == 0 || strncmp(dp->d_name, "..", 2) == 0) continue;
-    sscanf(dp->d_name, "f%d", &fid);
+    sscanf(dp->d_name, "v%df%d", &vid, &fid);
 
     if (tsdbSearchFGroup(pRepo->tsdbFileH, fid, TD_EQ) != NULL) return 0;
 
diff --git a/src/tsdb/src/tsdbMain.c b/src/tsdb/src/tsdbMain.c
index 91cb21b93a..8cd5b53a56 100644
--- a/src/tsdb/src/tsdbMain.c
+++ b/src/tsdb/src/tsdbMain.c
@@ -134,7 +134,6 @@ TSDB_REPO_T *tsdbOpenRepo(char *rootDir, STsdbAppH *pAppH) {
 
 _err:
   tsdbCloseRepo(pRepo, false);
-  tsdbFreeRepo(pRepo);
   return NULL;
 }
 
diff --git a/src/util/src/tkvstore.c b/src/util/src/tkvstore.c
index 1ffc86bf5e..8fa2c387d4 100644
--- a/src/util/src/tkvstore.c
+++ b/src/util/src/tkvstore.c
@@ -223,6 +223,8 @@ _err:
 
 int tdUpdateKVStoreRecord(SKVStore *pStore, uint64_t uid, void *cont, int contLen) {
   SKVRecord rInfo = {0};
+  char      buf[64] = "\0";
+  char *    pBuf = buf;
 
   rInfo.offset = lseek(pStore->fd, 0, SEEK_CUR);
   if (rInfo.offset < 0) {
@@ -233,6 +235,16 @@ int tdUpdateKVStoreRecord(SKVStore *pStore, uint64_t uid, void *cont, int contLe
   rInfo.uid = uid;
   rInfo.size = contLen;
 
+  int tlen = tdEncodeKVRecord((void *)(&pBuf), &rInfo);
+  ASSERT(tlen == POINTER_DISTANCE(pBuf, buf));
+  ASSERT(tlen == sizeof(SKVRecord));
+
+  if (twrite(pStore->fd, buf, tlen) < tlen) {
+    uError("failed to write %d bytes to file %s since %s", tlen, pStore->fname, strerror(errno));
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    return -1;
+  }
+
   if (twrite(pStore->fd, cont, contLen) < contLen) {
     uError("failed to write %d bytes to file %s since %s", contLen, pStore->fname, strerror(errno));
     return -1;
@@ -534,7 +546,7 @@ static int tdRestoreKVStore(SKVStore *pStore) {
   while (taosHashIterNext(pIter)) {
     SKVRecord *pRecord = taosHashIterGet(pIter);
 
-    if (lseek(pStore->fd, pRecord->offset, SEEK_SET) < 0) {
+    if (lseek(pStore->fd, pRecord->offset + sizeof(SKVRecord), SEEK_SET) < 0) {
       uError("failed to lseek file %s since %s, offset %" PRId64, pStore->fname, strerror(errno), pRecord->offset);
       terrno = TAOS_SYSTEM_ERROR(errno);
       goto _err;
@@ -551,7 +563,7 @@ static int tdRestoreKVStore(SKVStore *pStore) {
       if ((*pStore->iFunc)(pStore->appH, buf, pRecord->size) < 0) {
         uError("failed to restore record uid %" PRIu64 " in kv store %s at offset %" PRId64 " size %" PRId64
                " since %s",
-               pStore->fname, pRecord->uid, pRecord->offset, pRecord->size, tstrerror(terrno));
+               pRecord->uid, pStore->fname, pRecord->offset, pRecord->size, tstrerror(terrno));
         goto _err;
       }
     }
-- 
GitLab