Merge a77cd38 into 45ddb73

ydb-platform · Sep 12, 2024 · 1968ec4 · 1968ec4
2 parents 45ddb73 + a77cd38
commit 1968ec4
Show file tree

Hide file tree

Showing 209 changed files with 2,448 additions and 1,871 deletions.
diff --git a/ydb/core/formats/arrow/accessor/abstract/constructor.h b/ydb/core/formats/arrow/accessor/abstract/constructor.h
@@ -1,9 +1,8 @@
 #pragma once
-#include "accessor.h"
-
-#include <ydb/core/formats/arrow/accessor/common/chunk_data.h>
-#include <ydb/core/formats/arrow/protos/accessor.pb.h>
 
+#include <ydb/library/formats/arrow/protos/accessor.pb.h>
+#include <ydb/library/formats/arrow/accessor/abstract/accessor.h>
+#include <ydb/library/formats/arrow/accessor/common/chunk_data.h>
 #include <ydb/services/bg_tasks/abstract/interface.h>
 
 #include <library/cpp/object_factory/object_factory.h>

diff --git a/ydb/core/formats/arrow/accessor/abstract/request.h b/ydb/core/formats/arrow/accessor/abstract/request.h
@@ -1,8 +1,7 @@
 #pragma once
 #include "constructor.h"
 
-#include <ydb/core/formats/arrow/protos/accessor.pb.h>
-
+#include <ydb/library/formats/arrow/protos/accessor.pb.h>
 #include <ydb/services/bg_tasks/abstract/interface.h>
 #include <ydb/services/metadata/abstract/request_features.h>
 

diff --git a/ydb/core/formats/arrow/accessor/abstract/ya.make b/ydb/core/formats/arrow/accessor/abstract/ya.make
@@ -1,15 +1,15 @@
 LIBRARY()
 
 PEERDIR(
-    ydb/core/formats/arrow/protos
-    ydb/core/formats/arrow/accessor/common
     contrib/libs/apache/arrow
     ydb/library/conclusion
     ydb/services/metadata/abstract
+    ydb/library/formats/arrow/accessor/abstract
+    ydb/library/formats/arrow/accessor/common
+    ydb/library/formats/arrow/protos
 )
 
 SRCS(
-    accessor.cpp
     constructor.cpp
     request.cpp
 )

diff --git a/ydb/core/formats/arrow/accessor/composite_serial/accessor.h b/ydb/core/formats/arrow/accessor/composite_serial/accessor.h
@@ -1,6 +1,6 @@
 #pragma once
-#include <ydb/core/formats/arrow/accessor/abstract/accessor.h>
 #include <ydb/core/formats/arrow/save_load/loader.h>
