Merge pull request #19973 from taosdata/fix/TD-22381

fix: add alter dnode configuration validdation

source/client/src/clientMain.c

@@ -934,6 +934,7 @@ void doAsyncQuery(SRequestObj *pRequest, bool updateMetaForce) {
   }
 
   if (TSDB_CODE_SUCCESS == code) {
+    pRequest->stmtType = pRequest->pQuery->pRoot->type;
     phaseAsyncQuery(pWrapper);
   } else {
     tscError("0x%" PRIx64 " error happens, code:%d - %s, reqId:0x%" PRIx64, pRequest->self, code, tstrerror(code),

source/dnode/mnode/impl/src/mndDnode.c

@@ -880,6 +880,12 @@ static int32_t mndProcessConfigDnodeReq(SRpcMsg *pReq) {
   if (strcasecmp(cfgReq.config, "resetlog") == 0) {
     strcpy(dcfgReq.config, "resetlog");
   } else if (strncasecmp(cfgReq.config, "monitor", 7) == 0) {
+    if (' ' != cfgReq.config[7] && 0 != cfgReq.config[7]) {
+      mError("dnode:%d, failed to config monitor since invalid conf:%s", cfgReq.dnodeId, cfgReq.config);
+      terrno = TSDB_CODE_INVALID_CFG;
+      return -1;
+    }
+
     const char *value = cfgReq.value;
     int32_t     flag = atoi(value);
     if (flag <= 0) {
@@ -900,12 +906,18 @@ static int32_t mndProcessConfigDnodeReq(SRpcMsg *pReq) {
       int32_t     optLen = strlen(optName);
       if (strncasecmp(cfgReq.config, optName, optLen) != 0) continue;
 
+      if (' ' != cfgReq.config[optLen] && 0 != cfgReq.config[optLen]) {
+        mError("dnode:%d, failed to config since invalid conf:%s", cfgReq.dnodeId, cfgReq.config);
+        terrno = TSDB_CODE_INVALID_CFG;
+        return -1;
+      }
+
       const char *value = cfgReq.value;
       int32_t     flag = atoi(value);
       if (flag <= 0) {
         flag = atoi(cfgReq.config + optLen + 1);
       }
-      if (flag <= 0 || flag > 255) {
+      if (flag < 0 || flag > 255) {
         mError("dnode:%d, failed to config %s since value:%d", cfgReq.dnodeId, optName, flag);
         terrno = TSDB_CODE_INVALID_CFG;
         return -1;

source/libs/scalar/src/filter.c

@@ -1057,7 +1057,7 @@ static FORCE_INLINE int32_t filterAddColFieldFromField(SFilterInfo *info, SFilte
 
 int32_t filterAddFieldFromNode(SFilterInfo *info, SNode *node, SFilterFieldId *fid) {
   if (node == NULL) {
-    fltError("empty node");
+    fltDebug("empty node");
     FLT_ERR_RET(TSDB_CODE_APP_ERROR);
   }
 

tests/script/tsim/alter/dnode.sim

@@ -58,6 +58,8 @@ sql_error alter dnode 1 'monDebugFlag 131'
 sql_error alter dnode 1 'cqDebugFlag 131'
 sql_error alter dnode 1 'httpDebugFlag 131'
 sql_error alter dnode 1 'mqttDebugFlag 131'
+sql_error alter dnode 1 'qDebugFlaga 131'
+sql_error alter all dnodes 'qDebugFlaga 131'
 
 sql_error alter dnode 2 'wDebugFlag' '135'
 sql_error alter dnode 2 'tmrDebugFlag' '135'
@@ -65,6 +67,8 @@ sql_error alter dnode 1 'monDebugFlag' '131'
 sql_error alter dnode 1 'cqDebugFlag' '131'
 sql_error alter dnode 1 'httpDebugFlag' '131'
 sql_error alter dnode 1 'mqttDebugFlag' '131'
+sql_error alter dnode 1 'qDebugFlaga' '131'
+sql_error alter all dnodes 'qDebugFlaga' '131'
 
 print ======== step3
 sql_error alter $hostname1 debugFlag 135