Allow ResultSet reordering

1 files changed, 7 insertions, 8 deletions

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 4e5d9a57bd..a124b79d52 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
@@ -216,18 +216,17 @@ private:
 
         auto resultSetIndex = ev->Get()->Record.GetQueryResultIndex();
 
-        if (resultSetIndex > ExpireAt.size()) {
-            Issues.AddIssue(MakeIssue(NKikimrIssues::TIssuesIds::DEFAULT_ERROR, "Unexpected result set index"));
-            Finish(Ydb::StatusIds::INTERNAL_ERROR);
-            return;
-        }
-
-        if (resultSetIndex == ExpireAt.size()) {
-            // next ResultSet arrived
+        if (resultSetIndex >= ExpireAt.size()) {
+            // we don't know result set count, so just accept all of them
+            // it's possible to have several result sets per script
+            // they can arrive in any order and may be missed for some indices 
             ResultSetRowCount.resize(resultSetIndex + 1);
             ResultSetByteCount.resize(resultSetIndex + 1);
             Truncated.resize(resultSetIndex + 1);
             ExpireAt.resize(resultSetIndex + 1);
+        }
+
+        if (ExpireAt[resultSetIndex] == TInstant::Zero()) {
             ExpireAt[resultSetIndex] = TInstant::Now() + TDuration::Days(1);
         }