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

improve error message of multiple file import

This commit is contained in:
localvar 2019-12-18 14:54:15 +08:00
parent 868a243a05
commit 6ace40b361
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/kit/shell/src/shellImport.c
View File

@ -167,9 +167,11 @@ static void shellSourceFile(TAOS *con, char *fptr) {
return; return;
} }
fprintf(stdout, "start to dispose file:%s\n", fname); fprintf(stdout, "begin import file:%s\n", fname);
int lineNo = 0;
while ((read_len = getline(&line, &line_len, f)) != -1) { while ((read_len = getline(&line, &line_len, f)) != -1) {
++lineNo;
if (read_len >= MAX_COMMAND_SIZE) continue; if (read_len >= MAX_COMMAND_SIZE) continue;
line[--read_len] = '\0'; line[--read_len] = '\0';
@ -186,7 +188,10 @@ static void shellSourceFile(TAOS *con, char *fptr) {
memcpy(cmd + cmd_len, line, read_len); memcpy(cmd + cmd_len, line, read_len);
if (taos_query(con, cmd)) { if (taos_query(con, cmd)) {
taos_error(con); fprintf(stderr, "DB error: %s: %s (%d)\n", taos_errstr(con), fname, lineNo);
/* free local resouce: allocated memory/metric-meta refcnt */
TAOS_RES *pRes = taos_use_result(con);
taos_free_result(pRes);
} }
memset(cmd, 0, MAX_COMMAND_SIZE); memset(cmd, 0, MAX_COMMAND_SIZE);