From f57e3f3c8511222ce74a03d574b233f27cd9d342 Mon Sep 17 00:00:00 2001
From: xsren <285808407@qq.com>
Date: Tue, 22 Oct 2024 16:22:27 +0800
Subject: [PATCH] enh: safetyCheck

---
 include/common/tglobal.h                  |  1 +
 source/common/src/tdatablock.c            |  2 +-
 source/common/src/tglobal.c               | 11 +++++++++--
 source/libs/executor/src/dataDispatcher.c |  3 +++
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/include/common/tglobal.h b/include/common/tglobal.h
index 41fb692e42..a13693d38c 100644
--- a/include/common/tglobal.h
+++ b/include/common/tglobal.h
@@ -153,6 +153,7 @@ extern bool     tsEnableCrashReport;
 extern char    *tsTelemUri;
 extern char    *tsClientCrashReportUri;
 extern char    *tsSvrCrashReportUri;
+extern bool    tsEnableSafetyCheck;
 
 // query buffer management
 extern int32_t tsQueryBufferSize;  // maximum allowed usage buffer size in MB for each data node during query processing
diff --git a/source/common/src/tdatablock.c b/source/common/src/tdatablock.c
index d41b433468..23efe48209 100644
--- a/source/common/src/tdatablock.c
+++ b/source/common/src/tdatablock.c
@@ -3165,7 +3165,7 @@ int32_t blockEncode(const SSDataBlock* pBlock, char* data, size_t dataBuflen, in
   return dataLen;
 
 _exit:
-  uError("blockEncode dataLen:%d, dataBuflen:%" PRIu64, dataLen, dataBuflen);
+  uError("blockEncode dataLen:%d, dataBuflen:%zu", dataLen, dataBuflen);
   terrno = TSDB_CODE_QRY_EXECUTOR_INTERNAL_ERROR;
   return -1;
 }
diff --git a/source/common/src/tglobal.c b/source/common/src/tglobal.c
index 7cff5de008..06791c5ec3 100644
--- a/source/common/src/tglobal.c
+++ b/source/common/src/tglobal.c
@@ -139,6 +139,7 @@ bool    tsEnableCrashReport = true;
 #endif
 char *tsClientCrashReportUri = "/ccrashreport";
 char *tsSvrCrashReportUri = "/dcrashreport";
+bool  tsEnableSafetyCheck = true;
 
 // schemaless
 bool tsSmlDot2Underline = true;
@@ -607,6 +608,7 @@ static int32_t taosAddClientCfg(SConfig *pCfg) {
   TAOS_CHECK_RETURN(
       cfgAddInt64(pCfg, "randErrorDivisor", tsRandErrDivisor, 1, INT64_MAX, CFG_SCOPE_BOTH, CFG_DYN_BOTH));
   TAOS_CHECK_RETURN(cfgAddInt64(pCfg, "randErrorScope", tsRandErrScope, 0, INT64_MAX, CFG_SCOPE_BOTH, CFG_DYN_BOTH));
+  TAOS_CHECK_RETURN(cfgAddBool(pCfg, "enableSafetyCheck", tsEnableSafetyCheck, CFG_SCOPE_BOTH, CFG_DYN_BOTH));
 
   tsNumOfRpcThreads = tsNumOfCores / 2;
   tsNumOfRpcThreads = TRANGE(tsNumOfRpcThreads, 1, TSDB_MAX_RPC_THREADS);
@@ -1299,6 +1301,9 @@ static int32_t taosSetClientCfg(SConfig *pCfg) {
 
   TAOS_CHECK_GET_CFG_ITEM(pCfg, pItem, "tsmaDataDeleteMark");
   tsmaDataDeleteMark = pItem->i32;
+
+  TAOS_CHECK_GET_CFG_ITEM(pCfg, pItem, "enableSafetyCheck");
+  tsEnableSafetyCheck = pItem->bval;
   TAOS_RETURN(TSDB_CODE_SUCCESS);
 }
 
@@ -2039,7 +2044,8 @@ static int32_t taosCfgDynamicOptionsForServer(SConfig *pCfg, const char *name) {
                                          {"s3UploadDelaySec", &tsS3UploadDelaySec},
                                          {"supportVnodes", &tsNumOfSupportVnodes},
                                          {"experimental", &tsExperimental},
-                                         {"maxTsmaNum", &tsMaxTsmaNum}};
+                                         {"maxTsmaNum", &tsMaxTsmaNum},
+                                         {"enableSafetyCheck", &tsEnableSafetyCheck}};
 
     if ((code = taosCfgSetOption(debugOptions, tListLen(debugOptions), pItem, true)) != TSDB_CODE_SUCCESS) {
       code = taosCfgSetOption(options, tListLen(options), pItem, false);
@@ -2295,7 +2301,8 @@ static int32_t taosCfgDynamicOptionsForClient(SConfig *pCfg, const char *name) {
                                          {"experimental", &tsExperimental},
                                          {"multiResultFunctionStarReturnTags", &tsMultiResultFunctionStarReturnTags},
                                          {"maxTsmaCalcDelay", &tsMaxTsmaCalcDelay},
-                                         {"tsmaDataDeleteMark", &tsmaDataDeleteMark}};
+                                         {"tsmaDataDeleteMark", &tsmaDataDeleteMark},
+                                         {"enableSafetyCheck", &tsEnableSafetyCheck}};
 
     if ((code = taosCfgSetOption(debugOptions, tListLen(debugOptions), pItem, true)) != TSDB_CODE_SUCCESS) {
       code = taosCfgSetOption(options, tListLen(options), pItem, false);
diff --git a/source/libs/executor/src/dataDispatcher.c b/source/libs/executor/src/dataDispatcher.c
index 983309b7c2..5c3bc88b5b 100644
--- a/source/libs/executor/src/dataDispatcher.c
+++ b/source/libs/executor/src/dataDispatcher.c
@@ -55,6 +55,9 @@ typedef struct SDataDispatchHandle {
 } SDataDispatchHandle;
 
 static int32_t inputSafetyCheck(SDataDispatchHandle* pHandle, const SInputData* pInput)  {
+  if(!tsEnableSafetyCheck) {
+    return TSDB_CODE_SUCCESS;
+  }
   if (pInput == NULL || pInput->pData == NULL || pInput->pData->info.rows <= 0) {
     qError("invalid input data");
     return TSDB_CODE_QRY_INVALID_INPUT;