database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Revert "Revert "[cherry-pick](branch-2.1) Fix enable_mow_light_delete default value"" (#40411)

Browse Source 
Reverts apache/doris#40359
This commit is contained in:
yiguolei
2024-09-05 14:59:01 +08:00
committed by GitHub
parent d9172bed64
commit 40d10bdb0a
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
fe/fe-core/src/main/java/org/apache/doris/common/util/PropertyAnalyzer.java
View File

@ -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")) {

3
fe/fe-core/src/main/java/org/apache/doris/datasource/InternalCatalog.java
View File

@ -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());
}