From 7830ab50f69b64d84c8590c3b4d2d90f4e703aad Mon Sep 17 00:00:00 2001 From: Nikolay Shumkov Date: Thu, 3 Oct 2024 06:16:55 +0300 Subject: [PATCH] Fixes --- ydb/core/kqp/compile_service/kqp_compile_actor.cpp | 2 +- ydb/library/yql/core/pg_settings/guc_settings.cpp | 10 +++++++--- ydb/library/yql/core/pg_settings/guc_settings.h | 1 + 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ydb/core/kqp/compile_service/kqp_compile_actor.cpp b/ydb/core/kqp/compile_service/kqp_compile_actor.cpp index b8aa6154578b..c2ac5186770d 100644 --- a/ydb/core/kqp/compile_service/kqp_compile_actor.cpp +++ b/ydb/core/kqp/compile_service/kqp_compile_actor.cpp @@ -338,7 +338,7 @@ class TKqpCompileActor : public TActorBootstrapped { replayMessage.InsertValue("table_metadata", TString(NJson::WriteJson(tablesMeta, false))); replayMessage.InsertValue("table_meta_serialization_type", EMetaSerializationType::EncodedProto); - //GUCSettings->ExportToJson(replayMessage); + GUCSettings->ExportToJson(replayMessage); TString message(NJson::WriteJson(replayMessage, /*formatOutput*/ false)); LOG_DEBUG_S(*TlsActivationContext, NKikimrServices::KQP_COMPILE_ACTOR, "[" << SelfId() << "]: " diff --git a/ydb/library/yql/core/pg_settings/guc_settings.cpp b/ydb/library/yql/core/pg_settings/guc_settings.cpp index c432e4e7fe1b..011056c78099 100644 --- a/ydb/library/yql/core/pg_settings/guc_settings.cpp +++ b/ydb/library/yql/core/pg_settings/guc_settings.cpp @@ -30,8 +30,7 @@ void TGUCSettings::RollBack() { Settings_ = SessionSettings_ = RollbackSettings_; } -TString TGUCSettings::SerializeToString() const { - NJson::TJsonValue gucJson; +void TGUCSettings::ExportToJson(NJson::TJsonValue& value) const { NJson::TJsonValue settings(NJson::JSON_MAP); for (const auto& setting : Settings_) { settings[setting.first] = setting.second; @@ -48,7 +47,12 @@ TString TGUCSettings::SerializeToString() const { gucSettings.InsertValue("settings", std::move(settings)); gucSettings.InsertValue("rollback_settings", std::move(rollbackSettings)); gucSettings.InsertValue("session_settings", std::move(sessionSettings)); - gucJson.InsertValue("guc_settings", std::move(gucSettings)); + value.InsertValue("guc_settings", std::move(gucSettings)); +} + +TString TGUCSettings::SerializeToString() const { + NJson::TJsonValue gucJson; + this->ExportToJson(gucJson); return WriteJson(gucJson); } diff --git a/ydb/library/yql/core/pg_settings/guc_settings.h b/ydb/library/yql/core/pg_settings/guc_settings.h index ee39537fc780..3ce055f2d093 100644 --- a/ydb/library/yql/core/pg_settings/guc_settings.h +++ b/ydb/library/yql/core/pg_settings/guc_settings.h @@ -18,6 +18,7 @@ struct TGUCSettings { void Set(const std::string&, const std::string&, bool isLocal = false); void Commit(); void RollBack(); + void ExportToJson(NJson::TJsonValue& value) const; TString SerializeToString() const; size_t GetHash() const noexcept;