Merge c09b6b2 into 487f050

Author: GrigoriyPA

ydb/core/kqp/finalize_script_service/kqp_finalize_script_actor.cpp

@@ -19,6 +19,8 @@ namespace NKikimr::NKqp {
 namespace {
 
 class TScriptFinalizerActor : public TActorBootstrapped<TScriptFinalizerActor> {
+    static constexpr size_t MAX_ARTIFACTS_SIZE_BYTES = 40_MB;
+
 public:
     TScriptFinalizerActor(TEvScriptFinalizeRequest::TPtr request,
         const NKikimrConfig::TQueryServiceConfig& queryServiceConfig,
@@ -37,6 +39,14 @@ class TScriptFinalizerActor : public TActorBootstrapped<TScriptFinalizerActor> {
 
     void CompressScriptArtifacts() const {
         auto& description = Request->Get()->Description;
+
+        bool truncated = false;
+        if (size_t planSize = description.QueryPlan.value_or("").size(); description.QueryAst && description.QueryAst->size() + planSize > MAX_ARTIFACTS_SIZE_BYTES) {
+            size_t toRemove = std::min(description.QueryAst->size() + planSize - MAX_ARTIFACTS_SIZE_BYTES, description.QueryAst->size());
+            description.QueryAst = TruncateString(*description.QueryAst, description.QueryAst->size() - toRemove);
+            truncated = true;
+        }
+
         auto ast = description.QueryAst;
         if (Compressor.IsEnabled() && ast) {
             const auto& [astCompressionMethod, astCompressed] = Compressor.Compress(*ast);
@@ -45,12 +55,15 @@ class TScriptFinalizerActor : public TActorBootstrapped<TScriptFinalizerActor> {
         }
 
         if (description.QueryAst && description.QueryAst->size() > NDataShard::NLimits::MaxWriteValueSize) {
-            NYql::TIssue astTruncatedIssue(TStringBuilder() << "Query ast size is " << description.QueryAst->size() << " bytes, that is larger than allowed limit " << NDataShard::NLimits::MaxWriteValueSize << " bytes, ast was truncated");
+            description.QueryAst = TruncateString(*ast, NDataShard::NLimits::MaxWriteValueSize - 1_KB);
+            description.QueryAstCompressionMethod = std::nullopt;
+            truncated = true;
+        }
+
+        if (truncated) {
+            NYql::TIssue astTruncatedIssue("Query ast was truncated");
             astTruncatedIssue.SetCode(NYql::DEFAULT_ERROR, NYql::TSeverityIds::S_INFO);
             description.Issues.AddIssue(astTruncatedIssue);
-
-            description.QueryAst = ast->substr(0, NDataShard::NLimits::MaxWriteValueSize - 1_KB) + "...\n(TRUNCATED)";
-            description.QueryAstCompressionMethod = std::nullopt;
         }
     }
 
@@ -223,6 +236,11 @@ class TScriptFinalizerActor : public TActorBootstrapped<TScriptFinalizerActor> {
         PassAway();
     }
 
+private:
+    static TString TruncateString(const TString& str, size_t size) {
+        return str.substr(0, std::min(str.size(), size)) + "...\n(TRUNCATED)";
+    }
+
 private:
     const TActorId ReplyActor;
     const TString ExecutionId;