Fixed map access

ydb-platform · May 8, 2024 · 6e53505 · 6e53505
1 parent 31b98e4
commit 6e53505
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/ydb/tests/tools/kqprun/kqprun.cpp b/ydb/tests/tools/kqprun/kqprun.cpp
@@ -108,10 +108,11 @@ THolder<TFileOutput> SetupDefaultFileOutput(const TString& filePath, IOutputStre
 
 template <typename EnumType>
 EnumType GetCaseVariant(const TString& optionName, const TString& caseName, const std::map<TString, EnumType>& casesMap) {
-    if (!casesMap.contains(caseName)) {
+    auto it = casesMap.find(caseName);
+    if (it == casesMap.end()) {
         ythrow yexception() << "Option '" << optionName << "' has no case '" << caseName << "'";
     }
-    return casesMap.at(caseName);
+    return it->second;
 }
 
 

diff --git a/ydb/tests/tools/kqprun/src/kqp_runner.cpp b/ydb/tests/tools/kqprun/src/kqp_runner.cpp
@@ -130,6 +130,7 @@ class TKqpRunner::TImpl {
 
 private:
     bool WaitScriptExecutionOperation() {
+        ExecutionMeta_ = TExecutionMeta();
         TRequestResult status;
         while (true) {
             status = YdbSetup_.GetScriptExecutionOperationRequest(ExecutionOperation_, ExecutionMeta_);

diff --git a/ydb/tests/tools/kqprun/src/ydb_setup.cpp b/ydb/tests/tools/kqprun/src/ydb_setup.cpp
@@ -388,7 +388,9 @@ TRequestResult TYdbSetup::GetScriptExecutionOperationRequest(const TString& oper
         meta.ExecutionStatus = static_cast<NYdb::NQuery::EExecStatus>(deserializedMeta.exec_status());
         meta.ResultSetsCount = deserializedMeta.result_sets_meta_size();
         meta.Ast = deserializedMeta.exec_stats().query_ast();
-        meta.Plan = deserializedMeta.exec_stats().query_plan();
+        if (deserializedMeta.exec_stats().query_plan()) {
+            meta.Plan = deserializedMeta.exec_stats().query_plan();
+        }
     }
 
     return TRequestResult(scriptExecutionOperation->Get()->Status, scriptExecutionOperation->Get()->Issues);