Skip to content

Commit 370d541

Browse files
fix filter reset and remove useless validation (#15312)
1 parent bd3b066 commit 370d541

File tree

3 files changed

+0
-9
lines changed

3 files changed

+0
-9
lines changed

ydb/core/formats/arrow/program/aggr_keys.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@ TConclusionStatus TWithKeysAggregationProcessor::DoExecute(
120120
}
121121
auto gbBatch = (*gbRes).record_batch();
122122
resources->Remove(AggregationKeys);
123-
resources->ResetFilter();
124123

125124
for (auto& assign : funcOpts.assigns) {
126125
auto column = gbBatch->GetColumnByName(assign.result_column);
@@ -180,7 +179,6 @@ TConclusionStatus TWithKeysAggregationProcessor::TBuilder::AddGroupBy(
180179

181180
TConclusion<arrow::Datum> TAggregateFunction::Call(
182181
const TExecFunctionContext& context, const std::shared_ptr<TAccessorsCollection>& resources) const {
183-
resources->ResetFilter();
184182
if (context.GetColumns().size() == 0 && AggregationType == NAggregation::EAggregate::NumRows) {
185183
auto rc = resources->GetRecordsCountActualOptional();
186184
if (!rc) {

ydb/core/formats/arrow/program/collection.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@ void TAccessorsCollection::AddVerified(const ui32 columnId, const std::shared_pt
1919

2020
void TAccessorsCollection::AddVerified(const ui32 columnId, const TAccessorCollectedContainer& data, const bool withFilter) {
2121
AFL_VERIFY(columnId);
22-
if (!Filter->IsTotalAllowFilter()) {
23-
AFL_VERIFY(!data.GetItWasScalar());
24-
}
2522
if (UseFilter && withFilter && !Filter->IsTotalAllowFilter()) {
2623
auto filtered = Filter->Apply(data.GetData());
2724
RecordsCountActual = filtered->GetRecordsCount();

ydb/core/formats/arrow/program/collection.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,6 @@ class TAccessorsCollection {
5353
return Accessors.size();
5454
}
5555

56-
void ResetFilter() {
57-
Filter = std::make_shared<TColumnFilter>(TColumnFilter::BuildAllowFilter());
58-
}
59-
6056
std::optional<ui32> GetRecordsCountActualOptional() const {
6157
return RecordsCountActual;
6258
}

0 commit comments

Comments
 (0)