Skip to content

YQL-16218 fix SqlIn for tuples #801

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
zverevgeny merged 2 commits into from
Dec 29, 2023
Merged

YQL-16218 fix SqlIn for tuples #801

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ef252be
YQL-16218 fix SqlIn for tuples
zverevgeny Dec 29, 2023
674f875
fix typos
zverevgeny Dec 29, 2023
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
29 changes: 24 additions & 5 deletions ydb/library/yql/core/peephole_opt/yql_opt_peephole_physical.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1813,15 +1813,34 @@ TExprNode::TPtr BuildDictOverList(TPositionHandle pos, const TExprNode::TPtr& co

TExprNode::TPtr BuildDictOverTuple(TExprNode::TPtr&& collection, const TTypeAnnotationNode*& dictKeyType, TExprContext& ctx)
{
if (!collection->GetTypeAnn()->Cast<TTupleExprType>()->GetSize()) {
const auto pos = collection->Pos();
const auto tupleType = collection->GetTypeAnn()->Cast<TTupleExprType>();
if (!tupleType->GetSize()) {
dictKeyType = nullptr;
return nullptr;
}
TTypeAnnotationNode::TListType types(tupleType->GetItems());
dictKeyType = CommonType(pos, types, ctx);
YQL_ENSURE(dictKeyType, "Uncompatible collection elements.");

dictKeyType = CommonTypeForChildren(*collection, ctx);
YQL_ENSURE(dictKeyType, "Uncompatible colllection elements.");
const auto pos = collection->Pos();
return ctx.NewCallable(pos, "DictFromKeys", {ExpandType(pos, *dictKeyType, ctx), std::move(collection)});
TExprNode::TPtr tuple;
if (collection->IsList()) {
tuple = collection;
} else {
TExprNode::TListType items;
items.reserve(tupleType->GetSize());
for (size_t i = 0; i != tupleType->GetSize(); ++i) {
items.push_back(
ctx.NewCallable(
pos,
"Nth",
{collection, ctx.NewAtom(pos, ui32(i))}
)
);
}
tuple = ctx.NewList(pos, std::move(items));
}
return ctx.NewCallable(pos, "DictFromKeys", {ExpandType(pos, *dictKeyType, ctx), std::move(tuple)});
}

TExprNode::TPtr ExpandSqlIn(const TExprNode::TPtr& input, TExprContext& ctx) {
Expand Down