bug fix

src/client/inc/tsclient.h

@@ -554,9 +554,8 @@ static FORCE_INLINE void initSMemRow(SMemRow row, uint8_t memRowType, STableData
 static FORCE_INLINE void convertToSDataRow(SMemRow dest, SMemRow src, SSchema *pSchema, int nCols,
                                            SParsedDataColInfo *spd) {
   ASSERT(isKvRow(src));
-
-  SDataRow dataRow = memRowDataBody(dest);
   SKVRow   kvRow = memRowKvBody(src);
+  SDataRow dataRow = memRowDataBody(dest);
 
   memRowSetType(dest, SMEM_ROW_DATA);
   dataRowSetVersion(dataRow, memRowKvVersion(src));
@@ -576,8 +575,8 @@ static FORCE_INLINE void convertToSKVRow(SMemRow dest, SMemRow src, SSchema *pSc
                                          SParsedDataColInfo *spd) {
   ASSERT(isDataRow(src));
 
-  SDataRow dataRow = memRowKvBody(src);
-  SKVRow   kvRow = memRowDataBody(dest);
+  SDataRow dataRow = memRowDataBody(src);
+  SKVRow   kvRow = memRowKvBody(dest);
 
   memRowSetType(dest, SMEM_ROW_KV);
   memRowSetKvVersion(kvRow, dataRowVersion(dataRow));

src/common/inc/tdataformat.h

@@ -622,7 +622,7 @@ typedef void *SMemRow;
 #define isDataRow(r) (SMEM_ROW_DATA == memRowType(r))
 #define isKvRowT(t) (SMEM_ROW_KV == (((uint8_t)(t)) & 0x01))
 #define isKvRow(r) (SMEM_ROW_KV == memRowType(r))
-#define isNeedConvertRow(r) ((((*(uint8_t *)(r)) & 0x7F) == SMEM_ROW_CONVERT))
+#define isNeedConvertRow(r) ((((*(uint8_t *)(r)) & 0x80) == SMEM_ROW_CONVERT))
 
 #define memRowDataBody(r) POINTER_SHIFT(r, TD_MEM_ROW_TYPE_SIZE)  // section after flag
 #define memRowKvBody(r) \