Skip to content

Commit 965aa2d

Browse files
authored
YQL-18029: Make BinaryCacheFolder pragma cluster-specific (#11707)
1 parent 53b8d42 commit 965aa2d

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

ydb/library/yql/providers/yt/common/yql_yt_settings.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ TYtConfiguration::TYtConfiguration(TTypeAnnotationContext& typeCtx)
391391
REGISTER_SETTING(*this, LLVMNodeCountLimit);
392392
REGISTER_SETTING(*this, SamplingIoBlockSize);
393393
REGISTER_SETTING(*this, BinaryTmpFolder);
394-
REGISTER_SETTING(*this, BinaryCacheFolder);
394+
REGISTER_SETTING(*this, _BinaryCacheFolder);
395395
REGISTER_SETTING(*this, BinaryExpirationInterval);
396396
REGISTER_SETTING(*this, FolderInlineDataLimit);
397397
REGISTER_SETTING(*this, FolderInlineItemsLimit);

ydb/library/yql/providers/yt/common/yql_yt_settings.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,6 @@ struct TYtSettings {
101101
NCommon::TConfSetting<TString, false> DefaultCluster;
102102
NCommon::TConfSetting<TString, false> StaticPool;
103103
NCommon::TConfSetting<TString, false> BinaryTmpFolder;
104-
NCommon::TConfSetting<TString, false> BinaryCacheFolder;
105104
NCommon::TConfSetting<TDuration, false> BinaryExpirationInterval;
106105
NCommon::TConfSetting<bool, false> IgnoreTypeV3;
107106
NCommon::TConfSetting<bool, false> _UseMultisetAttributes;
@@ -207,6 +206,7 @@ struct TYtSettings {
207206
NCommon::TConfSetting<TSet<NUdf::EDataSlot>, true> BlockReaderSupportedDataTypes;
208207
NCommon::TConfSetting<TSet<TString>, true> JobBlockInputSupportedTypes;
209208
NCommon::TConfSetting<TSet<NUdf::EDataSlot>, true> JobBlockInputSupportedDataTypes;
209+
NCommon::TConfSetting<TString, true> _BinaryCacheFolder;
210210

211211
// Optimizers
212212
NCommon::TConfSetting<bool, true> _EnableDq;

ydb/library/yql/providers/yt/gateway/native/yql_yt_spec.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -572,7 +572,7 @@ void FillUserJobSpecImpl(NYT::TUserJobSpec& spec,
572572
}
573573

574574
const TString binTmpFolder = settings->BinaryTmpFolder.Get().GetOrElse(TString());
575-
const TString binCacheFolder = settings->BinaryCacheFolder.Get().GetOrElse(TString());
575+
const TString binCacheFolder = settings->_BinaryCacheFolder.Get(cluster).GetOrElse(TString());
576576
if (!localRun && (binTmpFolder || binCacheFolder)) {
577577
TString bin = mrJobBin.empty() ? GetPersistentExecPath() : mrJobBin;
578578
const auto binSize = TFileStat(bin).Size;

ydb/library/yql/providers/yt/gateway/native/yql_yt_transform.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -444,7 +444,7 @@ void TGatewayTransformer::ApplyUserJobSpec(NYT::TUserJobSpec& spec, bool localRu
444444
spec.AddLocalFile(file.first, opts);
445445
}
446446
const TString binTmpFolder = Settings_->BinaryTmpFolder.Get().GetOrElse(TString());
447-
const TString binCacheFolder = Settings_->BinaryCacheFolder.Get().GetOrElse(TString());
447+
const TString binCacheFolder = Settings_->_BinaryCacheFolder.Get(ExecCtx_.Cluster_).GetOrElse(TString());
448448
if (!localRun && binCacheFolder) {
449449
auto udfFiles = std::move(*DeferredUdfFiles_);
450450
TTransactionCache::TEntry::TPtr entry = GetEntry();

0 commit comments

Comments
 (0)