diff --git a/ydb/core/kqp/rm_service/kqp_rm_service.cpp b/ydb/core/kqp/rm_service/kqp_rm_service.cpp index ac92ada75fc5..efba0bec590f 100644 --- a/ydb/core/kqp/rm_service/kqp_rm_service.cpp +++ b/ydb/core/kqp/rm_service/kqp_rm_service.cpp @@ -299,10 +299,9 @@ class TKqpResourceManager : public IKqpResourceManager { auto it = MemoryNamedPools.find(tx->MakePoolId()); if (it != MemoryNamedPools.end()) { it->second->Release(resources.Memory); - } - - if (it->second->GetUsed() == 0) { - MemoryNamedPools.erase(it); + if (it->second->GetUsed() == 0) { + MemoryNamedPools.erase(it); + } } } } diff --git a/ydb/core/kqp/ut/query/kqp_limits_ut.cpp b/ydb/core/kqp/ut/query/kqp_limits_ut.cpp index 0eebf6bec7dc..6883fab44a5f 100644 --- a/ydb/core/kqp/ut/query/kqp_limits_ut.cpp +++ b/ydb/core/kqp/ut/query/kqp_limits_ut.cpp @@ -192,6 +192,8 @@ Y_UNIT_TEST_SUITE(KqpLimits) { app.MutableResourceBrokerConfig()->CopyFrom(MakeResourceBrokerTestConfig(4)); + app.MutableFeatureFlags()->SetEnableResourcePools(true); + TKikimrRunner kikimr(app); CreateLargeTable(kikimr, 0, 0, 0);