Revert "Remove ut_osiris -> yt gateway dependence via tx_proxy (#2976)" (#3019)

dcherednik · web-flow · commit 2669af62f910 · 2024-03-21T00:39:27.000+01:00
This reverts commit 0b19900
diff --git a/ydb/core/grpc_services/rpc_load_rows.cpp b/ydb/core/grpc_services/rpc_load_rows.cpp
@@ -4,7 +4,7 @@
 #include "service_table.h"
 #include "audit_dml_operations.h"
 
-#include <ydb/core/tx/tx_proxy/upload_rows/upload_rows_common_impl.h>
+#include <ydb/core/tx/tx_proxy/upload_rows_common_impl.h>
 #include <ydb/core/ydb_convert/ydb_convert.h>
 
 #include <ydb/library/yql/public/udf/udf_types.h>
diff --git a/ydb/core/grpc_services/rpc_read_rows.cpp b/ydb/core/grpc_services/rpc_read_rows.cpp
@@ -7,7 +7,7 @@
 #include <ydb/core/kqp/executer_actor/kqp_executer_stats.h>
 #include <ydb/core/scheme/scheme_tabledefs.h>
 #include <ydb/core/tx/schemeshard/schemeshard.h>
-#include <ydb/core/tx/tx_proxy/upload_rows/upload_rows_common_impl.h>
+#include <ydb/core/tx/tx_proxy/upload_rows_common_impl.h>
 #include <ydb/core/ydb_convert/ydb_convert.h>
 
 #include <ydb/library/yql/parser/pg_wrapper/interface/type_desc.h>
diff --git a/ydb/core/kqp/executer_actor/kqp_executer.h b/ydb/core/kqp/executer_actor/kqp_executer.h
@@ -6,6 +6,7 @@
 #include <ydb/core/kqp/query_data/kqp_query_data.h>
 #include <ydb/core/kqp/gateway/kqp_gateway.h>
 #include <ydb/core/kqp/counters/kqp_counters.h>
+#include <ydb/core/kqp/federated_query/kqp_federated_query_helpers.h>
 #include <ydb/core/tx/long_tx_service/public/lock_handle.h>
 #include <ydb/library/yql/dq/actors/compute/dq_compute_actor_async_io_factory.h>
 #include <ydb/core/protos/table_service_config.pb.h>
@@ -94,8 +95,6 @@ struct TEvKqpExecuter {
     };
 };
 
