more code

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

@@ -614,32 +614,52 @@ int32_t tsdbCompact(STsdb *pTsdb, int32_t flag) {
 
       nRow++;
 
-      // write block data if schema changed
-      // if ((pCompactor->bData.suid || pCompactor->bData.uid) &&
-      //     !TABLE_SAME_SCHEMA(pCompactor->bData.suid, pCompactor->bData.uid, pRowInfo->suid, pRowInfo->uid)) {
-      //   // TODO: write block data
-      //   ASSERT(0);
-
-      //   // set block data not initialized
-      //   tBlockDataReset(&pCompactor->bData);
-      // }
-
-      // // init the block data if not initialized yet
-      // if (pCompactor->bData.suid == 0 && pCompactor->bData.uid == 0) {
-      //   code = tBlockDataInit(&pCompactor->bData, &(TABLEID){.suid = pRowInfo->suid, .uid = pRowInfo->uid}, pTSchema,
-      //                         NULL, 0);
-      //   TSDB_CHECK_CODE(code, lino, _exit);
-      // }
-
-      // // append row to block data
-      // code = tBlockDataAppendRow(&pCompactor->bData, &pRowInfo->row, pTSchema, pRowInfo->uid);
-      // TSDB_CHECK_CODE(code, lino, _exit);
-
-      // // check if block data is full
-      // if (pCompactor->bData.nRow >= pCompactor->maxRows) {
-      //   // TODO: write block data
-      //   ASSERT(0);
-      // }
+      if (pCompactor->bData.suid == 0 && pCompactor->bData.uid == 0) {  // init the block data if not initialized yet
+        code = tBlockDataInit(&pCompactor->bData, &(TABLEID){.suid = pRowInfo->suid, .uid = pRowInfo->uid}, pTSchema,
+                              NULL, 0);
+        TSDB_CHECK_CODE(code, lino, _exit);
+      } else {
+        if (pCompactor->bData.suid != pRowInfo->suid) {  // not same super table
+          if (pCompactor->bData.nRow < pCompactor->minRows) {
+            // TODO: write block data to .stt file, need to check if nRow is 0
+            tBlockDataClear(&pCompactor->bData);
+          } else {
+            // TODO: write block data to .data file, need to check if nRow is 0
+            tBlockDataClear(&pCompactor->bData);
+          }
+
+          code = tBlockDataInit(&pCompactor->bData, &(TABLEID){.suid = pRowInfo->suid, .uid = pRowInfo->uid}, pTSchema,
+                                NULL, 0);
+          TSDB_CHECK_CODE(code, lino, _exit);
+        } else if (pCompactor->bData.uid != pRowInfo->uid) {
+          if (pRowInfo->suid) {  // different child table
+            if (pCompactor->bData.nRow > pCompactor->minRows) {
+              // TODO
+            }
+          } else {  // different normal table
+            if (pCompactor->bData.nRow < pCompactor->minRows) {
+              // TODO: write data to .stt file, need to check if nRow is 0
+              tBlockDataClear(&pCompactor->bData);
+            } else {
+              // TODO: write data to .data file, need to check if nRow is 0
+              tBlockDataClear(&pCompactor->bData);
+            }
+
+            code = tBlockDataInit(&pCompactor->bData, &(TABLEID){.suid = pRowInfo->suid, .uid = pRowInfo->uid},
+                                  pTSchema, NULL, 0);
+            TSDB_CHECK_CODE(code, lino, _exit);
+          }
+        }
+      }
+
+      // append row to block data
+      code = tBlockDataAppendRow(&pCompactor->bData, &pRowInfo->row, pTSchema, pRowInfo->uid);
+      TSDB_CHECK_CODE(code, lino, _exit);
+
+      // check if block data is full
+      if (pCompactor->bData.nRow >= pCompactor->maxRows) {
+        tBlockDataClear(&pCompactor->bData);
+      }
 
       // iterate to next row
       code = tsdbCompactNextRow(pCompactor);

source/dnode/vnode/src/vnd/vnodeSvr.c

@@ -301,11 +301,7 @@ int32_t vnodeProcessWriteMsg(SVnode *pVnode, SRpcMsg *pMsg, int64_t version, SRp
       vnodeProcessAlterConfigReq(pVnode, version, pReq, len, pRsp);
       break;
     case TDMT_VND_COMMIT:
-#if 0
       vnodeSyncCommit(pVnode);
-#else
-      vnodeAsyncCompact(pVnode);
-#endif
       vnodeBegin(pVnode);
       goto _exit;
     case TDMT_VND_COMPACT:
@@ -1276,10 +1272,8 @@ static int32_t vnodeProcessCompactVnodeReq(SVnode *pVnode, int64_t version, void
   vInfo("vgId:%d, compact msg will be processed, db:%s dbUid:%" PRId64 " compactStartTime:%" PRId64, TD_VID(pVnode),
         req.db, req.dbUid, req.compactStartTime);
 
-#if 0
   vnodeAsyncCompact(pVnode);
   vnodeBegin(pVnode);
-#endif
 
   return 0;
 }
\ No newline at end of file