This is an automated email from the ASF dual-hosted git repository.
dataroaring pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.0 by this push:
new 209a564fa67 [cherry-pick](branch-2.0) Fix `enable_mow_light_delete`
default value (#40284)
209a564fa67 is described below
commit 209a564fa67e1e1632d009158d306cba899e315b
Author: abmdocrt <[email protected]>
AuthorDate: Tue Sep 3 10:36:43 2024 +0800
[cherry-pick](branch-2.0) Fix `enable_mow_light_delete` default value
(#40284)
Pick #40104 #40197
---
.../main/java/org/apache/doris/common/util/PropertyAnalyzer.java | 7 ++++---
.../src/main/java/org/apache/doris/datasource/InternalCatalog.java | 3 ++-
2 files changed, 6 insertions(+), 4 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 7772768beae..201001672b4 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
@@ -1183,14 +1183,15 @@ 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)
+ public static boolean analyzeEnableDeleteOnDeletePredicate(Map<String,
String> properties,
+ boolean enableUniqueKeyMergeOnWrite)
throws AnalysisException {
if (properties == null || properties.isEmpty()) {
- return false;
+ return enableUniqueKeyMergeOnWrite ?
Config.enable_mow_light_delete : false;
}
String value =
properties.get(PropertyAnalyzer.PROPERTIES_ENABLE_MOW_LIGHT_DELETE);
if (value == null) {
- return false;
+ return enableUniqueKeyMergeOnWrite ?
Config.enable_mow_light_delete : 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 d89abe34889..fd73fa51cd3 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
@@ -2253,7 +2253,8 @@ public class InternalCatalog implements
CatalogIf<Database> {
boolean enableDeleteOnDeletePredicate = false;
try {
- enableDeleteOnDeletePredicate =
PropertyAnalyzer.analyzeEnableDeleteOnDeletePredicate(properties);
+ enableDeleteOnDeletePredicate =
PropertyAnalyzer.analyzeEnableDeleteOnDeletePredicate(properties,
+ enableUniqueKeyMergeOnWrite);
} catch (AnalysisException e) {
throw new DdlException(e.getMessage());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
