aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAleksey Myasnikov <79263256394@ya.ru>2022-03-15 13:37:17 +0300
committerAleksey Myasnikov <79263256394@ya.ru>2022-03-15 13:37:17 +0300
commita30dbc813eceb61530643f30acd64b7e86e4dd04 (patch)
tree7f1398f4e800047c464ab63e7b45718084ce9724
parent3f32da3ced264f9860bba283f761cbcba02121bc (diff)
downloadydb-a30dbc813eceb61530643f30acd64b7e86e4dd04.tar.gz
REPLY_SIZE_EXECEEDED => REPLY_SIZE_EXCEEDED
REPLY_SIZE_EXECEEDED => REPLY_SIZE_EXCEEDED ref:e37f540df1640ad5a365f0693ac968c9805e2e9e
-rw-r--r--ydb/core/protos/tx_datashard.proto2
-rw-r--r--ydb/core/tx/datashard/datashard.cpp4
-rw-r--r--ydb/core/tx/datashard/datashard.h2
-rw-r--r--ydb/core/tx/datashard/datashard_kqp.cpp2
-rw-r--r--ydb/services/ydb/ydb_table_ut.cpp2
5 files changed, 6 insertions, 6 deletions
diff --git a/ydb/core/protos/tx_datashard.proto b/ydb/core/protos/tx_datashard.proto
index 89863b25400..341b81f20b6 100644
--- a/ydb/core/protos/tx_datashard.proto
+++ b/ydb/core/protos/tx_datashard.proto
@@ -506,7 +506,7 @@ message TError {
READ_SIZE_EXECEEDED = 15;
SHARD_IS_BLOCKED = 16;
UNKNOWN = 17;
- REPLY_SIZE_EXECEEDED = 18;
+ REPLY_SIZE_EXCEEDED = 18;
EXECUTION_CANCELLED = 19;
}
diff --git a/ydb/core/tx/datashard/datashard.cpp b/ydb/core/tx/datashard/datashard.cpp
index f3a811a2a6f..9daa230cb35 100644
--- a/ydb/core/tx/datashard/datashard.cpp
+++ b/ydb/core/tx/datashard/datashard.cpp
@@ -1605,7 +1605,7 @@ NKikimrTxDataShard::TError::EKind ConvertErrCode(NMiniKQL::IEngineFlat::EResult
case EResult::SnapshotNotExist:
return NKikimrTxDataShard::TError::SNAPSHOT_NOT_EXIST;
case EResult::ResultTooBig:
- return NKikimrTxDataShard::TError::REPLY_SIZE_EXECEEDED;
+ return NKikimrTxDataShard::TError::REPLY_SIZE_EXCEEDED;
case EResult::Cancelled:
return NKikimrTxDataShard::TError::EXECUTION_CANCELLED;
default:
@@ -1627,7 +1627,7 @@ Ydb::StatusIds::StatusCode ConvertToYdbStatusCode(NKikimrTxDataShard::TError::EK
case NKikimrTxDataShard::TError::READ_SIZE_EXECEEDED:
case NKikimrTxDataShard::TError::SHARD_IS_BLOCKED:
case NKikimrTxDataShard::TError::UNKNOWN:
- case NKikimrTxDataShard::TError::REPLY_SIZE_EXECEEDED:
+ case NKikimrTxDataShard::TError::REPLY_SIZE_EXCEEDED:
case NKikimrTxDataShard::TError::EXECUTION_CANCELLED:
return Ydb::StatusIds::INTERNAL_ERROR;
case NKikimrTxDataShard::TError::BAD_ARGUMENT:
diff --git a/ydb/core/tx/datashard/datashard.h b/ydb/core/tx/datashard/datashard.h
index bc85865cd68..5d39415ac39 100644
--- a/ydb/core/tx/datashard/datashard.h
+++ b/ydb/core/tx/datashard/datashard.h
@@ -536,7 +536,7 @@ struct TEvDataShard {
void SetExecutionError(const NKikimrTxDataShard::TError::EKind& error, const TStringBuf& message) {
switch (error) {
- case NKikimrTxDataShard::TError::REPLY_SIZE_EXECEEDED:
+ case NKikimrTxDataShard::TError::REPLY_SIZE_EXCEEDED:
Record.SetStatus(NKikimrTxDataShard::TEvProposeTransactionResult::RESULT_UNAVAILABLE);
break;
case NKikimrTxDataShard::TError::EXECUTION_CANCELLED:
diff --git a/ydb/core/tx/datashard/datashard_kqp.cpp b/ydb/core/tx/datashard/datashard_kqp.cpp
index a262c98de5a..5a374b8ac1d 100644
--- a/ydb/core/tx/datashard/datashard_kqp.cpp
+++ b/ydb/core/tx/datashard/datashard_kqp.cpp
@@ -449,7 +449,7 @@ THolder<TEvDataShard::TEvProposeTransactionResult> KqpCompleteTransaction(const
<< MaxDatashardReplySize << ")";
LOG_WARN_S(*TlsActivationContext, NKikimrServices::TX_DATASHARD, message);
- result->SetExecutionError(NKikimrTxDataShard::TError::REPLY_SIZE_EXECEEDED, message);
+ result->SetExecutionError(NKikimrTxDataShard::TError::REPLY_SIZE_EXCEEDED, message);
} else {
ctx.Send(computeActor, dataEv.Release());
}
diff --git a/ydb/services/ydb/ydb_table_ut.cpp b/ydb/services/ydb/ydb_table_ut.cpp
index 0ed2b7f712a..088b3a38a0a 100644
--- a/ydb/services/ydb/ydb_table_ut.cpp
+++ b/ydb/services/ydb/ydb_table_ut.cpp
@@ -1462,7 +1462,7 @@ R"___(<main>: Error: Transaction not found: , code: 2015
UNIT_ASSERT_C(HasIssue(result.GetIssues(), NYql::TIssuesIds::KIKIMR_RESULT_UNAVAILABLE,
"Result of Kikimr query didn't meet requirements and isn't available"sv), result.GetIssues().ToString());
- UNIT_ASSERT_C(result.GetIssues().ToString().Contains("REPLY_SIZE_EXECEEDED"), result.GetIssues().ToString());
+ UNIT_ASSERT_C(result.GetIssues().ToString().Contains("REPLY_SIZE_EXCEEDED"), result.GetIssues().ToString());
}
Y_UNIT_TEST(TestDoubleKey) {