From 5d20fde69209fda9e89ec1b7019cbaf4d7727559 Mon Sep 17 00:00:00 2001
From: xsren <285808407@qq.com>
Date: Thu, 24 Oct 2024 17:44:13 +0800
Subject: [PATCH] safetycheck, use reserve state

---
 include/common/tmsg.h               |  1 +
 source/common/src/tdatablock.c      | 10 +++++-----
 source/libs/executor/src/executil.c |  1 +
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/include/common/tmsg.h b/include/common/tmsg.h
index 01808d4f2f..14e3f9b0eb 100644
--- a/include/common/tmsg.h
+++ b/include/common/tmsg.h
@@ -1215,6 +1215,7 @@ typedef struct {
   int32_t bytes;
   int8_t  type;
   uint8_t pk;
+  bool    reserve;
 } SColumnInfo;
 
 typedef struct STimeWindow {
diff --git a/source/common/src/tdatablock.c b/source/common/src/tdatablock.c
index b8e9579c6b..9240e18700 100644
--- a/source/common/src/tdatablock.c
+++ b/source/common/src/tdatablock.c
@@ -3543,7 +3543,7 @@ int32_t blockDataCheck(const SSDataBlock* pDataBlock) {
     SColumnInfoData* pCol = (SColumnInfoData*)taosArrayGet(pDataBlock->pDataBlock, i);
     isVarType = IS_VAR_DATA_TYPE(pCol->info.type);
     checkRows = pDataBlock->info.rows;
-    if(pCol->pData == NULL) continue;
+    if (pCol->info.reserve == true) continue;
 
     if (isVarType) {
       BLOCK_DATA_CHECK_TRESSA(pCol->varmeta.offset);
@@ -3555,12 +3555,12 @@ int32_t blockDataCheck(const SSDataBlock* pDataBlock) {
     for (int64_t r = 0; r < checkRows; ++r) {
       if (tsSafetyCheckLevel <= TSDB_SAFETY_CHECK_LEVELL_NORMAL) break;
       if (!colDataIsNull_s(pCol, r)) {
-        // BLOCK_DATA_CHECK_TRESSA(pCol->pData);
+        BLOCK_DATA_CHECK_TRESSA(pCol->pData);
         BLOCK_DATA_CHECK_TRESSA(pCol->varmeta.length <= pCol->varmeta.allocLen);
-        
+
         if (isVarType) {
           BLOCK_DATA_CHECK_TRESSA(pCol->varmeta.allocLen > 0);
-          BLOCK_DATA_CHECK_TRESSA(pCol->varmeta.offset[r] < pCol->varmeta.length);
+          BLOCK_DATA_CHECK_TRESSA(pCol->varmeta.offset[r] <= pCol->varmeta.length);
           if (pCol->reassigned) {
             BLOCK_DATA_CHECK_TRESSA(pCol->varmeta.offset[r] >= 0);
           } else if (0 == r) {
@@ -3571,7 +3571,7 @@ int32_t blockDataCheck(const SSDataBlock* pDataBlock) {
           
           colLen = varDataTLen(pCol->pData + pCol->varmeta.offset[r]);
           BLOCK_DATA_CHECK_TRESSA(colLen >= VARSTR_HEADER_SIZE);
-          BLOCK_DATA_CHECK_TRESSA(colLen <= pCol->varmeta.length);
+          BLOCK_DATA_CHECK_TRESSA(colLen <= pCol->info.bytes);
           
           if (pCol->reassigned) {
             BLOCK_DATA_CHECK_TRESSA((pCol->varmeta.offset[r] + colLen) <= pCol->varmeta.length);
diff --git a/source/libs/executor/src/executil.c b/source/libs/executor/src/executil.c
index b15cc2ab45..1a43d42348 100644
--- a/source/libs/executor/src/executil.c
+++ b/source/libs/executor/src/executil.c
@@ -390,6 +390,7 @@ SSDataBlock* createDataBlockFromDescNode(SDataBlockDescNode* pNode) {
         createColumnInfoData(pDescNode->dataType.type, pDescNode->dataType.bytes, pDescNode->slotId);
     idata.info.scale = pDescNode->dataType.scale;
     idata.info.precision = pDescNode->dataType.precision;
+    idata.info.reserve = pDescNode->reserve;
 
     code = blockDataAppendColInfo(pBlock, &idata);
     if (code != TSDB_CODE_SUCCESS) {