summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorziganshinmr <[email protected]>2026-07-06 21:24:19 +0300
committerziganshinmr <[email protected]>2026-07-06 21:46:21 +0300
commitfbf0dbdf96bfb4b2ba415e1a231ea6037020d90b (patch)
tree6e5007d4037619e97536003c9d7a7682f96959de
parentc0103a765a3d969af6adebc562976fefe3e2cd41 (diff)
Revert commit rXXXXXX, Use credentials for downloads across UDF index & UDF meta task
#### Revert URL preprocessing and credentials handling in UDF resolution ✎ - Removed URL preprocessing dependency and related token resolution logic from UDF index integration - Simplified UDF resolver interface by eliminating optional URL preprocessing and token resolver parameters - Removed credential parsing and handling from UDF meta tasks, removing the dependency on credential management components - Streamlined file storage operations for UDF downloads by removing URL preprocessing and token handling steps - Updated task creation logic to remove URL preprocessing configuration and credential processing in meta task execution <a href="https://nda.ya.ru/t/qa0kX64r7DqvtN"><font size="2">Autodescription by Yandex Code Assistant</font></a> commit_hash:e490d4d4cbb7a4cba7b1fd8dea609ca2d314af0e
-rw-r--r--yql/essentials/core/facade/yql_facade.cpp14
-rw-r--r--yql/essentials/core/facade/yql_facade.h1
-rw-r--r--yql/essentials/providers/common/udf_resolve/ya.make1
-rw-r--r--yql/essentials/providers/common/udf_resolve/yql_udf_resolver_with_index.cpp43
-rw-r--r--yql/essentials/providers/common/udf_resolve/yql_udf_resolver_with_index.h9
5 files changed, 11 insertions, 57 deletions
diff --git a/yql/essentials/core/facade/yql_facade.cpp b/yql/essentials/core/facade/yql_facade.cpp
index 811467a7b54..08e776a5f50 100644
--- a/yql/essentials/core/facade/yql_facade.cpp
+++ b/yql/essentials/core/facade/yql_facade.cpp
@@ -303,6 +303,10 @@ TProgramPtr TProgramFactory::Create(
udfResolver = NCommon::CreateUdfResolverDecoratorWithLogger(FunctionRegistry_, udfResolver, *UdfResolverLogfile_, sessionId);
}
+ if (udfIndex) {
+ udfResolver = NCommon::CreateUdfResolverWithIndex(udfIndex, udfResolver, FileStorage_);
+ }
+
// make UserDataTable_ copy here
return new TProgram(IssueReportTarget_, FunctionRegistry_, randomProvider, timeProvider, NextUniqueId_, DataProvidersInit_,
LangVer_, MaxLangVer_, VolatileResults_, UserDataTable_, Credentials_, moduleResolver, urlListerManager,
@@ -360,7 +364,6 @@ TProgram::TProgram(
, UdfIndex_(udfIndex)
, UdfIndexPackageSet_(std::move(udfIndexPackageSet))
, FileStorage_(fileStorage)
- , UrlPreprocessing_(urlPreprocessing)
, SavedUserDataTable_(std::move(userDataTable))
, GatewaysConfig_(gatewaysConfig)
, Filename_(std::move(filename))
@@ -2194,15 +2197,6 @@ TTypeAnnotationContextPtr TProgram::BuildTypeAnnotationContext(const TString& us
typeAnnotationContext->UserDataStorage->SetTokenResolver(tokenResolver);
- if (UdfIndex_) {
- typeAnnotationContext->UdfResolver = NCommon::CreateUdfResolverWithIndex(
- UdfIndex_,
- typeAnnotationContext->UdfResolver,
- FileStorage_,
- UrlPreprocessing_,
- tokenResolver);
- }
-
if (auto* urlListerManager = typeAnnotationContext->UrlListerManager.Get()) {
urlListerManager->SetTokenResolver(std::move(tokenResolver));
}
diff --git a/yql/essentials/core/facade/yql_facade.h b/yql/essentials/core/facade/yql_facade.h
index f4c0a4e1049..4f8498d0110 100644
--- a/yql/essentials/core/facade/yql_facade.h
+++ b/yql/essentials/core/facade/yql_facade.h
@@ -465,7 +465,6 @@ private:
const TUdfIndex::TPtr UdfIndex_;
const TUdfIndexPackageSet::TPtr UdfIndexPackageSet_;
const TFileStoragePtr FileStorage_;
- const IUrlPreprocessing::TPtr UrlPreprocessing_;
TUserDataTable SavedUserDataTable_;
TUserDataStorage::TPtr UserDataStorage_;
const TGatewaysConfig* GatewaysConfig_;
diff --git a/yql/essentials/providers/common/udf_resolve/ya.make b/yql/essentials/providers/common/udf_resolve/ya.make
index 4c27dce36e0..3923e4e40d9 100644
--- a/yql/essentials/providers/common/udf_resolve/ya.make
+++ b/yql/essentials/providers/common/udf_resolve/ya.make
@@ -21,7 +21,6 @@ PEERDIR(
yql/essentials/utils
yql/essentials/utils/log
yql/essentials/core
- yql/essentials/core/url_preprocessing/interface
yql/essentials/providers/common/mkql
yql/essentials/providers/common/proto
yql/essentials/minikql/runtime_settings
diff --git a/yql/essentials/providers/common/udf_resolve/yql_udf_resolver_with_index.cpp b/yql/essentials/providers/common/udf_resolve/yql_udf_resolver_with_index.cpp
index 47bf3de4e30..ccf5f8c19e3 100644
--- a/yql/essentials/providers/common/udf_resolve/yql_udf_resolver_with_index.cpp
+++ b/yql/essentials/providers/common/udf_resolve/yql_udf_resolver_with_index.cpp
@@ -57,13 +57,10 @@ class TUdfResolverWithIndex: public IUdfResolver {
};
public:
- TUdfResolverWithIndex(TUdfIndex::TPtr udfIndex, IUdfResolver::TPtr fallback, TFileStoragePtr fileStorage,
- IUrlPreprocessing::TPtr urlPreprocessing, TTokenResolver tokenResolver)
+ TUdfResolverWithIndex(TUdfIndex::TPtr udfIndex, IUdfResolver::TPtr fallback, TFileStoragePtr fileStorage)
: UdfIndex_(std::move(udfIndex))
, Fallback_(std::move(fallback))
, FileStorage_(std::move(fileStorage))
- , UrlPreprocessing_(std::move(urlPreprocessing))
- , TokenResolver_(std::move(tokenResolver))
{
Y_ENSURE(UdfIndex_);
Y_ENSURE(FileStorage_);
@@ -246,25 +243,10 @@ private:
return it->second;
}
+ // token is empty for urls for now
+ // assumption: file path is frozen already, no need to put into file storage
const TDownloadLink& downloadLink = resource->Link;
- TFileLinkPtr link;
- if (downloadLink.IsUrl) {
- TString url = downloadLink.Path;
- TString alias;
- if (UrlPreprocessing_) {
- std::tie(url, alias) = UrlPreprocessing_->Preprocess(url);
- }
-
- TString token;
- if (TokenResolver_) {
- token = TokenResolver_(url, alias);
- }
-
- link = FileStorage_->PutUrl(url, token);
- } else {
- // assumption: file path is frozen already, no need to put into file storage
- link = CreateFakeFileLink(downloadLink.Path, downloadLink.Md5);
- }
+ TFileLinkPtr link = downloadLink.IsUrl ? FileStorage_->PutUrl(downloadLink.Path, {}) : CreateFakeFileLink(downloadLink.Path, downloadLink.Md5);
TResourceFile::TPtr file = TResourceFile::Create(canonizedModuleName, resource->Modules, link);
for (auto& d : resource->Modules) {
auto p = DownloadedFiles_.emplace(d, file);
@@ -282,25 +264,12 @@ private:
const TUdfIndex::TPtr UdfIndex_;
const IUdfResolver::TPtr Fallback_;
const TFileStoragePtr FileStorage_;
- const IUrlPreprocessing::TPtr UrlPreprocessing_;
- const TTokenResolver TokenResolver_;
// module -> downloaded resource file
mutable TMap<TString, TResourceFile::TPtr> DownloadedFiles_;
};
-IUdfResolver::TPtr CreateUdfResolverWithIndex(
- TUdfIndex::TPtr udfIndex,
- IUdfResolver::TPtr fallback,
- TFileStoragePtr fileStorage,
- IUrlPreprocessing::TPtr urlPreprocessing,
- TTokenResolver tokenResolver)
-{
- return new TUdfResolverWithIndex(
- std::move(udfIndex),
- std::move(fallback),
- std::move(fileStorage),
- std::move(urlPreprocessing),
- std::move(tokenResolver));
+IUdfResolver::TPtr CreateUdfResolverWithIndex(TUdfIndex::TPtr udfIndex, IUdfResolver::TPtr fallback, TFileStoragePtr fileStorage) {
+ return new TUdfResolverWithIndex(udfIndex, fallback, fileStorage);
}
} // namespace NYql::NCommon
diff --git a/yql/essentials/providers/common/udf_resolve/yql_udf_resolver_with_index.h b/yql/essentials/providers/common/udf_resolve/yql_udf_resolver_with_index.h
index c7a88963e3f..64f48156b08 100644
--- a/yql/essentials/providers/common/udf_resolve/yql_udf_resolver_with_index.h
+++ b/yql/essentials/providers/common/udf_resolve/yql_udf_resolver_with_index.h
@@ -2,16 +2,9 @@
#include <yql/essentials/core/yql_udf_index.h>
#include <yql/essentials/core/file_storage/file_storage.h>
-#include <yql/essentials/core/yql_user_data.h>
-#include <yql/essentials/core/url_preprocessing/interface/url_preprocessing.h>
namespace NYql::NCommon {
-IUdfResolver::TPtr CreateUdfResolverWithIndex(
- TUdfIndex::TPtr udfIndex,
- IUdfResolver::TPtr fallback,
- TFileStoragePtr fileStorage,
- IUrlPreprocessing::TPtr urlPreprocessing = {},
- TTokenResolver tokenResolver = {});
+IUdfResolver::TPtr CreateUdfResolverWithIndex(TUdfIndex::TPtr udfIndex, IUdfResolver::TPtr fallback, TFileStoragePtr fileStorage);
} // namespace NYql::NCommon