From 45fcefe80c094471f85cfa15b3ebba5dd0246569 Mon Sep 17 00:00:00 2001 From: Hongze Cheng Date: Fri, 30 Oct 2020 13:27:51 +0800 Subject: [PATCH] refactor part of code --- src/common/inc/tdataformat.h | 4 ++-- src/tsdb/src/tsdbMemTable.c | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/common/inc/tdataformat.h b/src/common/inc/tdataformat.h index f6683e4843..27052f08db 100644 --- a/src/common/inc/tdataformat.h +++ b/src/common/inc/tdataformat.h @@ -124,8 +124,8 @@ typedef uint64_t TKEY; #define TKEY_INVALID UINT64_MAX #define TKEY_NULL TKEY_INVALID -#define TKEY_NEGATIVE_FLAG (((TKEY)1) << (sizeof(TKEY) * 8 - 1)) -#define TKEY_DELETE_FLAG (((TKEY)1) << (sizeof(TKEY) * 8 - 2)) +#define TKEY_NEGATIVE_FLAG (((TKEY)1) << 63) +#define TKEY_DELETE_FLAG (((TKEY)1) << 62) #define TKEY_VALUE_FILTER (~(TKEY_NEGATIVE_FLAG | TKEY_DELETE_FLAG)) #define TKEY_IS_NEGATIVE(tkey) (((tkey)&TKEY_NEGATIVE_FLAG) != 0) diff --git a/src/tsdb/src/tsdbMemTable.c b/src/tsdb/src/tsdbMemTable.c index 2bdb95163d..19f59f3080 100644 --- a/src/tsdb/src/tsdbMemTable.c +++ b/src/tsdb/src/tsdbMemTable.c @@ -113,7 +113,6 @@ int tsdbUpdateRowInMem(STsdbRepo *pRepo, SDataRow row, STable *pTable) { } else { if (TABLE_LASTKEY(pTable) < key) TABLE_LASTKEY(pTable) = key; } - if ((!isRowDelete) && (TABLE_LASTKEY(pTable) < key)) TABLE_LASTKEY(pTable) = key; if (pMemTable->keyFirst > key) pMemTable->keyFirst = key; if (pMemTable->keyLast < key) pMemTable->keyLast = key;