+#include <ydb/library/formats/arrow/accessor/abstract/accessor.h>
 
 namespace NKikimr::NArrow::NAccessor {
 

diff --git a/ydb/core/formats/arrow/accessor/composite_serial/ya.make b/ydb/core/formats/arrow/accessor/composite_serial/ya.make
@@ -2,6 +2,7 @@ LIBRARY()
 
 PEERDIR(
     contrib/libs/apache/arrow
+    ydb/library/formats/arrow/accessor/abstract
     ydb/core/formats/arrow/common
     ydb/core/formats/arrow/save_load
 )

diff --git a/ydb/core/formats/arrow/accessor/plain/accessor.h b/ydb/core/formats/arrow/accessor/plain/accessor.h
@@ -1,6 +1,6 @@
 #pragma once
-#include <ydb/core/formats/arrow/accessor/abstract/accessor.h>
-#include <ydb/core/formats/arrow/validation/validation.h>
+#include <ydb/library/formats/arrow/accessor/abstract/accessor.h>
+#include <ydb/library/formats/arrow/validation/validation.h>
 
 namespace NKikimr::NArrow::NAccessor {
 

diff --git a/ydb/core/formats/arrow/accessor/plain/constructor.cpp b/ydb/core/formats/arrow/accessor/plain/constructor.cpp
@@ -1,9 +1,8 @@
 #include "accessor.h"
 #include "constructor.h"
 
-#include <ydb/core/formats/arrow/accessor/abstract/accessor.h>
-#include <ydb/core/formats/arrow/simple_arrays_cache.h>
-
+#include <ydb/library/formats/arrow/accessor/abstract/accessor.h>
+#include <ydb/library/formats/arrow/simple_arrays_cache.h>
 #include <contrib/libs/apache/arrow/cpp/src/arrow/record_batch.h>
 
 namespace NKikimr::NArrow::NAccessor::NPlain {

diff --git a/ydb/core/formats/arrow/accessor/plain/constructor.h b/ydb/core/formats/arrow/accessor/plain/constructor.h
@@ -1,6 +1,6 @@
 #pragma once
 #include <ydb/core/formats/arrow/accessor/abstract/constructor.h>
-#include <ydb/core/formats/arrow/accessor/common/const.h>
+#include <ydb/library/formats/arrow/accessor/common/const.h>
 
 namespace NKikimr::NArrow::NAccessor::NPlain {
 

diff --git a/ydb/core/formats/arrow/accessor/plain/request.h b/ydb/core/formats/arrow/accessor/plain/request.h
@@ -1,6 +1,6 @@
 #pragma once
 #include <ydb/core/formats/arrow/accessor/abstract/request.h>
-#include <ydb/core/formats/arrow/accessor/common/const.h>
+#include <ydb/library/formats/arrow/accessor/common/const.h>
 
 namespace NKikimr::NArrow::NAccessor::NPlain {
 

diff --git a/ydb/core/formats/arrow/accessor/plain/ya.make b/ydb/core/formats/arrow/accessor/plain/ya.make
@@ -1,8 +1,9 @@
 LIBRARY()
 
 PEERDIR(
-    ydb/core/formats/arrow/protos
     ydb/core/formats/arrow/accessor/abstract
+    ydb/library/formats/arrow
+    ydb/library/formats/arrow/protos
 )
 
 SRCS(

diff --git a/ydb/core/formats/arrow/accessor/sparsed/accessor.cpp b/ydb/core/formats/arrow/accessor/sparsed/accessor.cpp
@@ -1,9 +1,9 @@
 #include "accessor.h"
 
-#include <ydb/core/formats/arrow/simple_arrays_cache.h>
 #include <ydb/core/formats/arrow/size_calcer.h>
 #include <ydb/core/formats/arrow/splitter/simple.h>
 #include <ydb/core/formats/arrow/save_load/saver.h>
+#include <ydb/library/formats/arrow/simple_arrays_cache.h>
 
 namespace NKikimr::NArrow::NAccessor {
 

diff --git a/ydb/core/formats/arrow/accessor/sparsed/accessor.h b/ydb/core/formats/arrow/accessor/sparsed/accessor.h
@@ -1,8 +1,8 @@
 #pragma once
-#include <ydb/core/formats/arrow/accessor/abstract/accessor.h>
 #include <ydb/core/formats/arrow/arrow_helpers.h>
 
 #include <ydb/library/accessor/accessor.h>
+#include <ydb/library/formats/arrow/accessor/abstract/accessor.h>
 
 #include <contrib/libs/apache/arrow/cpp/src/arrow/array/array_base.h>
 #include <contrib/libs/apache/arrow/cpp/src/arrow/record_batch.h>

diff --git a/ydb/core/formats/arrow/accessor/sparsed/constructor.h b/ydb/core/formats/arrow/accessor/sparsed/constructor.h
@@ -1,6 +1,6 @@
 #pragma once
 #include <ydb/core/formats/arrow/accessor/abstract/constructor.h>
-#include <ydb/core/formats/arrow/accessor/common/const.h>
+#include <ydb/library/formats/arrow/accessor/common/const.h>
 
 namespace NKikimr::NArrow::NAccessor::NSparsed {
 

diff --git a/ydb/core/formats/arrow/accessor/sparsed/request.h b/ydb/core/formats/arrow/accessor/sparsed/request.h
@@ -1,6 +1,6 @@
 #pragma once
 #include <ydb/core/formats/arrow/accessor/abstract/request.h>
-#include <ydb/core/formats/arrow/accessor/common/const.h>
+#include <ydb/library/formats/arrow/accessor/common/const.h>
 
 namespace NKikimr::NArrow::NAccessor::NSparsed {
 

diff --git a/ydb/core/formats/arrow/accessor/sparsed/ya.make b/ydb/core/formats/arrow/accessor/sparsed/ya.make
@@ -1,8 +1,9 @@
 LIBRARY()
 
 PEERDIR(
-    ydb/core/formats/arrow/protos
     ydb/core/formats/arrow/accessor/abstract
+    ydb/library/formats/arrow
+    ydb/library/formats/arrow/protos
 )
 
 SRCS(

diff --git a/ydb/core/formats/arrow/accessor/ya.make b/ydb/core/formats/arrow/accessor/ya.make
@@ -3,7 +3,6 @@ LIBRARY()
 PEERDIR(
     ydb/core/formats/arrow/accessor/abstract
     ydb/core/formats/arrow/accessor/plain
-    ydb/core/formats/arrow/accessor/composite
     ydb/core/formats/arrow/accessor/composite_serial
     ydb/core/formats/arrow/accessor/sparsed
 )

diff --git a/ydb/core/formats/arrow/arrow_filter.cpp b/ydb/core/formats/arrow/arrow_filter.cpp
@@ -1,5 +1,5 @@
 #include "arrow_filter.h"
-#include "switch_type.h"
+#include "switch/switch_type.h"
 #include "common/container.h"
 #include "common/adapter.h"