fix bug

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

@@ -114,20 +114,20 @@ static int32_t tsdbCommitTSData(SCommitter2 *committer) {
 
   for (SRowInfo *row; (row = tsdbIterMergerGetData(committer->dataIterMerger)) != NULL;) {
     if (row->uid != committer->ctx->tbid->uid) {
+      committer->ctx->tbid->suid = row->suid;
+      committer->ctx->tbid->uid = row->uid;
+
       if (metaGetInfo(committer->tsdb->pVnode->pMeta, row->uid, &info, NULL) != 0) {
-        code = tsdbIterMergerSkipTableData(committer->dataIterMerger, (TABLEID *)row);
+        code = tsdbIterMergerSkipTableData(committer->dataIterMerger, committer->ctx->tbid);
         TSDB_CHECK_CODE(code, lino, _exit);
         continue;
       }
-
-      committer->ctx->tbid->suid = row->suid;
-      committer->ctx->tbid->uid = row->uid;
     }
 
     int64_t ts = TSDBROW_TS(&row->row);
     if (ts > committer->ctx->maxKey) {
       committer->ctx->nextKey = TMIN(committer->ctx->nextKey, ts);
-      code = tsdbIterMergerSkipTableData(committer->dataIterMerger, (TABLEID *)row);
+      code = tsdbIterMergerSkipTableData(committer->dataIterMerger, committer->ctx->tbid);
       TSDB_CHECK_CODE(code, lino, _exit);
       continue;
     }

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

@@ -332,14 +332,14 @@ static int32_t tsdbMergeFileSet(SMerger *merger, STFileSet *fset) {
   merger->ctx->tbid->uid = 0;
   while ((row = tsdbIterMergerGetData(merger->dataIterMerger)) != NULL) {
     if (row->uid != merger->ctx->tbid->uid) {
+      merger->ctx->tbid->uid = row->uid;
+      merger->ctx->tbid->suid = row->suid;
+
       if (metaGetInfo(merger->tsdb->pVnode->pMeta, row->uid, &info, NULL) != 0) {
-        code = tsdbIterMergerSkipTableData(merger->dataIterMerger, (TABLEID *)row);
+        code = tsdbIterMergerSkipTableData(merger->dataIterMerger, merger->ctx->tbid);
         TSDB_CHECK_CODE(code, lino, _exit);
         continue;
       }
-
-      merger->ctx->tbid->uid = row->uid;
-      merger->ctx->tbid->suid = row->suid;
     }
 
     code = tsdbFSetWriteRow(merger->writer, row);