Skip to content

Commit

Permalink
Revert "[fix](compaction) fix the longest continuous rowsets cannot b…
Browse files Browse the repository at this point in the history
…e selected when missing rowsets (apache#38728) (apache#39262)" (apache#40375)

This reverts commit c9949f2.

This pr may increase the probability of full clone failure, so revert it
first.
  • Loading branch information
luwei16 authored Sep 4, 2024
1 parent 08fb91f commit cc20ecd
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 295 deletions.
20 changes: 3 additions & 17 deletions be/src/olap/compaction.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1132,35 +1132,21 @@ Status Compaction::find_longest_consecutive_version(std::vector<RowsetSharedPtr>
if (rowsets->empty()) {
return Status::OK();
}

RowsetSharedPtr prev_rowset = rowsets->front();
size_t i = 1;
int max_start = 0;
int max_length = 1;

int start = 0;
int length = 1;
for (; i < rowsets->size(); ++i) {
RowsetSharedPtr rowset = (*rowsets)[i];
if (rowset->start_version() != prev_rowset->end_version() + 1) {
if (missing_version != nullptr) {
missing_version->push_back(prev_rowset->version());
missing_version->push_back(rowset->version());
}
start = i;
length = 1;
} else {
length++;
break;
}

if (length > max_length) {
max_start = start;
max_length = length;
}

prev_rowset = rowset;
}
*rowsets = {rowsets->begin() + max_start, rowsets->begin() + max_start + max_length};

rowsets->resize(i);
return Status::OK();
}

Expand Down
7 changes: 3 additions & 4 deletions be/src/olap/cumulative_compaction.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -111,11 +111,10 @@ Status CumulativeCompaction::pick_rowsets_to_compact() {
std::vector<Version> missing_versions;
RETURN_IF_ERROR(find_longest_consecutive_version(&candidate_rowsets, &missing_versions));
if (!missing_versions.empty()) {
DCHECK(missing_versions.size() % 2 == 0);
DCHECK(missing_versions.size() == 2);
LOG(WARNING) << "There are missed versions among rowsets. "
<< "total missed version size: " << missing_versions.size() / 2
<< " first missed version prev rowset verison=" << missing_versions[0]
<< ", first missed version next rowset version=" << missing_versions[1]
<< "prev rowset verison=" << missing_versions[0]
<< ", next rowset version=" << missing_versions[1]
<< ", tablet=" << _tablet->tablet_id();
}

Expand Down
274 changes: 0 additions & 274 deletions be/test/olap/cumulative_compaction_test.cpp

This file was deleted.

0 comments on commit cc20ecd

Please sign in to comment.