Fix

ydb-platform · Mar 5, 2024 · dbabe7c · dbabe7c
1 parent f6afcbb
commit dbabe7c
Show file tree

Hide file tree

Showing 26 changed files with 22 additions and 501 deletions.
diff --git a/client/ydb_persqueue_public/codecs/CMakeLists.txt b/client/ydb_persqueue_public/codecs/CMakeLists.txt
@@ -9,8 +9,7 @@ target_link_libraries(client-ydb_persqueue_public-codecs PUBLIC
   api-grpc-draft
   api-grpc
   api-protos
-  cpp-string_utils-string_output
-)
+  )
 
 target_sources(client-ydb_persqueue_public-codecs PRIVATE
   ${CMAKE_SOURCE_DIR}/client/ydb_persqueue_public/codecs/codecs.cpp

diff --git a/client/ydb_result/CMakeLists.txt b/client/ydb_result/CMakeLists.txt
@@ -9,8 +9,7 @@ target_link_libraries(cpp-client-ydb_result PUBLIC
   client-ydb_types-fatal_error_handlers
   cpp-client-ydb_value
   cpp-client-ydb_proto
-  cpp-string_utils-string_output
-)
+  )
 target_sources(cpp-client-ydb_result PRIVATE
   ${CMAKE_SOURCE_DIR}/client/ydb_result/proto_accessor.cpp
   ${CMAKE_SOURCE_DIR}/client/ydb_result/result.cpp

diff --git a/client/ydb_result/result.cpp b/client/ydb_result/result.cpp
@@ -6,7 +6,6 @@
 #include <ydb/public/api/protos/ydb_value.pb.h>
 
 #include <util/string/builder.h>
-#include <library/cpp/string_utils/string_output/string_output.h>
 
 #include <util/generic/mapfindptr.h>
 
@@ -16,7 +15,7 @@ namespace NYdb {
 
 std::string TColumn::ToString() const {
     std::string result;
-    NUtils::TStringOutput out(result);
+    TStringOutput out(result);
     Out(out);
     return result;
 }

diff --git a/client/ydb_scheme/CMakeLists.txt b/client/ydb_scheme/CMakeLists.txt
@@ -14,8 +14,7 @@ target_link_libraries(cpp-client-ydb_scheme PUBLIC
   impl-ydb_internal-make_request
   client-ydb_common_client-impl
   cpp-client-ydb_driver
-  cpp-string_utils-string_output
-)
+  )
 
 target_sources(cpp-client-ydb_scheme PRIVATE
   ${CMAKE_SOURCE_DIR}/client/ydb_scheme/scheme.cpp

diff --git a/client/ydb_scheme/scheme.cpp b/client/ydb_scheme/scheme.cpp
@@ -9,7 +9,6 @@
 #include <ydb/public/api/protos/ydb_scheme.pb.h>
 #include <client/ydb_common_client/impl/client.h>
 
-#include <library/cpp/string_utils/string_output/string_output.h>
 
 namespace NYdb {
 namespace NScheme {
@@ -28,7 +27,7 @@ TVirtualTimestamp::TVirtualTimestamp(const ::Ydb::VirtualTimestamp& proto)
 
 std::string TVirtualTimestamp::ToString() const {
     std::string result;
-    NUtils::TStringOutput out(result);
+    TStringOutput out(result);
     Out(out);
     return result;
 }

diff --git a/client/ydb_table/CMakeLists.txt b/client/ydb_table/CMakeLists.txt
@@ -28,8 +28,7 @@ target_link_libraries(cpp-client-ydb_table PUBLIC
   client-ydb_types-operation
   cpp-client-ydb_value
   cpp-string_utils-misc
-  cpp-string_utils-string_output
-)
+  )
 
 target_sources(cpp-client-ydb_table PRIVATE
   ${CMAKE_SOURCE_DIR}/client/ydb_table/table.cpp

diff --git a/client/ydb_table/table.cpp b/client/ydb_table/table.cpp
@@ -24,7 +24,6 @@
 
 #include <library/cpp/cache/cache.h>
 #include <library/cpp/string_utils/misc/misc.h>
-#include <library/cpp/string_utils/string_output/string_output.h>
 
 #include <util/random/random.h>
 #include <util/string/join.h>
@@ -2294,7 +2293,7 @@ void TIndexDescription::SerializeTo(Ydb::Table::TableIndex& proto) const {
 
 std::string TIndexDescription::ToString() const {
     std::string result;
-    NUtils::TStringOutput out(result);
+    TStringOutput out(result);
     Out(out);
     return result;
 }
@@ -2545,7 +2544,7 @@ void TChangefeedDescription::SerializeTo(Ydb::Table::Changefeed& proto) const {
 
 std::string TChangefeedDescription::ToString() const {
     std::string result;
-    NUtils::TStringOutput out(result);
+    TStringOutput out(result);
     Out(out);
     return result;
 }
@@ -2647,7 +2646,7 @@ void TValueSinceUnixEpochModeSettings::Out(IOutputStream& out, EUnit unit) {
 
 std::string TValueSinceUnixEpochModeSettings::ToString(EUnit unit) {
     std::string result;
-    NUtils::TStringOutput out(result);
+    TStringOutput out(result);
     Out(out, unit);
     return result;
 }

diff --git a/client/ydb_types/operation/CMakeLists.txt b/client/ydb_types/operation/CMakeLists.txt
@@ -7,8 +7,7 @@ target_link_libraries(client-ydb_types-operation PUBLIC
   cpp-threading-future
   public-lib-operation_id
   cpp-client-ydb_types
-  cpp-string_utils-string_output
-)
+  )
 
 target_sources(client-ydb_types-operation PRIVATE
   ${CMAKE_SOURCE_DIR}/client/ydb_types/operation/operation.cpp

diff --git a/client/ydb_types/operation/operation.cpp b/client/ydb_types/operation/operation.cpp
@@ -1,6 +1,5 @@
 #include "operation.h"
 
-#include <library/cpp/string_utils/string_output/string_output.h>
 
 #include <ydb/public/api/protos/ydb_operation.pb.h>
 #include <client/ydb_types/status/status.h>
@@ -68,7 +67,7 @@ const TStatus& TOperation::Status() const {
 
 std::string TOperation::ToString() const {
     std::string result;
-    NUtils::TStringOutput out(result);
+    TStringOutput out(result);
     Out(out);
     return result;
 }

diff --git a/library/cpp/dbg_output/CMakeLists.txt b/library/cpp/dbg_output/CMakeLists.txt
@@ -5,7 +5,6 @@ target_link_libraries(library-cpp-dbg_output PUBLIC
   yutil
   library-cpp-colorizer
   cpp-string_utils-misc
-  cpp-string_utils-escape
 )
 
 target_sources(library-cpp-dbg_output PRIVATE

diff --git a/library/cpp/getopt/small/CMakeLists.txt b/library/cpp/getopt/small/CMakeLists.txt
@@ -5,8 +5,7 @@ target_link_libraries(cpp-getopt-small PUBLIC
   yutil
   library-cpp-colorizer
   cpp-string_utils-misc
-  cpp-string_utils-string_output
-)
+  )
 
 target_sources(cpp-getopt-small PRIVATE
   ${CMAKE_SOURCE_DIR}/library/cpp/getopt/small/completer.cpp

diff --git a/library/cpp/getopt/small/wrap.cpp b/library/cpp/getopt/small/wrap.cpp
@@ -1,8 +1,8 @@
 #include "wrap.h"
 
 #include <library/cpp/colorizer/colors.h>
-#include <library/cpp/string_utils/string_output/string_output.h>
 
+#include <util/stream/str.h>
 #include <util/charset/utf8.h>
 
 namespace NLastGetopt {
@@ -20,7 +20,7 @@ namespace NLastGetopt {
         }
 
         std::string res;
-        auto os = NUtils::TStringOutput(res);
+        auto os = TStringOutput(res);
 
         const char* spaceBegin = text.begin();
         const char* wordBegin = text.begin();

diff --git a/library/cpp/string_utils/CMakeLists.txt b/library/cpp/string_utils/CMakeLists.txt
@@ -7,12 +7,10 @@
 
 
 add_subdirectory(base64)
-add_subdirectory(escape)
 add_subdirectory(misc)
 add_subdirectory(quote)
 add_subdirectory(relaxed_escaper)
 add_subdirectory(scan)
 add_subdirectory(stream)
 add_subdirectory(helpers)
-add_subdirectory(string_output)
 add_subdirectory(url)
diff --git a/library/cpp/string_utils/escape/CMakeLists.txt b/library/cpp/string_utils/escape/CMakeLists.txt
diff --git a/library/cpp/string_utils/escape/escape.cpp b/library/cpp/string_utils/escape/escape.cpp