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

Merge remote-tracking branch 'origin/beta/v1.6.5.3' into beta/v1.6.5.3

This commit is contained in:
hjxilinx 2020-01-18 10:24:32 +08:00
parent e12f765b8f 69c95d0d75
commit 59bb8b3c90
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/kit/taosdump/taosdump.c
View File

@ -797,7 +797,10 @@ int32_t taosDumpTable(char *table, char *metric, struct arguments *arguments, FI
if (metric != NULL && metric[0] != '\0') { // dump metric definition if (metric != NULL && metric[0] != '\0') { // dump metric definition
count = taosGetTableDes(metric, tableDes); count = taosGetTableDes(metric, tableDes);
if (count < 0) return -1; if (count < 0) {
free(tableDes);
return -1;
}
taosDumpCreateTableClause(tableDes, count, arguments, fp); taosDumpCreateTableClause(tableDes, count, arguments, fp);
@ -805,18 +808,26 @@ int32_t taosDumpTable(char *table, char *metric, struct arguments *arguments, FI
count = taosGetTableDes(table, tableDes); count = taosGetTableDes(table, tableDes);
if (count < 0) return -1; if (count < 0) {
free(tableDes);
return -1;
}
taosDumpCreateMTableClause(tableDes, metric, count, arguments, fp); taosDumpCreateMTableClause(tableDes, metric, count, arguments, fp);
} else { // dump table definition } else { // dump table definition
count = taosGetTableDes(table, tableDes); count = taosGetTableDes(table, tableDes);
if (count < 0) return -1; if (count < 0) {
free(tableDes);
return -1;
}
taosDumpCreateTableClause(tableDes, count, arguments, fp); taosDumpCreateTableClause(tableDes, count, arguments, fp);
} }
free(tableDes);
return taosDumpTableData(fp, table, arguments); return taosDumpTableData(fp, table, arguments);
} }