This is an automated email from the ASF dual-hosted git repository.
zhangchen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 1c22742a14 [fix](compaction) remove check rowset overlapping in base
compaction (#22599)
1c22742a14 is described below
commit 1c22742a14ef11f441c3833e74ba16108db407c3
Author: huanghaibin <[email protected]>
AuthorDate: Thu Aug 10 16:36:33 2023 +0800
[fix](compaction) remove check rowset overlapping in base compaction
(#22599)
---
be/src/olap/base_compaction.cpp | 14 --------------
be/src/olap/base_compaction.h | 4 ----
2 files changed, 18 deletions(-)
diff --git a/be/src/olap/base_compaction.cpp b/be/src/olap/base_compaction.cpp
index 5723752d5e..2ad83edfbf 100644
--- a/be/src/olap/base_compaction.cpp
+++ b/be/src/olap/base_compaction.cpp
@@ -122,7 +122,6 @@ void BaseCompaction::_filter_input_rowset() {
Status BaseCompaction::pick_rowsets_to_compact() {
_input_rowsets = _tablet->pick_candidate_rowsets_to_base_compaction();
RETURN_IF_ERROR(check_version_continuity(_input_rowsets));
- RETURN_IF_ERROR(_check_rowset_overlapping(_input_rowsets));
_filter_input_rowset();
if (_input_rowsets.size() <= 1) {
return Status::Error<BE_NO_SUITABLE_VERSION>("_input_rowsets.size() is
1");
@@ -216,17 +215,4 @@ Status BaseCompaction::pick_rowsets_to_compact() {
interval_since_last_base_compaction);
}
-Status BaseCompaction::_check_rowset_overlapping(const
std::vector<RowsetSharedPtr>& rowsets) {
- for (auto& rs : rowsets) {
- if (rs->rowset_meta()->is_segments_overlapping()) {
- return Status::Error<BE_SEGMENTS_OVERLAPPING>(
- "There is overlapping rowset before cumulative point,
rowset version={}-{}, "
- "cumulative point={}, tablet={}",
- rs->start_version(), rs->end_version(),
_tablet->cumulative_layer_point(),
- _tablet->full_name());
- }
- }
- return Status::OK();
-}
-
} // namespace doris
diff --git a/be/src/olap/base_compaction.h b/be/src/olap/base_compaction.h
index ecee304449..73aca0d5e1 100644
--- a/be/src/olap/base_compaction.h
+++ b/be/src/olap/base_compaction.h
@@ -52,10 +52,6 @@ protected:
ReaderType compaction_type() const override { return
ReaderType::READER_BASE_COMPACTION; }
private:
- // check if all input rowsets are non overlapping among segments.
- // a rowset with overlapping segments should be compacted by cumulative
compaction first.
- Status _check_rowset_overlapping(const vector<RowsetSharedPtr>& rowsets);
-
// filter input rowset in some case:
// 1. dup key without delete predicate
void _filter_input_rowset();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
