Skip to content

Verify input Arrow Datum in WideFromBlocks #4096

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 3, 2024
Merged

Verify input Arrow Datum in WideFromBlocks #4096

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions ydb/library/yql/minikql/comp_nodes/mkql_blocks.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -698,17 +698,20 @@ using TBaseComputation = TStatefulWideFlowCodegeneratorNode<TWideFromBlocksWrapp
TUnboxedValueVector Values_;
std::vector<std::unique_ptr<IBlockReader>> Readers_;
std::vector<std::unique_ptr<IBlockItemConverter>> Converters_;
const std::vector<arrow::ValueDescr> ValuesDescr_;

TState(TMemoryUsageInfo* memInfo, TComputationContext& ctx, const TVector<TType*>& types)
: TComputationValue(memInfo)
, Values_(types.size() + 1)
, ValuesDescr_(ToValueDescr(types))
{
Pointer_ = Values_.data();

const auto& pgBuilder = ctx.Builder->GetPgBuilder();
for (size_t i = 0; i < types.size(); ++i) {
Readers_.push_back(MakeBlockReader(TTypeInfoHelper(), types[i]));
Converters_.push_back(MakeBlockItemConverter(TTypeInfoHelper(), types[i], pgBuilder));
const TType* blockItemType = AS_TYPE(TBlockType, types[i])->GetItemType();
Readers_.push_back(MakeBlockReader(TTypeInfoHelper(), blockItemType));
Converters_.push_back(MakeBlockItemConverter(TTypeInfoHelper(), blockItemType, pgBuilder));
}
}

Expand All @@ -718,7 +721,9 @@ using TBaseComputation = TStatefulWideFlowCodegeneratorNode<TWideFromBlocksWrapp

NUdf::TUnboxedValuePod Get(const THolderFactory& holderFactory, size_t idx) const {
TBlockItem item;
if (const auto& datum = TArrowBlock::From(Values_[idx]).GetDatum(); datum.is_scalar()) {
const auto& datum = TArrowBlock::From(Values_[idx]).GetDatum();
Y_DEBUG_ABORT_UNLESS(ValuesDescr_[idx] == datum.descr());
if (datum.is_scalar()) {
item = Readers_[idx]->GetScalarItem(*datum.scalar());
} else {
MKQL_ENSURE(datum.is_array(), "Expecting array");
Expand Down Expand Up @@ -1230,8 +1235,7 @@ IComputationNode* WrapWideFromBlocks(TCallable& callable, const TComputationNode
MKQL_ENSURE(wideComponents.size() > 0, "Expected at least one column");
TVector<TType*> items;
for (ui32 i = 0; i < wideComponents.size() - 1; ++i) {
const auto blockType = AS_TYPE(TBlockType, wideComponents[i]);
items.push_back(blockType->GetItemType());
items.push_back(AS_TYPE(TBlockType, wideComponents[i]));
}

const auto wideFlow = dynamic_cast<IComputationWideFlowNode*>(LocateNode(ctx.NodeLocator, callable, 0));
Expand Down
Loading