diff --git a/be/src/agent/be_exec_version_manager.cpp b/be/src/agent/be_exec_version_manager.cpp index de9dfb9745dc5e..a2d3d05f384114 100644 --- a/be/src/agent/be_exec_version_manager.cpp +++ b/be/src/agent/be_exec_version_manager.cpp @@ -126,11 +126,13 @@ void BeExecVersionManager::check_function_compatibility(int current_be_exec_vers // a. use new fixed object serialization way. // 11: start from master // a. enforce Iceberg SQL MERGE cardinality only when every executing BE supports it. -// 12: start from Doris 4.1 +// 12: start from master +// a. support Variant columns and delete-only writer omission in Iceberg SQL MERGE. +// 13: start from Doris 4.1 // a. support strict ownership hash routing for external table sink writers. // b. support Paimon default fixed-bucket routing in the external sink exchange. -const int BeExecVersionManager::max_be_exec_version = 12; +const int BeExecVersionManager::max_be_exec_version = 13; const int BeExecVersionManager::min_be_exec_version = 0; std::map> BeExecVersionManager::_function_change_map {}; std::set BeExecVersionManager::_function_restrict_map; diff --git a/be/src/agent/be_exec_version_manager.h b/be/src/agent/be_exec_version_manager.h index b19d1aabac8c43..5d081efb258605 100644 --- a/be/src/agent/be_exec_version_manager.h +++ b/be/src/agent/be_exec_version_manager.h @@ -34,7 +34,7 @@ constexpr inline int USE_CONST_SERDE = 8; // support const column in serialize/deserialize function: PR #41175 constexpr inline int USE_NEW_FIXED_OBJECT_SERIALIZATION_VERSION = 10; constexpr inline int SUPPORT_ICEBERG_MERGE_CARDINALITY_VERSION = 11; -constexpr inline int SUPPORT_EXTERNAL_TABLE_SINK_HASH_VERSION = 12; +constexpr inline int SUPPORT_EXTERNAL_TABLE_SINK_HASH_VERSION = 13; class BeExecVersionManager { public: diff --git a/fe/fe-common/src/main/java/org/apache/doris/common/Config.java b/fe/fe-common/src/main/java/org/apache/doris/common/Config.java index 6432720fb62e7d..1c6cf2996d5e78 100644 --- a/fe/fe-common/src/main/java/org/apache/doris/common/Config.java +++ b/fe/fe-common/src/main/java/org/apache/doris/common/Config.java @@ -2260,7 +2260,7 @@ public class Config extends ConfigBase { * Max data version of backends serialize block. */ @ConfField(mutable = false) - public static int max_be_exec_version = 12; + public static int max_be_exec_version = 13; /** * Min data version of backends serialize block. diff --git a/fe/fe-core/pom.xml b/fe/fe-core/pom.xml index a880c5ffad4db4..9b8240c9610e02 100644 --- a/fe/fe-core/pom.xml +++ b/fe/fe-core/pom.xml @@ -468,32 +468,6 @@ under the License. com.google.flatbuffers flatbuffers-java - - - org.apache.paimon - paimon-core - - - org.apache.paimon - paimon-common - - - org.apache.paimon - paimon-hive-connector-3.1 - - - org.apache.paimon - paimon-format - - - org.apache.paimon - paimon-s3 - - - org.apache.paimon - paimon-jindo - org.apache.doris hive-catalog-shade @@ -604,6 +578,30 @@ under the License. iceberg-aws ${iceberg.version} + + org.apache.paimon + paimon-core + + + + org.apache.paimon + paimon-common + + + + org.apache.paimon + paimon-format + + + + org.apache.paimon + paimon-s3 + + + org.apache.paimon + paimon-jindo + + software.amazon.awssdk glue @@ -1117,44 +1115,11 @@ under the License. false true runtime - - hive-catalog-shade ${skip.plugin} - - org.apache.maven.plugins - maven-antrun-plugin - 3.1.0 - - - package-hive-catalog-shade-without-paimon - package - - - - - - - - - - - - - - - run - - - - org.codehaus.mojo cobertura-maven-plugin diff --git a/fe/pom.xml b/fe/pom.xml index 3783d2660e6b9b..b1dfc2121820d1 100644 --- a/fe/pom.xml +++ b/fe/pom.xml @@ -226,7 +226,7 @@ under the License. fe-authentication - 3.1.1 + 3.1.2 1.12.1 1.17.0