Intermediate changes

1 files changed, 20 insertions, 3 deletions

diff --git a/yt/yt/client/driver/transaction_commands.cpp b/yt/yt/client/driver/transaction_commands.cpp
index 0d9621de780..6c47b4f1f6f 100644
--- a/yt/yt/client/driver/transaction_commands.cpp
+++ b/yt/yt/client/driver/transaction_commands.cpp
@@ -17,6 +17,7 @@ using namespace NTransactionClient;
 using namespace NCypressClient;
 using namespace NObjectClient;
 using namespace NConcurrency;
+using namespace NYson;
 
 ////////////////////////////////////////////////////////////////////////////////
 
@@ -173,10 +174,26 @@ void TPingTransactionCommand::DoExecute(ICommandContextPtr context)
 void TCommitTransactionCommand::DoExecute(ICommandContextPtr context)
 {
     auto transaction = AttachTransaction(context, true);
-    WaitFor(transaction->Commit(Options))
-        .ThrowOnError();
+    auto transactionCommitResult = WaitFor(transaction->Commit(Options))
+        .ValueOrThrow();
 
-    ProduceEmptyOutput(context);
+    if (context->GetConfig()->ApiVersion == ApiVersion3 || !context->GetConfig()->EnableInternalCommands) {
+        ProduceEmptyOutput(context);
+    } else {
+        ProduceOutput(
+            context,
+            [&] (IYsonConsumer* consumer) {
+                BuildYsonFluently(consumer)
+                    .BeginMap()
+                        .Item("primary_commit_timestamp").Value(transactionCommitResult.PrimaryCommitTimestamp)
+                        .Item("commit_timestamps").DoMapFor(
+                            transactionCommitResult.CommitTimestamps.Timestamps,
+                            [&](auto fluent, const auto& pair) {
+                                fluent.Item(ToString(pair.first)).Value(pair.second);
+                            })
+                    .EndMap();
+            });
+    }
 }
 
 ////////////////////////////////////////////////////////////////////////////////