From 4c603fee55cc4d44febbd5e16105aa702f5aa86e Mon Sep 17 00:00:00 2001 From: 54liuyao <54liuyao> Date: Wed, 15 May 2024 10:54:24 +0800 Subject: [PATCH] format code --- include/common/tdataformat.h | 14 +++++++------- source/dnode/vnode/src/inc/tsdb.h | 20 ++++++++++---------- source/dnode/vnode/src/tsdb/tsdbRead2.c | 4 ++-- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/include/common/tdataformat.h b/include/common/tdataformat.h index 2bf88fef8a..ce9b95522a 100644 --- a/include/common/tdataformat.h +++ b/include/common/tdataformat.h @@ -95,13 +95,13 @@ const static uint8_t BIT2_MAP[4] = {0b11111100, 0b11110011, 0b11001111, 0b001111 #define COL_VAL_IS_NULL(CV) ((CV)->flag == CV_FLAG_NULL) #define COL_VAL_IS_VALUE(CV) ((CV)->flag == CV_FLAG_VALUE) -#define tRowGetKey(_pRow, _pKey) \ - do { \ - (_pKey)->ts = (_pRow)->ts; \ - (_pKey)->numOfPKs = 0; \ - if ((_pRow)->numOfPKs > 0) { \ - tRowGetPrimaryKey((_pRow), (_pKey)); \ - } \ +#define tRowGetKey(_pRow, _pKey) \ + do { \ + (_pKey)->ts = (_pRow)->ts; \ + (_pKey)->numOfPKs = 0; \ + if ((_pRow)->numOfPKs > 0) { \ + tRowGetPrimaryKey((_pRow), (_pKey)); \ + } \ } while (0) // SValueColumn ================================ diff --git a/source/dnode/vnode/src/inc/tsdb.h b/source/dnode/vnode/src/inc/tsdb.h index e1293c7f11..04a621d4f5 100644 --- a/source/dnode/vnode/src/inc/tsdb.h +++ b/source/dnode/vnode/src/inc/tsdb.h @@ -120,19 +120,19 @@ static FORCE_INLINE int64_t tsdbLogicToFileSize(int64_t lSize, int32_t szPage) { #define tsdbRowFromBlockData(BLOCKDATA, IROW) \ ((TSDBROW){.type = TSDBROW_COL_FMT, .pBlockData = (BLOCKDATA), .iRow = (IROW)}) -#define TSDBROW_INIT_KEY(_ROW, _KEY) \ - { \ - if ((_ROW)->type == TSDBROW_ROW_FMT) { \ - _KEY.version = (_ROW)->version; \ - _KEY.ts = (_ROW)->pTSRow->ts; \ - } else { \ - _KEY.version = (_ROW)->pBlockData->aVersion[(_ROW)->iRow]; \ - _KEY.ts = (_ROW)->pBlockData->aTSKEY[(_ROW)->iRow]; \ - } \ +#define TSDBROW_INIT_KEY(_ROW, _KEY) \ + { \ + if ((_ROW)->type == TSDBROW_ROW_FMT) { \ + _KEY.version = (_ROW)->version; \ + _KEY.ts = (_ROW)->pTSRow->ts; \ + } else { \ + _KEY.version = (_ROW)->pBlockData->aVersion[(_ROW)->iRow]; \ + _KEY.ts = (_ROW)->pBlockData->aTSKEY[(_ROW)->iRow]; \ + } \ } #define tColRowGetKey(_pBlock, _irow, _key) \ - { \ + { \ (_key)->ts = (_pBlock)->aTSKEY[(_irow)]; \ (_key)->numOfPKs = 0; \ if ((_pBlock)->nColData > 0) { \ diff --git a/source/dnode/vnode/src/tsdb/tsdbRead2.c b/source/dnode/vnode/src/tsdb/tsdbRead2.c index 9ba45a9850..99520f7c92 100644 --- a/source/dnode/vnode/src/tsdb/tsdbRead2.c +++ b/source/dnode/vnode/src/tsdb/tsdbRead2.c @@ -24,14 +24,14 @@ #define ASCENDING_TRAVERSE(o) (o == TSDB_ORDER_ASC) #define getCurrentKeyInSttBlock(_r) (&((_r)->currentKey)) -#define tColRowGetKeyDeepCopy(_pBlock, _irow, _slotId, _pKey) \ +#define tColRowGetKeyDeepCopy(_pBlock, _irow, _slotId, _pKey) \ do { \ (_pKey)->ts = (_pBlock)->aTSKEY[(_irow)]; \ (_pKey)->numOfPKs = 0; \ if ((_slotId) != -1) { \ tColRowGetPriamyKeyDeepCopy(_pBlock, _irow, _slotId, _pKey); \ } \ - } while(0) + } while (0) #define outOfTimeWindow(_ts, _window) (((_ts) > (_window)->ekey) || ((_ts) < (_window)->skey))