fix: taosBenchmark adjust priority cmd > json > evn

tools/taos-tools/src/benchJsonOpt.c

@@ -1504,6 +1504,15 @@ static int getMetaFromCommonJsonFile(tools_cJSON *json) {
         }        
     }
 
+    // dsn
+    tools_cJSON *dsn = tools_cJSON_GetObjectItem(json, "dsn");
+    if (tools_cJSON_IsString(dsn) && strlen(dsn->valuestring) > 0) {
+        if (g_arguments->dsn == NULL) {
+            g_arguments->dsn = dsn->valuestring;
+            infoPrint("set websocket true from json->dsn=%s\n", g_arguments->dsn);    
+        }
+    }    
+
     tools_cJSON *host = tools_cJSON_GetObjectItem(json, "host");
     if (host && host->type == tools_cJSON_String && host->valuestring != NULL) {
         if(g_arguments->host && strlen(g_arguments->host) > 0) {
@@ -1592,12 +1601,6 @@ static int getMetaFromCommonJsonFile(tools_cJSON *json) {
 static int getMetaFromInsertJsonFile(tools_cJSON *json) {
     int32_t code = -1;
 
-    tools_cJSON *dsn = tools_cJSON_GetObjectItem(json, "dsn");
-    if (tools_cJSON_IsString(dsn)) {
-        g_arguments->dsn = dsn->valuestring;
-        infoPrint("set websocket true from json->dsn=%s\n", g_arguments->dsn);
-    }
-
     // check after inserted
     tools_cJSON *checkSql = tools_cJSON_GetObjectItem(json, "check_sql");
     if (tools_cJSON_IsString(checkSql)) {

tools/taos-tools/src/benchMain.c

@@ -60,11 +60,6 @@ void checkArgumentValid() {
         g_arguments->host = DEFAULT_HOST;
     }
 
-    // check dsn valid
-    if(g_arguments->dsn && g_arguments->dsn[0] == 0) {
-        warnPrint("dsn is not null, but empty string, so set null. dsn=%s\n", g_arguments->dsn);
-        g_arguments->dsn = NULL;
-    }
 }
 
 // apply cfg
@@ -91,12 +86,6 @@ int32_t applyConfigDir(char * cfgDir){
  }
 
 int32_t setConnMode(int8_t  connMode, char *dsn) {
-    // check valid
-    if (connMode == CONN_MODE_NATIVE && dsn != NULL ) {
-        errorPrint("set connMode Native but found dns, conflict. dsn=%s\n", dsn);
-        return -1;
-    }
-
     // set conn mode
     char * strMode = connMode == CONN_MODE_NATIVE ? STR_NATIVE : STR_WEBSOCKET;
     int32_t code = taos_options(TSDB_OPTION_DRIVER, strMode);
@@ -130,15 +119,11 @@ int main(int argc, char* argv[]) {
         return -1;
     }
 
-    // read evn
-    if (g_arguments->dsn != NULL) {
-        infoPrint("Get dsn from command. dsn=%s\n", g_arguments->dsn);
-    } else {
-        char * dsn = getenv("TDENGINE_CLOUD_DSN");
-        if (dsn != NULL && strlen(dsn) > 3) {
-            g_arguments->dsn = dsn;
-            infoPrint("Get dsn from getenv TDENGINE_CLOUD_DSN=%s\n", g_arguments->dsn);
-        } 
+    // check valid
+    if(g_arguments->connMode == CONN_MODE_NATIVE && g_arguments->dsn) {
+        errorPrint("Setting native and setting dsn cannot be specified simultaneously in command line. dsn=%s\n", g_arguments->dsn);
+        exitLog();
+        return -1;
     }
 
     // read json config
@@ -147,12 +132,21 @@ int main(int argc, char* argv[]) {
         if (readJsonConfig(g_arguments->metaFile)) {
             errorPrint("failed to readJsonConfig %s\n", g_arguments->metaFile);
             exitLog();
-            return -1;    
+            return -1;
         }
     } else {
         modifyArgument();
     }
 
+    // read evn
+    if (g_arguments->dsn == NULL) {
+        char * dsn = getenv("TDENGINE_CLOUD_DSN");
+        if (dsn != NULL && strlen(dsn) > 0) {
+            g_arguments->dsn = dsn;
+            infoPrint("Get dsn from getenv TDENGINE_CLOUD_DSN=%s\n", g_arguments->dsn);
+        } 
+    }
+
     // open result file
     if(g_arguments->output_file[0] == 0) {
         infoPrint("%s","result_file is empty, ignore output.");

tools/taos-tools/src/benchUtil.c

@@ -307,7 +307,7 @@ SBenchConn* initBenchConnImpl() {
     char *   dsnc = NULL;
 
     // set mode
-    if (g_arguments->dsn) {
+    if (g_arguments->connMode != CONN_MODE_NATIVE && g_arguments->dsn) {
         dsnc = strToLowerCopy(g_arguments->dsn);
         if (dsnc == NULL) {
             tmfree(conn);