code optimization

src/client/src/tscParseInsert.c

@@ -1146,7 +1146,7 @@ int tscSortRemoveDataBlockDupRows(STableDataBlocks *dataBuf, SBlockKeyInfo *pBlk
   TDRowTLenT      payloadTLen = 0;
   int             n = 0;
   while (n < nRows) {
-    pBlkKeyTuple->skey = payloadKey(pBlockData);
+    pBlkKeyTuple->skey = payloadTSKey(pBlockData);
     pBlkKeyTuple->payloadAddr = pBlockData;
     payloadTLen = payloadTLen(pBlockData);
 #if 0

src/common/inc/tdataformat.h

@@ -617,10 +617,11 @@ static FORCE_INLINE void *tdGetMemRowDataOfCol(void *row, int8_t type, int32_t o
 #define payloadColSetType(c, t) (payloadColType(c) = (t))
 #define payloadColSetOffset(c, o) (payloadColOffset(c) = (o))
 
-#define payloadKeyOffset(r) (*(uint16_t *)POINTER_SHIFT(r, PAYLOAD_HEADER_LEN + PAYLOAD_ID_TYPE_LEN))
-#define payloadTKey(r) (*(TKEY *)POINTER_SHIFT(r, payloadValuesOffset(r) + payloadKeyOffset(r)))
+#define payloadTSKey(r) (*(TSKEY *)POINTER_SHIFT(r, payloadValuesOffset(r)))
+#define payloadTKey(r) (*(TKEY *)POINTER_SHIFT(r, payloadValuesOffset(r)))
 #define payloadKey(r) tdGetKey(payloadTKey(r))
 
+
 static FORCE_INLINE char *payloadNextCol(char *pCol) { return (char *)POINTER_SHIFT(pCol, PAYLOAD_COL_HEAD_LEN); }
 
 #ifdef __cplusplus