Skip to content

Commit 8ae1425

Browse files
Merge ea42199 into 15f3d76
2 parents 15f3d76 + ea42199 commit 8ae1425

File tree

2 files changed

+12
-21
lines changed

2 files changed

+12
-21
lines changed

ydb/core/formats/arrow/arrow_filter.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -569,7 +569,7 @@ TColumnFilter TColumnFilter::CombineSequentialAnd(const TColumnFilter& extFilter
569569
++itExt;
570570
}
571571
}
572-
Y_ABORT_UNLESS(itSelf == Filter.end() && itExt == extFilter.Filter.cend());
572+
AFL_VERIFY(itSelf == Filter.end() && itExt == extFilter.Filter.cend());
573573
TColumnFilter result = TColumnFilter::BuildAllowFilter();
574574
std::swap(resultFilter, result.Filter);
575575
std::swap(curCurrent, result.LastValue);

ydb/core/formats/arrow/permutations.cpp

+11-20
Original file line numberDiff line numberDiff line change
@@ -15,34 +15,24 @@
1515
namespace NKikimr::NArrow {
1616

1717
std::shared_ptr<arrow::UInt64Array> MakePermutation(const int size, const bool reverse) {
18-
if (size < 1) {
19-
return {};
20-
}
21-
2218
arrow::UInt64Builder builder;
23-
if (!builder.Reserve(size).ok()) {
24-
return {};
25-
}
19+
TStatusValidator::Validate(builder.Reserve(size));
2620

27-
if (reverse) {
28-
ui64 value = size - 1;
29-
for (i64 i = 0; i < size; ++i, --value) {
30-
if (!builder.Append(value).ok()) {
31-
return {};
21+
if (size) {
22+
if (reverse) {
23+
ui64 value = size - 1;
24+
for (i64 i = 0; i < size; ++i, --value) {
25+
TStatusValidator::Validate(builder.Append(value));
3226
}
33-
}
34-
} else {
35-
for (i64 i = 0; i < size; ++i) {
36-
if (!builder.Append(i).ok()) {
37-
return {};
27+
} else {
28+
for (i64 i = 0; i < size; ++i) {
29+
TStatusValidator::Validate(builder.Append(i));
3830
}
3931
}
4032
}
4133

4234
std::shared_ptr<arrow::UInt64Array> out;
43-
if (!builder.Finish(&out).ok()) {
44-
return {};
45-
}
35+
TStatusValidator::Validate(builder.Finish(&out));
4636
return out;
4737
}
4838

@@ -287,6 +277,7 @@ std::shared_ptr<arrow::UInt64Array> TShardingSplitIndex::BuildPermutation() cons
287277
}
288278

289279
std::shared_ptr<arrow::RecordBatch> ReverseRecords(const std::shared_ptr<arrow::RecordBatch>& batch) {
280+
AFL_VERIFY(batch);
290281
auto permutation = NArrow::MakePermutation(batch->num_rows(), true);
291282
return NArrow::TStatusValidator::GetValid(arrow::compute::Take(batch, permutation)).record_batch();
292283
}

0 commit comments

Comments
 (0)