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

print exception log

This commit is contained in:
facetosea 2023-10-24 15:15:39 +08:00
parent b9fa620b26
commit c14dbbdd01
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tools/shell/src/shellEngine.c
View File

@ -751,13 +751,9 @@ void init_dump_info(tsDumpInfo *dump_info, TAOS_RES *tres, const char *sql, bool
} }
void shellVerticalPrintResult(TAOS_RES *tres, tsDumpInfo *dump_info) { void shellVerticalPrintResult(TAOS_RES *tres, tsDumpInfo *dump_info) {
if (dump_info->numOfRows <= 0) return;
if (dump_info->numOfAllRows >= dump_info->resShowMaxNum) {
return;
}
TAOS_ROW row = taos_fetch_row(tres); TAOS_ROW row = taos_fetch_row(tres);
if (row == NULL) { if (row == NULL) {
printf("\033[31mtaos_fetch_row failed.\033[0m\n");
return; return;
} }
@ -898,13 +894,9 @@ void shellPrintHeader(TAOS_FIELD *fields, int32_t *width, int32_t num_fields) {
} }
void shellHorizontalPrintResult(TAOS_RES *tres, tsDumpInfo *dump_info) { void shellHorizontalPrintResult(TAOS_RES *tres, tsDumpInfo *dump_info) {
if (dump_info->numOfRows <= 0) return;
if (dump_info->numOfAllRows >= dump_info->resShowMaxNum) {
return;
}
TAOS_ROW row = taos_fetch_row(tres); TAOS_ROW row = taos_fetch_row(tres);
if (row == NULL) { if (row == NULL) {
printf("\033[31mtaos_fetch_row failed.\033[0m\n");
return; return;
} }
@ -957,10 +949,12 @@ void shellDumpResultCallback(void *param, TAOS_RES *tres, int num_of_rows) {
tsDumpInfo *dump_info = (tsDumpInfo *)param; tsDumpInfo *dump_info = (tsDumpInfo *)param;
if (num_of_rows > 0) { if (num_of_rows > 0) {
dump_info->numOfRows = num_of_rows; dump_info->numOfRows = num_of_rows;
if (dump_info->vertical) { if (dump_info->numOfAllRows < dump_info->resShowMaxNum) {
shellVerticalPrintResult(tres, dump_info); if (dump_info->vertical) {
} else { shellVerticalPrintResult(tres, dump_info);
shellHorizontalPrintResult(tres, dump_info); } else {
shellHorizontalPrintResult(tres, dump_info);
}
} }
dump_info->numOfAllRows += num_of_rows; dump_info->numOfAllRows += num_of_rows;
taos_fetch_rows_a(tres, shellDumpResultCallback, param); taos_fetch_rows_a(tres, shellDumpResultCallback, param);