-struct TKqpFederatedQuerySetup;
-
 IActor* CreateKqpExecuter(IKqpGateway::TExecPhysicalRequest&& request, const TString& database,
     const TIntrusiveConstPtr<NACLib::TUserToken>& userToken, TKqpRequestCounters::TPtr counters,
     const NKikimrConfig::TTableServiceConfig::TAggregationConfig& aggregation,
diff --git a/ydb/core/kqp/ut/data/kqp_read_null_ut.cpp b/ydb/core/kqp/ut/data/kqp_read_null_ut.cpp
@@ -5,7 +5,7 @@
 #include <ydb/core/testlib/test_client.h>
 #include <ydb/core/tx/schemeshard/schemeshard.h>
 #include <ydb/core/tx/tx_proxy/proxy.h>
-#include <ydb/core/tx/tx_proxy/upload_rows/upload_rows.h>
+#include <ydb/core/tx/tx_proxy/upload_rows.h>
 
 #include <library/cpp/testing/unittest/registar.h>
 
diff --git a/ydb/core/tx/datashard/build_index.cpp b/ydb/core/tx/datashard/build_index.cpp
@@ -10,7 +10,7 @@
 #include <ydb/core/kqp/common/kqp_types.h>
 
 #include <ydb/core/tx/tx_proxy/proxy.h>
-#include <ydb/core/tx/tx_proxy/upload_rows/upload_rows.h>
+#include <ydb/core/tx/tx_proxy/upload_rows.h>
 
 #include <ydb/library/yql/public/issue/yql_issue_message.h>
 
diff --git a/ydb/core/tx/datashard/datashard_ut_build_index.cpp b/ydb/core/tx/datashard/datashard_ut_build_index.cpp
@@ -5,6 +5,7 @@
 #include <ydb/core/testlib/test_client.h>
 #include <ydb/core/tx/schemeshard/schemeshard.h>
 #include <ydb/core/tx/tx_proxy/proxy.h>
+#include <ydb/core/tx/tx_proxy/upload_rows.h>
 
 #include <ydb/library/yql/public/issue/yql_issue_message.h>
 
diff --git a/ydb/core/tx/datashard/datashard_ut_snapshot.cpp b/ydb/core/tx/datashard/datashard_ut_snapshot.cpp
@@ -5,7 +5,7 @@
 #include <ydb/core/formats/factory.h>
 #include <ydb/core/tx/long_tx_service/public/lock_handle.h>
 #include <ydb/core/tx/tx_proxy/proxy.h>
-#include <ydb/core/tx/tx_proxy/upload_rows/upload_rows.h>
+#include <ydb/core/tx/tx_proxy/upload_rows.h>
 
 #include <ydb/core/kqp/ut/common/kqp_ut_common.h> // Y_UNIT_TEST_(TWIN|QUAD)
 #include <ydb/core/mind/local.h>
diff --git a/ydb/core/tx/datashard/datashard_ut_trace.cpp b/ydb/core/tx/datashard/datashard_ut_trace.cpp
@@ -7,6 +7,7 @@
 #include <ydb/core/tx/datashard/ut_common/datashard_ut_common.h>
 #include <ydb/core/tx/schemeshard/schemeshard.h>
 #include <ydb/core/tx/tx_proxy/proxy.h>
+#include <ydb/core/tx/tx_proxy/upload_rows.h>
 #include <ydb/library/actors/wilson/test_util/fake_wilson_uploader.h>
 
 #include <library/cpp/testing/unittest/registar.h>
diff --git a/ydb/core/tx/datashard/datashard_ut_upload_rows.cpp b/ydb/core/tx/datashard/datashard_ut_upload_rows.cpp
@@ -6,7 +6,7 @@
 #include <ydb/core/testlib/test_client.h>
 #include <ydb/core/tx/schemeshard/schemeshard.h>
 #include <ydb/core/tx/tx_proxy/proxy.h>
-#include <ydb/core/tx/tx_proxy/upload_rows/upload_rows.h>
+#include <ydb/core/tx/tx_proxy/upload_rows.h>
 
 #include <library/cpp/testing/unittest/registar.h>
 
diff --git a/ydb/core/tx/datashard/ut_common/datashard_ut_common.cpp b/ydb/core/tx/datashard/ut_common/datashard_ut_common.cpp
@@ -12,7 +12,7 @@
 #include <ydb/core/tx/data_events/payload_helper.h>
 #include <ydb/core/tx/tx_allocator/txallocator.h>
 #include <ydb/core/tx/tx_proxy/proxy.h>
-#include <ydb/core/tx/tx_proxy/upload_rows/upload_rows.h>
+#include <ydb/core/tx/tx_proxy/upload_rows.h>
 #include <ydb/core/tx/schemeshard/schemeshard_build_index.h>
 #include <ydb/core/protos/follower_group.pb.h>
 #include <ydb/public/sdk/cpp/client/ydb_result/result.h>
diff --git a/ydb/core/tx/tx_proxy/upload_rows.cpp b/ydb/core/tx/tx_proxy/upload_rows.cpp
diff --git a/ydb/core/tx/tx_proxy/upload_rows.h b/ydb/core/tx/tx_proxy/upload_rows.h
diff --git a/ydb/core/tx/tx_proxy/upload_rows/defs.h b/ydb/core/tx/tx_proxy/upload_rows/defs.h
diff --git a/ydb/core/tx/tx_proxy/upload_rows/ya.make b/ydb/core/tx/tx_proxy/upload_rows/ya.make
diff --git a/ydb/core/tx/tx_proxy/upload_rows_common_impl.cpp b/ydb/core/tx/tx_proxy/upload_rows_common_impl.cpp
diff --git a/ydb/core/tx/tx_proxy/upload_rows_common_impl.h b/ydb/core/tx/tx_proxy/upload_rows_common_impl.h
diff --git a/ydb/core/tx/tx_proxy/ya.make b/ydb/core/tx/tx_proxy/ya.make
@@ -11,6 +11,8 @@ SRCS(
     resolvereq.cpp
     snapshotreq.cpp
     commitreq.cpp
+    upload_rows_common_impl.cpp
+    upload_rows.cpp
 )
 
 GENERATE_ENUM_SERIALIZATION(read_table_impl.h)
@@ -26,6 +28,7 @@ PEERDIR(
     ydb/core/docapi
     ydb/core/engine
     ydb/core/formats
+    ydb/core/grpc_services
     ydb/core/io_formats/arrow
     ydb/core/protos
     ydb/core/scheme
@@ -48,10 +51,6 @@ YQL_LAST_ABI_VERSION()
 
 END()
 
-RECURSE(
-    upload_rows
-)
-
 RECURSE_FOR_TESTS(
     ut_base_tenant
     ut_encrypted_storage
diff --git a/ydb/core/ymq/actor/ya.make b/ydb/core/ymq/actor/ya.make
@@ -89,7 +89,6 @@ PEERDIR(
     ydb/public/lib/value
     ydb/public/sdk/cpp/client/ydb_types/credentials
     ydb/library/yql/minikql
-    ydb/library/ycloud/api
     ydb/public/lib/deprecated/client
 )
 
diff --git a/ydb/services/ext_index/service/activation.h b/ydb/services/ext_index/service/activation.h
@@ -1,4 +1,5 @@
 #pragma once
+#include <ydb/core/tx/tx_proxy/proxy.h>
 #include <ydb/services/ext_index/metadata/object.h>
 #include <ydb/services/metadata/ds_table/scheme_describe.h>
 
diff --git a/ydb/services/ext_index/service/add_data.h b/ydb/services/ext_index/service/add_data.h
@@ -3,6 +3,7 @@
 #include <ydb/services/ext_index/common/service.h>
 #include <ydb/services/metadata/ds_table/scheme_describe.h>
 #include <contrib/libs/apache/arrow/cpp/src/arrow/record_batch.h>
+#include <ydb/core/tx/tx_proxy/proxy.h>
 #include "add_index.h"
 
 namespace NKikimr::NCSIndex {
diff --git a/ydb/services/ext_index/service/add_index.cpp b/ydb/services/ext_index/service/add_index.cpp
@@ -1,5 +1,5 @@
 #include "add_index.h"
-#include <ydb/core/tx/tx_proxy/upload_rows/upload_rows.h>
+#include <ydb/core/tx/tx_proxy/upload_rows.h>
 #include <ydb/core/formats/arrow/converter.h>
 #include <ydb/core/scheme/scheme_tablecell.h>
 
diff --git a/ydb/services/ext_index/service/deleting.h b/ydb/services/ext_index/service/deleting.h
@@ -1,4 +1,5 @@
 #pragma once
+#include <ydb/core/tx/tx_proxy/proxy.h>
 
 #include <ydb/services/metadata/request/request_actor.h>
 #include <ydb/services/ext_index/metadata/object.h>
diff --git a/ydb/services/ext_index/service/ya.make b/ydb/services/ext_index/service/ya.make
@@ -10,7 +10,6 @@ SRCS(
 
 PEERDIR(
     ydb/library/actors/core
-    ydb/core/tx/tx_proxy/upload_rows
     ydb/services/ext_index/metadata
     ydb/services/ext_index/common
     ydb/library/yql/minikql/jsonpath
