Always detach forget operation

Author: GrigoriyPA

ydb/core/kqp/proxy_service/kqp_script_executions.cpp

@@ -839,14 +839,36 @@ class TForgetScriptExecutionOperationQueryActor : public TQueryBase {
             FROM `.metadata/script_executions`
             WHERE database = $database AND execution_id = $execution_id;
 
+            DELETE
+            FROM `.metadata/script_execution_leases`
+            WHERE database = $database AND execution_id = $execution_id;
+        )";
+
+        NYdb::TParamsBuilder params;
+        params
+            .AddParam("$database")
+                .Utf8(Database)
+                .Build()
+            .AddParam("$execution_id")
+                .Utf8(ExecutionId)
+                .Build();
+
+        RunDataQuery(sql, &params);
+        SetQueryResultHandler(&TForgetScriptExecutionOperationQueryActor::OnOperationDeleted, "Forget script execution operation");
+    }
+
+    void OnOperationDeleted() {
+        SendResponse(Ydb::StatusIds::SUCCESS, {});
+
+        TString sql = R"(
+            -- TForgetScriptExecutionOperationQueryActor::OnOperationDeleted
+            DECLARE $database AS Text;
+            DECLARE $execution_id AS Text;
+
             SELECT MAX(result_set_id) AS max_result_set_id, MAX(row_id) AS max_row_id
             FROM `.metadata/result_sets`
             WHERE database = $database AND execution_id = $execution_id AND
                   (expire_at > CurrentUtcTimestamp() OR expire_at IS NULL);
-
-            DELETE
-            FROM `.metadata/script_execution_leases`
-            WHERE database = $database AND execution_id = $execution_id;
         )";
 
         NYdb::TParamsBuilder params;
@@ -859,7 +881,7 @@ class TForgetScriptExecutionOperationQueryActor : public TQueryBase {
                 .Build();
 
         RunDataQuery(sql, &params);
-        SetQueryResultHandler(&TForgetScriptExecutionOperationQueryActor::OnGetResultsInfo, "Forget script execution operation");
+        SetQueryResultHandler(&TForgetScriptExecutionOperationQueryActor::OnGetResultsInfo, "Get results info");
     }
 
     void OnGetResultsInfo() {
@@ -890,16 +912,6 @@ class TForgetScriptExecutionOperationQueryActor : public TQueryBase {
         }
         MaxRowId = *maxRowId;
 
-        if (MaxRowId >= NumberRowsInBatch) {
-            TStringBuilder message = TStringBuilder() << "Query result rows count is " << MaxRowId + 1;
-            if (*maxResultSetId > 0) {
-                message << " in " << *maxResultSetId + 1 << " result sets";
-            }
-            NYql::TIssue issue(message << ", that is larger than allowed limit " << MAX_NUMBER_ROWS_IN_BATCH << " rows for one time forget, results will be forgotten in the background process");
-            issue.SetCode(NYql::DEFAULT_ERROR, NYql::TSeverityIds::S_INFO);
-            SendResponse(Ydb::StatusIds::SUCCESS, {issue});
-        }
-
         DeleteScriptResults();
     }