Merge branch 'branch-2.1' into branch-2.1-p3

eldenmoon · Sep 5, 2024 · 4a0d78a · 4a0d78a
2 parents 2a389cd + c6771da
commit 4a0d78a
Show file tree

Hide file tree

Showing 20 changed files with 256 additions and 497 deletions.
diff --git a/be/src/olap/compaction.cpp b/be/src/olap/compaction.cpp
@@ -1132,35 +1132,21 @@ Status Compaction::find_longest_consecutive_version(std::vector<RowsetSharedPtr>
     if (rowsets->empty()) {
         return Status::OK();
     }
-
     RowsetSharedPtr prev_rowset = rowsets->front();
     size_t i = 1;
-    int max_start = 0;
-    int max_length = 1;
-
-    int start = 0;
-    int length = 1;
     for (; i < rowsets->size(); ++i) {
         RowsetSharedPtr rowset = (*rowsets)[i];
         if (rowset->start_version() != prev_rowset->end_version() + 1) {
             if (missing_version != nullptr) {
                 missing_version->push_back(prev_rowset->version());
                 missing_version->push_back(rowset->version());
             }
-            start = i;
-            length = 1;
-        } else {
-            length++;
+            break;
         }
-
-        if (length > max_length) {
-            max_start = start;
-            max_length = length;
-        }
-
         prev_rowset = rowset;
     }
-    *rowsets = {rowsets->begin() + max_start, rowsets->begin() + max_start + max_length};
+
+    rowsets->resize(i);
     return Status::OK();
 }
 

diff --git a/be/src/olap/cumulative_compaction.cpp b/be/src/olap/cumulative_compaction.cpp
@@ -111,11 +111,10 @@ Status CumulativeCompaction::pick_rowsets_to_compact() {
     std::vector<Version> missing_versions;
     RETURN_IF_ERROR(find_longest_consecutive_version(&candidate_rowsets, &missing_versions));
     if (!missing_versions.empty()) {
-        DCHECK(missing_versions.size() % 2 == 0);
+        DCHECK(missing_versions.size() == 2);
         LOG(WARNING) << "There are missed versions among rowsets. "
-                     << "total missed version size: " << missing_versions.size() / 2
-                     << " first missed version prev rowset verison=" << missing_versions[0]
-                     << ", first missed version next rowset version=" << missing_versions[1]
+                     << "prev rowset verison=" << missing_versions[0]
+                     << ", next rowset version=" << missing_versions[1]
                      << ", tablet=" << _tablet->tablet_id();
     }
 

diff --git a/be/test/olap/cumulative_compaction_test.cpp b/be/test/olap/cumulative_compaction_test.cpp
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
@@ -1311,15 +1311,14 @@ 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,
-            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
@@ -2498,8 +2498,7 @@ private boolean createOlapTable(Database db, CreateTableStmt stmt) throws UserEx
 
         boolean enableDeleteOnDeletePredicate = false;
         try {
-            enableDeleteOnDeletePredicate = PropertyAnalyzer.analyzeEnableDeleteOnDeletePredicate(properties,
-                    enableUniqueKeyMergeOnWrite);
+            enableDeleteOnDeletePredicate = PropertyAnalyzer.analyzeEnableDeleteOnDeletePredicate(properties);
         } catch (AnalysisException e) {
             throw new DdlException(e.getMessage());
         }

diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/stats/FilterEstimation.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/stats/FilterEstimation.java
@@ -622,7 +622,9 @@ private Statistics estimateBinaryComparisonFilter(Expression leftExpr, DataType
                     .setMaxExpr(intersectRange.getHighExpr())
                     .setNdv(intersectRange.getDistinctValues())
                     .setNumNulls(0);
-            double sel = leftRange.overlapPercentWith(rightRange);
+            double sel = leftRange.getDistinctValues() == 0
+                    ? 1.0
+                    : intersectRange.getDistinctValues() / leftRange.getDistinctValues();
             if (!(dataType instanceof RangeScalable) && (sel != 0.0 && sel != 1.0)) {
                 sel = DEFAULT_INEQUALITY_COEFFICIENT;
             }