From 22512c09222c82055038d92fd5e3581ba1fd1f78 Mon Sep 17 00:00:00 2001
From: Cary Xu <klxu@taosdata.com>
Date: Wed, 3 Aug 2022 16:33:53 +0800
Subject: [PATCH] enh: row optimization

---
 include/common/trow.h    | 6 +++---
 source/common/src/trow.c | 9 ++++-----
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/include/common/trow.h b/include/common/trow.h
index 35270341ff..bd8510dde6 100644
--- a/include/common/trow.h
+++ b/include/common/trow.h
@@ -150,8 +150,8 @@ typedef struct {
   void    *pBitmap;
   void    *pOffset;
   int32_t  extendedRowSize;
-  int16_t  nNone;
-  int16_t  nNull;
+  bool     hasNone;
+  bool     hasNull;
 } SRowBuilder;
 
 #define TD_ROW_HEAD_LEN  (sizeof(STSRow))
@@ -292,7 +292,7 @@ int32_t tdSRowSetExtendedInfo(SRowBuilder *pBuilder, int32_t nCols, int32_t nBou
 int32_t tdSRowResetBuf(SRowBuilder *pBuilder, void *pBuf);
 static FORCE_INLINE void tdSRowEnd(SRowBuilder *pBuilder) {
   STSRow *pRow = (STSRow *)pBuilder->pBuf;
-  if (pBuilder->nNone || pBuilder->nNull) {
+  if (pBuilder->hasNull || pBuilder->hasNone) {
     pRow->statis = 1;
   }
 }
diff --git a/source/common/src/trow.c b/source/common/src/trow.c
index ec51d65cdd..d968221432 100644
--- a/source/common/src/trow.c
+++ b/source/common/src/trow.c
@@ -925,10 +925,10 @@ int32_t tdAppendColValToRow(SRowBuilder *pBuilder, col_id_t colId, int8_t colTyp
     case TD_VTYPE_NORM:
       break;
     case TD_VTYPE_NULL:
-      ++pBuilder->nNull;
+      if (!pBuilder->hasNull) pBuilder->hasNull = true;
       break;
     case TD_VTYPE_NONE:
-      ++pBuilder->nNone;
+      if (!pBuilder->hasNone) pBuilder->hasNone = true;
       break;
     default:
       ASSERT(0);
@@ -1102,10 +1102,9 @@ int32_t tdSRowResetBuf(SRowBuilder *pBuilder, void *pBuf) {
     return terrno;
   }
 
-  if (pBuilder->nNone) pBuilder->nNone = 0;
-  if (pBuilder->nNull) pBuilder->nNull = 0;
+  if (pBuilder->hasNone) pBuilder->hasNone = false;
+  if (pBuilder->hasNull) pBuilder->hasNull = false;
 
-  pBuilder->nNull = 0;
   TD_ROW_SET_INFO(pBuilder->pBuf, 0);
   TD_ROW_SET_TYPE(pBuilder->pBuf, pBuilder->rowType);