Skip to content

Commit b63a905

Browse files
Merge 53312e8 into 273805e
2 parents 273805e + 53312e8 commit b63a905

File tree

1 file changed

+6
-8
lines changed

1 file changed

+6
-8
lines changed

ydb/core/tx/columnshard/engines/reader/plain_reader/fetched_data.h

+6-8
Original file line numberDiff line numberDiff line change
@@ -63,14 +63,10 @@ class TFetchedData {
6363
}
6464

6565
void AddFilter(const std::shared_ptr<NArrow::TColumnFilter>& filter) {
66-
if (UseFilter && Table && filter) {
67-
AFL_VERIFY(filter->Apply(Table));
68-
}
69-
if (!Filter) {
70-
Filter = filter;
71-
} else if (filter) {
72-
*Filter = Filter->CombineSequentialAnd(*filter);
66+
if (!filter) {
67+
return;
7368
}
69+
return AddFilter(*filter);
7470
}
7571

7672
void AddFilter(const NArrow::TColumnFilter& filter) {
@@ -79,8 +75,10 @@ class TFetchedData {
7975
}
8076
if (!Filter) {
8177
Filter = std::make_shared<NArrow::TColumnFilter>(filter);
82-
} else {
78+
} else if (UseFilter) {
8379
*Filter = Filter->CombineSequentialAnd(filter);
80+
} else {
81+
*Filter = Filter->And(filter);
8482
}
8583
}
8684

0 commit comments

Comments
 (0)