Skip to content

Commit 94fa60c

Browse files
committed
Change error for sink: out of buffer memory (#18241)
1 parent d9ec410 commit 94fa60c

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

ydb/core/kqp/runtime/kqp_write_actor.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1504,7 +1504,8 @@ class TKqpDirectWriteActor : public TActorBootstrapped<TKqpDirectWriteActor>, pu
15041504
RuntimeError(
15051505
NYql::NDqProto::StatusIds::PRECONDITION_FAILED,
15061506
NYql::TIssuesIds::KIKIMR_PRECONDITION_FAILED,
1507-
TStringBuilder() << "Stream write can't be used for this query.",
1507+
TStringBuilder() << "Out of buffer memory. Used " << GetMemory()
1508+
<< " bytes of " << MessageSettings.InFlightMemoryLimitPerActorBytes << " bytes.",
15081509
{});
15091510
return;
15101511
}
@@ -1904,7 +1905,8 @@ class TKqpBufferWriteActor :public TActorBootstrapped<TKqpBufferWriteActor>, pub
19041905
ReplyErrorAndDie(
19051906
NYql::NDqProto::StatusIds::PRECONDITION_FAILED,
19061907
NYql::TIssuesIds::KIKIMR_PRECONDITION_FAILED,
1907-
TStringBuilder() << "Stream write queries aren't allowed.",
1908+
TStringBuilder() << "Out of buffer memory. Used " << GetTotalMemory()
1909+
<< " bytes of " << MessageSettings.InFlightMemoryLimitPerActorBytes << " bytes.",
19081910
{});
19091911
return false;
19101912
}

ydb/core/kqp/ut/query/kqp_limits_ut.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ Y_UNIT_TEST_SUITE(KqpLimits) {
136136
if (!Allowed) {
137137
UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::PRECONDITION_FAILED, result.GetIssues().ToString());
138138
UNIT_ASSERT_C(
139-
result.GetIssues().ToString().contains("Stream write queries aren't allowed."),
139+
result.GetIssues().ToString().contains("Out of buffer memory."),
140140
result.GetIssues().ToString());
141141
} else {
142142
UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::SUCCESS, result.GetIssues().ToString());
@@ -1498,7 +1498,7 @@ Y_UNIT_TEST_SUITE(KqpLimits) {
14981498
UNIT_ASSERT_VALUES_EQUAL(result.GetStatus(), EStatus::PRECONDITION_FAILED);
14991499
UNIT_ASSERT(!to_lower(TString{result.GetIssues().ToString()}).Contains("query result"));
15001500
if (useSink) {
1501-
UNIT_ASSERT(result.GetIssues().ToString().contains("Stream write queries aren't allowed"));
1501+
UNIT_ASSERT(result.GetIssues().ToString().contains("Out of buffer memory"));
15021502
}
15031503
}
15041504
}

0 commit comments

Comments
 (0)