Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
43c056fb
T
TDengine
项目概览
taosdata
/
TDengine
大约 2 年 前同步成功
通知
1192
Star
22018
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看板
提交
43c056fb
编写于
8月 17, 2023
作者:
D
dapan1121
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: node clone and mac compile issues
上级
3045a623
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
5 addition
and
5 deletion
+5
-5
source/libs/executor/src/groupcacheoperator.c
source/libs/executor/src/groupcacheoperator.c
+3
-3
source/libs/executor/src/hashjoinoperator.c
source/libs/executor/src/hashjoinoperator.c
+1
-1
source/libs/planner/src/planOptimizer.c
source/libs/planner/src/planOptimizer.c
+1
-1
未找到文件。
source/libs/executor/src/groupcacheoperator.c
浏览文件 @
43c056fb
...
@@ -167,7 +167,7 @@ static void destroySGcBlkCacheInfo(SGcBlkCacheInfo* pBlkCache) {
...
@@ -167,7 +167,7 @@ static void destroySGcBlkCacheInfo(SGcBlkCacheInfo* pBlkCache) {
taosHashCleanup
(
pBlkCache
->
pDirtyBlk
);
taosHashCleanup
(
pBlkCache
->
pDirtyBlk
);
void
*
p
=
NULL
;
void
*
p
=
NULL
;
while
(
p
=
taosHashIterate
(
pBlkCache
->
pReadBlk
,
p
))
{
while
(
NULL
!=
(
p
=
taosHashIterate
(
pBlkCache
->
pReadBlk
,
p
)
))
{
blockDataDeepCleanup
(
*
(
SSDataBlock
**
)
p
);
blockDataDeepCleanup
(
*
(
SSDataBlock
**
)
p
);
freeGcBlockInList
(
p
);
freeGcBlockInList
(
p
);
}
}
...
@@ -892,14 +892,14 @@ static int32_t handleDownstreamFetchDone(struct SOperatorInfo* pOperator, SGcSes
...
@@ -892,14 +892,14 @@ static int32_t handleDownstreamFetchDone(struct SOperatorInfo* pOperator, SGcSes
if
(
pGCache
->
batchFetch
)
{
if
(
pGCache
->
batchFetch
)
{
SHashObj
*
pGrpHash
=
pGCache
->
globalGrp
?
pGCache
->
pGrpHash
:
pCtx
->
pGrpHash
;
SHashObj
*
pGrpHash
=
pGCache
->
globalGrp
?
pGCache
->
pGrpHash
:
pCtx
->
pGrpHash
;
SGroupCacheData
*
pGroup
=
NULL
;
SGroupCacheData
*
pGroup
=
NULL
;
while
(
pGroup
=
taosHashIterate
(
pGrpHash
,
pGroup
))
{
while
(
NULL
!=
(
pGroup
=
taosHashIterate
(
pGrpHash
,
pGroup
)
))
{
handleGroupFetchDone
(
pGroup
);
handleGroupFetchDone
(
pGroup
);
}
}
}
else
{
}
else
{
int32_t
uidNum
=
0
;
int32_t
uidNum
=
0
;
SGcVgroupCtx
*
pVgCtx
=
NULL
;
SGcVgroupCtx
*
pVgCtx
=
NULL
;
int32_t
iter
=
0
;
int32_t
iter
=
0
;
while
(
pVgCtx
=
tSimpleHashIterate
(
pCtx
->
pVgTbHash
,
pVgCtx
,
&
iter
))
{
while
(
NULL
!=
(
pVgCtx
=
tSimpleHashIterate
(
pCtx
->
pVgTbHash
,
pVgCtx
,
&
iter
)
))
{
uidNum
=
taosArrayGetSize
(
pVgCtx
->
pTbList
);
uidNum
=
taosArrayGetSize
(
pVgCtx
->
pTbList
);
for
(
int32_t
i
=
0
;
i
<
uidNum
;
++
i
)
{
for
(
int32_t
i
=
0
;
i
<
uidNum
;
++
i
)
{
SGcNewGroupInfo
*
pNew
=
taosArrayGet
(
pVgCtx
->
pTbList
,
i
);
SGcNewGroupInfo
*
pNew
=
taosArrayGet
(
pVgCtx
->
pTbList
,
i
);
...
...
source/libs/executor/src/hashjoinoperator.c
浏览文件 @
43c056fb
...
@@ -42,7 +42,7 @@ static int64_t getRowsNumOfKeyHash(SSHashObj* pHash) {
...
@@ -42,7 +42,7 @@ static int64_t getRowsNumOfKeyHash(SSHashObj* pHash) {
int32_t
iter
=
0
;
int32_t
iter
=
0
;
int64_t
rowsNum
=
0
;
int64_t
rowsNum
=
0
;
while
(
pGroup
=
tSimpleHashIterate
(
pHash
,
pGroup
,
&
iter
))
{
while
(
NULL
!=
(
pGroup
=
tSimpleHashIterate
(
pHash
,
pGroup
,
&
iter
)
))
{
int32_t
*
pKey
=
tSimpleHashGetKey
(
pGroup
,
NULL
);
int32_t
*
pKey
=
tSimpleHashGetKey
(
pGroup
,
NULL
);
int64_t
rows
=
getSingleKeyRowsNum
(
pGroup
->
rows
);
int64_t
rows
=
getSingleKeyRowsNum
(
pGroup
->
rows
);
qTrace
(
"build_key:%d, rows:%"
PRId64
,
*
pKey
,
rows
);
qTrace
(
"build_key:%d, rows:%"
PRId64
,
*
pKey
,
rows
);
...
...
source/libs/planner/src/planOptimizer.c
浏览文件 @
43c056fb
...
@@ -941,7 +941,7 @@ static int32_t pushDownCondOptAppendFilterCol(SOptimizeContext* pCxt, SJoinLogic
...
@@ -941,7 +941,7 @@ static int32_t pushDownCondOptAppendFilterCol(SOptimizeContext* pCxt, SJoinLogic
}
}
}
}
if
(
!
found
)
{
if
(
!
found
)
{
nodesListStrictAppend
(
pJoin
->
node
.
pTargets
,
pNode
);
nodesListStrictAppend
(
pJoin
->
node
.
pTargets
,
nodesCloneNode
(
pNode
)
);
}
}
}
}
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录