Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
慢慢CG
TDengine
提交
53eadeef
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看板
提交
53eadeef
编写于
2月 06, 2021
作者:
H
Haojun Liao
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[TD-225] fix compiler warning.
上级
89a49abc
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
6 addition
and
6 deletion
+6
-6
src/query/src/qExecutor.c
src/query/src/qExecutor.c
+6
-6
未找到文件。
src/query/src/qExecutor.c
浏览文件 @
53eadeef
...
@@ -3956,7 +3956,7 @@ static int32_t doCopyToSData(SQueryRuntimeEnv* pRuntimeEnv, SGroupResInfo* pGrou
...
@@ -3956,7 +3956,7 @@ static int32_t doCopyToSData(SQueryRuntimeEnv* pRuntimeEnv, SGroupResInfo* pGrou
SQuery
*
pQuery
=
pRuntimeEnv
->
pQuery
;
SQuery
*
pQuery
=
pRuntimeEnv
->
pQuery
;
int32_t
numOfRows
=
getNumOfTotalRes
(
pGroupResInfo
);
int32_t
numOfRows
=
getNumOfTotalRes
(
pGroupResInfo
);
int32_t
numOfResult
=
pQuery
->
rec
.
rows
;
// there are already exists result rows
int32_t
numOfResult
=
(
int32_t
)
pQuery
->
rec
.
rows
;
// there are already exists result rows
int32_t
start
=
0
;
int32_t
start
=
0
;
int32_t
step
=
-
1
;
int32_t
step
=
-
1
;
...
@@ -3981,7 +3981,7 @@ static int32_t doCopyToSData(SQueryRuntimeEnv* pRuntimeEnv, SGroupResInfo* pGrou
...
@@ -3981,7 +3981,7 @@ static int32_t doCopyToSData(SQueryRuntimeEnv* pRuntimeEnv, SGroupResInfo* pGrou
//current output space is not enough to accommodate all data of this page, prepare more space
//current output space is not enough to accommodate all data of this page, prepare more space
if
(
numOfRowsToCopy
>
(
pQuery
->
rec
.
capacity
-
numOfResult
))
{
if
(
numOfRowsToCopy
>
(
pQuery
->
rec
.
capacity
-
numOfResult
))
{
int32_t
newSize
=
pQuery
->
rec
.
capacity
+
(
numOfRowsToCopy
-
numOfResult
);
int32_t
newSize
=
(
int32_t
)
(
pQuery
->
rec
.
capacity
+
(
numOfRowsToCopy
-
numOfResult
)
);
expandBuffer
(
pRuntimeEnv
,
newSize
,
GET_QINFO_ADDR
(
pRuntimeEnv
));
expandBuffer
(
pRuntimeEnv
,
newSize
,
GET_QINFO_ADDR
(
pRuntimeEnv
));
}
}
...
@@ -4634,7 +4634,7 @@ int32_t doInitQInfo(SQInfo *pQInfo, STSBuf *pTsBuf, SArray* prevResult, void *ts
...
@@ -4634,7 +4634,7 @@ int32_t doInitQInfo(SQInfo *pQInfo, STSBuf *pTsBuf, SArray* prevResult, void *ts
pQInfo
->
tsdb
=
tsdb
;
pQInfo
->
tsdb
=
tsdb
;
pQInfo
->
vgId
=
vgId
;
pQInfo
->
vgId
=
vgId
;
pQInfo
->
groupResInfo
.
totalGroup
=
isSTableQuery
?
GET_NUM_OF_TABLEGROUP
(
pQInfo
)
:
0
;
pQInfo
->
groupResInfo
.
totalGroup
=
(
int32_t
)
(
isSTableQuery
?
GET_NUM_OF_TABLEGROUP
(
pQInfo
)
:
0
)
;
pRuntimeEnv
->
pQuery
=
pQuery
;
pRuntimeEnv
->
pQuery
=
pQuery
;
pRuntimeEnv
->
pTsBuf
=
pTsBuf
;
pRuntimeEnv
->
pTsBuf
=
pTsBuf
;
...
@@ -5733,14 +5733,14 @@ static void tableIntervalProcess(SQInfo *pQInfo, STableQueryInfo* pTableInfo) {
...
@@ -5733,14 +5733,14 @@ static void tableIntervalProcess(SQInfo *pQInfo, STableQueryInfo* pTableInfo) {
return
;
return
;
}
}
initGroupResInfo
(
&
pQInfo
->
groupResInfo
,
&
pRuntimeEnv
->
resultRowInfo
,
pQuery
->
limit
.
offset
);
initGroupResInfo
(
&
pQInfo
->
groupResInfo
,
&
pRuntimeEnv
->
resultRowInfo
,
(
int32_t
)
pQuery
->
limit
.
offset
);
copyToOutputBuf
(
pQInfo
,
&
pRuntimeEnv
->
resultRowInfo
);
copyToOutputBuf
(
pQInfo
,
&
pRuntimeEnv
->
resultRowInfo
);
doSecondaryArithmeticProcess
(
pQuery
);
doSecondaryArithmeticProcess
(
pQuery
);
limitOperator
(
pQuery
,
pQInfo
);
limitOperator
(
pQuery
,
pQInfo
);
}
else
{
}
else
{
initGroupResInfo
(
&
pQInfo
->
groupResInfo
,
&
pRuntimeEnv
->
resultRowInfo
,
0
);
initGroupResInfo
(
&
pQInfo
->
groupResInfo
,
&
pRuntimeEnv
->
resultRowInfo
,
0
);
return
copyAndFillResult
(
pQInfo
);
copyAndFillResult
(
pQInfo
);
}
}
}
}
...
@@ -5759,7 +5759,7 @@ void tableQueryImpl(SQInfo *pQInfo) {
...
@@ -5759,7 +5759,7 @@ void tableQueryImpl(SQInfo *pQInfo) {
limitOperator
(
pQuery
,
pQInfo
);
limitOperator
(
pQuery
,
pQInfo
);
qDebug
(
"QInfo:%p current:%"
PRId64
" returned, total:%"
PRId64
,
pQInfo
,
pQuery
->
rec
.
rows
,
pQuery
->
rec
.
total
);
qDebug
(
"QInfo:%p current:%"
PRId64
" returned, total:%"
PRId64
,
pQInfo
,
pQuery
->
rec
.
rows
,
pQuery
->
rec
.
total
);
}
else
{
}
else
{
return
copyAndFillResult
(
pQInfo
);
copyAndFillResult
(
pQInfo
);
}
}
}
else
{
}
else
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录