diff --git a/src/client/src/tscUtil.c b/src/client/src/tscUtil.c
index 5972252d678022b6a627ccf22d80c0a7df52e130..2a6271d1d172e3a228801c20700fcb01c1d71912 100644
--- a/src/client/src/tscUtil.c
+++ b/src/client/src/tscUtil.c
@@ -1843,7 +1843,6 @@ static int trimDataBlock(void* pDataBlock, STableDataBlocks* pTableDataBlock, SI
         TDRowTLenT rowTLen = memRowTLen(pDataBlock);
         pDataBlock = POINTER_SHIFT(pDataBlock, rowTLen);
         pBlock->dataLen += rowTLen;
-        ASSERT(rowTLen < memRowTLen(payload));
       } else {
         TDRowTLenT rowTLen = memRowTLen(payload);
         memcpy(pDataBlock, payload, rowTLen);
diff --git a/src/common/inc/tdataformat.h b/src/common/inc/tdataformat.h
index 04e5e66c1c4b1cd350d4cf8cd85538e367afbc87..627a8c72c458b4fa0fdf1f7ccd3e1929942f96f3 100644
--- a/src/common/inc/tdataformat.h
+++ b/src/common/inc/tdataformat.h
@@ -614,7 +614,7 @@ typedef void *SMemRow;
 #define KVRatioData (0.75f)  // all bigint
 #define KVRatioConvert (0.9f)
 
-#define memRowType(r) ((*(uint8_t *)(r)) & 0x01U)
+#define memRowType(r) ((*(uint8_t *)(r)) & 0x01)
 
 #define memRowSetType(r, t) ((*(uint8_t *)(r)) = (((*(uint8_t *)(r)) & 0xFE) | (t)))               // lowest bit
 #define memRowSetConvert(r) ((*(uint8_t *)(r)) = (((*(uint8_t *)(r)) & 0x7F) | SMEM_ROW_CONVERT))  // highest bit