Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
385552c6
TDengine
项目概览
taosdata
/
TDengine
大约 1 年 前同步成功
通知
1184
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看板
体验新版 GitCode,发现更多精彩内容 >>
提交
385552c6
编写于
6月 25, 2021
作者:
W
wpan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
support join filter
上级
39521a1b
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
15 addition
and
3 deletion
+15
-3
src/client/inc/tscUtil.h
src/client/inc/tscUtil.h
+1
-0
src/client/src/tscSQLParser.c
src/client/src/tscSQLParser.c
+2
-0
src/client/src/tscServer.c
src/client/src/tscServer.c
+1
-1
src/client/src/tscSubquery.c
src/client/src/tscSubquery.c
+4
-0
src/client/src/tscUtil.c
src/client/src/tscUtil.c
+5
-0
src/common/src/tname.c
src/common/src/tname.c
+1
-1
src/query/src/qExecutor.c
src/query/src/qExecutor.c
+1
-1
未找到文件。
src/client/inc/tscUtil.h
浏览文件 @
385552c6
...
...
@@ -61,6 +61,7 @@ typedef struct SJoinSupporter {
uint64_t
uid
;
// query table uid
SArray
*
colList
;
// previous query information, no need to use this attribute, and the corresponding attribution
SArray
*
exprList
;
SArray
*
colCond
;
SFieldInfo
fieldsInfo
;
STagCond
tagCond
;
SGroupbyExpr
groupInfo
;
// group by info
...
...
src/client/src/tscSQLParser.c
浏览文件 @
385552c6
...
...
@@ -3517,6 +3517,8 @@ static int32_t checkColumnFilterInfo(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, SCol
SColumn
*
pColumn
=
tscColumnListInsert
(
pQueryInfo
->
colList
,
pIndex
->
columnIndex
,
pTableMeta
->
id
.
uid
,
pSchema
);
pColumn
->
info
.
flist
.
numOfFilters
++
;
/*
* in case of TK_AND filter condition, we first find the corresponding column and build the query condition together
* the already existed condition.
...
...
src/client/src/tscServer.c
浏览文件 @
385552c6
...
...
@@ -914,7 +914,7 @@ int tscBuildQueryMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
//serializeColFilterInfo(pCol->flist.filterInfo, pCol->flist.numOfFilters, &pMsg);
}
if
(
pQueryInfo
->
colCond
&&
taosArrayGetSize
(
pQueryInfo
->
colCond
)
>
0
)
{
if
(
pQueryInfo
->
colCond
&&
taosArrayGetSize
(
pQueryInfo
->
colCond
)
>
0
&&
!
onlyQueryTags
(
&
query
)
)
{
SCond
*
pCond
=
tsGetTableFilter
(
pQueryInfo
->
colCond
,
pTableMeta
->
id
.
uid
);
if
(
pCond
!=
NULL
&&
pCond
->
cond
!=
NULL
)
{
pQueryMsg
->
colCondLen
=
htons
(
pCond
->
len
);
...
...
src/client/src/tscSubquery.c
浏览文件 @
385552c6
...
...
@@ -808,6 +808,7 @@ static void issueTsCompQuery(SSqlObj* pSql, SJoinSupporter* pSupporter, SSqlObj*
STimeWindow
window
=
pQueryInfo
->
window
;
tscInitQueryInfo
(
pQueryInfo
);
pQueryInfo
->
colCond
=
pSupporter
->
colCond
;
pQueryInfo
->
window
=
window
;
TSDB_QUERY_CLEAR_TYPE
(
pQueryInfo
->
type
,
TSDB_QUERY_TYPE_TAG_FILTER_QUERY
);
TSDB_QUERY_SET_TYPE
(
pQueryInfo
->
type
,
TSDB_QUERY_TYPE_MULTITABLE_QUERY
);
...
...
@@ -1883,6 +1884,9 @@ int32_t tscCreateJoinSubquery(SSqlObj *pSql, int16_t tableIndex, SJoinSupporter
if
(
UTIL_TABLE_IS_SUPER_TABLE
(
pTableMetaInfo
))
{
// return the tableId & tag
SColumnIndex
colIndex
=
{
0
};
pSupporter
->
colCond
=
pNewQueryInfo
->
colCond
;
pNewQueryInfo
->
colCond
=
NULL
;
STagCond
*
pTagCond
=
&
pSupporter
->
tagCond
;
assert
(
pTagCond
->
joinInfo
.
hasJoin
);
...
...
src/client/src/tscUtil.c
浏览文件 @
385552c6
...
...
@@ -2011,6 +2011,11 @@ int32_t tscGetResRowLength(SArray* pExprList) {
}
static
void
destroyFilterInfo
(
SColumnFilterList
*
pFilterList
)
{
if
(
pFilterList
->
filterInfo
==
NULL
)
{
pFilterList
->
numOfFilters
=
0
;
return
;
}
for
(
int32_t
i
=
0
;
i
<
pFilterList
->
numOfFilters
;
++
i
)
{
if
(
pFilterList
->
filterInfo
[
i
].
filterstr
)
{
tfree
(
pFilterList
->
filterInfo
[
i
].
pz
);
...
...
src/common/src/tname.c
浏览文件 @
385552c6
...
...
@@ -61,7 +61,7 @@ bool tscValidateTableNameLength(size_t len) {
// TODO refactor
SColumnFilterInfo
*
tFilterInfoDup
(
const
SColumnFilterInfo
*
src
,
int32_t
numOfFilters
)
{
if
(
numOfFilters
==
0
)
{
if
(
numOfFilters
==
0
||
src
==
NULL
)
{
assert
(
src
==
NULL
);
return
NULL
;
}
...
...
src/query/src/qExecutor.c
浏览文件 @
385552c6
...
...
@@ -7078,7 +7078,7 @@ void* doDestroyFilterInfo(SSingleColumnFilterInfo* pFilterInfo, int32_t numOfFil
int32_t
createFilterInfo
(
SQueryAttr
*
pQueryAttr
,
uint64_t
qId
)
{
for
(
int32_t
i
=
0
;
i
<
pQueryAttr
->
numOfCols
;
++
i
)
{
if
(
pQueryAttr
->
tableCols
[
i
].
flist
.
numOfFilters
>
0
)
{
if
(
pQueryAttr
->
tableCols
[
i
].
flist
.
numOfFilters
>
0
&&
pQueryAttr
->
tableCols
[
i
].
flist
.
filterInfo
!=
NULL
)
{
pQueryAttr
->
numOfFilterCols
++
;
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录