This is an automated email from the ASF dual-hosted git repository. yiguolei pushed a commit to branch revert-40283-Pick-40197 in repository https://gitbox.apache.org/repos/asf/doris.git
commit e7e20de6f1044f9fdf342ee64e090545f397054a Author: yiguolei <[email protected]> AuthorDate: Wed Sep 4 12:55:38 2024 +0800 Revert "[cherry-pick](branch-2.1) Fix `enable_mow_light_delete` default value…" This reverts commit c49b345342326f1e53f8fe22b7b1e9df09b62d29. --- .../main/java/org/apache/doris/common/util/PropertyAnalyzer.java | 7 +++---- .../src/main/java/org/apache/doris/datasource/InternalCatalog.java | 3 +-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/util/PropertyAnalyzer.java b/fe/fe-core/src/main/java/org/apache/doris/common/util/PropertyAnalyzer.java index dd39b12a18e..d1a710bcf9f 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/util/PropertyAnalyzer.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/util/PropertyAnalyzer.java @@ -1311,15 +1311,14 @@ public class PropertyAnalyzer { throw new AnalysisException(PropertyAnalyzer.ENABLE_UNIQUE_KEY_MERGE_ON_WRITE + " must be `true` or `false`"); } - public static boolean analyzeEnableDeleteOnDeletePredicate(Map<String, String> properties, - boolean enableUniqueKeyMergeOnWrite) + public static boolean analyzeEnableDeleteOnDeletePredicate(Map<String, String> properties) throws AnalysisException { if (properties == null || properties.isEmpty()) { - return enableUniqueKeyMergeOnWrite ? Config.enable_mow_light_delete : false; + return false; } String value = properties.get(PropertyAnalyzer.PROPERTIES_ENABLE_MOW_LIGHT_DELETE); if (value == null) { - return enableUniqueKeyMergeOnWrite ? Config.enable_mow_light_delete : false; + return false; } properties.remove(PropertyAnalyzer.PROPERTIES_ENABLE_MOW_LIGHT_DELETE); if (value.equals("true")) { diff --git a/fe/fe-core/src/main/java/org/apache/doris/datasource/InternalCatalog.java b/fe/fe-core/src/main/java/org/apache/doris/datasource/InternalCatalog.java index 46b1c44fa23..1fb8826903b 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/datasource/InternalCatalog.java +++ b/fe/fe-core/src/main/java/org/apache/doris/datasource/InternalCatalog.java @@ -2498,8 +2498,7 @@ public class InternalCatalog implements CatalogIf<Database> { boolean enableDeleteOnDeletePredicate = false; try { - enableDeleteOnDeletePredicate = PropertyAnalyzer.analyzeEnableDeleteOnDeletePredicate(properties, - enableUniqueKeyMergeOnWrite); + enableDeleteOnDeletePredicate = PropertyAnalyzer.analyzeEnableDeleteOnDeletePredicate(properties); } catch (AnalysisException e) { throw new DdlException(e.getMessage()); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
