Skip to content

[yql] Fix query cache for UDFs (YQL-17478) #778

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
rvu1024 merged 1 commit into from
Dec 28, 2023
Merged

[yql] Fix query cache for UDFs (YQL-17478) #778

Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions ydb/library/yql/providers/yt/lib/hash/ya.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ PEERDIR(
ydb/library/yql/utils
ydb/library/yql/utils/log
ydb/library/yql/core
ydb/library/yql/core/expr_nodes
)

END()
7 changes: 5 additions & 2 deletions ydb/library/yql/providers/yt/lib/hash/yql_op_hash.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,14 @@
#include "yql_hash_builder.h"

#include <ydb/library/yql/core/yql_type_annotation.h>
#include <ydb/library/yql/core/expr_nodes/yql_expr_nodes.h>
#include <ydb/library/yql/utils/log/log.h>
#include <ydb/library/yql/utils/yql_panic.h>

namespace NYql {

using namespace NNodes;

void TNodeHashCalculator::UpdateFileHash(THashBuilder& builder, TStringBuf alias) const {
auto block = Types.UserDataStorage->FindUserDataBlock(alias);
YQL_ENSURE(block, "File " << alias << " not found");
Expand Down Expand Up @@ -78,9 +81,9 @@ TString TNodeHashCalculator::GetHashImpl(const TExprNode& node, TArgIndex& argIn
isHashable = false;
}
else {
if (node.Content() == "Udf" && node.ChildrenSize() == 7 && !node.Child(6)->Content().empty()) {
if (TCoUdf::Match(&node) && node.ChildrenSize() > TCoUdf::idx_FileAlias && !node.Child(TCoUdf::idx_FileAlias)->Content().empty()) {
// an udf from imported file, use hash of file
auto alias = node.Child(6)->Content();
auto alias = node.Child(TCoUdf::idx_FileAlias)->Content();
UpdateFileHash(builder, alias);
} else if (node.Content() == "FilePath" || node.Content() == "FileContent") {
auto alias = node.Child(0)->Content();
Expand Down