From 1f93f32f57835c86d9ee1b9c0c6ba4260272ca4a Mon Sep 17 00:00:00 2001 From: zhiqiang Date: Thu, 8 Jan 2026 10:14:56 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"branch-4.0:=20[fix](compaction)=20Che?= =?UTF-8?q?ck=20schema=20version=20before=20ordered=20dat=E2=80=A6"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit d1ebe957c184df42c159edebbd82651bcf2c13f4. --- be/src/olap/compaction.cpp | 23 ----------------------- be/src/olap/rowset/rowset_meta.h | 2 -- 2 files changed, 25 deletions(-) diff --git a/be/src/olap/compaction.cpp b/be/src/olap/compaction.cpp index 4ce6630012993d..543fad1f3dd61d 100644 --- a/be/src/olap/compaction.cpp +++ b/be/src/olap/compaction.cpp @@ -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" @@ -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 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. diff --git a/be/src/olap/rowset/rowset_meta.h b/be/src/olap/rowset/rowset_meta.h index c0dc1fb8c674ae..4cd346ce414850 100644 --- a/be/src/olap/rowset/rowset_meta.h +++ b/be/src/olap/rowset/rowset_meta.h @@ -424,8 +424,6 @@ class RowsetMeta : public MetadataAdder { 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);