From d3c9fc730d5117c3d2cb0d73b3963314dba9313a Mon Sep 17 00:00:00 2001 From: wangmm0220 Date: Fri, 20 Aug 2021 15:31:57 +0800 Subject: [PATCH] [TD-5992] add set config interface for connector --- src/client/src/taos.def | 1 + src/client/tests/cliTest.cpp | 4 ++-- src/util/src/tconfig.c | 6 +++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/client/src/taos.def b/src/client/src/taos.def index 7d3b8e80c2..f1ff17a491 100644 --- a/src/client/src/taos.def +++ b/src/client/src/taos.def @@ -2,6 +2,7 @@ EXPORTS taos_init taos_cleanup taos_options +taos_set_config taos_connect taos_connect_auth taos_close diff --git a/src/client/tests/cliTest.cpp b/src/client/tests/cliTest.cpp index 98a44333b4..d8f155c088 100644 --- a/src/client/tests/cliTest.cpp +++ b/src/client/tests/cliTest.cpp @@ -262,8 +262,8 @@ TEST(testCase, result_field_test) { taos_options(TSDB_OPTION_CONFIGDIR, "~/first/cfg"); taos_init(); - char *config = "{\"tempDir\":\"/root/tmp/\",\"sercerPort\":\"3333\"}"; - taos_set_config(config); + //char *config = "{\"tempDir:\"/root/tmp/\",\"sercerPort\":\"3333\"}"; + //taos_set_config(config); validateResultFields(); stmtInsertTest(); } diff --git a/src/util/src/tconfig.c b/src/util/src/tconfig.c index 4b6cc1a18d..ad7e90a4bd 100644 --- a/src/util/src/tconfig.c +++ b/src/util/src/tconfig.c @@ -574,7 +574,10 @@ int taos_set_config(const char *config){ pthread_mutex_lock(&setConfMutex); - if (setConfFlag) return; + if (setConfFlag) { + uError("already set config"); + return 0; + } cJSON *root = cJSON_Parse(config); if (root == NULL) { uError("failed to set config, invalid json format: %s", config); @@ -592,4 +595,5 @@ int taos_set_config(const char *config){ } setConfFlag = true; pthread_mutex_unlock(&setConfMutex); + return 0; } -- GitLab