Skip to content

YQL-16896: Fixed BuildProjectionLambda when emitPgStar is true #849

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 2 commits into from
Jan 5, 2024
Merged

YQL-16896: Fixed BuildProjectionLambda when emitPgStar is true #849

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d85c887
Fixed BuildProjectionLambda when emitPgStar is true
marsaly79 Jan 4, 2024
cba35bc
WS
marsaly79 Jan 4, 2024
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
12 changes: 7 additions & 5 deletions ydb/library/yql/core/common_opt/yql_co_pgselect.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1688,11 +1688,10 @@ TExprNode::TPtr BuildProjectionLambda(TPositionHandle pos, const TExprNode::TPtr
bool subLink, bool emitPgStar, TExprContext& ctx) {

YQL_ENSURE(nodeColumnOrder.size() == setItemColumnOrder.size());

TMap<TStringBuf, TStringBuf> columnNamesMap;
if (!emitPgStar) {
for (size_t i = 0; i < nodeColumnOrder.size(); ++i) {
columnNamesMap[setItemColumnOrder[i]] = nodeColumnOrder[i];
}
for (size_t i = 0; i < nodeColumnOrder.size(); ++i) {
columnNamesMap[setItemColumnOrder[i]] = nodeColumnOrder[i];
}

return ctx.Builder(pos)
Expand Down Expand Up @@ -1743,7 +1742,9 @@ TExprNode::TPtr BuildProjectionLambda(TPositionHandle pos, const TExprNode::TPtr
if (!emitPgStar) {
const auto& columnName = x->Child(0)->Content();
auto listBuilder = parent.List(index++);
addAtomToListWithCast(listBuilder, x.Get(), finalType->FindItemType(columnNamesMap[columnName]));
const auto expectedType = finalType->FindItemType(columnNamesMap[columnName]);
Y_ENSURE(expectedType);
addAtomToListWithCast(listBuilder, x.Get(), expectedType);
}
} else {
auto type = x->Child(1)->GetTypeAnn()->Cast<TTypeExprType>()->GetType()->Cast<TStructExprType>();
Expand All @@ -1762,6 +1763,7 @@ TExprNode::TPtr BuildProjectionLambda(TPositionHandle pos, const TExprNode::TPtr
listBuilder.Atom(0, columnName);

const auto expectedType = finalType->FindItemType(columnNamesMap[columnName]);
Y_ENSURE(expectedType);
if (item->GetItemType() == expectedType) {
listBuilder.Callable(1, "Member")
.Arg(0, "row")
Expand Down