Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lzh_me
TDengine
提交
d32a5996
TDengine
项目概览
lzh_me
/
TDengine
与 Fork 源项目一致
Fork自
taosdata / TDengine
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
d32a5996
编写于
2月 24, 2021
作者:
D
dapan1121
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix bug
上级
e329f9f4
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
89 addition
and
13 deletion
+89
-13
src/client/inc/tsclient.h
src/client/inc/tsclient.h
+3
-0
src/client/src/tscUtil.c
src/client/src/tscUtil.c
+29
-0
src/kit/shell/inc/shell.h
src/kit/shell/inc/shell.h
+2
-0
src/kit/shell/src/shellEngine.c
src/kit/shell/src/shellEngine.c
+55
-13
未找到文件。
src/client/inc/tsclient.h
浏览文件 @
d32a5996
...
...
@@ -449,6 +449,9 @@ void doAsyncQuery(STscObj *pObj, SSqlObj *pSql, __async_cb_func_t fp, void *para
void
tscImportDataFromFile
(
SSqlObj
*
pSql
);
void
tscInitResObjForLocalQuery
(
SSqlObj
*
pObj
,
int32_t
numOfRes
,
int32_t
rowLen
);
bool
tscIsUpdateQuery
(
SSqlObj
*
pSql
);
char
*
tscGetSqlStr
(
SSqlObj
*
pSql
);
bool
tscIsQueryWithLimit
(
SSqlObj
*
pSql
);
bool
tscHasReachLimitation
(
SQueryInfo
*
pQueryInfo
,
SSqlRes
*
pRes
);
char
*
tscGetErrorMsgPayload
(
SSqlCmd
*
pCmd
);
...
...
src/client/src/tscUtil.c
浏览文件 @
d32a5996
...
...
@@ -2310,6 +2310,35 @@ bool tscIsUpdateQuery(SSqlObj* pSql) {
return
((
pCmd
->
command
>=
TSDB_SQL_INSERT
&&
pCmd
->
command
<=
TSDB_SQL_DROP_DNODE
)
||
TSDB_SQL_USE_DB
==
pCmd
->
command
);
}
char
*
tscGetSqlStr
(
SSqlObj
*
pSql
)
{
if
(
pSql
==
NULL
||
pSql
->
signature
!=
pSql
)
{
return
NULL
;
}
return
pSql
->
sqlstr
;
}
bool
tscIsQueryWithLimit
(
SSqlObj
*
pSql
)
{
if
(
pSql
==
NULL
||
pSql
->
signature
!=
pSql
)
{
return
false
;
}
SSqlCmd
*
pCmd
=
&
pSql
->
cmd
;
for
(
int32_t
i
=
0
;
i
<
pCmd
->
numOfClause
;
++
i
)
{
SQueryInfo
*
pqi
=
tscGetQueryInfoDetailSafely
(
pCmd
,
i
);
if
(
pqi
==
NULL
)
{
continue
;
}
if
(
pqi
->
limit
.
limit
>
0
)
{
return
true
;
}
}
return
false
;
}
int32_t
tscSQLSyntaxErrMsg
(
char
*
msg
,
const
char
*
additionalInfo
,
const
char
*
sql
)
{
const
char
*
msgFormat1
=
"syntax error near
\'
%s
\'
"
;
const
char
*
msgFormat2
=
"syntax error near
\'
%s
\'
(%s)"
;
...
...
src/kit/shell/inc/shell.h
浏览文件 @
d32a5996
...
...
@@ -30,6 +30,8 @@
#define MAX_COMMAND_SIZE 65536
#define HISTORY_FILE ".taos_history"
#define DEFAULT_RES_SHOW_NUM 100
typedef
struct
SShellHistory
{
char
*
hist
[
MAX_HISTORY_SIZE
];
int
hstart
;
...
...
src/kit/shell/src/shellEngine.c
浏览文件 @
d32a5996
...
...
@@ -48,6 +48,9 @@ int prompt_size = 6;
int64_t
result
=
0
;
SShellHistory
history
;
uint32_t
resShowMaxNum
=
UINT32_MAX
;
int32_t
resShowMaxReached
=
0
;
#define DEFAULT_MAX_BINARY_DISPLAY_WIDTH 30
extern
int32_t
tsMaxBinaryDisplayWidth
;
...
...
@@ -324,7 +327,9 @@ void shellRunCommandOnServer(TAOS *con, char command[]) {
}
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
);
if
(
numOfRows
<
0
)
{
atomic_store_64
(
&
result
,
0
);
...
...
@@ -335,6 +340,10 @@ void shellRunCommandOnServer(TAOS *con, char command[]) {
et
=
taosGetTimestampUs
();
if
(
error_no
==
0
)
{
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
{
printf
(
"Query interrupted (%s), %d row(s) in set (%.6fs)
\n
"
,
taos_errstr
(
pSql
),
numOfRows
,
(
et
-
st
)
/
1E6
);
}
...
...
@@ -659,6 +668,17 @@ static void printField(const char* val, TAOS_FIELD* field, int width, int32_t le
}
bool
isSelectQuery
(
TAOS_RES
*
tres
)
{
char
*
sql
=
tscGetSqlStr
(
tres
);
if
(
regex_match
(
sql
,
"^[
\t
]*select[
\t
]*"
,
REG_EXTENDED
|
REG_ICASE
))
{
return
true
;
}
return
false
;
}
static
int
verticalPrintResult
(
TAOS_RES
*
tres
)
{
TAOS_ROW
row
=
taos_fetch_row
(
tres
);
if
(
row
==
NULL
)
{
...
...
@@ -677,18 +697,29 @@ static int verticalPrintResult(TAOS_RES* tres) {
}
}
if
(
isSelectQuery
(
tres
)
&&
!
tscIsQueryWithLimit
(
tres
))
{
resShowMaxNum
=
DEFAULT_RES_SHOW_NUM
;
}
else
{
resShowMaxNum
=
UINT32_MAX
;
}
int
numOfRows
=
0
;
do
{
printf
(
"*************************** %d.row ***************************
\n
"
,
numOfRows
+
1
);
int32_t
*
length
=
taos_fetch_lengths
(
tres
);
for
(
int
i
=
0
;
i
<
num_fields
;
i
++
)
{
TAOS_FIELD
*
field
=
fields
+
i
;
if
(
numOfRows
<
resShowMaxNum
)
{
for
(
int
i
=
0
;
i
<
num_fields
;
i
++
)
{
TAOS_FIELD
*
field
=
fields
+
i
;
int
padding
=
(
int
)(
maxColNameLen
-
strlen
(
field
->
name
));
printf
(
"%*.s%s: "
,
padding
,
" "
,
field
->
name
);
int
padding
=
(
int
)(
maxColNameLen
-
strlen
(
field
->
name
));
printf
(
"%*.s%s: "
,
padding
,
" "
,
field
->
name
);
printField
((
const
char
*
)
row
[
i
],
field
,
0
,
length
[
i
],
precision
);
putchar
(
'\n'
);
printField
((
const
char
*
)
row
[
i
],
field
,
0
,
length
[
i
],
precision
);
putchar
(
'\n'
);
}
}
else
{
resShowMaxReached
=
1
;
}
numOfRows
++
;
...
...
@@ -795,16 +826,27 @@ static int horizontalPrintResult(TAOS_RES* tres) {
printHeader
(
fields
,
width
,
num_fields
);
if
(
isSelectQuery
(
tres
)
&&
!
tscIsQueryWithLimit
(
tres
))
{
resShowMaxNum
=
DEFAULT_RES_SHOW_NUM
;
}
else
{
resShowMaxNum
=
UINT32_MAX
;
}
int
numOfRows
=
0
;
do
{
int32_t
*
length
=
taos_fetch_lengths
(
tres
);
for
(
int
i
=
0
;
i
<
num_fields
;
i
++
)
{
putchar
(
' '
);
printField
((
const
char
*
)
row
[
i
],
fields
+
i
,
width
[
i
],
length
[
i
],
precision
);
putchar
(
' '
);
putchar
(
'|'
);
if
(
numOfRows
<
resShowMaxNum
)
{
for
(
int
i
=
0
;
i
<
num_fields
;
i
++
)
{
putchar
(
' '
);
printField
((
const
char
*
)
row
[
i
],
fields
+
i
,
width
[
i
],
length
[
i
],
precision
);
putchar
(
' '
);
putchar
(
'|'
);
}
putchar
(
'\n'
);
}
else
{
resShowMaxReached
=
1
;
}
putchar
(
'\n'
);
numOfRows
++
;
row
=
taos_fetch_row
(
tres
);
}
while
(
row
!=
NULL
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录