finish more code

include/common/tdataformat.h

@@ -89,12 +89,12 @@ void    tRowGet(SRow *pRow, STSchema *pTSchema, int32_t iCol, SColVal *pColVal);
 void    tRowDestroy(SRow *pRow);
 void    tRowSort(SArray *aRowP);
 int32_t tRowMerge(SArray *aRowP, STSchema *pTSchema, int8_t flag);
+int32_t tRowAppendToColData(SRow *pRow, STSchema *pTSchema, SColData *aColData, int32_t nColData);
 
 // SRowIter ================================
 int32_t  tRowIterOpen(SRow *pRow, STSchema *pTSchema, SRowIter **ppIter);
 void     tRowIterClose(SRowIter **ppIter);
 SColVal *tRowIterNext(SRowIter *pIter);
-int32_t  tRowAppendToColData(SRow *pRow, STSchema *pTSchema, SColData *aColData, int32_t nColData);
 
 // STag ================================
 int32_t tTagNew(SArray *pArray, int32_t version, int8_t isJson, STag **ppTag);

source/dnode/vnode/src/inc/tsdb.h

@@ -117,7 +117,8 @@ static FORCE_INLINE int64_t tsdbLogicToFileSize(int64_t lSize, int32_t szPage) {
 void    tsdbRowGetColVal(TSDBROW *pRow, STSchema *pTSchema, int32_t iCol, SColVal *pColVal);
 int32_t tsdbRowCmprFn(const void *p1, const void *p2);
 // STSDBRowIter
-void     tsdbRowIterInit(STSDBRowIter *pIter, TSDBROW *pRow, STSchema *pTSchema);
+int32_t  tsdbRowIterOpen(STSDBRowIter *pIter, TSDBROW *pRow, STSchema *pTSchema);
+void     tsdbRowClose(STSDBRowIter *pIter);
 SColVal *tsdbRowIterNext(STSDBRowIter *pIter);
 // SRowMerger
 int32_t tsdbRowMergerInit2(SRowMerger *pMerger, STSchema *pResTSchema, TSDBROW *pRow, STSchema *pTSchema);
@@ -571,10 +572,14 @@ struct SDFileSet {
 };
 
 struct STSDBRowIter {
-  TSDBROW  *pRow;
+  TSDBROW *pRow;
-  STSchema *pTSchema;
+  union {
-  SColVal   colVal;
+    SRowIter *pIter;
-  int32_t   i;
+    struct {
+      int32_t iColData;
+      SColVal cv;
+    };
+  };
 };
 struct SRowMerger {
   STSchema *pTSchema;

source/dnode/vnode/src/tsdb/tsdbDiskData.c

@@ -596,7 +596,7 @@ int32_t tDiskDataAddRow(SDiskDataBuilder *pBuilder, TSDBROW *pRow, STSchema *pTS
   if (pBuilder->bi.maxKey < kRow.ts) pBuilder->bi.maxKey = kRow.ts;
 
   STSDBRowIter iter = {0};
-  tsdbRowIterInit(&iter, pRow, pTSchema);
+  tsdbRowIterOpen(&iter, pRow, pTSchema);
 
   SColVal *pColVal = tsdbRowIterNext(&iter);
   for (int32_t iBuilder = 0; iBuilder < pBuilder->nBuilder; iBuilder++) {

source/dnode/vnode/src/tsdb/tsdbUtil.c

@@ -594,42 +594,50 @@ int32_t tsdbRowCmprFn(const void *p1, const void *p2) {
 }
 
 // STSDBRowIter ======================================================
-void tsdbRowIterInit(STSDBRowIter *pIter, TSDBROW *pRow, STSchema *pTSchema) {
+int32_t tsdbRowIterOpen(STSDBRowIter *pIter, TSDBROW *pRow, STSchema *pTSchema) {
+  int32_t code = 0;
+
   pIter->pRow = pRow;
   if (pRow->type == TSDBROW_ROW_FMT) {
-    ASSERT(pTSchema);
+    code = tRowIterOpen(pRow->pTSRow, pTSchema, &pIter->pIter);
-    pIter->pTSchema = pTSchema;
+    if (code) goto _exit;
-    pIter->i = 1;
   } else if (pRow->type == TSDBROW_COL_FMT) {
-    pIter->pTSchema = NULL;
+    pIter->iColData = 0;
-    pIter->i = 0;
   } else {
     ASSERT(0);
   }
+
+_exit:
+  return code;
+}
+
+void tsdbRowClose(STSDBRowIter *pIter) {
+  if (pIter->pRow->type == TSDBROW_ROW_FMT) {
+    tRowIterClose(&pIter->pIter);
+  }
 }
 
 SColVal *tsdbRowIterNext(STSDBRowIter *pIter) {
   if (pIter->pRow->type == TSDBROW_ROW_FMT) {
-    if (pIter->i < pIter->pTSchema->numOfCols) {
+    return tRowIterNext(pIter->pIter);
-      tRowGet(pIter->pRow->pTSRow, pIter->pTSchema, pIter->i, &pIter->colVal);
-      pIter->i++;
-
-      return &pIter->colVal;
-    }
   } else if (pIter->pRow->type == TSDBROW_COL_FMT) {
-    if (pIter->i < pIter->pRow->pBlockData->nColData) {
+    if (pIter->iColData == 0) {
-      SColData *pColData = tBlockDataGetColDataByIdx(pIter->pRow->pBlockData, pIter->i);
+      pIter->cv = COL_VAL_VALUE(PRIMARYKEY_TIMESTAMP_COL_ID, TSDB_DATA_TYPE_TIMESTAMP,
+                                (SValue){.val = pIter->pRow->pBlockData->aTSKEY[pIter->pRow->iRow]});
+      ++pIter->iColData;
+      return &pIter->cv;
+    }
 
-      tColDataGetValue(pColData, pIter->pRow->iRow, &pIter->colVal);
+    if (pIter->iColData < pIter->pRow->pBlockData->nColData) {
-      pIter->i++;
+      tColDataGetValue(&pIter->pRow->pBlockData->aColData[pIter->iColData], pIter->pRow->iRow, &pIter->cv);
-
+      ++pIter->iColData;
-      return &pIter->colVal;
+      return &pIter->cv;
+    } else {
+      return NULL;
     }
   } else {
     ASSERT(0);
   }
-
-  return NULL;
 }
 
 // SRowMerger ======================================================