From 34b0208f149682423d2237bf401d25afa3f9b0d6 Mon Sep 17 00:00:00 2001
From: Minglei Jin <mljin@taosdata.com>
Date: Thu, 28 Jul 2022 15:29:22 +0800
Subject: [PATCH] refact: tsdbCache/cleanup, remove tsRowFromTsdbRow

---
 source/dnode/vnode/src/tsdb/tsdbCache.c | 81 ++++++++++++-------------
 1 file changed, 38 insertions(+), 43 deletions(-)

diff --git a/source/dnode/vnode/src/tsdb/tsdbCache.c b/source/dnode/vnode/src/tsdb/tsdbCache.c
index 46de219035..4e6a450d35 100644
--- a/source/dnode/vnode/src/tsdb/tsdbCache.c
+++ b/source/dnode/vnode/src/tsdb/tsdbCache.c
@@ -46,11 +46,6 @@ void tsdbCloseCache(SLRUCache *pCache) {
   }
 }
 
-/* static void getTableCacheKeyS(tb_uid_t uid, const char *cacheType, char *key, int *len) { */
-/*   snprintf(key, 30, "%" PRIi64 "%s", uid, cacheType); */
-/*   *len = strlen(key); */
-/* } */
-
 static void getTableCacheKey(tb_uid_t uid, int cacheType, char *key, int *len) {
   if (cacheType == 0) {  // last_row
     *(uint64_t *)key = (uint64_t)uid;
@@ -649,44 +644,44 @@ _err:
   return code;
 }
 
-static int32_t tsRowFromTsdbRow(STSchema *pTSchema, TSDBROW *pRow, STSRow **ppRow) {
-  int32_t code = 0;
-
-  SColVal *pColVal = &(SColVal){0};
-
-  if (pRow->type == 0) {
-    *ppRow = tdRowDup(pRow->pTSRow);
-  } else {
-    SArray *pArray = taosArrayInit(pTSchema->numOfCols, sizeof(SColVal));
-    if (pArray == NULL) {
-      code = TSDB_CODE_OUT_OF_MEMORY;
-      goto _exit;
-    }
-
-    TSDBKEY   key = TSDBROW_KEY(pRow);
-    STColumn *pTColumn = &pTSchema->columns[0];
-    *pColVal = COL_VAL_VALUE(pTColumn->colId, pTColumn->type, (SValue){.ts = key.ts});
-
-    if (taosArrayPush(pArray, pColVal) == NULL) {
-      code = TSDB_CODE_OUT_OF_MEMORY;
-      goto _exit;
-    }
-
-    for (int16_t iCol = 1; iCol < pTSchema->numOfCols; iCol++) {
-      tsdbRowGetColVal(pRow, pTSchema, iCol, pColVal);
-      if (taosArrayPush(pArray, pColVal) == NULL) {
-        code = TSDB_CODE_OUT_OF_MEMORY;
-        goto _exit;
-      }
-    }
-
-    code = tdSTSRowNew(pArray, pTSchema, ppRow);
-    if (code) goto _exit;
-  }
-
-_exit:
-  return code;
-}
+/* static int32_t tsRowFromTsdbRow(STSchema *pTSchema, TSDBROW *pRow, STSRow **ppRow) { */
+/*   int32_t code = 0; */
+
+/*   SColVal *pColVal = &(SColVal){0}; */
+
+/*   if (pRow->type == 0) { */
+/*     *ppRow = tdRowDup(pRow->pTSRow); */
+/*   } else { */
+/*     SArray *pArray = taosArrayInit(pTSchema->numOfCols, sizeof(SColVal)); */
+/*     if (pArray == NULL) { */
+/*       code = TSDB_CODE_OUT_OF_MEMORY; */
+/*       goto _exit; */
+/*     } */
+
+/*     TSDBKEY   key = TSDBROW_KEY(pRow); */
+/*     STColumn *pTColumn = &pTSchema->columns[0]; */
+/*     *pColVal = COL_VAL_VALUE(pTColumn->colId, pTColumn->type, (SValue){.ts = key.ts}); */
+
+/*     if (taosArrayPush(pArray, pColVal) == NULL) { */
+/*       code = TSDB_CODE_OUT_OF_MEMORY; */
+/*       goto _exit; */
+/*     } */
+
+/*     for (int16_t iCol = 1; iCol < pTSchema->numOfCols; iCol++) { */
+/*       tsdbRowGetColVal(pRow, pTSchema, iCol, pColVal); */
+/*       if (taosArrayPush(pArray, pColVal) == NULL) { */
+/*         code = TSDB_CODE_OUT_OF_MEMORY; */
+/*         goto _exit; */
+/*       } */
+/*     } */
+
+/*     code = tdSTSRowNew(pArray, pTSchema, ppRow); */
+/*     if (code) goto _exit; */
+/*   } */
+
+/* _exit: */
+/*   return code; */
+/* } */
 
 static bool tsdbKeyDeleted(TSDBKEY *key, SArray *pSkyline, int64_t *iSkyline) {
   bool deleted = false;
-- 
GitLab