diff --git a/source/common/src/tmsg.c b/source/common/src/tmsg.c
index 5715b20f3a5558f3f7f42da87f535b2966104b58..73a034c23ffd0c1635aa855af2a0971ac600881b 100644
--- a/source/common/src/tmsg.c
+++ b/source/common/src/tmsg.c
@@ -6838,14 +6838,6 @@ void tDestroySSubmitTbData(SSubmitTbData *pTbData, int32_t flag) {
 
   if (flag == TSDB_MSG_FLG_ENCODE) {
     if (pTbData->flags & SUBMIT_REQ_COLUMN_DATA_FORMAT) {
-      int32_t nRow = TARRAY_SIZE(pTbData->aRowP);
-      SRow  **rows = (SRow **)TARRAY_DATA(pTbData->aRowP);
-
-      for (int32_t i = 0; i < nRow; ++i) {
-        tRowDestroy(rows[i]);
-      }
-      taosArrayDestroy(pTbData->aRowP);
-    } else {
       int32_t   nColData = TARRAY_SIZE(pTbData->aCol);
       SColData *aColData = (SColData *)TARRAY_DATA(pTbData->aCol);
 
@@ -6853,6 +6845,14 @@ void tDestroySSubmitTbData(SSubmitTbData *pTbData, int32_t flag) {
         tColDataDestroy(&aColData[i]);
       }
       taosArrayDestroy(pTbData->aCol);
+    } else {
+      int32_t nRow = TARRAY_SIZE(pTbData->aRowP);
+      SRow  **rows = (SRow **)TARRAY_DATA(pTbData->aRowP);
+
+      for (int32_t i = 0; i < nRow; ++i) {
+        tRowDestroy(rows[i]);
+      }
+      taosArrayDestroy(pTbData->aRowP);
     }
   } else if (flag == TSDB_MSG_FLG_DECODE) {
     if (pTbData->flags & SUBMIT_REQ_COLUMN_DATA_FORMAT) {