Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
冷面1992
TDengine
提交
25fae2a1
TDengine
项目概览
冷面1992
/
TDengine
与 Fork 源项目一致
Fork自
taosdata / TDengine
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
25fae2a1
编写于
12月 27, 2019
作者:
H
hjxilinx
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
refactor some codes, add a safety check
上级
117e1f8b
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
4 addition
and
6 deletion
+4
-6
src/system/detail/src/vnodeQueryImpl.c
src/system/detail/src/vnodeQueryImpl.c
+4
-6
未找到文件。
src/system/detail/src/vnodeQueryImpl.c
浏览文件 @
25fae2a1
...
...
@@ -872,9 +872,8 @@ static int32_t loadDataBlockIntoMem(SCompBlock *pBlock, SField **pField, SQueryR
int32_t
status
=
vnodeIsDatablockLoaded
(
pRuntimeEnv
,
pMeterObj
,
fileIdx
,
loadPrimaryCol
);
if
(
status
==
DISK_BLOCK_NO_NEED_TO_LOAD
)
{
dTrace
(
"QInfo:%p vid:%d sid:%d id:%s, fileId:%d, data block has been loaded, no need to load again, ts:%d, slot:%d, "
"brange:%lld-%lld, rows:%d"
,
dTrace
(
"QInfo:%p vid:%d sid:%d id:%s, fileId:%d, data block has been loaded, no need to load again, ts:%d, slot:%d,"
" brange:%lld-%lld, rows:%d"
,
GET_QINFO_ADDR
(
pQuery
),
pMeterObj
->
vnode
,
pMeterObj
->
sid
,
pMeterObj
->
meterId
,
pQuery
->
fileId
,
loadPrimaryCol
,
pQuery
->
slot
,
pBlock
->
keyFirst
,
pBlock
->
keyLast
,
pBlock
->
numOfPoints
);
...
...
@@ -1176,7 +1175,7 @@ static bool getQualifiedDataBlock(SMeterObj *pMeterObj, SQueryRuntimeEnv *pRunti
// load first data block into memory failed, caused by disk block error
bool
blockLoaded
=
false
;
while
(
blkIdx
<
pQuery
->
numOfBlocks
)
{
while
(
blkIdx
<
pQuery
->
numOfBlocks
&&
blkIdx
>=
0
)
{
pQuery
->
slot
=
blkIdx
;
if
(
loadDataBlockIntoMem
(
&
pQuery
->
pBlock
[
pQuery
->
slot
],
&
pQuery
->
pFields
[
pQuery
->
slot
],
pRuntimeEnv
,
fid
,
true
,
true
)
==
0
)
{
...
...
@@ -2893,8 +2892,7 @@ static bool doGetQueryPos(TSKEY key, SMeterQuerySupportObj *pSupporter, SPointIn
/**
* determine the first query range, according to raw query range [skey, ekey] and group-by interval.
* the time interval for aggregating is not enforced to check its validation, the minimum interval is not less than
* 10ms,
* which is guaranteed by parser at client-side
* 10ms, which is guaranteed by parser at client-side
*/
bool
normalizedFirstQueryRange
(
bool
dataInDisk
,
bool
dataInCache
,
SMeterQuerySupportObj
*
pSupporter
,
SPointInterpoSupporter
*
pPointInterpSupporter
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录