better

vitstn · Dec 4, 2024 · c077826 · c077826
1 parent ef06d28
commit c077826
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 11 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
@@ -30,16 +30,8 @@ TDqConfiguration::TDqConfiguration() {
     REGISTER_SETTING(*this, EnableInsert);
 
     REGISTER_SETTING(*this, _LiteralTimeout);
-    REGISTER_SETTING(*this, _TableTimeout)
-        .ValueSetter([this](const TString&, ui64 value) {
-            _TableTimeout = value;
-            QueryTimeout = Min(QueryTimeout.Get().GetOrElse(TDefault::TableTimeout), value);
-        });
-
-    REGISTER_SETTING(*this, QueryTimeout)
-        .ValueSetter([this](const TString&, ui64 value) {
-            QueryTimeout = Min(value, _TableTimeout.Get().GetOrElse(TDefault::TableTimeout));
-        });
+    REGISTER_SETTING(*this, _TableTimeout);
+    REGISTER_SETTING(*this, QueryTimeout);
 
     REGISTER_SETTING(*this, _LongWorkersAllocationWarnTimeout);
     REGISTER_SETTING(*this, _LongWorkersAllocationFailTimeout);

diff --git a/ydb/library/yql/providers/dq/common/yql_dq_settings.h b/ydb/library/yql/providers/dq/common/yql_dq_settings.h
@@ -226,7 +226,12 @@ struct TDqSettings {
     }
 
     ui64 GetQueryTimeout() const {
-        return QueryTimeout.Get().GetOrElse(_TableTimeout.Get().GetOrElse(TDefault::TableTimeout));
+        auto upper = _TableTimeout.Get().GetOrElse(TDefault::TableTimeout);
+        if (QueryTimeout.Get().Defined()) {
+            return Min(*QueryTimeout.Get(), upper);
+        }
+
+        return upper;
     }
 
     bool IsSpillingEngineEnabled() const {