Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
慢慢CG
TDengine
提交
7fa9ecbd
T
TDengine
项目概览
慢慢CG
/
TDengine
与 Fork 源项目一致
Fork自
taosdata / TDengine
通知
1
Star
0
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看板
提交
7fa9ecbd
编写于
5月 26, 2021
作者:
H
Haojun Liao
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[td-225]fix compiler error.
上级
649669ec
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
5 addition
and
6 deletion
+5
-6
src/client/src/tscUtil.c
src/client/src/tscUtil.c
+5
-6
未找到文件。
src/client/src/tscUtil.c
浏览文件 @
7fa9ecbd
...
@@ -909,7 +909,7 @@ SOperatorInfo* createJoinOperator(SOperatorInfo** pUpstream, int32_t numOfUpstre
...
@@ -909,7 +909,7 @@ SOperatorInfo* createJoinOperator(SOperatorInfo** pUpstream, int32_t numOfUpstre
SRspResultInfo
*
pResInfo
=
&
pInfo
->
resultInfo
;
SRspResultInfo
*
pResInfo
=
&
pInfo
->
resultInfo
;
pResInfo
->
capacity
=
4096
;
pResInfo
->
capacity
=
4096
;
pResInfo
->
threshold
=
4096
*
0
.
8
;
pResInfo
->
threshold
=
(
int32_t
)
(
4096
*
0
.
8
)
;
pInfo
->
pRes
=
calloc
(
1
,
sizeof
(
SSDataBlock
));
pInfo
->
pRes
=
calloc
(
1
,
sizeof
(
SSDataBlock
));
pInfo
->
pRes
->
info
.
numOfCols
=
numOfOutput
;
pInfo
->
pRes
->
info
.
numOfCols
=
numOfOutput
;
...
@@ -992,7 +992,7 @@ void handleDownstreamOperator(SSqlObj** pSqlObjList, int32_t numOfUpstream, SQue
...
@@ -992,7 +992,7 @@ void handleDownstreamOperator(SSqlObj** pSqlObjList, int32_t numOfUpstream, SQue
SOperatorInfo
**
p
=
calloc
(
px
->
numOfTables
,
POINTER_BYTES
);
SOperatorInfo
**
p
=
calloc
(
px
->
numOfTables
,
POINTER_BYTES
);
p
[
0
]
=
pSourceOperator
;
p
[
0
]
=
pSourceOperator
;
int32_t
num
=
taosArrayGetSize
(
px
->
colList
);
int32_t
num
=
(
int32_t
)
taosArrayGetSize
(
px
->
colList
);
schema
=
calloc
(
num
,
sizeof
(
SSchema
));
schema
=
calloc
(
num
,
sizeof
(
SSchema
));
memcpy
(
schema
,
pSchema
,
numOfCol1
*
sizeof
(
SSchema
));
memcpy
(
schema
,
pSchema
,
numOfCol1
*
sizeof
(
SSchema
));
...
@@ -1011,8 +1011,7 @@ void handleDownstreamOperator(SSqlObj** pSqlObjList, int32_t numOfUpstream, SQue
...
@@ -1011,8 +1011,7 @@ void handleDownstreamOperator(SSqlObj** pSqlObjList, int32_t numOfUpstream, SQue
pSourceOperator
=
createJoinOperator
(
p
,
px
->
numOfTables
,
schema
,
num
);
pSourceOperator
=
createJoinOperator
(
p
,
px
->
numOfTables
,
schema
,
num
);
tfree
(
p
);
tfree
(
p
);
}
else
{
}
else
{
int32_t
num
=
taosArrayGetSize
(
px
->
colList
);
size_t
num
=
taosArrayGetSize
(
px
->
colList
);
schema
=
calloc
(
num
,
sizeof
(
SSchema
));
schema
=
calloc
(
num
,
sizeof
(
SSchema
));
memcpy
(
schema
,
pSchema
,
numOfCol1
*
sizeof
(
SSchema
));
memcpy
(
schema
,
pSchema
,
numOfCol1
*
sizeof
(
SSchema
));
}
}
...
@@ -1080,7 +1079,7 @@ void tscFreeQueryInfo(SSqlCmd* pCmd, bool removeMeta) {
...
@@ -1080,7 +1079,7 @@ void tscFreeQueryInfo(SSqlCmd* pCmd, bool removeMeta) {
while
(
pQueryInfo
!=
NULL
)
{
while
(
pQueryInfo
!=
NULL
)
{
SQueryInfo
*
p
=
pQueryInfo
->
sibling
;
SQueryInfo
*
p
=
pQueryInfo
->
sibling
;
int32
_t
numOfUpstream
=
taosArrayGetSize
(
pQueryInfo
->
pUpstream
);
size
_t
numOfUpstream
=
taosArrayGetSize
(
pQueryInfo
->
pUpstream
);
for
(
int32_t
i
=
0
;
i
<
numOfUpstream
;
++
i
)
{
for
(
int32_t
i
=
0
;
i
<
numOfUpstream
;
++
i
)
{
SQueryInfo
*
pUpQueryInfo
=
taosArrayGetP
(
pQueryInfo
->
pUpstream
,
i
);
SQueryInfo
*
pUpQueryInfo
=
taosArrayGetP
(
pQueryInfo
->
pUpstream
,
i
);
freeQueryInfoImpl
(
pUpQueryInfo
);
freeQueryInfoImpl
(
pUpQueryInfo
);
...
@@ -3353,7 +3352,7 @@ void executeQuery(SSqlObj* pSql, SQueryInfo* pQueryInfo) {
...
@@ -3353,7 +3352,7 @@ void executeQuery(SSqlObj* pSql, SQueryInfo* pQueryInfo) {
}
}
if
(
taosArrayGetSize
(
pQueryInfo
->
pUpstream
)
>
0
)
{
// nest query. do execute it firstly
if
(
taosArrayGetSize
(
pQueryInfo
->
pUpstream
)
>
0
)
{
// nest query. do execute it firstly
pSql
->
subState
.
numOfSub
=
taosArrayGetSize
(
pQueryInfo
->
pUpstream
);
pSql
->
subState
.
numOfSub
=
(
int32_t
)
taosArrayGetSize
(
pQueryInfo
->
pUpstream
);
pSql
->
pSubs
=
calloc
(
pSql
->
subState
.
numOfSub
,
POINTER_BYTES
);
pSql
->
pSubs
=
calloc
(
pSql
->
subState
.
numOfSub
,
POINTER_BYTES
);
pSql
->
subState
.
states
=
calloc
(
pSql
->
subState
.
numOfSub
,
sizeof
(
int8_t
));
pSql
->
subState
.
states
=
calloc
(
pSql
->
subState
.
numOfSub
,
sizeof
(
int8_t
));
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录