Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
c97e4f14
TDengine
项目概览
taosdata
/
TDengine
大约 1 年 前同步成功
通知
1185
Star
22015
Fork
4786
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
c97e4f14
编写于
6月 01, 2020
作者:
S
Shengliang Guan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix crash while pconn is null
上级
29cc962f
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
9 addition
and
6 deletion
+9
-6
src/plugins/mqtt/src/mqttSystem.c
src/plugins/mqtt/src/mqttSystem.c
+1
-1
src/rpc/src/rpcMain.c
src/rpc/src/rpcMain.c
+1
-1
tests/script/general/http/restful_full.sim
tests/script/general/http/restful_full.sim
+1
-1
tests/script/jenkins/basic.txt
tests/script/jenkins/basic.txt
+1
-3
tests/script/jenkins/general.txt
tests/script/jenkins/general.txt
+5
-0
tests/script/jenkins/unique.txt
tests/script/jenkins/unique.txt
+0
-0
未找到文件。
src/plugins/mqtt/src/mqttSystem.c
浏览文件 @
c97e4f14
...
@@ -50,7 +50,7 @@ int32_t mqttInitSystem() {
...
@@ -50,7 +50,7 @@ int32_t mqttInitSystem() {
recntStatus
.
password
=
strstr
(
url
,
"@"
)
!=
NULL
?
strbetween
(
strstr
(
url
,
recntStatus
.
user_name
),
":"
,
"@"
)
:
NULL
;
recntStatus
.
password
=
strstr
(
url
,
"@"
)
!=
NULL
?
strbetween
(
strstr
(
url
,
recntStatus
.
user_name
),
":"
,
"@"
)
:
NULL
;
if
(
strlen
(
url
)
==
0
)
{
if
(
strlen
(
url
)
==
0
)
{
mqtt
Error
(
"failed to initialize mqtt module, reason:
url is null"
);
mqtt
Trace
(
"mqtt module not init,
url is null"
);
return
rc
;
return
rc
;
}
}
...
...
src/rpc/src/rpcMain.c
浏览文件 @
c97e4f14
...
@@ -680,13 +680,13 @@ static SRpcConn *rpcSetupConnToServer(SRpcReqContext *pContext) {
...
@@ -680,13 +680,13 @@ static SRpcConn *rpcSetupConnToServer(SRpcReqContext *pContext) {
}
}
if
(
pConn
)
{
if
(
pConn
)
{
pConn
->
tretry
=
0
;
pConn
->
ahandle
=
pContext
->
ahandle
;
pConn
->
ahandle
=
pContext
->
ahandle
;
sprintf
(
pConn
->
info
,
"%s %p %p"
,
pRpc
->
label
,
pConn
,
pConn
->
ahandle
);
sprintf
(
pConn
->
info
,
"%s %p %p"
,
pRpc
->
label
,
pConn
,
pConn
->
ahandle
);
}
else
{
}
else
{
tError
(
"%s %p, failed to set up connection(%s)"
,
pRpc
->
label
,
pContext
->
ahandle
,
tstrerror
(
terrno
));
tError
(
"%s %p, failed to set up connection(%s)"
,
pRpc
->
label
,
pContext
->
ahandle
,
tstrerror
(
terrno
));
}
}
pConn
->
tretry
=
0
;
return
pConn
;
return
pConn
;
}
}
...
...
tests/script/general/http/restful_full.sim
浏览文件 @
c97e4f14
...
@@ -147,7 +147,7 @@ print =============== step3 - db
...
@@ -147,7 +147,7 @@ print =============== step3 - db
system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04' -d ' select * from d1.t1;' 127.0.0.1:6020/rest/sql
system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04' -d ' select * from d1.t1;' 127.0.0.1:6020/rest/sql
print 21-> $system_content
print 21-> $system_content
if $system_content != @{"status":"error","code":1000,"desc":"invalid table
name
"}@ then
if $system_content != @{"status":"error","code":1000,"desc":"invalid table
id
"}@ then
return -1
return -1
endi
endi
...
...
tests/script/jenkins/basic.txt
浏览文件 @
c97e4f14
...
@@ -59,7 +59,6 @@ cd ../../../debug; make
...
@@ -59,7 +59,6 @@ cd ../../../debug; make
./test.sh -f general/db/delete_writing1.sim
./test.sh -f general/db/delete_writing1.sim
./test.sh -f general/db/delete_writing2.sim
./test.sh -f general/db/delete_writing2.sim
./test.sh -f general/db/delete.sim
./test.sh -f general/db/delete.sim
#not test ./test.sh -f general/db/dropdnodes.sim
./test.sh -f general/db/len.sim
./test.sh -f general/db/len.sim
./test.sh -f general/db/repeat.sim
./test.sh -f general/db/repeat.sim
./test.sh -f general/db/tables.sim
./test.sh -f general/db/tables.sim
...
@@ -121,7 +120,7 @@ cd ../../../debug; make
...
@@ -121,7 +120,7 @@ cd ../../../debug; make
# ./test.sh -f general/parser/import_file.sim
# ./test.sh -f general/parser/import_file.sim
./test.sh -f general/parser/lastrow.sim
./test.sh -f general/parser/lastrow.sim
./test.sh -f general/parser/nchar.sim
./test.sh -f general/parser/nchar.sim
./test.sh -f general/parser/null_char.sim
#unsupport
./test.sh -f general/parser/null_char.sim
./test.sh -f general/parser/single_row_in_tb.sim
./test.sh -f general/parser/single_row_in_tb.sim
./test.sh -f general/parser/select_from_cache_disk.sim
./test.sh -f general/parser/select_from_cache_disk.sim
./test.sh -f general/parser/limit.sim
./test.sh -f general/parser/limit.sim
...
@@ -214,7 +213,6 @@ cd ../../../debug; make
...
@@ -214,7 +213,6 @@ cd ../../../debug; make
./test.sh -f general/tag/tinyint.sim
./test.sh -f general/tag/tinyint.sim
./test.sh -f general/user/authority.sim
./test.sh -f general/user/authority.sim
./test.sh -f general/user/basic1.sim
./test.sh -f general/user/monitor.sim
./test.sh -f general/user/monitor.sim
./test.sh -f general/user/pass_alter.sim
./test.sh -f general/user/pass_alter.sim
./test.sh -f general/user/pass_len.sim
./test.sh -f general/user/pass_len.sim
...
...
tests/script/jenkins/general.txt
0 → 100644
浏览文件 @
c97e4f14
cd ../../debug; cmake ..
cd ../../debug; make
./test.sh -f general/db/dropdnodes.sim
./test.sh -f general/user/basic1.sim
tests/script/jenkins/
sync
.txt
→
tests/script/jenkins/
unique
.txt
浏览文件 @
c97e4f14
文件已移动
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录