more code

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

@@ -778,160 +778,51 @@ _err:
   return code;
 }
 
-static int32_t tsdbMergeCommitLast(SCommitter *pCommitter, STbDataIter *pIter) {
+static int32_t tsdbCommitLastFile(SCommitter *pCommitter, STbDataIter *pIter) {
-  int32_t code = 0;
+  int32_t     code = 0;
-#if 0
+  STbData    *pTbData = pIter->pTbData;
-  STbData *pTbData = pIter->pTbData;
+  SBlockData *pBlockData = &pCommitter->dWriter.bDatal;
-  int32_t  nRow = tsdbGetNumOfRowsLessThan(pIter, (TSDBKEY){.ts = pCommitter->maxKey + 1, .version = VERSION_MIN});
+  TSDBROW    *pRow = tsdbTbDataIterGet(pIter);
 
-  if (pCommitter->dReader.pRowInfo && tTABLEIDCmprFn(pTbData, pCommitter->dReader.pRowInfo) == 0) {
-    if (pCommitter->dReader.pRowInfo->suid) {  // super table
-      for (int32_t iRow = pCommitter->dReader.iRow; iRow < pCommitter->dReader.bDatal.nRow; iRow++) {
-        if (pTbData->uid != pCommitter->dReader.bDatal.aUid[iRow]) break;
-        nRow++;
-      }
-    } else {  // normal table
-      ASSERT(pCommitter->dReader.iRow == 0);
-      nRow += pCommitter->dReader.bDatal.nRow;
-    }
-  }
-
-  if (nRow == 0) goto _exit;
-
-  TSDBROW *pRow = tsdbTbDataIterGet(pIter);
   if (pRow && TSDBROW_TS(pRow) > pCommitter->maxKey) {
     pRow = NULL;
   }
 
-  SRowInfo *pRowInfo = pCommitter->dReader.pRowInfo;
+  if (pRow == NULL) goto _exit;
-  if (pRowInfo && pRowInfo->uid != pTbData->uid) {
-    pRowInfo = NULL;
-  }
 
-  while (nRow) {
+  if (pBlockData->suid || pBlockData->uid) {
-    SBlockData *pBlockData;
+    if (pBlockData->suid != pTbData->suid || pBlockData->suid == 0) {
-    int8_t      toData;
+      if (pBlockData->nRow > 0) {
-
-    if (nRow < pCommitter->minRow) {  // to .last
-      toData = 0;
-      pBlockData = &pCommitter->dWriter.bDatal;
-
-      // commit and reset block data schema if need
-      // QUESTION: Is there a case that pBlockData->nRow == 0 but need to change schema ?
-      if (pBlockData->suid || pBlockData->uid) {
-        if (pBlockData->suid != pTbData->suid || pBlockData->suid == 0) {
-          if (pBlockData->nRow > 0) {
-            code = tsdbCommitLastBlock(pCommitter);
-            if (code) goto _err;
-          }
-
-          tBlockDataReset(pBlockData);
-        }
-      }
-
-      // set block data schema if need
-      if (pBlockData->suid == 0 && pBlockData->uid == 0) {
-        code =
-            tBlockDataInit(pBlockData, pTbData->suid, pTbData->suid ? 0 : pTbData->uid, pCommitter->skmTable.pTSchema);
-        if (code) goto _err;
-      }
-
-      if (pBlockData->nRow + nRow > pCommitter->maxRow) {
         code = tsdbCommitLastBlock(pCommitter);
         if (code) goto _err;
       }
-    } else {  // to .data
+
-      toData = 1;
+      tBlockDataReset(pBlockData);
-      pBlockData = &pCommitter->dWriter.bData;
+    }
-      ASSERT(pBlockData->nRow == 0);
+  }
+
+  if (!pBlockData->suid && !pBlockData->uid) {
+    code = tBlockDataInit(pBlockData, pTbData->suid, pTbData->uid, pCommitter->skmTable.pTSchema);
+    if (code) goto _err;
+  }
+
+  while (pRow) {
+    code = tsdbCommitterUpdateRowSchema(pCommitter, pTbData->suid, pTbData->uid, TSDBROW_SVERSION(pRow));
+    if (code) goto _err;
+
+    code = tBlockDataAppendRow(pBlockData, pRow, pCommitter->skmRow.pTSchema, pTbData->uid);
+    if (code) goto _err;
+
+    tsdbTbDataIterNext(pIter);
+    pRow = tsdbTbDataIterGet(pIter);
+    if (pRow && TSDBROW_TS(pRow) > pCommitter->maxKey) {
+      pRow = NULL;
     }
 
-    while (pRow && pRowInfo) {
+    if (pBlockData->nRow >= pCommitter->maxRow) {
-      int32_t c = tsdbRowCmprFn(pRow, &pRowInfo->row);
+      code = tsdbCommitLastBlock(pCommitter);
-      if (c < 0) {
+      if (code) goto _err;
-        code = tsdbCommitterUpdateRowSchema(pCommitter, pTbData->suid, pTbData->uid, TSDBROW_SVERSION(pRow));
-        if (code) goto _err;
-
-        code = tBlockDataAppendRow(pBlockData, pRow, pCommitter->skmRow.pTSchema, pTbData->uid);
-        if (code) goto _err;
-
-        tsdbTbDataIterNext(pIter);
-        pRow = tsdbTbDataIterGet(pIter);
-        if (pRow && TSDBROW_TS(pRow) > pCommitter->maxKey) {
-          pRow = NULL;
-        }
-      } else if (c > 0) {
-        code = tBlockDataAppendRow(pBlockData, &pRowInfo->row, NULL, pTbData->uid);
-        if (code) goto _err;
-
-        code = tsdbCommitterNextLastRow(pCommitter);
-        if (code) goto _err;
-
-        pRowInfo = pCommitter->dReader.pRowInfo;
-        if (pRowInfo && pRowInfo->uid != pTbData->uid) {
-          pRowInfo = NULL;
-        }
-      } else {
-        ASSERT(0);
-      }
-
-      nRow--;
-      if (toData) {
-        if (nRow == 0 || pBlockData->nRow >= pCommitter->maxRow * 4 / 5) {
-          code = tsdbCommitDataBlock(pCommitter, NULL);
-          if (code) goto _err;
-          goto _outer_break;
-        }
-      }
     }
-
-    while (pRow) {
-      code = tsdbCommitterUpdateRowSchema(pCommitter, pTbData->suid, pTbData->uid, TSDBROW_SVERSION(pRow));
-      if (code) goto _err;
-
-      code = tBlockDataAppendRow(pBlockData, pRow, pCommitter->skmRow.pTSchema, pTbData->uid);
-      if (code) goto _err;
-
-      tsdbTbDataIterNext(pIter);
-      pRow = tsdbTbDataIterGet(pIter);
-      if (pRow && TSDBROW_TS(pRow) > pCommitter->maxKey) {
-        pRow = NULL;
-      }
-
-      nRow--;
-      if (toData) {
-        if (nRow == 0 || pBlockData->nRow >= pCommitter->maxRow * 4 / 5) {
-          code = tsdbCommitDataBlock(pCommitter, NULL);
-          if (code) goto _err;
-          goto _outer_break;
-        }
-      }
-    }
-
-    while (pRowInfo) {
-      code = tBlockDataAppendRow(pBlockData, &pRowInfo->row, NULL, pTbData->uid);
-      if (code) goto _err;
-
-      code = tsdbCommitterNextLastRow(pCommitter);
-      if (code) goto _err;
-
-      pRowInfo = pCommitter->dReader.pRowInfo;
-      if (pRowInfo && pRowInfo->uid != pTbData->uid) {
-        pRowInfo = NULL;
-      }
-
-      nRow--;
-      if (toData) {
-        if (nRow == 0 || pBlockData->nRow >= pCommitter->maxRow * 4 / 5) {
-          code = tsdbCommitDataBlock(pCommitter, NULL);
-          if (code) goto _err;
-          goto _outer_break;
-        }
-      }
-    }
-
-  _outer_break:
-    ASSERT(nRow >= 0);
   }
 
 _exit:
@@ -939,7 +830,6 @@ _exit:
 
 _err:
   tsdbError("vgId:%d tsdb merge commit last failed since %s", TD_VID(pCommitter->pTsdb->pVnode), tstrerror(code));
-#endif
   return code;
 }
 
@@ -1061,7 +951,7 @@ static int32_t tsdbCommitTableData(SCommitter *pCommitter, STbData *pTbData) {
   if (code) goto _err;
 
   // commit last
-  code = tsdbMergeCommitLast(pCommitter, &iter);
+  code = tsdbCommitLastFile(pCommitter, &iter);
   if (code) goto _err;
 
 _exit: