Skip to content

Commit edc9411

Browse files
zverevgenyivanmorozov333fexolmaavdonkinswalrus1
authored
Cherries from stable cs (#10446)
Co-authored-by: ivanmorozov333 <[email protected]> Co-authored-by: Artem Alekseev <[email protected]> Co-authored-by: Alexander Avdonkin <[email protected]> Co-authored-by: Semyon <[email protected]>
1 parent e8c42a4 commit edc9411

File tree

246 files changed

+2738
-2065
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

246 files changed

+2738
-2065
lines changed

‎ydb/core/formats/arrow/accessor/abstract/constructor.h

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
#pragma once
2-
#include "accessor.h"
3-
4-
#include <ydb/core/formats/arrow/accessor/common/chunk_data.h>
5-
#include <ydb/core/formats/arrow/protos/accessor.pb.h>
62

3+
#include <ydb/library/formats/arrow/protos/accessor.pb.h>
4+
#include <ydb/library/formats/arrow/accessor/abstract/accessor.h>
5+
#include <ydb/library/formats/arrow/accessor/common/chunk_data.h>
76
#include <ydb/services/bg_tasks/abstract/interface.h>
87

98
#include <library/cpp/object_factory/object_factory.h>

‎ydb/core/formats/arrow/accessor/abstract/request.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
#pragma once
22
#include "constructor.h"
33

4-
#include <ydb/core/formats/arrow/protos/accessor.pb.h>
5-
4+
#include <ydb/library/formats/arrow/protos/accessor.pb.h>
65
#include <ydb/services/bg_tasks/abstract/interface.h>
76
#include <ydb/services/metadata/abstract/request_features.h>
87

‎ydb/core/formats/arrow/accessor/abstract/ya.make

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
LIBRARY()
22

33
PEERDIR(
4-
ydb/core/formats/arrow/protos
5-
ydb/core/formats/arrow/accessor/common
64
contrib/libs/apache/arrow
75
ydb/library/conclusion
86
ydb/services/metadata/abstract
7+
ydb/library/formats/arrow/accessor/abstract
8+
ydb/library/formats/arrow/accessor/common
9+
ydb/library/formats/arrow/protos
910
)
1011

1112
SRCS(
12-
accessor.cpp
1313
constructor.cpp
1414
request.cpp
1515
)

‎ydb/core/formats/arrow/accessor/composite_serial/accessor.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#pragma once
2-
#include <ydb/core/formats/arrow/accessor/abstract/accessor.h>
32
#include <ydb/core/formats/arrow/save_load/loader.h>
3+
#include <ydb/library/formats/arrow/accessor/abstract/accessor.h>
44

55
namespace NKikimr::NArrow::NAccessor {
66

‎ydb/core/formats/arrow/accessor/composite_serial/ya.make

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ LIBRARY()
22

33
PEERDIR(
44
contrib/libs/apache/arrow
5+
ydb/library/formats/arrow/accessor/abstract
56
ydb/core/formats/arrow/common
67
ydb/core/formats/arrow/save_load
78
)

‎ydb/core/formats/arrow/accessor/plain/accessor.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#pragma once
2-
#include <ydb/core/formats/arrow/accessor/abstract/accessor.h>
3-
#include <ydb/core/formats/arrow/validation/validation.h>
2+
#include <ydb/library/formats/arrow/accessor/abstract/accessor.h>
3+
#include <ydb/library/formats/arrow/validation/validation.h>
44

55
namespace NKikimr::NArrow::NAccessor {
66

‎ydb/core/formats/arrow/accessor/plain/constructor.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
#include "accessor.h"
22
#include "constructor.h"
33

4-
#include <ydb/core/formats/arrow/accessor/abstract/accessor.h>
5-
#include <ydb/core/formats/arrow/simple_arrays_cache.h>
6-
4+
#include <ydb/library/formats/arrow/accessor/abstract/accessor.h>
5+
#include <ydb/library/formats/arrow/simple_arrays_cache.h>
76
#include <contrib/libs/apache/arrow/cpp/src/arrow/record_batch.h>
87

98
namespace NKikimr::NArrow::NAccessor::NPlain {

‎ydb/core/formats/arrow/accessor/plain/constructor.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#pragma once
22
#include <ydb/core/formats/arrow/accessor/abstract/constructor.h>
3-
#include <ydb/core/formats/arrow/accessor/common/const.h>
3+
#include <ydb/library/formats/arrow/accessor/common/const.h>
44

55
namespace NKikimr::NArrow::NAccessor::NPlain {
66

‎ydb/core/formats/arrow/accessor/plain/request.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#pragma once
22
#include <ydb/core/formats/arrow/accessor/abstract/request.h>
3-
#include <ydb/core/formats/arrow/accessor/common/const.h>
3+
#include <ydb/library/formats/arrow/accessor/common/const.h>
44

55
namespace NKikimr::NArrow::NAccessor::NPlain {
66

‎ydb/core/formats/arrow/accessor/plain/ya.make

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
LIBRARY()
22

33
PEERDIR(
4-
ydb/core/formats/arrow/protos
54
ydb/core/formats/arrow/accessor/abstract
5+
ydb/library/formats/arrow
6+
ydb/library/formats/arrow/protos
67
)
78

89
SRCS(

‎ydb/core/formats/arrow/accessor/sparsed/accessor.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#include "accessor.h"
22

3-
#include <ydb/core/formats/arrow/simple_arrays_cache.h>
43
#include <ydb/core/formats/arrow/size_calcer.h>
54
#include <ydb/core/formats/arrow/splitter/simple.h>
65
#include <ydb/core/formats/arrow/save_load/saver.h>
6+
#include <ydb/library/formats/arrow/simple_arrays_cache.h>
77

88
namespace NKikimr::NArrow::NAccessor {
99

‎ydb/core/formats/arrow/accessor/sparsed/accessor.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#pragma once
2-
#include <ydb/core/formats/arrow/accessor/abstract/accessor.h>
32
#include <ydb/core/formats/arrow/arrow_helpers.h>
43

54
#include <ydb/library/accessor/accessor.h>
5+
#include <ydb/library/formats/arrow/accessor/abstract/accessor.h>
66

77
#include <contrib/libs/apache/arrow/cpp/src/arrow/array/array_base.h>
88
#include <contrib/libs/apache/arrow/cpp/src/arrow/record_batch.h>

‎ydb/core/formats/arrow/accessor/sparsed/constructor.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#pragma once
22
#include <ydb/core/formats/arrow/accessor/abstract/constructor.h>
3-
#include <ydb/core/formats/arrow/accessor/common/const.h>
3+
#include <ydb/library/formats/arrow/accessor/common/const.h>
44

55
namespace NKikimr::NArrow::NAccessor::NSparsed {
66

‎ydb/core/formats/arrow/accessor/sparsed/request.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#pragma once
22
#include <ydb/core/formats/arrow/accessor/abstract/request.h>
3-
#include <ydb/core/formats/arrow/accessor/common/const.h>
3+
#include <ydb/library/formats/arrow/accessor/common/const.h>
44

55
namespace NKikimr::NArrow::NAccessor::NSparsed {
66

‎ydb/core/formats/arrow/accessor/sparsed/ya.make

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
LIBRARY()
22

33
PEERDIR(
4-
ydb/core/formats/arrow/protos
54
ydb/core/formats/arrow/accessor/abstract
5+
ydb/library/formats/arrow
6+
ydb/library/formats/arrow/protos
67
)
78

89
SRCS(

‎ydb/core/formats/arrow/accessor/ya.make

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ LIBRARY()
33
PEERDIR(
44
ydb/core/formats/arrow/accessor/abstract
55
ydb/core/formats/arrow/accessor/plain
6-
ydb/core/formats/arrow/accessor/composite
76
ydb/core/formats/arrow/accessor/composite_serial
87
ydb/core/formats/arrow/accessor/sparsed
98
)

‎ydb/core/formats/arrow/arrow_filter.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#include "arrow_filter.h"
2-
#include "switch_type.h"
2+
#include "switch/switch_type.h"
33
#include "common/container.h"
44
#include "common/adapter.h"
55

0 commit comments

Comments
 (0)