提交 59bb8b3c 编写于 作者: H hjxilinx

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

...@@ -797,7 +797,10 @@ int32_t taosDumpTable(char *table, char *metric, struct arguments *arguments, FI ...@@ -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 ...@@ -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);
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册