diff --git a/source/common/src/trow.c b/source/common/src/trow.c
index cf6d4752d9..e2a8d5d5c3 100644
--- a/source/common/src/trow.c
+++ b/source/common/src/trow.c
@@ -444,6 +444,7 @@ int32_t tdSTSRowNew(SArray *pArray, STSchema *pTSchema, STSRow **ppRow, int8_t r
   SColVal  *pColVal;
   int32_t   nColVal = taosArrayGetSize(pArray);
   int32_t   varDataLen = 0;
+  int32_t   nonVarDataLen = 0;
   int32_t   maxVarDataLen = 0;
   int32_t   iColVal = 0;
   int32_t   nBound = 0;
@@ -488,16 +489,26 @@ int32_t tdSTSRowNew(SArray *pArray, STSchema *pTSchema, STSRow **ppRow, int8_t r
             }
           }
         }
+      } else {
+        if(pColVal && COL_VAL_IS_VALUE(pColVal)) {
+          nonVarDataLen += TYPE_BYTES[pTColumn->type];
+        }
       }
     }
 
     ++iColVal;
   }
 
-  if (!(*ppRow)) {
-    *ppRow = (STSRow *)taosMemoryCalloc(
-        1, sizeof(STSRow) + pTSchema->flen + varDataLen + TD_BITMAP_BYTES(pTSchema->numOfCols - 1));
-    isAlloc = true;
+  int32_t rowTotalLen = 0;
+  if (rowType == TD_ROW_TP) {
+    rowTotalLen = sizeof(STSRow) + pTSchema->flen + varDataLen + TD_BITMAP_BYTES(pTSchema->numOfCols - 1);
+  } else {
+    rowTotalLen = sizeof(STSRow) + sizeof(col_id_t) + varDataLen + nonVarDataLen + (nBound - 1) * sizeof(SKvRowIdx) +
+                  TD_BITMAP_BYTES(nBound - 1);
+  }
+    if (!(*ppRow)) {
+      *ppRow = (STSRow *)taosMemoryCalloc(1, rowTotalLen);
+      isAlloc = true;
   }
 
   if (!(*ppRow)) {
@@ -554,7 +565,7 @@ int32_t tdSTSRowNew(SArray *pArray, STSchema *pTSchema, STSRow **ppRow, int8_t r
     if (TD_IS_TP_ROW(rb.pBuf)) {
       tdAppendColValToRow(&rb, pTColumn->colId, pTColumn->type, valType, val, true, pTColumn->offset, iColVal);
     } else {
-      tdAppendColValToRow(&rb, pTColumn->colId, pTColumn->type, valType, val, true, rb.offset, iBound);
+      tdAppendColValToRow(&rb, pTColumn->colId, pTColumn->type, valType, val, true, rb.offset, iBound - 1);
     }
 
     ++iColVal;
diff --git a/source/common/test/dataformatTest.cpp b/source/common/test/dataformatTest.cpp
index 81407c7ef0..80631fa1b3 100644
--- a/source/common/test/dataformatTest.cpp
+++ b/source/common/test/dataformatTest.cpp
@@ -461,13 +461,14 @@ TEST(testCase, AllNormTest) {
   char *data[14] = {
       "1653694220000", "10", "20", "10.1", "10.1", "binary10", "nchar10", "10", "10", "10", "10", "20", "30", "40"};
 
-  // genTestData((const char **)&data, nCols, &pArray);
+  genTestData((const char **)&data, nCols, &pArray);
 
-  // tdSTSRowNew(pArray, pTSchema, &row, TD_ROW_TP);
-  // debugPrintTSRow(row, pTSchema, __func__, __LINE__);
-  // tdSRowPrint(row, pTSchema, __func__);
-  // checkTSRow((const char **)&data, row, pTSchema);
+  tdSTSRowNew(pArray, pTSchema, &row, TD_ROW_TP);
+  debugPrintTSRow(row, pTSchema, __func__, __LINE__);
+  tdSRowPrint(row, pTSchema, __func__);
+  checkTSRow((const char **)&data, row, pTSchema);
 
+  taosMemoryFreeClear(row);
   taosArrayDestroy(pArray);
   taosMemoryFree(pTSchema);
 }
@@ -485,17 +486,15 @@ TEST(testCase, NoneTest) {
 
   // ts timestamp,  c1 int,  c2 bigint,  c3 float,  c4 double,  c5 binary(10),  c6 nchar(10),  c7 tinyint,  c8 smallint,
   // c9 bool c10 tinyint unsigned, c11 smallint unsigned, c12 int unsigned, c13 bigint unsigned
-  // const int8_t rowType[nRows] = {TD_ROW_TP, TD_ROW_KV, TD_ROW_KV, TD_ROW_KV, TD_ROW_KV, TD_ROW_KV, TD_ROW_KV,
-  //                                TD_ROW_KV, TD_ROW_KV, TD_ROW_KV, TD_ROW_KV, TD_ROW_TP, TD_ROW_KV, TD_ROW_KV,
-  //                                TD_ROW_KV, TD_ROW_KV, TD_ROW_KV, TD_ROW_KV, TD_ROW_KV, TD_ROW_TP};
-  const int8_t rowType[nRows] = {TD_ROW_KV, TD_ROW_KV, TD_ROW_KV, TD_ROW_KV,
-                                 TD_ROW_KV, TD_ROW_KV, TD_ROW_KV, TD_ROW_TP, TD_ROW_KV, TD_ROW_KV,
+  const int8_t rowType[nRows] = {TD_ROW_TP, TD_ROW_KV, TD_ROW_KV, TD_ROW_KV, TD_ROW_KV, TD_ROW_KV, TD_ROW_KV,
+                                 TD_ROW_KV, TD_ROW_KV, TD_ROW_KV, TD_ROW_KV, TD_ROW_TP, TD_ROW_KV, TD_ROW_KV,
                                  TD_ROW_KV, TD_ROW_KV, TD_ROW_KV, TD_ROW_KV, TD_ROW_KV, TD_ROW_TP};
+
 const char  *data[nRows][nCols] = {
-    // {"1653694220000", "no", "20", "10.1", "10.1", "binary10", "no", "10", "10", "nu", "10", "20", "30", "40"},
-    // {"1653694220001", "no", "no", "no", "no", "no", "no", "no", "no", "no", "no", "no", "no", "no"},
-    // {"1653694220002", "10", "no", "no", "no", "no", "no", "no", "no", "no", "no", "no", "no", "no"},
-    // {"1653694220003", "10", "10", "no", "no", "no", "no", "no", "no", "no", "no", "no", "no", "no"},
+    {"1653694220000", "no", "20", "10.1", "10.1", "binary10", "no", "10", "10", "nu", "10", "20", "30", "40"},
+    {"1653694220001", "no", "no", "no", "no", "no", "no", "no", "no", "no", "no", "no", "no", "no"},
+    {"1653694220002", "10", "no", "no", "no", "no", "no", "no", "no", "no", "no", "no", "no", "no"},
+    {"1653694220003", "10", "10", "no", "no", "no", "no", "no", "no", "no", "no", "no", "no", "no"},
     {"1653694220004", "no", "20", "no", "no", "no", "nchar10", "no", "no", "no", "no", "no", "no", "no"},
     {"1653694220005", "nu", "nu", "nu", "nu", "nu", "nu", "nu", "nu", "nu", "nu", "nu", "nu", "nu"},
     {"1653694220006", "no", "nu", "nu", "nu", "nu", "nu", "nu", "nu", "nu", "nu", "nu", "nu", "nu"},
@@ -517,7 +516,6 @@ const char  *data[nRows][nCols] = {
       "no"}};
 
 for (int r = 0; r < nRows; ++r) {
-  printf("%s:%d index:%d\n", __func__, __LINE__, r);
   genTestData((const char **)&data[r], nCols, &pArray);
   tdSTSRowNew(pArray, pTSchema, &row, rowType[r]);
   debugPrintTSRow(row, pTSchema, __func__, __LINE__);  // debug print