Merge 5a0e3ed into c808caf

ydb-platform · May 31, 2024 · 1a79277 · 1a79277
2 parents c808caf + 5a0e3ed
commit 1a79277
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 10 deletions.
diff --git a/ydb/library/yql/providers/s3/actors/ya.make b/ydb/library/yql/providers/s3/actors/ya.make
@@ -9,17 +9,17 @@ ADDINCL(
 YQL_LAST_ABI_VERSION()
 
 SRCS(
-    raw_read_actor.cpp
     yql_s3_actors_util.cpp
     yql_s3_applicator_actor.cpp
     yql_s3_sink_factory.cpp
+    yql_s3_raw_read_actor.cpp
     yql_s3_source_factory.cpp
     yql_s3_write_actor.cpp
 )
 
 PEERDIR(
-    contrib/libs/fmt
     contrib/libs/apache/arrow
+    contrib/libs/fmt
     contrib/libs/poco/Util
     ydb/library/actors/http
     library/cpp/protobuf/util
@@ -50,9 +50,9 @@ PEERDIR(
 IF (CLANG AND NOT WITH_VALGRIND)
 
     SRCS(
-        source_queue.cpp
         yql_arrow_column_converters.cpp
         yql_s3_read_actor.cpp
+        yql_s3_source_queue.cpp
     )
 
     PEERDIR(

diff --git a/...ql/providers/s3/actors/raw_read_actor.cpp → ...iders/s3/actors/yql_s3_raw_read_actor.cpp b/...ql/providers/s3/actors/raw_read_actor.cpp → ...iders/s3/actors/yql_s3_raw_read_actor.cpp
@@ -1,8 +1,8 @@
 #include <ydb/library/yql/providers/s3/events/events.h>
 
-#include "raw_read_actor.h"
-#include "source_queue.h"
 #include "yql_s3_actors_util.cpp"
+#include "yql_s3_raw_read_actor.h"
+#include "yql_s3_source_queue.h"
 
 #include <ydb/library/actors/core/actor_bootstrapped.h>
 #include <ydb/library/actors/core/log.h>

diff --git a/.../yql/providers/s3/actors/raw_read_actor.h → ...oviders/s3/actors/yql_s3_raw_read_actor.h b/.../yql/providers/s3/actors/raw_read_actor.h → ...oviders/s3/actors/yql_s3_raw_read_actor.h
diff --git a/ydb/library/yql/providers/s3/actors/yql_s3_read_actor.cpp b/ydb/library/yql/providers/s3/actors/yql_s3_read_actor.cpp
@@ -36,12 +36,12 @@
 
 #endif
 
-#include "raw_read_actor.h"
-#include "source_queue.h"
 #include "yql_arrow_column_converters.h"
 #include "yql_s3_actors_util.h"
+#include "yql_s3_raw_read_actor.h"
 #include "yql_s3_read_actor.h"
 #include "yql_s3_source_factory.h"
+#include "yql_s3_source_queue.h"
 
 #include <ydb/core/base/events.h>
 #include <ydb/library/services/services.pb.h>

diff --git a/ydb/library/yql/providers/s3/actors/yql_s3_read_actor.h b/ydb/library/yql/providers/s3/actors/yql_s3_read_actor.h
@@ -2,11 +2,12 @@
 
 #include <ydb/library/yql/dq/actors/compute/dq_compute_actor_async_io.h>
 #include <ydb/library/yql/providers/common/http_gateway/yql_http_gateway.h>
-#include "ydb/library/yql/providers/s3/object_listers/yql_s3_list.h"
+#include <ydb/library/yql/providers/s3/object_listers/yql_s3_list.h>
 #include <ydb/library/yql/providers/s3/proto/retry_config.pb.h>
 #include <ydb/library/yql/providers/s3/proto/source.pb.h>
-#include "ydb/library/yql/providers/s3/range_helpers/path_list_reader.h"
+#include <ydb/library/yql/providers/s3/range_helpers/path_list_reader.h>
 #include <ydb/library/yql/providers/common/token_accessor/client/factory.h>
+
 #include <ydb/library/actors/core/actor.h>
 
 namespace NYql::NDq {

diff --git a/.../yql/providers/s3/actors/source_queue.cpp → ...oviders/s3/actors/yql_s3_source_queue.cpp b/.../yql/providers/s3/actors/source_queue.cpp → ...oviders/s3/actors/yql_s3_source_queue.cpp
@@ -38,8 +38,8 @@
 
 #include "yql_arrow_column_converters.h"
 #include "yql_s3_actors_util.h"
-#include "yql_s3_read_actor.h"
 #include "yql_s3_source_factory.h"
+#include "yql_s3_source_queue.h"
 
 #include <ydb/core/base/events.h>
 #include <ydb/library/services/services.pb.h>

diff --git a/...ry/yql/providers/s3/actors/source_queue.h → ...providers/s3/actors/yql_s3_source_queue.h b/...ry/yql/providers/s3/actors/source_queue.h → ...providers/s3/actors/yql_s3_source_queue.h