Move ydb/core/io_formats/arrow/csv_arrow ->ydb/library/formats/arrow/…

…csv/converter (#12492)
ydb-platform · Dec 11, 2024 · 95a821a · 95a821a
1 parent 6ed9d1b
commit 95a821a
Show file tree

Hide file tree

Showing 14 changed files with 13 additions and 12 deletions.
diff --git a/ydb/core/io_formats/arrow/csv_arrow_ut.cpp → .../io_formats/arrow/scheme/csv_arrow_ut.cpp b/ydb/core/io_formats/arrow/csv_arrow_ut.cpp → .../io_formats/arrow/scheme/csv_arrow_ut.cpp
diff --git a/ydb/core/io_formats/arrow/scheme/scheme.h b/ydb/core/io_formats/arrow/scheme/scheme.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <ydb/core/io_formats/arrow/csv_arrow/csv_arrow.h>
+#include <ydb/library/formats/arrow/csv/converter/csv_arrow.h>
 #include <ydb/core/scheme_types/scheme_type_info.h>
 
 namespace NKikimr::NFormats {

diff --git a/ydb/core/io_formats/arrow/ut/ya.make → ydb/core/io_formats/arrow/scheme/ut/ya.make b/ydb/core/io_formats/arrow/ut/ya.make → ydb/core/io_formats/arrow/scheme/ut/ya.make
@@ -1,10 +1,8 @@
-UNITTEST_FOR(ydb/core/io_formats/arrow)
+UNITTEST_FOR(ydb/core/io_formats/arrow/scheme)
 
 SIZE(SMALL)
 
 PEERDIR(
-    ydb/core/io_formats/arrow/scheme
-
     # for NYql::NUdf alloc stuff used in binary_json
     yql/essentials/public/udf/service/exception_policy
     yql/essentials/sql/pg_dummy

diff --git a/ydb/core/io_formats/arrow/scheme/ya.make b/ydb/core/io_formats/arrow/scheme/ya.make
@@ -6,10 +6,12 @@ SRCS(
 
 PEERDIR(
     ydb/core/formats/arrow
-    ydb/core/io_formats/arrow/csv_arrow
+    ydb/library/formats/arrow/csv/converter
     ydb/core/scheme_types
 )
 
 YQL_LAST_ABI_VERSION()
 
 END()
+
+RECURSE_FOR_TESTS(ut)
diff --git a/ydb/core/io_formats/arrow/ya.make b/ydb/core/io_formats/arrow/ya.make
@@ -1,6 +1,3 @@
 RECURSE(
-    csv_arrow
     scheme
 )
-
-RECURSE_FOR_TESTS(ut)
diff --git a/.../io_formats/arrow/csv_arrow/csv_arrow.cpp → ...formats/arrow/csv/converter/csv_arrow.cpp b/.../io_formats/arrow/csv_arrow/csv_arrow.cpp → ...formats/arrow/csv/converter/csv_arrow.cpp
diff --git a/...re/io_formats/arrow/csv_arrow/csv_arrow.h → ...y/formats/arrow/csv/converter/csv_arrow.h b/...re/io_formats/arrow/csv_arrow/csv_arrow.h → ...y/formats/arrow/csv/converter/csv_arrow.h
diff --git a/ydb/core/io_formats/arrow/csv_arrow/ya.make → ...brary/formats/arrow/csv/converter/ya.make b/ydb/core/io_formats/arrow/csv_arrow/ya.make → ...brary/formats/arrow/csv/converter/ya.make
diff --git a/ydb/core/io_formats/arrow/table/table.cpp → ...library/formats/arrow/csv/table/table.cpp b/ydb/core/io_formats/arrow/table/table.cpp → ...library/formats/arrow/csv/table/table.cpp
diff --git a/ydb/core/io_formats/arrow/table/table.h → ydb/library/formats/arrow/csv/table/table.h b/ydb/core/io_formats/arrow/table/table.h → ydb/library/formats/arrow/csv/table/table.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <ydb/core/io_formats/arrow/csv_arrow/csv_arrow.h>
+#include <ydb/library/formats/arrow/csv/converter/csv_arrow.h>
 #include <ydb/public/sdk/cpp/client/ydb_table/table.h>
 
 namespace NKikimr::NFormats {

diff --git a/ydb/core/io_formats/arrow/table/ya.make → ydb/library/formats/arrow/csv/table/ya.make b/ydb/core/io_formats/arrow/table/ya.make → ydb/library/formats/arrow/csv/table/ya.make
@@ -5,7 +5,7 @@ SRCS(
 )
 
 PEERDIR(
-    ydb/core/io_formats/arrow/csv_arrow
+    ydb/library/formats/arrow/csv/converter
     ydb/public/sdk/cpp/client/ydb_table
 )
 

diff --git a/ydb/library/formats/arrow/csv/ya.make b/ydb/library/formats/arrow/csv/ya.make
@@ -0,0 +1,4 @@
+RECURSE(
+    converter
+    table
+)
diff --git a/ydb/public/lib/ydb_cli/commands/ya.make b/ydb/public/lib/ydb_cli/commands/ya.make
@@ -38,6 +38,7 @@ PEERDIR(
     library/cpp/regex/pcre
     library/cpp/threading/local_executor
     ydb/library/backup
+    ydb/library/formats/arrow/csv/table
     ydb/library/workload
     ydb/library/yaml_config/public
     ydb/public/lib/operation_id
@@ -66,7 +67,6 @@ PEERDIR(
     ydb/public/sdk/cpp/client/ydb_table
     ydb/public/sdk/cpp/client/ydb_topic
     ydb/public/sdk/cpp/client/ydb_types/credentials/login
-    ydb/core/io_formats/arrow/table
 )
 
 GENERATE_ENUM_SERIALIZATION(ydb_ping.h)

diff --git a/ydb/public/lib/ydb_cli/commands/ydb_workload_import.cpp b/ydb/public/lib/ydb_cli/commands/ydb_workload_import.cpp
@@ -1,5 +1,5 @@
 #include "ydb_workload_import.h"
-#include <ydb/core/io_formats/arrow/table/table.h>
+#include <ydb/library/formats/arrow/csv/table/table.h>
 #include <ydb/public/api/protos/ydb_formats.pb.h>
 #include <ydb/public/lib/ydb_cli/commands/ydb_common.h>
 #include <ydb/public/lib/ydb_cli/common/recursive_list.h>