Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
哥们要飞
TDengine
提交
c43695e3
T
TDengine
项目概览
哥们要飞
/
TDengine
与 Fork 源项目一致
Fork自
taosdata / TDengine
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
c43695e3
编写于
5月 10, 2020
作者:
guanshengliang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix bug in pass_alter.sim, add log, revise shellActiveTimer
上级
dba2b23c
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
31 addition
and
10 deletion
+31
-10
src/client/src/tscSql.c
src/client/src/tscSql.c
+2
-2
src/client/src/tscSystem.c
src/client/src/tscSystem.c
+2
-0
src/client/src/tscUtil.c
src/client/src/tscUtil.c
+1
-1
src/dnode/src/dnodePeer.c
src/dnode/src/dnodePeer.c
+2
-2
src/dnode/src/dnodeShell.c
src/dnode/src/dnodeShell.c
+1
-1
src/rpc/src/rpcMain.c
src/rpc/src/rpcMain.c
+1
-1
tests/script/general/user/pass_alter.sim
tests/script/general/user/pass_alter.sim
+22
-3
未找到文件。
src/client/src/tscSql.c
浏览文件 @
c43695e3
...
...
@@ -172,7 +172,7 @@ static void syncConnCallback(void *param, TAOS_RES *tres, int code) {
}
TAOS
*
taos_connect
(
const
char
*
ip
,
const
char
*
user
,
const
char
*
pass
,
const
char
*
db
,
uint16_t
port
)
{
tscTrace
(
"try to create a connection to %s
"
,
ip
);
tscTrace
(
"try to create a connection to %s
:%u, user:%s db:%s"
,
ip
,
port
,
user
,
db
);
STscObj
*
pObj
=
taosConnectImpl
(
ip
,
user
,
pass
,
db
,
port
,
NULL
,
NULL
,
NULL
);
if
(
pObj
!=
NULL
)
{
...
...
@@ -191,7 +191,7 @@ TAOS *taos_connect(const char *ip, const char *user, const char *pass, const cha
return
NULL
;
}
tscTrace
(
"%p DB connection is opening
"
,
pObj
);
tscTrace
(
"%p DB connection is opening
, dnodeConn:%p"
,
pObj
,
pObj
->
pDnodeConn
);
// version compare only requires the first 3 segments of the version string
int
code
=
taosCheckVersion
(
version
,
taos_get_server_info
(
pObj
),
3
);
...
...
src/client/src/tscSystem.c
浏览文件 @
c43695e3
...
...
@@ -69,6 +69,8 @@ int32_t tscInitRpc(const char *user, const char *secret, void** pDnodeConn) {
if
(
*
pDnodeConn
==
NULL
)
{
tscError
(
"failed to init connection to TDengine"
);
return
-
1
;
}
else
{
tscTrace
(
"dnodeConn:%p is created, user:%s"
,
*
pDnodeConn
,
user
);
}
}
...
...
src/client/src/tscUtil.c
浏览文件 @
c43695e3
...
...
@@ -766,7 +766,7 @@ void tscCloseTscObj(STscObj* pObj) {
rpcClose
(
pObj
->
pDnodeConn
);
}
tscTrace
(
"%p DB connection is closed
"
,
pObj
);
tscTrace
(
"%p DB connection is closed
, dnodeConn:%p"
,
pObj
,
pObj
->
pDnodeConn
);
tfree
(
pObj
);
}
...
...
src/dnode/src/dnodePeer.c
浏览文件 @
c43695e3
...
...
@@ -61,7 +61,7 @@ int32_t dnodeInitServer() {
rpcInit
.
cfp
=
dnodeProcessReqMsgFromDnode
;
rpcInit
.
sessions
=
100
;
rpcInit
.
connType
=
TAOS_CONN_SERVER
;
rpcInit
.
idleTime
=
tsShellActivityTimer
*
2
000
;
rpcInit
.
idleTime
=
tsShellActivityTimer
*
1
000
;
tsDnodeServerRpc
=
rpcOpen
(
&
rpcInit
);
if
(
tsDnodeServerRpc
==
NULL
)
{
...
...
@@ -122,7 +122,7 @@ int32_t dnodeInitClient() {
rpcInit
.
ufp
=
dnodeUpdateIpSet
;
rpcInit
.
sessions
=
100
;
rpcInit
.
connType
=
TAOS_CONN_CLIENT
;
rpcInit
.
idleTime
=
tsShellActivityTimer
*
2
000
;
rpcInit
.
idleTime
=
tsShellActivityTimer
*
1
000
;
rpcInit
.
user
=
"t"
;
rpcInit
.
ckey
=
"key"
;
rpcInit
.
secret
=
"secret"
;
...
...
src/dnode/src/dnodeShell.c
浏览文件 @
c43695e3
...
...
@@ -86,7 +86,7 @@ int32_t dnodeInitShell() {
rpcInit
.
cfp
=
dnodeProcessMsgFromShell
;
rpcInit
.
sessions
=
TSDB_SESSIONS_PER_DNODE
;
rpcInit
.
connType
=
TAOS_CONN_SERVER
;
rpcInit
.
idleTime
=
tsShellActivityTimer
*
1
5
00
;
rpcInit
.
idleTime
=
tsShellActivityTimer
*
1
0
00
;
rpcInit
.
afp
=
dnodeRetrieveUserAuthInfo
;
tsDnodeShellRpc
=
rpcOpen
(
&
rpcInit
);
...
...
src/rpc/src/rpcMain.c
浏览文件 @
c43695e3
...
...
@@ -793,7 +793,7 @@ static SRpcConn *rpcProcessMsgHead(SRpcInfo *pRpc, SRecvInfo *pRecv) {
pConn
->
chandle
=
pRecv
->
chandle
;
pConn
->
peerIp
=
pRecv
->
ip
;
if
(
pConn
->
peerPort
==
0
)
pConn
->
peerPort
=
pRecv
->
port
;
pConn
->
peerPort
=
pRecv
->
port
;
if
(
pHead
->
port
)
pConn
->
peerPort
=
htons
(
pHead
->
port
);
terrno
=
rpcCheckAuthentication
(
pConn
,
(
char
*
)
pHead
,
pRecv
->
msgLen
);
...
...
tests/script/general/user/pass_alter.sim
浏览文件 @
c43695e3
...
...
@@ -19,28 +19,47 @@ endi
print ============= step2
sql close
sleep 2500
print user read login
sql connect read
sleep 2000
sql alter user read pass 'taosdata'
sql alter user write pass 'taosdata1' -x step2
return -1
step2:
sql_error create user read pass 'taosdata1'
sql_error create user write pass 'taosdata1'
sql show users
if $rows != 5 then
return -1
endi
print ============= step3
sql close
sleep 2500
print user write login
sql connect write
sleep 2000
sql_error create user read pass 'taosdata1'
sql_error create user write pass 'taosdata1'
sql alter user write pass 'taosdata'
sql alter user read pass 'taosdata' -x step3
return -1
step3:
sql show users
if $rows != 5 then
return -1
endi
print ============= step4
sql close
sleep 2500
print root write login
sql connect
sleep 2000
sql create user oroot pass 'taosdata'
sql show users
if $rows != 6 then
return -1
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录