database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Revert "[fix](compaction) fix the longest continuous rowsets cannot be selected when missing rowsets (#38728) (#39262)" (#40375)

Browse Source 
This reverts commit c9949f24e5c15e9529285f0e99b7ffdb1095558b.

This pr may increase the probability of full clone failure, so revert it
first.
This commit is contained in:
Luwei
2024-09-05 00:01:03 +08:00
committed by GitHub
parent 08fb91f161
commit cc20ecd738
3 changed files with 6 additions and 295 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
be/src/olap/compaction.cpp
View File

@ -1132,14 +1132,8 @@ 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) {
@ -1147,20 +1141,12 @@ Status Compaction::find_longest_consecutive_version(std::vector<RowsetSharedPtr>
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();
}

7
be/src/olap/cumulative_compaction.cpp
View File

@ -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();
}

274
be/test/olap/cumulative_compaction_test.cpp
View File

@ -1,274 +0,0 @@
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
// regarding copyright ownership. The ASF licenses this file
// to you under the Apache License, Version 2.0 (the
// "License"); you may not use this file except in compliance
// with the License. You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing,
// software distributed under the License is distributed on an
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
#include "olap/cumulative_compaction.h"
#include <gmock/gmock-actions.h>
#include <gmock/gmock-matchers.h>
#include <gtest/gtest-message.h>
#include <gtest/gtest-test-part.h>
#include <gtest/gtest.h>
#include <filesystem>
#include <memory>
#include "common/status.h"
#include "gtest/gtest_pred_impl.h"
#include "io/fs/local_file_system.h"
#include "olap/cumulative_compaction_policy.h"
#include "olap/data_dir.h"
#include "olap/rowset/rowset_factory.h"
#include "olap/storage_engine.h"
#include "olap/tablet_manager.h"
#include "util/threadpool.h"
namespace doris {
using namespace config;
class CumulativeCompactionTest : public testing::Test {
public:
virtual void SetUp() {}
virtual void TearDown() {}
};
static RowsetSharedPtr create_rowset(Version version, int num_segments, bool overlapping,
int data_size) {
auto rs_meta = std::make_shared<RowsetMeta>();
rs_meta->set_rowset_type(BETA_ROWSET); // important
rs_meta->_rowset_meta_pb.set_start_version(version.first);
rs_meta->_rowset_meta_pb.set_end_version(version.second);
rs_meta->set_num_segments(num_segments);
rs_meta->set_segments_overlap(overlapping ? OVERLAPPING : NONOVERLAPPING);
rs_meta->set_total_disk_size(data_size);
RowsetSharedPtr rowset;
Status st = RowsetFactory::create_rowset(nullptr, "", std::move(rs_meta), &rowset);
if (!st.ok()) {
return nullptr;
}
return rowset;
}
TEST_F(CumulativeCompactionTest, TestConsecutiveVersion) {
EngineOptions options;
StorageEngine storage_engine(options);
//TabletSharedPtr tablet;
TabletMetaSharedPtr tablet_meta;
tablet_meta.reset(new TabletMeta(1, 2, 15673, 15674, 4, 5, TTabletSchema(), 6, {{7, 8}},
UniqueId(9, 10), TTabletType::TABLET_TYPE_DISK,
TCompressionType::LZ4F));
TabletSharedPtr tablet(
new Tablet(storage_engine, tablet_meta, nullptr, CUMULATIVE_SIZE_BASED_POLICY));
CumulativeCompaction cumu_compaction(tablet);
{
std::vector<RowsetSharedPtr> rowsets;
for (int i = 2; i < 10; ++i) {
RowsetSharedPtr rs = create_rowset({i, i}, 1, false, 1024);
rowsets.push_back(rs);
}
std::vector<Version> missing_version;
Status st = cumu_compaction.find_longest_consecutive_version(&rowsets, &missing_version);
EXPECT_TRUE(st.OK());
EXPECT_EQ(rowsets.size(), 8);
EXPECT_EQ(rowsets.front()->start_version(), 2);
EXPECT_EQ(rowsets.front()->end_version(), 2);
EXPECT_EQ(rowsets.back()->start_version(), 9);
EXPECT_EQ(rowsets.back()->end_version(), 9);
EXPECT_EQ(missing_version.size(), 0);
}
{
std::vector<RowsetSharedPtr> rowsets;
for (int i = 2; i <= 4; ++i) {
RowsetSharedPtr rs = create_rowset({i, i}, 1, false, 1024);
rowsets.push_back(rs);
}
for (int i = 6; i <= 10; ++i) {
RowsetSharedPtr rs = create_rowset({i, i}, 1, false, 1024);
rowsets.push_back(rs);
}
for (int i = 12; i <= 13; ++i) {
RowsetSharedPtr rs = create_rowset({i, i}, 1, false, 1024);
rowsets.push_back(rs);
}
std::vector<Version> missing_version;
Status st = cumu_compaction.find_longest_consecutive_version(&rowsets, &missing_version);
EXPECT_TRUE(st.OK());
EXPECT_EQ(rowsets.size(), 5);
EXPECT_EQ(rowsets.front()->start_version(), 6);
EXPECT_EQ(rowsets.front()->end_version(), 6);
EXPECT_EQ(rowsets.back()->start_version(), 10);
EXPECT_EQ(rowsets.back()->end_version(), 10);
EXPECT_EQ(missing_version.size(), 4);
EXPECT_EQ(missing_version[0].first, 4);
EXPECT_EQ(missing_version[0].second, 4);
EXPECT_EQ(missing_version[1].first, 6);
EXPECT_EQ(missing_version[1].second, 6);
EXPECT_EQ(missing_version[2].first, 10);
EXPECT_EQ(missing_version[2].second, 10);
EXPECT_EQ(missing_version[3].first, 12);
EXPECT_EQ(missing_version[3].second, 12);
}
{
std::vector<RowsetSharedPtr> rowsets;
for (int i = 2; i <= 2; ++i) {
RowsetSharedPtr rs = create_rowset({i, i}, 1, false, 1024);
rowsets.push_back(rs);
}
for (int i = 4; i <= 4; ++i) {
RowsetSharedPtr rs = create_rowset({i, i}, 1, false, 1024);
rowsets.push_back(rs);
}
std::vector<Version> missing_version;
Status st = cumu_compaction.find_longest_consecutive_version(&rowsets, &missing_version);
EXPECT_TRUE(st.OK());
EXPECT_EQ(rowsets.size(), 1);
EXPECT_EQ(rowsets.front()->start_version(), 2);
EXPECT_EQ(rowsets.front()->end_version(), 2);
EXPECT_EQ(rowsets.back()->start_version(), 2);
EXPECT_EQ(rowsets.back()->end_version(), 2);
EXPECT_EQ(missing_version.size(), 2);
EXPECT_EQ(missing_version[0].first, 2);
EXPECT_EQ(missing_version[0].second, 2);
EXPECT_EQ(missing_version[1].first, 4);
EXPECT_EQ(missing_version[1].second, 4);
}
{
std::vector<RowsetSharedPtr> rowsets;
RowsetSharedPtr rs = create_rowset({2, 3}, 1, false, 1024);
rowsets.push_back(rs);
rs = create_rowset({4, 5}, 1, false, 1024);
rowsets.push_back(rs);
rs = create_rowset({9, 11}, 1, false, 1024);
rowsets.push_back(rs);
rs = create_rowset({12, 13}, 1, false, 1024);
rowsets.push_back(rs);
std::vector<Version> missing_version;
Status st = cumu_compaction.find_longest_consecutive_version(&rowsets, &missing_version);
EXPECT_TRUE(st.OK());
EXPECT_EQ(rowsets.size(), 2);
EXPECT_EQ(rowsets.front()->start_version(), 2);
EXPECT_EQ(rowsets.front()->end_version(), 3);
EXPECT_EQ(rowsets.back()->start_version(), 4);
EXPECT_EQ(rowsets.back()->end_version(), 5);
EXPECT_EQ(missing_version.size(), 2);
EXPECT_EQ(missing_version[0].first, 4);
EXPECT_EQ(missing_version[0].second, 5);
EXPECT_EQ(missing_version[1].first, 9);
EXPECT_EQ(missing_version[1].second, 11);
}
{
std::vector<RowsetSharedPtr> rowsets;
for (int i = 2; i <= 2; ++i) {
RowsetSharedPtr rs = create_rowset({i, i}, 1, false, 1024);
rowsets.push_back(rs);
}
std::vector<Version> missing_version;
Status st = cumu_compaction.find_longest_consecutive_version(&rowsets, &missing_version);
EXPECT_TRUE(st.OK());
EXPECT_EQ(rowsets.size(), 1);
EXPECT_EQ(rowsets.front()->start_version(), 2);
EXPECT_EQ(rowsets.front()->end_version(), 2);
EXPECT_EQ(rowsets.back()->start_version(), 2);
EXPECT_EQ(rowsets.back()->end_version(), 2);
EXPECT_EQ(missing_version.size(), 0);
}
{
std::vector<RowsetSharedPtr> rowsets;
for (int i = 2; i <= 2; ++i) {
RowsetSharedPtr rs = create_rowset({i, i}, 1, false, 1024);
rowsets.push_back(rs);
}
std::vector<Version> missing_version;
Status st = cumu_compaction.find_longest_consecutive_version(&rowsets, &missing_version);
EXPECT_TRUE(st.OK());
EXPECT_EQ(rowsets.size(), 1);
EXPECT_EQ(rowsets.front()->start_version(), 2);
EXPECT_EQ(rowsets.front()->end_version(), 2);
EXPECT_EQ(rowsets.back()->start_version(), 2);
EXPECT_EQ(rowsets.back()->end_version(), 2);
EXPECT_EQ(missing_version.size(), 0);
}
{
std::vector<RowsetSharedPtr> rowsets;
for (int i = 2; i <= 4; ++i) {
RowsetSharedPtr rs = create_rowset({i, i}, 1, false, 1024);
rowsets.push_back(rs);
}
for (int i = 6; i <= 10; ++i) {
RowsetSharedPtr rs = create_rowset({i, i}, 1, false, 1024);
rowsets.push_back(rs);
}
for (int i = 12; i <= 20; ++i) {
RowsetSharedPtr rs = create_rowset({i, i}, 1, false, 1024);
rowsets.push_back(rs);
}
std::vector<Version> missing_version;
Status st = cumu_compaction.find_longest_consecutive_version(&rowsets, &missing_version);
EXPECT_TRUE(st.OK());
EXPECT_EQ(rowsets.size(), 9);
EXPECT_EQ(rowsets.front()->start_version(), 12);
EXPECT_EQ(rowsets.front()->end_version(), 12);
EXPECT_EQ(rowsets.back()->start_version(), 20);
EXPECT_EQ(rowsets.back()->end_version(), 20);
EXPECT_EQ(missing_version.size(), 4);
EXPECT_EQ(missing_version[0].first, 4);
EXPECT_EQ(missing_version[0].second, 4);
EXPECT_EQ(missing_version[1].first, 6);
EXPECT_EQ(missing_version[1].second, 6);
EXPECT_EQ(missing_version[2].first, 10);
EXPECT_EQ(missing_version[2].second, 10);
EXPECT_EQ(missing_version[3].first, 12);
EXPECT_EQ(missing_version[3].second, 12);
}
}
} // namespace doris