Skip to content

YQL-18029: Make BinaryCacheFolder pragma cluster-specific #11707

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
Nov 18, 2024
Merged

YQL-18029: Make BinaryCacheFolder pragma cluster-specific #11707

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
2 changes: 1 addition & 1 deletion ydb/library/yql/providers/yt/common/yql_yt_settings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,7 @@ TYtConfiguration::TYtConfiguration(TTypeAnnotationContext& typeCtx)
REGISTER_SETTING(*this, LLVMNodeCountLimit);
REGISTER_SETTING(*this, SamplingIoBlockSize);
REGISTER_SETTING(*this, BinaryTmpFolder);
REGISTER_SETTING(*this, BinaryCacheFolder);
REGISTER_SETTING(*this, _BinaryCacheFolder);
REGISTER_SETTING(*this, BinaryExpirationInterval);
REGISTER_SETTING(*this, FolderInlineDataLimit);
REGISTER_SETTING(*this, FolderInlineItemsLimit);
Expand Down
2 changes: 1 addition & 1 deletion ydb/library/yql/providers/yt/common/yql_yt_settings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,6 @@ struct TYtSettings {
NCommon::TConfSetting<TString, false> DefaultCluster;
NCommon::TConfSetting<TString, false> StaticPool;
NCommon::TConfSetting<TString, false> BinaryTmpFolder;
NCommon::TConfSetting<TString, false> BinaryCacheFolder;
NCommon::TConfSetting<TDuration, false> BinaryExpirationInterval;
NCommon::TConfSetting<bool, false> IgnoreTypeV3;
NCommon::TConfSetting<bool, false> _UseMultisetAttributes;
Expand Down Expand Up @@ -207,6 +206,7 @@ struct TYtSettings {
NCommon::TConfSetting<TSet<NUdf::EDataSlot>, true> BlockReaderSupportedDataTypes;
NCommon::TConfSetting<TSet<TString>, true> JobBlockInputSupportedTypes;
NCommon::TConfSetting<TSet<NUdf::EDataSlot>, true> JobBlockInputSupportedDataTypes;
NCommon::TConfSetting<TString, true> _BinaryCacheFolder;

// Optimizers
NCommon::TConfSetting<bool, true> _EnableDq;
Expand Down
2 changes: 1 addition & 1 deletion ydb/library/yql/providers/yt/gateway/native/yql_yt_spec.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -572,7 +572,7 @@ void FillUserJobSpecImpl(NYT::TUserJobSpec& spec,
}

const TString binTmpFolder = settings->BinaryTmpFolder.Get().GetOrElse(TString());
const TString binCacheFolder = settings->BinaryCacheFolder.Get().GetOrElse(TString());
const TString binCacheFolder = settings->_BinaryCacheFolder.Get(cluster).GetOrElse(TString());
if (!localRun && (binTmpFolder || binCacheFolder)) {
TString bin = mrJobBin.empty() ? GetPersistentExecPath() : mrJobBin;
const auto binSize = TFileStat(bin).Size;
Expand Down
2 changes: 1 addition & 1 deletion ydb/library/yql/providers/yt/gateway/native/yql_yt_transform.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,7 @@ void TGatewayTransformer::ApplyUserJobSpec(NYT::TUserJobSpec& spec, bool localRu
spec.AddLocalFile(file.first, opts);
}
const TString binTmpFolder = Settings_->BinaryTmpFolder.Get().GetOrElse(TString());
const TString binCacheFolder = Settings_->BinaryCacheFolder.Get().GetOrElse(TString());
const TString binCacheFolder = Settings_->_BinaryCacheFolder.Get(ExecCtx_.Cluster_).GetOrElse(TString());
if (!localRun && binCacheFolder) {
auto udfFiles = std::move(*DeferredUdfFiles_);
TTransactionCache::TEntry::TPtr entry = GetEntry();
Expand Down
Loading