ydb-platform · CyberROFL · Mar 6, 2024 · Mar 6, 2024
@@ -112,7 +112,9 @@ struct TEvYdbProxy {
         TString ToString() const override {
             auto ret = TStringBuilder() << this->ToStringHeader();
             if constexpr (THasOutFunc<TResult>::Value) {
-                ret << " { Result: " << Result << " }";
+                ret << " { Result: ";
+                Result.Out(ret.Out);
+                ret << " }";
             }
             return ret;
         }

@@ -125,11 +125,3 @@ class TExportClient {
 
 } // namespace NExport
 } // namespace NYdb
-
-Y_DECLARE_OUT_SPEC(inline, NYdb::NExport::TExportToYtResponse, o, x) {
-    return x.Out(o);
-}
-
-Y_DECLARE_OUT_SPEC(inline, NYdb::NExport::TExportToS3Response, o, x) {
-    return x.Out(o);
-}
@@ -0,0 +1,9 @@
+#include "export.h"
+
+Y_DECLARE_OUT_SPEC(, NYdb::NExport::TExportToYtResponse, o, x) {
+    return x.Out(o);
+}
+
+Y_DECLARE_OUT_SPEC(, NYdb::NExport::TExportToS3Response, o, x) {
+    return x.Out(o);
+}
@@ -2,6 +2,7 @@ LIBRARY()
 
 SRCS(
     export.cpp
+    out.cpp
 )
 
 GENERATE_ENUM_SERIALIZATION(export.h)

@@ -0,0 +1,5 @@
+#include "result.h"
+
+Y_DECLARE_OUT_SPEC(, NYdb::TColumn, o, x) {
+    return x.Out(o);
+}
@@ -107,7 +107,3 @@ class TResultSetParser : public TMoveOnly {
 using TResultSets = TVector<TResultSet>;
 
 } // namespace NYdb
-
-Y_DECLARE_OUT_SPEC(inline, NYdb::TColumn, o, x) {
-    return x.Out(o);
-}
@@ -1,6 +1,7 @@
 LIBRARY()
 
 SRCS(
+    out.cpp
     proto_accessor.cpp
     result.cpp
 )

@@ -0,0 +1,17 @@
+#include "scheme.h"
+
+Y_DECLARE_OUT_SPEC(, NYdb::NScheme::TVirtualTimestamp, o, x) {
+    return x.Out(o);
+}
+
+Y_DECLARE_OUT_SPEC(, NYdb::NScheme::TSchemeEntry, o, x) {
+    return x.Out(o);
+}
+
+Y_DECLARE_OUT_SPEC(, NYdb::NScheme::TDescribePathResult, o, x) {
+    return x.Out(o);
+}
+
+Y_DECLARE_OUT_SPEC(, NYdb::NScheme::TListDirectoryResult, o, x) {
+    return x.Out(o);
+}
@@ -321,19 +321,3 @@ TAsyncStatus TSchemeClient::ModifyPermissions(const TString& path,
 
 } // namespace NScheme
 } // namespace NYdb
-
-Y_DECLARE_OUT_SPEC(, NYdb::NScheme::TVirtualTimestamp, o, x) {
-    return x.Out(o);
-}
-
-Y_DECLARE_OUT_SPEC(, NYdb::NScheme::TSchemeEntry, o, x) {
-    return x.Out(o);
-}
-
-Y_DECLARE_OUT_SPEC(, NYdb::NScheme::TDescribePathResult, o, x) {
-    return x.Out(o);
-}
-
-Y_DECLARE_OUT_SPEC(, NYdb::NScheme::TListDirectoryResult, o, x) {
-    return x.Out(o);
-}
@@ -1,6 +1,7 @@
 LIBRARY()
 
 SRCS(
+    out.cpp
     scheme.cpp
 )
 

@@ -0,0 +1,25 @@
+#include "table.h"
+
+Y_DECLARE_OUT_SPEC(, NYdb::NTable::TIndexDescription, o, x) {
+    return x.Out(o);
+}
+
+Y_DECLARE_OUT_SPEC(, NYdb::NTable::TChangefeedDescription, o, x) {
+    return x.Out(o);
+}
+
+Y_DECLARE_OUT_SPEC(, NYdb::NTable::TValueSinceUnixEpochModeSettings::EUnit, o, x) {
+    return NYdb::NTable::TValueSinceUnixEpochModeSettings::Out(o, x);
+}
+
+Y_DECLARE_OUT_SPEC(, NYdb::NTable::TTxSettings, o, x) {
+    return x.Out(o);
+}
+
+Y_DECLARE_OUT_SPEC(, NYdb::NTable::TCreateSessionResult, o, x) {
+    return x.Out(o);
+}
+
+Y_DECLARE_OUT_SPEC(, NYdb::NTable::TDescribeTableResult, o, x) {
+    return x.Out(o);
+}
@@ -2849,11 +2849,3 @@ TReadRowsResult::TReadRowsResult(TStatus&& status, TResultSet&& resultSet)
 
 } // namespace NTable
 } // namespace NYdb
