Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

YQ-3568 fix error sent large get operation #8035

Merged
merged 2 commits into from
Aug 20, 2024
Merged

YQ-3568 fix error sent large get operation #8035

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c09b6b2
Added ast truncate by 40MB
GrigoriyPA Aug 20, 2024
7d8440f
Fixed error message
GrigoriyPA Aug 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 22 additions & 4 deletions ydb/core/kqp/finalize_script_service/kqp_finalize_script_actor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -37,6 +39,14 @@ class TScriptFinalizerActor : public TActorBootstrapped<TScriptFinalizerActor> {

void CompressScriptArtifacts() const {
auto& description = Request->Get()->Description;

TString astTruncateDescription;
if (size_t planSize = description.QueryPlan.value_or("").size(); description.QueryAst && description.QueryAst->size() + planSize > MAX_ARTIFACTS_SIZE_BYTES) {
astTruncateDescription = TStringBuilder() << "Query artifacts size is " << description.QueryAst->size() + planSize << " bytes (plan + ast), that is larger than allowed limit " << MAX_ARTIFACTS_SIZE_BYTES << " bytes, ast was truncated";
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);
}

auto ast = description.QueryAst;
if (Compressor.IsEnabled() && ast) {
const auto& [astCompressionMethod, astCompressed] = Compressor.Compress(*ast);
Expand All @@ -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");
GrigoriyPA marked this conversation as resolved.
Show resolved Hide resolved
astTruncateDescription = 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;
}

if (astTruncateDescription) {
NYql::TIssue astTruncatedIssue(astTruncateDescription);
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;
}
}

Expand Down Expand Up @@ -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;
Expand Down
Loading