fix issues

Author: VPolka

ydb/core/kqp/session_actor/kqp_query_state.cpp

@@ -123,9 +123,10 @@ bool TKqpQueryState::SaveAndCheckCompileResult(TEvKqp::TEvCompileResponse* ev) {
     return true;
 }
 
-bool TKqpQueryState::SaveAndCheckParseResult(TEvKqp::TEvParseResponse* ev) {
-    Statements = std::move(ev->AstStatements);
-    Orbit = std::move(ev->Orbit);
+bool TKqpQueryState::SaveAndCheckParseResult(TEvKqp::TEvParseResponse&& ev) {
+    Statements = std::move(ev.AstStatements);
+    CurrentStatementId = 0;
+    Orbit = std::move(ev.Orbit);
     return true;
 }
 
@@ -140,7 +141,7 @@ std::unique_ptr<TEvKqp::TEvCompileRequest> TKqpQueryState::BuildCompileRequest(s
     settings.IsPrepareQuery = GetAction() == NKikimrKqp::QUERY_ACTION_PREPARE;
 
     bool keepInCache = false;
-    bool perStatementResult = !HasTxControl();
+    const bool perStatementResult = !HasTxControl() && GetAction() == NKikimrKqp::QUERY_ACTION_EXECUTE;
     switch (GetAction()) {
         case NKikimrKqp::QUERY_ACTION_EXECUTE:
             query = TKqpQueryId(Cluster, Database, GetQuery(), settings, GetQueryParameterTypes());
@@ -150,19 +151,16 @@ std::unique_ptr<TEvKqp::TEvCompileRequest> TKqpQueryState::BuildCompileRequest(s
         case NKikimrKqp::QUERY_ACTION_PREPARE:
             query = TKqpQueryId(Cluster, Database, GetQuery(), settings, GetQueryParameterTypes());
             keepInCache = query->IsSql();
-            perStatementResult = false;
             break;
 
         case NKikimrKqp::QUERY_ACTION_EXECUTE_PREPARED:
             uid = GetPreparedQuery();
             keepInCache = GetQueryKeepInCache();
-            perStatementResult = false;
             break;
 
         case NKikimrKqp::QUERY_ACTION_EXPLAIN:
             query = TKqpQueryId(Cluster, Database, GetQuery(), settings, GetQueryParameterTypes());
             keepInCache = false;
-            perStatementResult = false;
             break;
 
         default:
@@ -176,6 +174,7 @@ std::unique_ptr<TEvKqp::TEvCompileRequest> TKqpQueryState::BuildCompileRequest(s
 
     TMaybe<TQueryAst> statementAst;
     if (!Statements.empty()) {
+        YQL_ENSURE(CurrentStatementId < Statements.size());
         statementAst = Statements[CurrentStatementId];
     }
 

ydb/core/kqp/session_actor/kqp_query_state.h

@@ -373,7 +373,7 @@ class TKqpQueryState : public TNonCopyable {
         return RequestEv->GetTxControl();
     }
 
-    bool FinishedStatements() {
+    bool ProcessingLastStatement() const {
         return CurrentStatementId + 1 >= Statements.size();
     }
 
@@ -419,7 +419,7 @@ class TKqpQueryState : public TNonCopyable {
     std::unique_ptr<TEvTxProxySchemeCache::TEvNavigateKeySet> BuildNavigateKeySet();
     // same the context of the compiled query to the query state.
     bool SaveAndCheckCompileResult(TEvKqp::TEvCompileResponse* ev);
-    bool SaveAndCheckParseResult(TEvKqp::TEvParseResponse* ev);
+    bool SaveAndCheckParseResult(TEvKqp::TEvParseResponse&& ev);
     // build the compilation request.
     std::unique_ptr<TEvKqp::TEvCompileRequest> BuildCompileRequest(std::shared_ptr<std::atomic<bool>> cookie);
     // TODO(gvit): get rid of code duplication in these requests,

ydb/core/kqp/session_actor/kqp_session_actor.cpp

@@ -514,7 +514,7 @@ class TKqpSessionActor : public TActorBootstrapped<TKqpSessionActor> {
     }
 
     void Handle(TEvKqp::TEvParseResponse::TPtr& ev) {
-        QueryState->SaveAndCheckParseResult(ev->Get());
+        QueryState->SaveAndCheckParseResult(std::move(*ev->Get()));
         CompileStatement();
     }
 
@@ -1631,7 +1631,7 @@ class TKqpSessionActor : public TActorBootstrapped<TKqpSessionActor> {
     }
 
     void ProcessNextStatement() {
-        if (QueryState->FinishedStatements()) {
+        if (QueryState->ProcessingLastStatement()) {
             Cleanup();
             return;
         }

ydb/library/yql/sql/sql.cpp

@@ -78,11 +78,6 @@ namespace NSQLTranslation {
             *actualSyntaxVersion = parsedSettings.SyntaxVersion;
         }
 
-        google::protobuf::Arena arena;
-        if (!parsedSettings.Arena) {
-            parsedSettings.Arena = &arena;
-        }
-
         switch (parsedSettings.SyntaxVersion) {
             case 0:
                 if (settings.V0ForceDisable || settings.V0Behavior == EV0Behavior::Disable) {
@@ -97,9 +92,9 @@ namespace NSQLTranslation {
                     return nullptr;
                 }
 
-                return NSQLTranslationV0::SqlAST(query, queryName, issues, maxErrors, parsedSettings.Arena);
+                return NSQLTranslationV0::SqlAST(query, queryName, issues, maxErrors, settings.Arena);
             case 1:
-                return NSQLTranslationV1::SqlAST(query, queryName, issues, maxErrors, parsedSettings.AnsiLexer, parsedSettings.Arena);
+                return NSQLTranslationV1::SqlAST(query, queryName, issues, maxErrors, parsedSettings.AnsiLexer, settings.Arena);
             default:
                 issues.AddIssue(NYql::YqlIssue(NYql::TPosition(), NYql::TIssuesIds::DEFAULT_ERROR,
                     TStringBuilder() << "Unknown SQL syntax version: " << parsedSettings.SyntaxVersion));