Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
13cd16f1
T
TDengine
项目概览
taosdata
/
TDengine
12 个月 前同步成功
通知
1180
Star
22014
Fork
4786
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
13cd16f1
编写于
2月 24, 2021
作者:
D
dapan1121
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix bug
上级
d32a5996
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
19 addition
and
19 deletion
+19
-19
src/kit/shell/src/shellEngine.c
src/kit/shell/src/shellEngine.c
+19
-19
未找到文件。
src/kit/shell/src/shellEngine.c
浏览文件 @
13cd16f1
...
@@ -48,9 +48,6 @@ int prompt_size = 6;
...
@@ -48,9 +48,6 @@ int prompt_size = 6;
int64_t
result
=
0
;
int64_t
result
=
0
;
SShellHistory
history
;
SShellHistory
history
;
uint32_t
resShowMaxNum
=
UINT32_MAX
;
int32_t
resShowMaxReached
=
0
;
#define DEFAULT_MAX_BINARY_DISPLAY_WIDTH 30
#define DEFAULT_MAX_BINARY_DISPLAY_WIDTH 30
extern
int32_t
tsMaxBinaryDisplayWidth
;
extern
int32_t
tsMaxBinaryDisplayWidth
;
...
@@ -328,7 +325,6 @@ void shellRunCommandOnServer(TAOS *con, char command[]) {
...
@@ -328,7 +325,6 @@ void shellRunCommandOnServer(TAOS *con, char command[]) {
if
(
!
tscIsUpdateQuery
(
pSql
))
{
// select and show kinds of commands
if
(
!
tscIsUpdateQuery
(
pSql
))
{
// select and show kinds of commands
int
error_no
=
0
;
int
error_no
=
0
;
resShowMaxReached
=
0
;
int
numOfRows
=
shellDumpResult
(
pSql
,
fname
,
&
error_no
,
printMode
);
int
numOfRows
=
shellDumpResult
(
pSql
,
fname
,
&
error_no
,
printMode
);
if
(
numOfRows
<
0
)
{
if
(
numOfRows
<
0
)
{
...
@@ -340,10 +336,6 @@ void shellRunCommandOnServer(TAOS *con, char command[]) {
...
@@ -340,10 +336,6 @@ void shellRunCommandOnServer(TAOS *con, char command[]) {
et
=
taosGetTimestampUs
();
et
=
taosGetTimestampUs
();
if
(
error_no
==
0
)
{
if
(
error_no
==
0
)
{
printf
(
"Query OK, %d row(s) in set (%.6fs)
\n
"
,
numOfRows
,
(
et
-
st
)
/
1E6
);
printf
(
"Query OK, %d row(s) in set (%.6fs)
\n
"
,
numOfRows
,
(
et
-
st
)
/
1E6
);
if
(
resShowMaxReached
)
{
printf
(
"Displayed 100 rows. You can add
\"
limit %d
\"
or redirect results to specific file to get all.
\n
"
,
numOfRows
);
}
}
else
{
}
else
{
printf
(
"Query interrupted (%s), %d row(s) in set (%.6fs)
\n
"
,
taos_errstr
(
pSql
),
numOfRows
,
(
et
-
st
)
/
1E6
);
printf
(
"Query interrupted (%s), %d row(s) in set (%.6fs)
\n
"
,
taos_errstr
(
pSql
),
numOfRows
,
(
et
-
st
)
/
1E6
);
}
}
...
@@ -697,18 +689,20 @@ static int verticalPrintResult(TAOS_RES* tres) {
...
@@ -697,18 +689,20 @@ static int verticalPrintResult(TAOS_RES* tres) {
}
}
}
}
if
(
isSelectQuery
(
tres
)
&&
!
tscIsQueryWithLimit
(
tres
))
{
uint64_t
resShowMaxNum
=
UINT64_MAX
;
if
(
args
.
commands
==
NULL
&&
args
.
file
[
0
]
==
0
&&
isSelectQuery
(
tres
)
&&
!
tscIsQueryWithLimit
(
tres
))
{
resShowMaxNum
=
DEFAULT_RES_SHOW_NUM
;
resShowMaxNum
=
DEFAULT_RES_SHOW_NUM
;
}
else
{
resShowMaxNum
=
UINT32_MAX
;
}
}
int
numOfRows
=
0
;
int
numOfRows
=
0
;
int
showMore
=
1
;
do
{
do
{
printf
(
"*************************** %d.row ***************************
\n
"
,
numOfRows
+
1
);
printf
(
"*************************** %d.row ***************************
\n
"
,
numOfRows
+
1
);
int32_t
*
length
=
taos_fetch_lengths
(
tres
);
if
(
numOfRows
<
resShowMaxNum
)
{
if
(
numOfRows
<
resShowMaxNum
)
{
int32_t
*
length
=
taos_fetch_lengths
(
tres
);
for
(
int
i
=
0
;
i
<
num_fields
;
i
++
)
{
for
(
int
i
=
0
;
i
<
num_fields
;
i
++
)
{
TAOS_FIELD
*
field
=
fields
+
i
;
TAOS_FIELD
*
field
=
fields
+
i
;
...
@@ -718,8 +712,10 @@ static int verticalPrintResult(TAOS_RES* tres) {
...
@@ -718,8 +712,10 @@ static int verticalPrintResult(TAOS_RES* tres) {
printField
((
const
char
*
)
row
[
i
],
field
,
0
,
length
[
i
],
precision
);
printField
((
const
char
*
)
row
[
i
],
field
,
0
,
length
[
i
],
precision
);
putchar
(
'\n'
);
putchar
(
'\n'
);
}
}
}
else
{
}
else
if
(
showMore
)
{
resShowMaxReached
=
1
;
printf
(
"100 Rows showed, and more rows are fetching but will not be showed. You can ctrl+c to stop or wait.
\n
"
);
printf
(
"You can add limit statement to get more or redirect results to specific file to get all.
\n
"
);
showMore
=
0
;
}
}
numOfRows
++
;
numOfRows
++
;
...
@@ -826,13 +822,15 @@ static int horizontalPrintResult(TAOS_RES* tres) {
...
@@ -826,13 +822,15 @@ static int horizontalPrintResult(TAOS_RES* tres) {
printHeader
(
fields
,
width
,
num_fields
);
printHeader
(
fields
,
width
,
num_fields
);
if
(
isSelectQuery
(
tres
)
&&
!
tscIsQueryWithLimit
(
tres
))
{
uint64_t
resShowMaxNum
=
UINT64_MAX
;
if
(
args
.
commands
==
NULL
&&
args
.
file
[
0
]
==
0
&&
isSelectQuery
(
tres
)
&&
!
tscIsQueryWithLimit
(
tres
))
{
resShowMaxNum
=
DEFAULT_RES_SHOW_NUM
;
resShowMaxNum
=
DEFAULT_RES_SHOW_NUM
;
}
else
{
resShowMaxNum
=
UINT32_MAX
;
}
}
int
numOfRows
=
0
;
int
numOfRows
=
0
;
int
showMore
=
1
;
do
{
do
{
int32_t
*
length
=
taos_fetch_lengths
(
tres
);
int32_t
*
length
=
taos_fetch_lengths
(
tres
);
if
(
numOfRows
<
resShowMaxNum
)
{
if
(
numOfRows
<
resShowMaxNum
)
{
...
@@ -843,8 +841,10 @@ static int horizontalPrintResult(TAOS_RES* tres) {
...
@@ -843,8 +841,10 @@ static int horizontalPrintResult(TAOS_RES* tres) {
putchar
(
'|'
);
putchar
(
'|'
);
}
}
putchar
(
'\n'
);
putchar
(
'\n'
);
}
else
{
}
else
if
(
showMore
)
{
resShowMaxReached
=
1
;
printf
(
"100 Rows showed, and more rows are fetching but will not be showed. You can ctrl+c to stop or wait.
\n
"
);
printf
(
"You can add limit statement to show more or redirect results to specific file to get all.
\n
"
);
showMore
=
0
;
}
}
numOfRows
++
;
numOfRows
++
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录