aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhcpp <hcpp@ydb.tech>2023-06-28 11:38:21 +0300
committerhcpp <hcpp@ydb.tech>2023-06-28 11:38:21 +0300
commitce8c2ea6dbe9e5a4338959a39a941adbbba1d34c (patch)
tree3e818f53d38617d1c3c5fdac1572122c7f8da903
parent2466f1c3a96e78cffc17686ffc1c3ae8fce680f9 (diff)
downloadydb-ce8c2ea6dbe9e5a4338959a39a941adbbba1d34c.tar.gz
some fixes
-rw-r--r--ydb/core/kqp/proxy_service/kqp_script_executions.cpp8
-rw-r--r--ydb/core/kqp/run_script_actor/kqp_run_script_actor.cpp4
2 files changed, 7 insertions, 5 deletions
diff --git a/ydb/core/kqp/proxy_service/kqp_script_executions.cpp b/ydb/core/kqp/proxy_service/kqp_script_executions.cpp
index 5d4540a695f..7bc832ccfb1 100644
--- a/ydb/core/kqp/proxy_service/kqp_script_executions.cpp
+++ b/ydb/core/kqp/proxy_service/kqp_script_executions.cpp
@@ -52,7 +52,9 @@ TString SerializeIssues(const NYql::TIssues& issues) {
root.AddSubIssue(MakeIntrusive<NYql::TIssue>(issue));
}
Ydb::Issue::IssueMessage rootMessage;
- NYql::IssueToMessage(root, &rootMessage);
+ if (issues) {
+ NYql::IssueToMessage(root, &rootMessage);
+ }
return NProtobufJson::Proto2Json(rootMessage, NProtobufJson::TProto2JsonConfig());
}
@@ -158,8 +160,6 @@ public:
switch (result.Status) {
case EStatus::Unknown:
[[fallthrough]];
- case EStatus::LookupError:
- [[fallthrough]];
case EStatus::PathNotTable:
[[fallthrough]];
case EStatus::PathNotPath:
@@ -173,6 +173,8 @@ public:
Become(&TTableCreator::StateFuncCreate);
RunCreateTableRequest();
break;
+ case EStatus::LookupError:
+ [[fallthrough]];
case EStatus::TableCreationNotComplete:
Retry();
break;
diff --git a/ydb/core/kqp/run_script_actor/kqp_run_script_actor.cpp b/ydb/core/kqp/run_script_actor/kqp_run_script_actor.cpp
index 7848fa7fd35..a79f4531343 100644
--- a/ydb/core/kqp/run_script_actor/kqp_run_script_actor.cpp
+++ b/ydb/core/kqp/run_script_actor/kqp_run_script_actor.cpp
@@ -396,8 +396,8 @@ private:
void CheckSaveInflight() {
- if (Status == Ydb::StatusIds::SUCCESS && RunState == ERunState::Finishing && (SaveResultMetaInflight || SaveResultInflight)) {
- // wait for save completions
+ if (Status == Ydb::StatusIds::STATUS_CODE_UNSPECIFIED || (Status == Ydb::StatusIds::SUCCESS && RunState == ERunState::Finishing && (SaveResultMetaInflight || SaveResultInflight))) {
+ // waiting for script completion
return;
}