Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
34145487
T
TDengine
项目概览
taosdata
/
TDengine
1 年多 前同步成功
通知
1185
Star
22016
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看板
提交
34145487
编写于
1月 02, 2021
作者:
Y
yihaoDeng
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
share mgmt ep set
上级
19c3c7c6
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
4 addition
and
4 deletion
+4
-4
src/client/inc/tsclient.h
src/client/inc/tsclient.h
+1
-1
src/client/src/tscSql.c
src/client/src/tscSql.c
+1
-2
src/client/src/tscSystem.c
src/client/src/tscSystem.c
+2
-1
未找到文件。
src/client/inc/tsclient.h
浏览文件 @
34145487
...
@@ -385,7 +385,7 @@ void tscSetStreamDestTable(SSqlStream* pStream, const char* dstTable);
...
@@ -385,7 +385,7 @@ void tscSetStreamDestTable(SSqlStream* pStream, const char* dstTable);
void
*
tscAcquireRpc
(
const
char
*
key
);
void
*
tscAcquireRpc
(
const
char
*
key
);
void
tscReleaseRpc
(
void
*
param
);
void
tscReleaseRpc
(
void
*
param
);
int32_t
tscInitRpc
(
const
char
*
key
,
const
char
*
user
,
const
char
*
secret
,
void
**
pRpcObj
);
int32_t
tscInitRpc
(
const
char
*
key
,
const
char
*
user
,
const
char
*
secret
,
void
**
pRpcObj
,
SRpcCorEpSet
*
corMgmtEpSet
);
void
tscInitMsgsFp
();
void
tscInitMsgsFp
();
int
tsParseSql
(
SSqlObj
*
pSql
,
bool
initial
);
int
tsParseSql
(
SSqlObj
*
pSql
,
bool
initial
);
...
...
src/client/src/tscSql.c
浏览文件 @
34145487
...
@@ -94,7 +94,7 @@ static SSqlObj *taosConnectImpl(const char *ip, const char *user, const char *pa
...
@@ -94,7 +94,7 @@ static SSqlObj *taosConnectImpl(const char *ip, const char *user, const char *pa
sprintf
(
rpcKey
,
"%s:%s:%s:%d"
,
user
,
pass
,
ip
,
port
);
sprintf
(
rpcKey
,
"%s:%s:%s:%d"
,
user
,
pass
,
ip
,
port
);
void
*
pRpcObj
=
NULL
;
void
*
pRpcObj
=
NULL
;
if
(
tscInitRpc
(
rpcKey
,
user
,
secretEncrypt
,
&
pRpcObj
)
!=
0
)
{
if
(
tscInitRpc
(
rpcKey
,
user
,
secretEncrypt
,
&
pRpcObj
,
&
corMgmtEpSet
)
!=
0
)
{
terrno
=
TSDB_CODE_RPC_NETWORK_UNAVAIL
;
terrno
=
TSDB_CODE_RPC_NETWORK_UNAVAIL
;
return
NULL
;
return
NULL
;
}
}
...
@@ -107,7 +107,6 @@ static SSqlObj *taosConnectImpl(const char *ip, const char *user, const char *pa
...
@@ -107,7 +107,6 @@ static SSqlObj *taosConnectImpl(const char *ip, const char *user, const char *pa
}
}
pObj
->
signature
=
pObj
;
pObj
->
signature
=
pObj
;
pObj
->
pRpcObj
=
(
SRpcObj
*
)
pRpcObj
;
pObj
->
pRpcObj
=
(
SRpcObj
*
)
pRpcObj
;
memcpy
(
pObj
->
pRpcObj
->
tscCorMgmtEpSet
,
&
corMgmtEpSet
,
sizeof
(
SRpcCorEpSet
));
tstrncpy
(
pObj
->
user
,
user
,
sizeof
(
pObj
->
user
));
tstrncpy
(
pObj
->
user
,
user
,
sizeof
(
pObj
->
user
));
secretEncryptLen
=
MIN
(
secretEncryptLen
,
sizeof
(
pObj
->
pass
));
secretEncryptLen
=
MIN
(
secretEncryptLen
,
sizeof
(
pObj
->
pass
));
memcpy
(
pObj
->
pass
,
secretEncrypt
,
secretEncryptLen
);
memcpy
(
pObj
->
pass
,
secretEncrypt
,
secretEncryptLen
);
...
...
src/client/src/tscSystem.c
浏览文件 @
34145487
...
@@ -73,7 +73,7 @@ void tscReleaseRpc(void *param) {
...
@@ -73,7 +73,7 @@ void tscReleaseRpc(void *param) {
pthread_mutex_unlock
(
&
rpcObjMutex
);
pthread_mutex_unlock
(
&
rpcObjMutex
);
}
}
int32_t
tscInitRpc
(
const
char
*
key
,
const
char
*
user
,
const
char
*
secretEncrypt
,
void
**
ppRpcObj
)
{
int32_t
tscInitRpc
(
const
char
*
key
,
const
char
*
user
,
const
char
*
secretEncrypt
,
void
**
ppRpcObj
,
SRpcCorEpSet
*
corMgmtEpSet
)
{
pthread_mutex_lock
(
&
rpcObjMutex
);
pthread_mutex_lock
(
&
rpcObjMutex
);
SRpcObj
*
pRpcObj
=
(
SRpcObj
*
)
tscAcquireRpc
(
key
);
SRpcObj
*
pRpcObj
=
(
SRpcObj
*
)
tscAcquireRpc
(
key
);
...
@@ -117,6 +117,7 @@ int32_t tscInitRpc(const char *key, const char *user, const char *secretEncrypt,
...
@@ -117,6 +117,7 @@ int32_t tscInitRpc(const char *key, const char *user, const char *secretEncrypt,
rpcClose
(
rpcObj
.
pDnodeConn
);
rpcClose
(
rpcObj
.
pDnodeConn
);
pthread_mutex_unlock
(
&
rpcObjMutex
);
pthread_mutex_unlock
(
&
rpcObjMutex
);
}
}
memcpy
(
pRpcObj
->
tscCorMgmtEpSet
,
corMgmtEpSet
,
sizeof
(
*
corMgmtEpSet
));
*
ppRpcObj
=
pRpcObj
;
*
ppRpcObj
=
pRpcObj
;
pthread_mutex_unlock
(
&
rpcObjMutex
);
pthread_mutex_unlock
(
&
rpcObjMutex
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录