Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
cb0a3ec0
T
TDengine
项目概览
taosdata
/
TDengine
12 个月 前同步成功
通知
1181
Star
22014
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看板
体验新版 GitCode,发现更多精彩内容 >>
提交
cb0a3ec0
编写于
10月 26, 2022
作者:
M
Minglei Jin
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: continue to fetch next row if deleted
上级
f3eb9c06
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
50 addition
and
51 deletion
+50
-51
source/dnode/vnode/src/tsdb/tsdbCache.c
source/dnode/vnode/src/tsdb/tsdbCache.c
+50
-51
未找到文件。
source/dnode/vnode/src/tsdb/tsdbCache.c
浏览文件 @
cb0a3ec0
...
...
@@ -1093,72 +1093,71 @@ _err:
// iterate next row non deleted backward ts, version (from high to low)
static
int32_t
nextRowIterGet
(
CacheNextRowIter
*
pIter
,
TSDBROW
**
ppRow
)
{
int
code
=
0
;
for
(;;)
{
for
(
int
i
=
0
;
i
<
4
;
++
i
)
{
if
(
pIter
->
input
[
i
].
next
&&
!
pIter
->
input
[
i
].
stop
)
{
code
=
pIter
->
input
[
i
].
nextRowFn
(
pIter
->
input
[
i
].
iter
,
&
pIter
->
input
[
i
].
pRow
);
if
(
code
)
goto
_err
;
for
(
int
i
=
0
;
i
<
4
;
++
i
)
{
if
(
pIter
->
input
[
i
].
next
&&
!
pIter
->
input
[
i
].
stop
)
{
code
=
pIter
->
input
[
i
].
nextRowFn
(
pIter
->
input
[
i
].
iter
,
&
pIter
->
input
[
i
].
pRow
);
if
(
code
)
goto
_err
;
if
(
pIter
->
input
[
i
].
pRow
==
NULL
)
{
pIter
->
input
[
i
].
stop
=
true
;
pIter
->
input
[
i
].
next
=
false
;
if
(
pIter
->
input
[
i
].
pRow
==
NULL
)
{
pIter
->
input
[
i
].
stop
=
true
;
pIter
->
input
[
i
].
next
=
false
;
}
}
}
}
if
(
pIter
->
input
[
0
].
stop
&&
pIter
->
input
[
1
].
stop
&&
pIter
->
input
[
2
].
stop
&&
pIter
->
input
[
3
].
stop
)
{
*
ppRow
=
NULL
;
return
code
;
}
if
(
pIter
->
input
[
0
].
stop
&&
pIter
->
input
[
1
].
stop
&&
pIter
->
input
[
2
].
stop
&&
pIter
->
input
[
3
].
stop
)
{
*
ppRow
=
NULL
;
return
code
;
}
// select maxpoint(s) from mem, imem, fs and last
TSDBROW
*
max
[
4
]
=
{
0
};
int
iMax
[
4
]
=
{
-
1
,
-
1
,
-
1
,
-
1
};
int
nMax
=
0
;
TSKEY
maxKey
=
TSKEY_MIN
;
// select maxpoint(s) from mem, imem, fs and last
TSDBROW
*
max
[
4
]
=
{
0
};
int
iMax
[
4
]
=
{
-
1
,
-
1
,
-
1
,
-
1
};
int
nMax
=
0
;
TSKEY
maxKey
=
TSKEY_MIN
;
for
(
int
i
=
0
;
i
<
4
;
++
i
)
{
if
(
!
pIter
->
input
[
i
].
stop
&&
pIter
->
input
[
i
].
pRow
!=
NULL
)
{
TSDBKEY
key
=
TSDBROW_KEY
(
pIter
->
input
[
i
].
pRow
);
// merging & deduplicating on client side
if
(
maxKey
<=
key
.
ts
)
{
if
(
maxKey
<
key
.
ts
)
{
nMax
=
0
;
maxKey
=
key
.
ts
;
}
for
(
int
i
=
0
;
i
<
4
;
++
i
)
{
if
(
!
pIter
->
input
[
i
].
stop
&&
pIter
->
input
[
i
].
pRow
!=
NULL
)
{
TSDBKEY
key
=
TSDBROW_KEY
(
pIter
->
input
[
i
].
pRow
);
// merging & deduplicating on client side
if
(
maxKey
<=
key
.
ts
)
{
if
(
maxKey
<
key
.
ts
)
{
nMax
=
0
;
maxKey
=
key
.
ts
;
iMax
[
nMax
]
=
i
;
max
[
nMax
++
]
=
pIter
->
input
[
i
].
pRow
;
}
iMax
[
nMax
]
=
i
;
max
[
nMax
++
]
=
pIter
->
input
[
i
].
pRow
;
}
}
}
// delete detection
TSDBROW
*
merge
[
4
]
=
{
0
};
int
iMerge
[
4
]
=
{
-
1
,
-
1
,
-
1
,
-
1
};
int
nMerge
=
0
;
for
(
int
i
=
0
;
i
<
nMax
;
++
i
)
{
TSDBKEY
maxKey1
=
TSDBROW_KEY
(
max
[
i
]);
bool
deleted
=
tsdbKeyDeleted
(
&
maxKey1
,
pIter
->
pSkyline
,
&
pIter
->
iSkyline
);
if
(
!
deleted
)
{
iMerge
[
nMerge
]
=
iMax
[
i
];
merge
[
nMerge
++
]
=
max
[
i
];
}
// delete detection
TSDBROW
*
merge
[
4
]
=
{
0
};
int
iMerge
[
4
]
=
{
-
1
,
-
1
,
-
1
,
-
1
};
int
nMerge
=
0
;
for
(
int
i
=
0
;
i
<
nMax
;
++
i
)
{
TSDBKEY
maxKey1
=
TSDBROW_KEY
(
max
[
i
]);
bool
deleted
=
tsdbKeyDeleted
(
&
maxKey1
,
pIter
->
pSkyline
,
&
pIter
->
iSkyline
);
if
(
!
deleted
)
{
iMerge
[
nMerge
]
=
iMax
[
i
];
merge
[
nMerge
++
]
=
max
[
i
];
}
pIter
->
input
[
iMax
[
i
]].
next
=
deleted
;
}
pIter
->
input
[
iMax
[
i
]].
next
=
deleted
;
}
if
(
nMerge
>
0
)
{
pIter
->
input
[
iMerge
[
0
]].
next
=
true
;
if
(
nMerge
>
0
)
{
pIter
->
input
[
iMerge
[
0
]].
next
=
true
;
*
ppRow
=
merge
[
0
];
}
else
{
*
ppRow
=
NULL
;
*
ppRow
=
merge
[
0
];
return
code
;
}
}
return
code
;
_err:
return
code
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录