<enh>: remove plugin mqtt (#11336)

* [TD-14555]<impr>: remove plugins/mqtt

* [TD-14540]<impr>: taosdump code cleanup

* update taos-tools

* refine 5-taos-tools/taosdump/taosdumpTestInspect.py

* [TD-14540]<impr>: refine tools/taosdumpTest2.py

* remove a few unused checks

* update taos-tools

* debug tools/taosdumpTest2.py

* add more debug

* merge with develop

* remove all MQTT code

* remove all MQTT code

* remove debug from tests/pytest/tools/taosdumpTest2.py

* fix mac compile error

* remove mqttDebugFlag

src/client/src/tscSQLParser.c

@@ -7713,15 +7713,15 @@ int32_t validateDNodeConfig(SMiscInfo* pOptions) {
   const int tokenBalance = 2;
   const int tokenMonitor = 3;
   const int tokenDebugFlag = 4;
-  const int tokenDebugFlagEnd = 20;
-  const int tokenOfflineInterval = 21;
-  const int tokenKeepTimeOffset = 22;
+  const int tokenDebugFlagEnd = 19;
+  const int tokenOfflineInterval = 20;
+  const int tokenKeepTimeOffset = 21;
   const SDNodeDynConfOption cfgOptions[] = {
       {"resetLog", 8},    {"resetQueryCache", 15},  {"balance", 7},     {"monitor", 7},
       {"debugFlag", 9},   {"monDebugFlag", 12},     {"vDebugFlag", 10}, {"mDebugFlag", 10},
       {"cDebugFlag", 10}, {"httpDebugFlag", 13},    {"qDebugflag", 10}, {"sdbDebugFlag", 12},
       {"uDebugFlag", 10}, {"tsdbDebugFlag", 13},    {"sDebugflag", 10}, {"rpcDebugFlag", 12},
-      {"dDebugFlag", 10}, {"mqttDebugFlag", 13},    {"wDebugFlag", 10}, {"tmrDebugFlag", 12},
+      {"dDebugFlag", 10}, {"wDebugFlag", 10}, {"tmrDebugFlag", 12},
       {"cqDebugFlag", 11},
       {"offlineInterval", 15},
       {"keepTimeOffset", 14},

src/common/inc/tglobal.h

@@ -142,15 +142,6 @@ extern int8_t   tsTelegrafUseFieldNum;
 extern int8_t   tsHttpDbNameMandatory;
 extern int32_t  tsHttpKeepAlive;
 
-// mqtt
-extern int8_t tsEnableMqttModule;
-extern char   tsMqttHostName[];
-extern char   tsMqttPort[];
-extern char   tsMqttUser[];
-extern char   tsMqttPass[];
-extern char   tsMqttClientId[];
-extern char   tsMqttTopic[];
-
 // monitor
 extern int8_t  tsEnableMonitorModule;
 extern int8_t  tsMonitorReplica;
@@ -216,7 +207,6 @@ extern int32_t  jniDebugFlag;
 extern int32_t  tmrDebugFlag;
 extern int32_t  sdbDebugFlag;
 extern int32_t  httpDebugFlag;
-extern int32_t  mqttDebugFlag;
 extern int32_t  monDebugFlag;
 extern int32_t  uDebugFlag;
 extern int32_t  rpcDebugFlag;

src/common/src/tglobal.c

@@ -187,15 +187,6 @@ int8_t   tsTelegrafUseFieldNum = 0;
 int8_t   tsHttpDbNameMandatory = 0;
 int32_t  tsHttpKeepAlive = 30000;
 
-// mqtt
-int8_t tsEnableMqttModule = 0;  // not finished yet, not started it by default
-char   tsMqttHostName[TSDB_MQTT_HOSTNAME_LEN] = "test.mosquitto.org";
-char   tsMqttPort[TSDB_MQTT_PORT_LEN] = "1883";
-char   tsMqttUser[TSDB_MQTT_USER_LEN] = {0};
-char   tsMqttPass[TSDB_MQTT_PASS_LEN] = {0};
-char   tsMqttClientId[TSDB_MQTT_CLIENT_ID_LEN] = "TDengineMqttSubscriber";
-char   tsMqttTopic[TSDB_MQTT_TOPIC_LEN] = "/test";  // #
-
 // monitor
 int8_t  tsEnableMonitorModule = 1;
 int8_t  tsMonitorReplica = 1;
@@ -264,7 +255,6 @@ uint32_t cDebugFlag = 131;
 int32_t  jniDebugFlag = 131;
 int32_t  odbcDebugFlag = 131;
 int32_t  httpDebugFlag = 131;
-int32_t  mqttDebugFlag = 131;
 int32_t  monDebugFlag = 131;
 uint32_t qDebugFlag = 131;
 int32_t  rpcDebugFlag = 131;
@@ -321,7 +311,6 @@ void taosSetAllDebugFlag() {
     jniDebugFlag = debugFlag;
     odbcDebugFlag = debugFlag;
     httpDebugFlag = debugFlag;
-    mqttDebugFlag = debugFlag;
     monDebugFlag = debugFlag;
     qDebugFlag = debugFlag;
     rpcDebugFlag = debugFlag;
@@ -1051,36 +1040,6 @@ static void doInitGlobalConfig(void) {
   cfg.unitType = TAOS_CFG_UTYPE_NONE;
   taosInitConfigOption(cfg);
 
-  cfg.option = "mqttHostName";
-  cfg.ptr = tsMqttHostName;
-  cfg.valType = TAOS_CFG_VTYPE_STRING;
-  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_NOT_PRINT;
-  cfg.minValue = 0;
-  cfg.maxValue = 0;
-  cfg.ptrLength = TSDB_MQTT_HOSTNAME_LEN;
-  cfg.unitType = TAOS_CFG_UTYPE_NONE;
-  taosInitConfigOption(cfg);
-
-  cfg.option = "mqttPort";
-  cfg.ptr = tsMqttPort;
-  cfg.valType = TAOS_CFG_VTYPE_STRING;
-  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_NOT_PRINT;
-  cfg.minValue = 0;
-  cfg.maxValue = 0;
-  cfg.ptrLength = TSDB_MQTT_PORT_LEN;
-  cfg.unitType = TAOS_CFG_UTYPE_NONE;
-  taosInitConfigOption(cfg);
-
-  cfg.option = "mqttTopic";
-  cfg.ptr = tsMqttTopic;
-  cfg.valType = TAOS_CFG_VTYPE_STRING;
-  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_NOT_PRINT;
-  cfg.minValue = 0;
-  cfg.maxValue = 0;
-  cfg.ptrLength = TSDB_MQTT_TOPIC_LEN;
-  cfg.unitType = TAOS_CFG_UTYPE_NONE;
-  taosInitConfigOption(cfg);
-
   cfg.option = "compressMsgSize";
   cfg.ptr = &tsCompressMsgSize;
   cfg.valType = TAOS_CFG_VTYPE_INT32;
@@ -1305,16 +1264,6 @@ static void doInitGlobalConfig(void) {
   cfg.unitType = TAOS_CFG_UTYPE_NONE;
   taosInitConfigOption(cfg);
 
-  cfg.option = "mqtt";
-  cfg.ptr = &tsEnableMqttModule;
-  cfg.valType = TAOS_CFG_VTYPE_INT8;
-  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW;
-  cfg.minValue = 0;
-  cfg.maxValue = 1;
-  cfg.ptrLength = 1;
-  cfg.unitType = TAOS_CFG_UTYPE_NONE;
-  taosInitConfigOption(cfg);
-
   cfg.option = "monitor";
   cfg.ptr = &tsEnableMonitorModule;
   cfg.valType = TAOS_CFG_VTYPE_INT8;
@@ -1567,16 +1516,6 @@ static void doInitGlobalConfig(void) {
   cfg.unitType = TAOS_CFG_UTYPE_NONE;
   taosInitConfigOption(cfg);
 
-  cfg.option = "mqttDebugFlag";
-  cfg.ptr = &mqttDebugFlag;
-  cfg.valType = TAOS_CFG_VTYPE_INT32;
-  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_LOG;
-  cfg.minValue = 0;
-  cfg.maxValue = 255;
-  cfg.ptrLength = 0;
-  cfg.unitType = TAOS_CFG_UTYPE_NONE;
-  taosInitConfigOption(cfg);
-
   cfg.option = "monDebugFlag";
   cfg.ptr = &monDebugFlag;
   cfg.valType = TAOS_CFG_VTYPE_INT32;

src/dnode/CMakeLists.txt

@@ -47,10 +47,6 @@ IF (TD_USB_DONGLE)
   TARGET_LINK_LIBRARIES(taosd usb_dongle)
 ENDIF ()
 
-IF (TD_MQTT)
-  TARGET_LINK_LIBRARIES(taosd mqtt)
-ENDIF ()
-
 IF (TD_TOPIC)
   TARGET_LINK_LIBRARIES(taosd topic)
 ENDIF ()

src/dnode/src/dnodeModule.c

@@ -17,7 +17,6 @@
 #include "os.h"
 #include "mnode.h"
 #include "http.h"
-#include "tmqtt.h"
 #include "monitor.h"
 #include "dnodeModule.h"
 
@@ -61,18 +60,6 @@ static void dnodeAllocModules() {
   }
 #endif
 
-#ifdef _MQTT
-  tsModule[TSDB_MOD_MQTT].enable = (tsEnableMqttModule == 1);
-  tsModule[TSDB_MOD_MQTT].name = "mqtt";
-  tsModule[TSDB_MOD_MQTT].initFp = mqttInitSystem;
-  tsModule[TSDB_MOD_MQTT].cleanUpFp = mqttCleanUpSystem;
-  tsModule[TSDB_MOD_MQTT].startFp = mqttStartSystem;
-  tsModule[TSDB_MOD_MQTT].stopFp = mqttStopSystem;
-  if (tsEnableMqttModule) {
-    dnodeSetModuleStatus(TSDB_MOD_MQTT);
-  }
-#endif  
-
   tsModule[TSDB_MOD_MONITOR].enable    = (tsEnableMonitorModule == 1);
   tsModule[TSDB_MOD_MONITOR].name      = "monitor";
   tsModule[TSDB_MOD_MONITOR].initFp    = monInitSystem;

src/inc/taosdef.h

@@ -249,13 +249,6 @@ do { \
 #define TSDB_STEP_NAME_LEN        32
 #define TSDB_STEP_DESC_LEN        128
 
-#define TSDB_MQTT_HOSTNAME_LEN    64
-#define TSDB_MQTT_PORT_LEN        8
-#define TSDB_MQTT_USER_LEN        24
-#define TSDB_MQTT_PASS_LEN        24
-#define TSDB_MQTT_TOPIC_LEN       64
-#define TSDB_MQTT_CLIENT_ID_LEN   32
-
 #define TSDB_DB_TYPE_DEFAULT      0
 #define TSDB_DB_TYPE_TOPIC        1
 
@@ -461,8 +454,7 @@ typedef enum {
   TSDB_MOD_MNODE   = 0,
   TSDB_MOD_HTTP    = 1,
   TSDB_MOD_MONITOR = 2,
-  TSDB_MOD_MQTT    = 3,
-  TSDB_MOD_MAX     = 4
+  TSDB_MOD_MAX     = 3
 } EModuleType;
 
 typedef enum {

src/inc/tmqtt.h

-/*
- * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
- *
- * This program is free software: you can use, redistribute, and/or modify
- * it under the terms of the GNU Affero General Public License, version 3
- * or later ("AGPL"), as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef TDENGINE_MQTT_H
-#define TDENGINE_MQTT_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-int32_t mqttInitSystem();
-int32_t mqttStartSystem();
-void    mqttStopSystem();
-void    mqttCleanUpSystem();
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif

src/mnode/src/mnodeDnode.c

@@ -1044,7 +1044,7 @@ int32_t mnodeRetrieveModules(SShowObj *pShow, char *data, int32_t rows, void *pC
   int32_t numOfRows = 0;
 
   char* pWrite;
-  char* moduleName[5] = { "MNODE", "HTTP", "MONITOR", "MQTT", "UNKNOWN" };
+  char* moduleName[4] = { "MNODE", "HTTP", "MONITOR", "UNKNOWN" };
   int32_t cols;
 
   while (numOfRows < rows) {

src/util/inc/tconfig.h

@@ -20,7 +20,7 @@
 extern "C" {
 #endif
 
-#define TSDB_CFG_MAX_NUM    136
+#define TSDB_CFG_MAX_NUM    131
 #define TSDB_CFG_PRINT_LEN  23
 #define TSDB_CFG_OPTION_LEN 24
 #define TSDB_CFG_VALUE_LEN  41

tests/script/general/alter/dnode.sim

@@ -36,7 +36,6 @@ sql alter dnode 1 tsdbDebugFlag 135
 sql alter dnode 1 sDebugflag 135
 sql alter dnode 1 rpcDebugFlag 135
 sql alter dnode 1 dDebugFlag 135
-sql alter dnode 1 mqttDebugFlag 135
 sql alter dnode 1 wDebugFlag 135
 sql alter dnode 1 tmrDebugFlag 135
 sql_error alter dnode 2 wDebugFlag 135