-
-Y_DECLARE_OUT_SPEC(, NYdb::NTable::TCreateSessionResult, o, x) {
-    return x.Out(o);
-}
-
-Y_DECLARE_OUT_SPEC(, NYdb::NTable::TDescribeTableResult, o, x) {
-    return x.Out(o);
-}
@@ -2008,19 +2008,3 @@ class TReadRowsResult : public TStatus {
 
 } // namespace NTable
 } // namespace NYdb
-
-Y_DECLARE_OUT_SPEC(inline, NYdb::NTable::TIndexDescription, o, x) {
-    return x.Out(o);
-}
-
-Y_DECLARE_OUT_SPEC(inline, NYdb::NTable::TChangefeedDescription, o, x) {
-    return x.Out(o);
-}
-
-Y_DECLARE_OUT_SPEC(inline, NYdb::NTable::TValueSinceUnixEpochModeSettings::EUnit, o, x) {
-    return NYdb::NTable::TValueSinceUnixEpochModeSettings::Out(o, x);
-}
-
-Y_DECLARE_OUT_SPEC(inline, NYdb::NTable::TTxSettings, o, x) {
-    return x.Out(o);
-}
@@ -1,8 +1,9 @@
 LIBRARY()
 
 SRCS(
-    table.cpp
+    out.cpp
     proto_accessor.cpp
+    table.cpp
 )
 
 GENERATE_ENUM_SERIALIZATION(table_enum.h)

@@ -480,11 +480,3 @@ TAsyncStatus TTopicClient::CommitOffset(const TString& path, ui64 partitionId, c
 }
 
 } // namespace NYdb::NTopic
-
-Y_DECLARE_OUT_SPEC(, NYdb::NTopic::TDescribeTopicResult, o, x) {
-    return x.Out(o);
-}
-
-Y_DECLARE_OUT_SPEC(, NYdb::NTopic::TDescribeConsumerResult, o, x) {
-    return x.Out(o);
-}
@@ -0,0 +1,9 @@
+#include "topic.h"
+
+Y_DECLARE_OUT_SPEC(, NYdb::NTopic::TDescribeTopicResult, o, x) {
+    return x.Out(o);
+}
+
+Y_DECLARE_OUT_SPEC(, NYdb::NTopic::TDescribeConsumerResult, o, x) {
+    return x.Out(o);
+}
@@ -3,8 +3,9 @@ LIBRARY()
 GENERATE_ENUM_SERIALIZATION(ydb/public/sdk/cpp/client/ydb_topic/topic.h)
 
 SRCS(
-    topic.h
+    out.cpp
     proto_accessor.cpp
+    topic.h
 )
 
 PEERDIR(

@@ -47,7 +47,3 @@ class TOperation {
 using TAsyncOperation = NThreading::TFuture<TOperation>;
 
 } // namespace NYdb
-
-Y_DECLARE_OUT_SPEC(inline, NYdb::TOperation, o, x) {
-    return x.Out(o);
-}
@@ -0,0 +1,5 @@
+#include "operation.h"
+
+Y_DECLARE_OUT_SPEC(, NYdb::TOperation, o, x) {
+    return x.Out(o);
+}
@@ -2,6 +2,7 @@ LIBRARY()
 
 SRCS(
     operation.cpp
+    out.cpp
 )
 
 PEERDIR(

@@ -98,7 +98,3 @@ bool TStreamPartStatus::EOS() const {
 }
 
 } // namespace NYdb
-
-Y_DECLARE_OUT_SPEC(, NYdb::TStatus, o, x) {
-    return x.Out(o);
-}
@@ -0,0 +1,5 @@
+#include "value.h"
+
+Y_DECLARE_OUT_SPEC(, NYdb::TType, o, x) {
+    return x.Out(o);
+}
@@ -517,7 +517,3 @@ class TValueBuilder : public TValueBuilderBase<TValueBuilder> {
 };
 
 } // namespace NYdb
-
-Y_DECLARE_OUT_SPEC(inline, NYdb::TType, o, x) {
-    return x.Out(o);
-}
@@ -1,6 +1,7 @@
 LIBRARY()
 
 SRCS(
+    out.cpp
     value.cpp
 )
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,7 @@ LIBRARY() @@
     SRCS(
         export.cpp
+        out.cpp
     )
     GENERATE_ENUM_SERIALIZATION(export.h)
@@ Expand Down @@