Skip to content

Commit

Permalink
[cherry-pick](branch-2.1) Fix enable_mow_light_delete default value (
Browse files Browse the repository at this point in the history
…#40283)

## Proposed changes

Pick #40104 #40197

<!--Describe your changes.-->
  • Loading branch information
Yukang-Lian authored Sep 3, 2024
1 parent 41271ec commit c49b345
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -1311,14 +1311,15 @@ public static boolean analyzeUniqueKeyMergeOnWrite(Map<String, String> propertie
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")) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2498,7 +2498,8 @@ private boolean createOlapTable(Database db, CreateTableStmt stmt) throws UserEx

boolean enableDeleteOnDeletePredicate = false;
try {
enableDeleteOnDeletePredicate = PropertyAnalyzer.analyzeEnableDeleteOnDeletePredicate(properties);
enableDeleteOnDeletePredicate = PropertyAnalyzer.analyzeEnableDeleteOnDeletePredicate(properties,
enableUniqueKeyMergeOnWrite);
} catch (AnalysisException e) {
throw new DdlException(e.getMessage());
}
Expand Down

0 comments on commit c49b345

Please sign in to comment.