Merge 76f7656 into 1143523

Author: iddqdex

ydb/core/kqp/common/kqp_timeouts.cpp

@@ -19,9 +19,10 @@ ui64 GetDefaultQueryTimeoutMs(NKikimrKqp::EQueryType queryType,
         case NKikimrKqp::QUERY_TYPE_SQL_DML:
         case NKikimrKqp::QUERY_TYPE_PREPARED_DML:
         case NKikimrKqp::QUERY_TYPE_AST_DML:
+            return queryLimits.GetDataQueryTimeoutMs();
         case NKikimrKqp::QUERY_TYPE_SQL_GENERIC_QUERY:
         case NKikimrKqp::QUERY_TYPE_SQL_GENERIC_CONCURRENT_QUERY:
-            return queryLimits.GetDataQueryTimeoutMs();
+            return queryServiceConfig.GetQueryTimeoutDefaultSeconds() * 1000;
 
         case NKikimrKqp::QUERY_TYPE_SQL_GENERIC_SCRIPT:
             return queryServiceConfig.GetScriptOperationTimeoutDefaultSeconds() 

ydb/core/protos/config.proto

@@ -1025,6 +1025,7 @@ message TQueryServiceConfig {
     optional NYql.TGenericGatewayConfig Generic = 11;
     optional TFinalizeScriptServiceConfig FinalizeScriptServiceConfig = 12;
     optional uint64 ProgressStatsPeriodMs = 14 [default = 0]; // 0 = disabled
+    optional uint32 QueryTimeoutDefaultSeconds = 19 [default = 1800];
     optional bool EnableMatchRecognize = 20 [default = false];
 }