aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraozeritsky <aozeritsky@ydb.tech>2023-09-08 14:47:31 +0300
committeraozeritsky <aozeritsky@ydb.tech>2023-09-08 15:19:00 +0300
commitdb354bce42a55f4f79b4894c7da6bc38f838a9f1 (patch)
tree6cc666e5d42acfc55b2aa1891c05232057d1cd48
parent1ddfdf5e0386126afd13afb315bd51b7272ec6fa (diff)
downloadydb-db354bce42a55f4f79b4894c7da6bc38f838a9f1.tar.gz
Skip revision check on client side (for tests)
-rw-r--r--ydb/library/yql/providers/dq/common/yql_dq_settings.cpp1
-rw-r--r--ydb/library/yql/providers/dq/common/yql_dq_settings.h1
-rw-r--r--ydb/library/yql/providers/dq/provider/exec/yql_dq_exectransformer.cpp36
3 files changed, 21 insertions, 17 deletions
diff --git a/ydb/library/yql/providers/dq/common/yql_dq_settings.cpp b/ydb/library/yql/providers/dq/common/yql_dq_settings.cpp
index 6ed7416582a..7cc6e857308 100644
--- a/ydb/library/yql/providers/dq/common/yql_dq_settings.cpp
+++ b/ydb/library/yql/providers/dq/common/yql_dq_settings.cpp
@@ -74,6 +74,7 @@ TDqConfiguration::TDqConfiguration() {
REGISTER_SETTING(*this, EnableChannelStats);
REGISTER_SETTING(*this, ExportStats);
REGISTER_SETTING(*this, TaskRunnerStats).Parser([](const TString& v) { return FromString<ETaskRunnerStats>(v); });
+ REGISTER_SETTING(*this, _SkipRevisionCheck);
}
} // namespace NYql
diff --git a/ydb/library/yql/providers/dq/common/yql_dq_settings.h b/ydb/library/yql/providers/dq/common/yql_dq_settings.h
index 3cfa5f14ff9..613c105901f 100644
--- a/ydb/library/yql/providers/dq/common/yql_dq_settings.h
+++ b/ydb/library/yql/providers/dq/common/yql_dq_settings.h
@@ -113,6 +113,7 @@ struct TDqSettings {
NCommon::TConfSetting<bool, false> EnableChannelStats;
NCommon::TConfSetting<bool, false> ExportStats;
NCommon::TConfSetting<ETaskRunnerStats, false> TaskRunnerStats;
+ NCommon::TConfSetting<bool, false> _SkipRevisionCheck;
// This options will be passed to executor_actor and worker_actor
template <typename TProtoConfig>
diff --git a/ydb/library/yql/providers/dq/provider/exec/yql_dq_exectransformer.cpp b/ydb/library/yql/providers/dq/provider/exec/yql_dq_exectransformer.cpp
index 47286810cc6..19663be4163 100644
--- a/ydb/library/yql/providers/dq/provider/exec/yql_dq_exectransformer.cpp
+++ b/ydb/library/yql/providers/dq/provider/exec/yql_dq_exectransformer.cpp
@@ -364,23 +364,25 @@ private:
TTypeEnvironment& typeEnv,
TUserDataTable& files) const
{
- if (State->VanillaJobPath.empty()) {
- auto f = IDqGateway::TFileResource();
- f.SetName("dq_vanilla_job.lite");
- f.SetObjectId(GetProgramCommitId());
- f.SetObjectType(IDqGateway::TFileResource::EEXE_FILE);
- uploadList->emplace(f);
- } else {
- auto f = IDqGateway::TFileResource();
- f.SetName("dq_vanilla_job.lite");
- TString path = State->VanillaJobPath;
- TString objectId = GetProgramCommitId();
- std::tie(path, objectId) = GetPathAndObjectId(path, objectId, State->VanillaJobMd5);
- f.SetObjectId(objectId);
- f.SetLocalPath(path);
- f.SetObjectType(IDqGateway::TFileResource::EEXE_FILE);
- f.SetSize(TFile(path, OpenExisting | RdOnly).GetLength());
- uploadList->emplace(f);
+ if (!State->Settings->_SkipRevisionCheck.Get().GetOrElse(false)) {
+ if (State->VanillaJobPath.empty()) {
+ auto f = IDqGateway::TFileResource();
+ f.SetName("dq_vanilla_job.lite");
+ f.SetObjectId(GetProgramCommitId());
+ f.SetObjectType(IDqGateway::TFileResource::EEXE_FILE);
+ uploadList->emplace(f);
+ } else {
+ auto f = IDqGateway::TFileResource();
+ f.SetName("dq_vanilla_job.lite");
+ TString path = State->VanillaJobPath;
+ TString objectId = GetProgramCommitId();
+ std::tie(path, objectId) = GetPathAndObjectId(path, objectId, State->VanillaJobMd5);
+ f.SetObjectId(objectId);
+ f.SetLocalPath(path);
+ f.SetObjectType(IDqGateway::TFileResource::EEXE_FILE);
+ f.SetSize(TFile(path, OpenExisting | RdOnly).GetLength());
+ uploadList->emplace(f);
+ }
}
bool fallbackFlag = false;
for (TNode* node : explorer.GetNodes()) {