Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
ba0913e6
TDengine
项目概览
taosdata
/
TDengine
1 年多 前同步成功
通知
1185
Star
22016
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看板
提交
ba0913e6
编写于
10月 26, 2022
作者:
D
dapan1121
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: remove not used code
上级
78ff5f75
变更
7
显示空白变更内容
内联
并排
Showing
7 changed file
with
50 addition
and
5 deletion
+50
-5
source/dnode/qnode/src/qnode.c
source/dnode/qnode/src/qnode.c
+1
-1
source/dnode/vnode/src/vnd/vnodeSvr.c
source/dnode/vnode/src/vnd/vnodeSvr.c
+2
-2
source/libs/catalog/test/catalogTests.cpp
source/libs/catalog/test/catalogTests.cpp
+39
-0
source/libs/qcom/src/queryUtil.c
source/libs/qcom/src/queryUtil.c
+2
-0
source/libs/qworker/src/qwDbg.c
source/libs/qworker/src/qwDbg.c
+1
-1
source/libs/qworker/src/qwMsg.c
source/libs/qworker/src/qwMsg.c
+4
-0
source/libs/qworker/test/qworkerTests.cpp
source/libs/qworker/test/qworkerTests.cpp
+1
-1
未找到文件。
source/dnode/qnode/src/qnode.c
浏览文件 @
ba0913e6
...
...
@@ -90,7 +90,7 @@ int32_t qndProcessQueryMsg(SQnode *pQnode, int64_t ts, SRpcMsg *pMsg) {
code
=
qWorkerProcessFetchMsg
(
pQnode
,
pQnode
->
pQuery
,
pMsg
,
ts
);
break
;
case
TDMT_SCH_CANCEL_TASK
:
code
=
qWorkerProcessCancelMsg
(
pQnode
,
pQnode
->
pQuery
,
pMsg
,
ts
);
//
code = qWorkerProcessCancelMsg(pQnode, pQnode->pQuery, pMsg, ts);
break
;
case
TDMT_SCH_DROP_TASK
:
code
=
qWorkerProcessDropMsg
(
pQnode
,
pQnode
->
pQuery
,
pMsg
,
ts
);
...
...
source/dnode/vnode/src/vnd/vnodeSvr.c
浏览文件 @
ba0913e6
...
...
@@ -369,8 +369,8 @@ int32_t vnodeProcessFetchMsg(SVnode *pVnode, SRpcMsg *pMsg, SQueueInfo *pInfo) {
return
qWorkerProcessFetchMsg
(
pVnode
,
pVnode
->
pQuery
,
pMsg
,
0
);
case
TDMT_SCH_FETCH_RSP
:
return
qWorkerProcessRspMsg
(
pVnode
,
pVnode
->
pQuery
,
pMsg
,
0
);
case
TDMT_SCH_CANCEL_TASK
:
return
qWorkerProcessCancelMsg
(
pVnode
,
pVnode
->
pQuery
,
pMsg
,
0
);
//
case TDMT_SCH_CANCEL_TASK:
//
return qWorkerProcessCancelMsg(pVnode, pVnode->pQuery, pMsg, 0);
case
TDMT_SCH_DROP_TASK
:
return
qWorkerProcessDropMsg
(
pVnode
,
pVnode
->
pQuery
,
pMsg
,
0
);
case
TDMT_SCH_QUERY_HEARTBEAT
:
...
...
source/libs/catalog/test/catalogTests.cpp
浏览文件 @
ba0913e6
...
...
@@ -57,6 +57,7 @@ enum {
CTGT_RSP_CTBMETA
,
CTGT_RSP_STBMETA
,
CTGT_RSP_MSTBMETA
,
CTGT_RSP_INDEXINFO_E
,
CTGT_RSP_TBMETA_NOT_EXIST
,
};
...
...
@@ -507,6 +508,14 @@ void ctgTestRspMultiSTableMeta(void *shandle, SEpSet *pEpSet, SRpcMsg *pMsg, SRp
tFreeSTableMetaRsp
(
&
metaRsp
);
}
void
ctgTestRspErrIndexInfo
(
void
*
shandle
,
SEpSet
*
pEpSet
,
SRpcMsg
*
pMsg
,
SRpcMsg
*
pRsp
)
{
pRsp
->
code
=
TSDB_CODE_MND_DB_INDEX_NOT_EXIST
;
pRsp
->
contLen
=
0
;
pRsp
->
pCont
=
NULL
;
}
void
ctgTestRspByIdx
(
void
*
shandle
,
SEpSet
*
pEpSet
,
SRpcMsg
*
pMsg
,
SRpcMsg
*
pRsp
)
{
switch
(
ctgTestRspFunc
[
ctgTestRspIdx
])
{
case
CTGT_RSP_VGINFO
:
...
...
@@ -524,6 +533,9 @@ void ctgTestRspByIdx(void *shandle, SEpSet *pEpSet, SRpcMsg *pMsg, SRpcMsg *pRsp
case
CTGT_RSP_MSTBMETA
:
ctgTestRspMultiSTableMeta
(
shandle
,
pEpSet
,
pMsg
,
pRsp
);
break
;
case
CTGT_RSP_INDEXINFO_E
:
ctgTestRspErrIndexInfo
(
shandle
,
pEpSet
,
pMsg
,
pRsp
);
break
;
case
CTGT_RSP_TBMETA_NOT_EXIST
:
ctgTestRspTableMetaNotExist
(
shandle
,
pEpSet
,
pMsg
,
pRsp
);
break
;
...
...
@@ -1412,6 +1424,33 @@ TEST(tableMeta, updateStbMeta) {
memset
(
&
gCtgMgmt
.
stat
,
0
,
sizeof
(
gCtgMgmt
.
stat
));
}
TEST
(
getIndexInfo
,
notExists
)
{
struct
SCatalog
*
pCtg
=
NULL
;
SRequestConnInfo
*
mockPointer
=
(
SRequestConnInfo
*
)
0x1
;
SVgroupInfo
vgInfo
=
{
0
};
SArray
*
vgList
=
NULL
;
ctgTestInitLogFile
();
memset
(
ctgTestRspFunc
,
0
,
sizeof
(
ctgTestRspFunc
));
ctgTestRspIdx
=
0
;
ctgTestRspFunc
[
0
]
=
CTGT_RSP_INDEXINFO_E
;
ctgTestSetRspByIdx
();
initQueryModuleMsgHandle
();
int32_t
code
=
catalogInit
(
NULL
);
ASSERT_EQ
(
code
,
0
);
code
=
catalogGetHandle
(
ctgTestClusterId
,
&
pCtg
);
ASSERT_EQ
(
code
,
0
);
SIndexInfo
info
;
code
=
catalogGetIndexMeta
(
pCtg
,
mockPointer
,
"index1"
,
&
info
);
ASSERT_TRUE
(
code
!=
0
);
}
TEST
(
refreshGetMeta
,
normal2normal
)
{
struct
SCatalog
*
pCtg
=
NULL
;
SRequestConnInfo
*
mockPointer
=
(
SRequestConnInfo
*
)
0x1
;
...
...
source/libs/qcom/src/queryUtil.c
浏览文件 @
ba0913e6
...
...
@@ -202,6 +202,7 @@ char* jobTaskStatusStr(int32_t status) {
return
"UNKNOWN"
;
}
#if 0
SSchema createSchema(int8_t type, int32_t bytes, col_id_t colId, const char* name) {
SSchema s = {0};
s.type = type;
...
...
@@ -211,6 +212,7 @@ SSchema createSchema(int8_t type, int32_t bytes, col_id_t colId, const char* nam
tstrncpy(s.name, name, tListLen(s.name));
return s;
}
#endif
void
freeSTableMetaRspPointer
(
void
*
p
)
{
tFreeSTableMetaRsp
(
*
(
void
**
)
p
);
...
...
source/libs/qworker/src/qwDbg.c
浏览文件 @
ba0913e6
...
...
@@ -253,7 +253,7 @@ int32_t qwDbgEnableDebug(char *option) {
}
if
(
0
==
strcasecmp
(
option
,
"dead"
))
{
gQWDebug
.
sleep
Simulate
=
true
;
gQWDebug
.
dead
Simulate
=
true
;
qError
(
"qw dead debug enabled"
);
return
TSDB_CODE_SUCCESS
;
}
...
...
source/libs/qworker/src/qwMsg.c
浏览文件 @
ba0913e6
...
...
@@ -146,6 +146,7 @@ int32_t qwBuildAndSendFetchRsp(int32_t rspType, SRpcHandleInfo *pConn, SRetrieve
return
TSDB_CODE_SUCCESS
;
}
#if 0
int32_t qwBuildAndSendCancelRsp(SRpcHandleInfo *pConn, int32_t code) {
STaskCancelRsp *pRsp = (STaskCancelRsp *)rpcMallocCont(sizeof(STaskCancelRsp));
pRsp->code = code;
...
...
@@ -177,6 +178,7 @@ int32_t qwBuildAndSendDropRsp(SRpcHandleInfo *pConn, int32_t code) {
tmsgSendRsp(&rpcRsp);
return TSDB_CODE_SUCCESS;
}
#endif
int32_t
qwBuildAndSendDropMsg
(
QW_FPARAMS_DEF
,
SRpcHandleInfo
*
pConn
)
{
STaskDropReq
*
req
=
(
STaskDropReq
*
)
rpcMallocCont
(
sizeof
(
STaskDropReq
));
...
...
@@ -490,6 +492,7 @@ int32_t qWorkerProcessRspMsg(void *node, void *qWorkerMgmt, SRpcMsg *pMsg, int64
return
TSDB_CODE_SUCCESS
;
}
#if 0
int32_t qWorkerProcessCancelMsg(void *node, void *qWorkerMgmt, SRpcMsg *pMsg, int64_t ts) {
if (NULL == node || NULL == qWorkerMgmt || NULL == pMsg) {
return TSDB_CODE_QRY_INVALID_INPUT;
...
...
@@ -530,6 +533,7 @@ _return:
return TSDB_CODE_SUCCESS;
}
#endif
int32_t
qWorkerProcessDropMsg
(
void
*
node
,
void
*
qWorkerMgmt
,
SRpcMsg
*
pMsg
,
int64_t
ts
)
{
if
(
NULL
==
node
||
NULL
==
qWorkerMgmt
||
NULL
==
pMsg
)
{
...
...
source/libs/qworker/test/qworkerTests.cpp
浏览文件 @
ba0913e6
...
...
@@ -796,7 +796,7 @@ void *fetchQueueThread(void *param) {
qWorkerProcessFetchMsg
(
mockPointer
,
mgmt
,
fetchRpc
,
0
);
break
;
case
TDMT_SCH_CANCEL_TASK
:
qWorkerProcessCancelMsg
(
mockPointer
,
mgmt
,
fetchRpc
,
0
);
//
qWorkerProcessCancelMsg(mockPointer, mgmt, fetchRpc, 0);
break
;
case
TDMT_SCH_DROP_TASK
:
qWorkerProcessDropMsg
(
mockPointer
,
mgmt
,
fetchRpc
,
0
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录