From 8712b64101b9e5ce7a6a6099327e690467798cff Mon Sep 17 00:00:00 2001 From: lihui Date: Sat, 4 Jan 2020 18:53:38 +0800 Subject: [PATCH 1/3] [#1078] --- src/client/src/tscParseInsert.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/client/src/tscParseInsert.c b/src/client/src/tscParseInsert.c index f01652b716..3360f6b26a 100644 --- a/src/client/src/tscParseInsert.c +++ b/src/client/src/tscParseInsert.c @@ -1086,6 +1086,7 @@ _error_clean: _clean: taosCleanUpIntHash(pSql->pTableHashList); pSql->pTableHashList = NULL; + pSql->asyncTblPos = NULL; return code; } From 1ca089de105a0f3511393058bc67f635e281e54b Mon Sep 17 00:00:00 2001 From: slguan Date: Mon, 6 Jan 2020 12:05:56 +0800 Subject: [PATCH 2/3] update log content --- src/util/src/tglobalcfg.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/util/src/tglobalcfg.c b/src/util/src/tglobalcfg.c index 00da094d5f..f888537a0f 100644 --- a/src/util/src/tglobalcfg.c +++ b/src/util/src/tglobalcfg.c @@ -1097,9 +1097,9 @@ void tsSetAllDebugFlag() { * In case that the setLocale failed to be executed, the right charset needs to be set. */ void tsSetLocale() { - char msgLocale[] = "Invalid locale:%s, please set the valid locale in config file"; - char msgCharset[] = "Invalid charset:%s, please set the valid charset in config file"; - char msgCharset1[] = "failed to get charset, please set the valid charset in config file"; + char msgLocale[] = "Invalid locale:%s, please set the valid locale in config file\n"; + char msgCharset[] = "Invalid charset:%s, please set the valid charset in config file\n"; + char msgCharset1[] = "failed to get charset, please set the valid charset in config file\n"; char *locale = setlocale(LC_CTYPE, tsLocale); From 241c93b4bbb47cd6ca69ce47d19e331ba044dead Mon Sep 17 00:00:00 2001 From: slguan Date: Mon, 6 Jan 2020 14:27:27 +0800 Subject: [PATCH 3/3] examples --- tests/examples/c/stream.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/examples/c/stream.c b/tests/examples/c/stream.c index 623775c780..060f5b84ff 100755 --- a/tests/examples/c/stream.c +++ b/tests/examples/c/stream.c @@ -162,12 +162,13 @@ void* insert_rows(void *sarg) } // insert data - int index = 0; + int64_t begin = (int64_t)time(NULL); + int index = 0; while (1) { if (g_thread_exit_flag) break; index++; - sprintf(command, "insert into %s values (%ld, %d)", winfo->tbl_name, 1546300800000+index*1000, index); + sprintf(command, "insert into %s values (%ld, %d)", winfo->tbl_name, (begin + index) * 1000, index); if (taos_query(taos, command)) { printf("failed to insert row [%s], reason:%s\n", command, taos_errstr(taos)); }