Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
冷面1992
TDengine
提交
2b09a97f
TDengine
项目概览
冷面1992
/
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,发现更多精彩内容 >>
未验证
提交
2b09a97f
编写于
12月 12, 2019
作者:
P
plum-lihui
提交者:
GitHub
12月 12, 2019
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #908 from taosdata/feature/slguan
remove some warnings
上级
be2c6f5d
379156b1
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
26 addition
and
16 deletion
+26
-16
src/client/src/sql.c
src/client/src/sql.c
+2
-0
src/client/src/tscServer.c
src/client/src/tscServer.c
+1
-1
src/modules/monitor/src/monitorSystem.c
src/modules/monitor/src/monitorSystem.c
+23
-15
未找到文件。
src/client/src/sql.c
浏览文件 @
2b09a97f
...
@@ -22,6 +22,8 @@
...
@@ -22,6 +22,8 @@
** The following is the concatenation of all %include directives from the
** The following is the concatenation of all %include directives from the
** input grammar file:
** input grammar file:
*/
*/
#pragma GCC diagnostic ignored "-Wunused-variable"
#include <stdio.h>
#include <stdio.h>
/************ Begin %include sections from the grammar ************************/
/************ Begin %include sections from the grammar ************************/
...
...
src/client/src/tscServer.c
浏览文件 @
2b09a97f
...
@@ -211,7 +211,6 @@ void tscGetConnToMgmt(SSqlObj *pSql, uint8_t *pCode) {
...
@@ -211,7 +211,6 @@ void tscGetConnToMgmt(SSqlObj *pSql, uint8_t *pCode) {
}
}
void
tscGetConnToVnode
(
SSqlObj
*
pSql
,
uint8_t
*
pCode
)
{
void
tscGetConnToVnode
(
SSqlObj
*
pSql
,
uint8_t
*
pCode
)
{
char
ipstr
[
40
]
=
{
0
};
SVPeerDesc
*
pVPeersDesc
=
NULL
;
SVPeerDesc
*
pVPeersDesc
=
NULL
;
static
int
vidIndex
=
0
;
static
int
vidIndex
=
0
;
STscObj
*
pTscObj
=
pSql
->
pTscObj
;
STscObj
*
pTscObj
=
pSql
->
pTscObj
;
...
@@ -244,6 +243,7 @@ void tscGetConnToVnode(SSqlObj *pSql, uint8_t *pCode) {
...
@@ -244,6 +243,7 @@ void tscGetConnToVnode(SSqlObj *pSql, uint8_t *pCode) {
while
(
pSql
->
retry
<
pSql
->
maxRetry
)
{
while
(
pSql
->
retry
<
pSql
->
maxRetry
)
{
(
pSql
->
retry
)
++
;
(
pSql
->
retry
)
++
;
#ifdef CLUSTER
#ifdef CLUSTER
char
ipstr
[
40
]
=
{
0
};
if
(
pVPeersDesc
[
pSql
->
index
].
ip
==
0
)
{
if
(
pVPeersDesc
[
pSql
->
index
].
ip
==
0
)
{
(
pSql
->
index
)
=
(
pSql
->
index
+
1
)
%
TSDB_VNODES_SUPPORT
;
(
pSql
->
index
)
=
(
pSql
->
index
+
1
)
%
TSDB_VNODES_SUPPORT
;
continue
;
continue
;
...
...
src/modules/monitor/src/monitorSystem.c
浏览文件 @
2b09a97f
...
@@ -389,21 +389,29 @@ void monitorSaveAcctLog(char *acctId, int64_t currentPointsPerSecond, int64_t ma
...
@@ -389,21 +389,29 @@ void monitorSaveAcctLog(char *acctId, int64_t currentPointsPerSecond, int64_t ma
char
sql
[
1024
]
=
{
0
};
char
sql
[
1024
]
=
{
0
};
sprintf
(
sql
,
sprintf
(
sql
,
"insert into %s.acct_%s using %s.acct tags('%s') values(now"
"insert into %s.acct_%s using %s.acct tags('%s') values(now"
", %"
PRId64
,
"
%"
PRId64
", %"
PRId64
",
%"
PRId64
", %"
PRId64
,
"
%"
PRId64
", %"
PRId64
",
%"
PRId64
", %"
PRId64
,
"
%"
PRId64
", %"
PRId64
",
%"
PRId64
", %"
PRId64
,
"
%"
PRId64
", %"
PRId64
",
%"
PRId64
", %"
PRId64
,
"
%"
PRId64
", %"
PRId64
",
%"
PRId64
", %"
PRId64
,
"
%"
PRId64
", %"
PRId64
",
%"
PRId64
", %"
PRId64
,
"
%"
PRId64
", %"
PRId64
",
%"
PRId64
", %"
PRId64
,
"
%"
PRId64
", %"
PRId64
",
%"
PRId64
", %"
PRId64
,
"
%"
PRId64
", %"
PRId64
",
%"
PRId64
", %"
PRId64
,
"
%"
PRId64
", %"
PRId64
",
%"
PRId64
", %d)"
,
", %d)"
,
tsMonitorDbName
,
acctId
,
tsMonitorDbName
,
acctId
,
currentPointsPerSecond
,
maxPointsPerSecond
,
totalTimeSeries
,
tsMonitorDbName
,
acctId
,
tsMonitorDbName
,
acctId
,
maxTimeSeries
,
totalStorage
,
maxStorage
,
totalQueryTime
,
maxQueryTime
,
totalInbound
,
maxInbound
,
currentPointsPerSecond
,
maxPointsPerSecond
,
totalOutbound
,
maxOutbound
,
totalDbs
,
maxDbs
,
totalUsers
,
maxUsers
,
totalStreams
,
maxStreams
,
totalConns
,
totalTimeSeries
,
maxTimeSeries
,
maxConns
,
accessState
);
totalStorage
,
maxStorage
,
totalQueryTime
,
maxQueryTime
,
totalInbound
,
maxInbound
,
totalOutbound
,
maxOutbound
,
totalDbs
,
maxDbs
,
totalUsers
,
maxUsers
,
totalStreams
,
maxStreams
,
totalConns
,
maxConns
,
accessState
);
monitorTrace
(
"monitor:%p, save account info, sql %s"
,
monitor
->
conn
,
sql
);
monitorTrace
(
"monitor:%p, save account info, sql %s"
,
monitor
->
conn
,
sql
);
taos_query_a
(
monitor
->
conn
,
sql
,
dnodeMontiorInsertAcctCallback
,
"account"
);
taos_query_a
(
monitor
->
conn
,
sql
,
dnodeMontiorInsertAcctCallback
,
"account"
);
...
@@ -418,7 +426,7 @@ void monitorSaveLog(int level, const char *const format, ...) {
...
@@ -418,7 +426,7 @@ void monitorSaveLog(int level, const char *const format, ...) {
return
;
return
;
}
}
int
len
=
snprintf
(
sql
,
(
size_t
)
max_length
,
"import into %s.log values(%
\"
PRId64
\
"
, %d,'"
,
tsMonitorDbName
,
int
len
=
snprintf
(
sql
,
(
size_t
)
max_length
,
"import into %s.log values(%
"
PRId64
", %d,'"
,
tsMonitorDbName
,
taosGetTimestampUs
(),
level
);
taosGetTimestampUs
(),
level
);
va_start
(
argpointer
,
format
);
va_start
(
argpointer
,
format
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录