From 53312e8912a6ccdc908d39d421092905423f49bd Mon Sep 17 00:00:00 2001
From: ivanmorozov333 <ivanmorozov@hotmail.com>
Date: Tue, 6 Feb 2024 17:26:17 +0300
Subject: [PATCH] fix filter apply

---
 .../engines/reader/plain_reader/fetched_data.h     | 14 ++++++--------
 1 file changed, 6 insertions(+), 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
index 62d3c1fcb3b2..e31f51bd0dac 100644
--- 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);
         }
     }