xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into develop 

# Conflicts:
#	src/client/src/tscParseInsert.c
This commit is contained in:
slguan 2020-01-06 17:09:14 +08:00
parent ac5a9c9bb2 14111fbd6e
commit 7bcfa2f0ab
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/util/src/tglobalcfg.c
View File

@ -1108,9 +1108,9 @@ void tsSetAllDebugFlag() {
* In case that the setLocale failed to be executed, the right charset needs to be set. * In case that the setLocale failed to be executed, the right charset needs to be set.
*/ */
void tsSetLocale() { void tsSetLocale() {
char msgLocale[] = "Invalid locale:%s, please set the valid locale 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"; 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"; char msgCharset1[] = "failed to get charset, please set the valid charset in config file\n";
char *locale = setlocale(LC_CTYPE, tsLocale); char *locale = setlocale(LC_CTYPE, tsLocale);

5
tests/examples/c/stream.c
View File

@ -162,12 +162,13 @@ void* insert_rows(void *sarg)
} }
// insert data // insert data
int index = 0; int64_t begin = (int64_t)time(NULL);
int index = 0;
while (1) { while (1) {
if (g_thread_exit_flag) break; if (g_thread_exit_flag) break;
index++; 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)) { if (taos_query(taos, command)) {
printf("failed to insert row [%s], reason:%s\n", command, taos_errstr(taos)); printf("failed to insert row [%s], reason:%s\n", command, taos_errstr(taos));
} }