Skip to content

Commit 8277803

Browse files
Merge dab9bf0 into 4b88656
2 parents 4b88656 + dab9bf0 commit 8277803

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

ydb/core/protos/config.proto

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1736,6 +1736,7 @@ message TColumnShardConfig {
17361736
optional string ReaderClassName = 28;
17371737
optional bool AllowNullableColumnsInPK = 29 [default = false];
17381738
optional uint32 RestoreDataOnWriteTimeoutSeconds = 30;
1739+
optional bool UseSlicesFilter = 31 [default = true];
17391740
}
17401741

17411742
message TSchemeShardConfig {

ydb/core/tx/columnshard/engines/reader/common_reader/iterator/fetched_data.h

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
#include <contrib/libs/apache/arrow/cpp/src/arrow/array/array_base.h>
1515
#include <contrib/libs/apache/arrow/cpp/src/arrow/table.h>
16+
#include <ydb/core/base/appdata.h>
1617

1718
namespace NKikimr::NOlap::NReader::NCommon {
1819

@@ -146,7 +147,8 @@ class TFetchedData {
146147

147148
void AddFilter(const NArrow::TColumnFilter& filter) {
148149
if (UseFilter && Table) {
149-
AFL_VERIFY(filter.Apply(Table, NArrow::TColumnFilter::TApplyContext().SetTrySlices(true)));
150+
AFL_VERIFY(filter.Apply(Table,
151+
NArrow::TColumnFilter::TApplyContext().SetTrySlices(!HasAppData() || AppDataVerified().ColumnShardConfig.GetUseSlicesFilter())));
150152
}
151153
if (!Filter) {
152154
Filter = std::make_shared<NArrow::TColumnFilter>(filter);
@@ -176,7 +178,8 @@ class TFetchedData {
176178
DataAdded = true;
177179
auto tableLocal = table;
178180
if (Filter && UseFilter) {
179-
AFL_VERIFY(Filter->Apply(tableLocal, NArrow::TColumnFilter::TApplyContext().SetTrySlices(true)));
181+
AFL_VERIFY(Filter->Apply(tableLocal,
182+
NArrow::TColumnFilter::TApplyContext().SetTrySlices(!HasAppData() || AppDataVerified().ColumnShardConfig.GetUseSlicesFilter())));
180183
}
181184
if (!Table) {
182185
Table = std::make_shared<NArrow::TGeneralContainer>(tableLocal);

0 commit comments

Comments
 (0)