This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.1 by this push:
new c49b3453423 [cherry-pick](branch-2.1) Fix `enable_mow_light_delete`
default value (#40283)
c49b3453423 is described below
commit c49b345342326f1e53f8fe22b7b1e9df09b62d29
Author: abmdocrt <[email protected]>
AuthorDate: Tue Sep 3 11:19:05 2024 +0800
[cherry-pick](branch-2.1) Fix `enable_mow_light_delete` default value
(#40283)
## Proposed changes
Pick #40104 #40197
<!--Describe your changes.-->
---
.../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 d1a710bcf9f..dd39b12a18e 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,14 +1311,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 1fb8826903b..46b1c44fa23 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,7 +2498,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]
