address comments

Signed-off-by: Lloyd-Pottiger <yan1579196623@gmail.com>

Author: Lloyd-Pottiger

dbms/src/Storages/DeltaMerge/BitmapFilter/BitmapFilter.cpp

@@ -97,7 +97,7 @@ void BitmapFilter::rangeAnd(IColumn::Filter & f, UInt32 start, UInt32 limit) con
     }
 }
 
-void BitmapFilter::merge(const BitmapFilter & other)
+void BitmapFilter::logicalOr(const BitmapFilter & other)
 {
     RUNTIME_CHECK(filter.size() == other.filter.size());
     if (all_match)
@@ -108,9 +108,10 @@ void BitmapFilter::merge(const BitmapFilter & other)
     {
         filter[i] = filter[i] || other.filter[i];
     }
+    all_match = all_match || other.all_match;
 }
 
-void BitmapFilter::intersect(const BitmapFilter & other)
+void BitmapFilter::logicalAnd(const BitmapFilter & other)
 {
     RUNTIME_CHECK(filter.size() == other.filter.size());
     if (all_match)

dbms/src/Storages/DeltaMerge/BitmapFilter/BitmapFilter.h

@@ -41,9 +41,9 @@ class BitmapFilter
     void rangeAnd(IColumn::Filter & f, UInt32 start, UInt32 limit) const;
 
     // f = f | other
-    void merge(const BitmapFilter & other);
+    void logicalOr(const BitmapFilter & other);
     // f = f & other
-    void intersect(const BitmapFilter & other);
+    void logicalAnd(const BitmapFilter & other);
 
     void runOptimize();
 

dbms/src/Storages/DeltaMerge/Filter/ColumnRange.cpp

@@ -92,7 +92,7 @@ BitmapFilterPtr AndColumnRange::check(
         if (!result || !child_result)
             result = child_result;
         else
-            result->intersect(*child_result);
+            result->logicalAnd(*child_result);
     }
     return result;
 }
@@ -168,7 +168,7 @@ BitmapFilterPtr OrColumnRange::check(
         if (!result || !child_result)
             result = child_result;
         else
-            result->merge(*child_result);
+            result->logicalOr(*child_result);
     }
     return result;
 }

dbms/src/Storages/DeltaMerge/Filter/IntegerSet.cpp

@@ -574,7 +574,7 @@ BitmapFilterPtr CompositeSet<T>::search(InvertedIndexReaderPtr inverted_index, s
         case SetType::Range:
         case SetType::Composite:
             auto sub_filter = set->search(inverted_index, size);
-            filter->merge(*sub_filter);
+            filter->logicalOr(*sub_filter);
             break;
         }
     }