Skip to content

Revert "branch-4.0: [fix](compaction) Check schema version before ordered data compaction #59570" #59661

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yiguolei merged 1 commit into from
Jan 8, 2026
Merged

Revert "branch-4.0: [fix](compaction) Check schema version before ordered data compaction #59570" #59661

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 0 additions & 23 deletions be/src/olap/compaction.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@
#include "io/fs/file_writer.h"
#include "io/fs/remote_file_system.h"
#include "io/io_common.h"
#include "olap/collection_statistics.h"
#include "olap/cumulative_compaction.h"
#include "olap/cumulative_compaction_policy.h"
#include "olap/cumulative_compaction_time_series_policy.h"
Expand Down Expand Up @@ -424,28 +423,6 @@ bool CompactionMixin::handle_ordered_data_compaction() {
if (!config::enable_ordered_data_compaction) {
return false;
}

// If some rowsets has idx files and some rowsets has not, we can not do link file compaction.
// Since the output rowset will be broken.

// Use schema version instead of schema hash to check if they are the same,
// because light schema change will not change the schema hash on BE, but will increase the schema version
// See fe/fe-core/src/main/java/org/apache/doris/alter/SchemaChangeHandler.java::2979
std::vector<int32_t> schema_versions_of_rowsets;

for (auto input_rowset : _input_rowsets) {
schema_versions_of_rowsets.push_back(input_rowset->rowset_meta()->schema_version());
}

// If all rowsets has same schema version, then we can do link file compaction directly.
bool all_same_schema_version =
std::all_of(schema_versions_of_rowsets.begin(), schema_versions_of_rowsets.end(),
[&](int32_t v) { return v == schema_versions_of_rowsets.front(); });

if (!all_same_schema_version) {
return false;
}

if (compaction_type() == ReaderType::READER_COLD_DATA_COMPACTION ||
compaction_type() == ReaderType::READER_FULL_COMPACTION) {
// The remote file system and full compaction does not support to link files.
Expand Down
2 changes: 0 additions & 2 deletions be/src/olap/rowset/rowset_meta.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,8 +424,6 @@ class RowsetMeta : public MetadataAdder<RowsetMeta> {
RowsetMeta(const RowsetMeta&) = delete;
RowsetMeta operator=(const RowsetMeta&) = delete;

int32_t schema_version() const { return _rowset_meta_pb.schema_version(); }

private:
bool _deserialize_from_pb(std::string_view value);

Expand Down
Loading