aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgrigoriypisar <grigoriypisar@yandex-team.com>2023-09-29 19:55:41 +0300
committergrigoriypisar <grigoriypisar@yandex-team.com>2023-09-29 22:19:06 +0300
commit9eeb224863c358335df3af41d158cb39f6b6ec17 (patch)
tree2ea377ba725a73c7a2471c8dca7d1023bc04e1df
parentafaa0c68804284c5945d9df10466885a8174debc (diff)
downloadydb-9eeb224863c358335df3af41d158cb39f6b6ec17.tar.gz
fix default behaviour with rows limit
Added debug logs
-rw-r--r--ydb/core/kqp/compile_service/kqp_compile_actor.cpp6
-rw-r--r--ydb/core/kqp/host/kqp_host.cpp2
-rw-r--r--ydb/core/kqp/session_actor/kqp_session_actor.cpp2
3 files changed, 7 insertions, 3 deletions
diff --git a/ydb/core/kqp/compile_service/kqp_compile_actor.cpp b/ydb/core/kqp/compile_service/kqp_compile_actor.cpp
index 2bd14a8285c..29485c077cb 100644
--- a/ydb/core/kqp/compile_service/kqp_compile_actor.cpp
+++ b/ydb/core/kqp/compile_service/kqp_compile_actor.cpp
@@ -93,7 +93,11 @@ public:
if (QueryId.Settings.QueryType == NKikimrKqp::QUERY_TYPE_SQL_GENERIC_SCRIPT) {
ui32 scriptResultRowsLimit = queryServiceConfig.GetScriptResultRowsLimit();
- Config->_ResultRowsLimit = scriptResultRowsLimit ? scriptResultRowsLimit : std::numeric_limits<ui32>::max();
+ if (scriptResultRowsLimit > 0) {
+ Config->_ResultRowsLimit = scriptResultRowsLimit;
+ } else {
+ Config->_ResultRowsLimit.Clear();
+ }
}
Config->FreezeDefaults();
diff --git a/ydb/core/kqp/host/kqp_host.cpp b/ydb/core/kqp/host/kqp_host.cpp
index 0ddf0bce7d0..6e4ef4f0388 100644
--- a/ydb/core/kqp/host/kqp_host.cpp
+++ b/ydb/core/kqp/host/kqp_host.cpp
@@ -1562,7 +1562,7 @@ private:
auto kikimrDataSink = CreateKikimrDataSink(*FuncRegistry, *TypesCtx, gatewayProxy, SessionCtx, ExternalSourceFactory, queryExecutor);
FillSettings.AllResultsBytesLimit = Nothing();
- FillSettings.RowsLimitPerWrite = SessionCtx->Config()._ResultRowsLimit.Get().GetRef();
+ FillSettings.RowsLimitPerWrite = SessionCtx->Config()._ResultRowsLimit.Get();
FillSettings.Format = IDataProvider::EResultFormat::Custom;
FillSettings.FormatDetails = TString(KikimrMkqlProtoFormat);
diff --git a/ydb/core/kqp/session_actor/kqp_session_actor.cpp b/ydb/core/kqp/session_actor/kqp_session_actor.cpp
index 9aa23b25476..6276b9d6a40 100644
--- a/ydb/core/kqp/session_actor/kqp_session_actor.cpp
+++ b/ydb/core/kqp/session_actor/kqp_session_actor.cpp
@@ -173,7 +173,7 @@ public:
CompilationCookie = std::make_shared<std::atomic<bool>>(true);
FillSettings.AllResultsBytesLimit = Nothing();
- FillSettings.RowsLimitPerWrite = Config->_ResultRowsLimit.Get().GetRef();
+ FillSettings.RowsLimitPerWrite = Config->_ResultRowsLimit.Get();
FillSettings.Format = IDataProvider::EResultFormat::Custom;
FillSettings.FormatDetails = TString(KikimrMkqlProtoFormat);