Merge 53312e8 into 273805e

ydb-platform · Feb 6, 2024 · b63a905 · b63a905
2 parents 273805e + 53312e8
commit b63a905
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/ydb/core/tx/columnshard/engines/reader/plain_reader/fetched_data.h b/ydb/core/tx/columnshard/engines/reader/plain_reader/fetched_data.h
@@ -63,14 +63,10 @@ class TFetchedData {
     }
 
     void AddFilter(const std::shared_ptr<NArrow::TColumnFilter>& filter) {
-        if (UseFilter && Table && filter) {
-            AFL_VERIFY(filter->Apply(Table));
-        }
-        if (!Filter) {
-            Filter = filter;
-        } else if (filter) {
-            *Filter = Filter->CombineSequentialAnd(*filter);
+        if (!filter) {
+            return;
         }
+        return AddFilter(*filter);
     }
 
     void AddFilter(const NArrow::TColumnFilter& filter) {
@@ -79,8 +75,10 @@ class TFetchedData {
         }
         if (!Filter) {
             Filter = std::make_shared<NArrow::TColumnFilter>(filter);
-        } else {
+        } else if (UseFilter) {
             *Filter = Filter->CombineSequentialAnd(filter);
+        } else {
+            *Filter = Filter->And(filter);
         }
     }