Fixes

shnikd · Oct 3, 2024 · 7830ab5 · 7830ab5
1 parent 690d91e
commit 7830ab5
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git 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<TKqpCompileActor> {
         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
@@ -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
@@ -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;