From f0b2063f6b51d0df06fedbf65644760136147c53 Mon Sep 17 00:00:00 2001 From: Cary Xu Date: Tue, 3 Aug 2021 17:49:12 +0800 Subject: [PATCH] bug fix --- src/client/inc/tsclient.h | 7 +++---- src/common/inc/tdataformat.h | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/client/inc/tsclient.h b/src/client/inc/tsclient.h index c63c84df94..cb67fa336b 100644 --- a/src/client/inc/tsclient.h +++ b/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)); diff --git a/src/common/inc/tdataformat.h b/src/common/inc/tdataformat.h index 0bde3937f3..627a8c72c4 100644 --- a/src/common/inc/tdataformat.h +++ b/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) \