From bdfd86052d223b845dcb5b15d9ecb51f122f45c0 Mon Sep 17 00:00:00 2001
From: Shuduo Sang <sangshuduo@gmail.com>
Date: Sun, 29 Aug 2021 06:41:15 +0800
Subject: [PATCH] Hotfix/sangshuduo/td 6294 taosdemo long arg (#7680)

* [TD-6294]<fix>: taosdemo support long arg

fix conflict with develop branch.

* fix few words.

* declare default child tables number.

* add support email prompt.

* support the way no space between param and value

* fix uncatched status.

* fix -PP arg.

* fix total child tables bug.

Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
---
 src/kit/taosdemo/taosdemo.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/kit/taosdemo/taosdemo.c b/src/kit/taosdemo/taosdemo.c
index de47222a68..4f3b17c37f 100644
--- a/src/kit/taosdemo/taosdemo.c
+++ b/src/kit/taosdemo/taosdemo.c
@@ -1381,6 +1381,8 @@ static void parse_args(int argc, char *argv[], SArguments *arguments) {
                 errorUnreconized(argv[0], argv[i]);
                 exit(EXIT_FAILURE);
             }
+
+            g_totalChildTables = arguments->num_of_tables;
         } else if ((0 == strncmp(argv[i], "-n", strlen("-n")))
                 || (0 == strncmp(argv[i], "--records", strlen("--records")))) {
             if (2 == strlen(argv[i])) {
@@ -1399,11 +1401,11 @@ static void parse_args(int argc, char *argv[], SArguments *arguments) {
                     errorPrintReqArg2(argv[0], "--records");
                     exit(EXIT_FAILURE);
                 }
-            } else if (0 == strncmp(argv[i], "-r", strlen("-r"))) {
-                if (isStringNumber((char *)(argv[i] + strlen("-r")))) {
-                    arguments->num_of_DPT = atoi((char *)(argv[i]+strlen("-r")));
+            } else if (0 == strncmp(argv[i], "-n", strlen("-n"))) {
+                if (isStringNumber((char *)(argv[i] + strlen("-n")))) {
+                    arguments->num_of_DPT = atoi((char *)(argv[i]+strlen("-n")));
                 } else {
-                    errorPrintReqArg2(argv[0], "-r");
+                    errorPrintReqArg2(argv[0], "-n");
                     exit(EXIT_FAILURE);
                 }
             } else if (strlen("--records") == strlen(argv[i])) {
@@ -1419,8 +1421,6 @@ static void parse_args(int argc, char *argv[], SArguments *arguments) {
                 errorUnreconized(argv[0], argv[i]);
                 exit(EXIT_FAILURE);
             }
-
-            g_totalChildTables = arguments->num_of_DPT;
         } else if ((0 == strncmp(argv[i], "-d", strlen("-d")))
                 || (0 == strncmp(argv[i], "--database", strlen("--database")))) {
             if (2 == strlen(argv[i])) {
-- 
GitLab