This is an automated email from the ASF dual-hosted git repository.
kangkaisen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-doris.git
The following commit(s) were added to refs/heads/master by this push:
new d9f1ffe (#5151) An already merged rowset should skip window check
(#5152)
d9f1ffe is described below
commit d9f1ffe9a0141872dafa8ffe5f8613b8992bc3f6
Author: wangbo <506340...@qq.com>
AuthorDate: Sat Dec 26 11:40:44 2020 +0800
(#5151) An already merged rowset should skip window check (#5152)
---
be/src/olap/cumulative_compaction_policy.cpp | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/be/src/olap/cumulative_compaction_policy.cpp
b/be/src/olap/cumulative_compaction_policy.cpp
index 979938d..c29ab06 100644
--- a/be/src/olap/cumulative_compaction_policy.cpp
+++ b/be/src/olap/cumulative_compaction_policy.cpp
@@ -427,8 +427,10 @@ void CumulativeCompactionPolicy::pick_candidate_rowsets(
int64_t now = UnixSeconds();
for (auto& it : rs_version_map) {
// find all rowset version greater than cumulative_point and skip the
create time in skip_window_sec
- if (it.first.first >= cumulative_point &&
- (it.second->creation_time() + skip_window_sec < now)) {
+ if (it.first.first >= cumulative_point
+ && ((it.second->creation_time() + skip_window_sec < now)
+ // this case means a rowset has been compacted before which is not
a new published rowset, so it should participate compaction
+ || (it.first.first != it.first.second))) {
candidate_rowsets->push_back(it.second);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
