aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraneporada <aneporada@yandex-team.com>2024-12-02 12:26:29 +0300
committeraneporada <aneporada@yandex-team.com>2024-12-02 12:40:40 +0300
commit1a9b1e0798979615af62615cfb965f01c2898625 (patch)
treebf67e1d935a5d045bc039248446194bd3799486e
parent3d5ec21a38b36bbc71c5296afdfda0fe7e07d569 (diff)
downloadydb-1a9b1e0798979615af62615cfb965f01c2898625.tar.gz
Relocate yt and stat providers
В рамках возвращения YQL в лоно Аркадии в данном PR осуществляется механический перенос YQL YT провайдера из contrib/ydb/library/yql/providers/yt в yt/yql/providers/yt (просто arc mv \+ правка путей). Подробности см. в YQL-19206 и YQL-19309 commit_hash:4c5b43760d3053698f0d5b6cdb820bc72c48e741
-rw-r--r--yql/essentials/core/extract_predicate/ut/extract_predicate_ut.cpp6
-rw-r--r--yql/essentials/core/extract_predicate/ut/ya.make8
-rw-r--r--yql/essentials/core/ut/ya.make8
-rw-r--r--yql/essentials/core/ut/yql_execution_ut.cpp6
-rw-r--r--yql/essentials/core/ut/yql_expr_constraint_ut.cpp4
-rw-r--r--yql/essentials/core/ut/yql_expr_discover_ut.cpp6
-rw-r--r--yql/essentials/core/ut/yql_expr_optimize_ut.cpp6
-rw-r--r--yql/essentials/core/ut/yql_expr_providers_ut.cpp6
-rw-r--r--yql/essentials/core/ut/yql_qplayer_ut.cpp6
-rw-r--r--yql/essentials/core/ut_common/yql_ut_common.h4
-rw-r--r--yql/essentials/minikql/protobuf_udf/ut/type_builder_ut.cpp4
-rw-r--r--yql/essentials/minikql/protobuf_udf/ut/ya.make4
-rw-r--r--yql/essentials/public/purecalc/common/no_llvm/ya.make2
-rw-r--r--yql/essentials/public/purecalc/common/ya.make2
-rw-r--r--yql/essentials/public/purecalc/no_llvm/ya.make2
-rw-r--r--yql/essentials/tools/pgrun/pgrun.cpp10
-rw-r--r--yql/essentials/tools/pgrun/ya.make10
-rw-r--r--yt/yql/providers/yt/comp_nodes/ya.make.inc45
18 files changed, 92 insertions, 47 deletions
diff --git a/yql/essentials/core/extract_predicate/ut/extract_predicate_ut.cpp b/yql/essentials/core/extract_predicate/ut/extract_predicate_ut.cpp
index 5c55117901..05a2b08b2a 100644
--- a/yql/essentials/core/extract_predicate/ut/extract_predicate_ut.cpp
+++ b/yql/essentials/core/extract_predicate/ut/extract_predicate_ut.cpp
@@ -1,8 +1,8 @@
#include "extract_predicate_impl.h"
-#include <contrib/ydb/library/yql/providers/yt/provider/yql_yt_provider.h>
-#include <contrib/ydb/library/yql/providers/yt/gateway/file/yql_yt_file.h>
-#include <contrib/ydb/library/yql/providers/yt/gateway/file/yql_yt_file_services.h>
+#include <yt/yql/providers/yt/provider/yql_yt_provider.h>
+#include <yt/yql/providers/yt/gateway/file/yql_yt_file.h>
+#include <yt/yql/providers/yt/gateway/file/yql_yt_file_services.h>
#include <yql/essentials/providers/config/yql_config_provider.h>
#include <yql/essentials/providers/result/provider/yql_result_provider.h>
#include <yql/essentials/providers/common/provider/yql_provider_names.h>
diff --git a/yql/essentials/core/extract_predicate/ut/ya.make b/yql/essentials/core/extract_predicate/ut/ya.make
index fd2595e89b..4df3655466 100644
--- a/yql/essentials/core/extract_predicate/ut/ya.make
+++ b/yql/essentials/core/extract_predicate/ut/ya.make
@@ -18,10 +18,10 @@ PEERDIR(
yql/essentials/providers/common/mkql
yql/essentials/providers/common/provider
yql/essentials/providers/result/provider
- contrib/ydb/library/yql/providers/yt/gateway/file
- contrib/ydb/library/yql/providers/yt/provider
- contrib/ydb/library/yql/providers/yt/codec/codegen
- contrib/ydb/library/yql/providers/yt/comp_nodes/llvm14
+ yt/yql/providers/yt/gateway/file
+ yt/yql/providers/yt/provider
+ yt/yql/providers/yt/codec/codegen
+ yt/yql/providers/yt/comp_nodes/llvm14
yql/essentials/core/cbo/simple
yql/essentials/minikql/comp_nodes/llvm14
yql/essentials/minikql/invoke_builtins/llvm14
diff --git a/yql/essentials/core/ut/ya.make b/yql/essentials/core/ut/ya.make
index 5a40d5367e..8f548fea27 100644
--- a/yql/essentials/core/ut/ya.make
+++ b/yql/essentials/core/ut/ya.make
@@ -36,10 +36,10 @@ PEERDIR(
yql/essentials/providers/common/provider
yql/essentials/providers/common/schema/parser
yql/essentials/providers/result/provider
- contrib/ydb/library/yql/providers/yt/gateway/file
- contrib/ydb/library/yql/providers/yt/provider
- contrib/ydb/library/yql/providers/yt/codec/codegen
- contrib/ydb/library/yql/providers/yt/comp_nodes/llvm14
+ yt/yql/providers/yt/gateway/file
+ yt/yql/providers/yt/provider
+ yt/yql/providers/yt/codec/codegen
+ yt/yql/providers/yt/comp_nodes/llvm14
yql/essentials/minikql/comp_nodes/llvm14
yql/essentials/minikql/invoke_builtins/llvm14
yql/essentials/sql/pg
diff --git a/yql/essentials/core/ut/yql_execution_ut.cpp b/yql/essentials/core/ut/yql_execution_ut.cpp
index 8860188a54..01ba31c50d 100644
--- a/yql/essentials/core/ut/yql_execution_ut.cpp
+++ b/yql/essentials/core/ut/yql_execution_ut.cpp
@@ -15,9 +15,9 @@
#include <yql/essentials/providers/result/provider/yql_result_provider.h>
#include <yql/essentials/core/facade/yql_facade.h>
-#include <contrib/ydb/library/yql/providers/yt/provider/yql_yt_provider.h>
-#include <contrib/ydb/library/yql/providers/yt/gateway/file/yql_yt_file.h>
-#include <contrib/ydb/library/yql/providers/yt/gateway/file/yql_yt_file_services.h>
+#include <yt/yql/providers/yt/provider/yql_yt_provider.h>
+#include <yt/yql/providers/yt/gateway/file/yql_yt_file.h>
+#include <yt/yql/providers/yt/gateway/file/yql_yt_file_services.h>
#include <yql/essentials/minikql/invoke_builtins/mkql_builtins.h>
#include <library/cpp/testing/unittest/registar.h>
diff --git a/yql/essentials/core/ut/yql_expr_constraint_ut.cpp b/yql/essentials/core/ut/yql_expr_constraint_ut.cpp
index e860d506c5..d83c2a15c0 100644
--- a/yql/essentials/core/ut/yql_expr_constraint_ut.cpp
+++ b/yql/essentials/core/ut/yql_expr_constraint_ut.cpp
@@ -1,5 +1,5 @@
-#include <contrib/ydb/library/yql/providers/yt/provider/yql_yt_provider.h>
-#include <contrib/ydb/library/yql/providers/yt/gateway/file/yql_yt_file.h>
+#include <yt/yql/providers/yt/provider/yql_yt_provider.h>
+#include <yt/yql/providers/yt/gateway/file/yql_yt_file.h>
#include <yql/essentials/providers/common/provider/yql_provider_names.h>
#include <yql/essentials/ast/yql_ast_annotation.h>
#include <yql/essentials/ast/yql_expr.h>
diff --git a/yql/essentials/core/ut/yql_expr_discover_ut.cpp b/yql/essentials/core/ut/yql_expr_discover_ut.cpp
index bf59d252dc..59dfd69dc4 100644
--- a/yql/essentials/core/ut/yql_expr_discover_ut.cpp
+++ b/yql/essentials/core/ut/yql_expr_discover_ut.cpp
@@ -1,8 +1,8 @@
#include "yql_opt_proposed_by_data.h"
-#include <contrib/ydb/library/yql/providers/yt/provider/yql_yt_provider.h>
-#include <contrib/ydb/library/yql/providers/yt/gateway/file/yql_yt_file.h>
-#include <contrib/ydb/library/yql/providers/yt/gateway/file/yql_yt_file_services.h>
+#include <yt/yql/providers/yt/provider/yql_yt_provider.h>
+#include <yt/yql/providers/yt/gateway/file/yql_yt_file.h>
+#include <yt/yql/providers/yt/gateway/file/yql_yt_file_services.h>
#include <yql/essentials/providers/common/provider/yql_provider_names.h>
#include <yql/essentials/ast/yql_ast_annotation.h>
#include <yql/essentials/ast/yql_expr.h>
diff --git a/yql/essentials/core/ut/yql_expr_optimize_ut.cpp b/yql/essentials/core/ut/yql_expr_optimize_ut.cpp
index 81e30dd397..3e97406d12 100644
--- a/yql/essentials/core/ut/yql_expr_optimize_ut.cpp
+++ b/yql/essentials/core/ut/yql_expr_optimize_ut.cpp
@@ -2,9 +2,9 @@
#include "yql_opt_rewrite_io.h"
#include "yql_opt_proposed_by_data.h"
-#include <contrib/ydb/library/yql/providers/yt/provider/yql_yt_provider.h>
-#include <contrib/ydb/library/yql/providers/yt/gateway/file/yql_yt_file.h>
-#include <contrib/ydb/library/yql/providers/yt/gateway/file/yql_yt_file_services.h>
+#include <yt/yql/providers/yt/provider/yql_yt_provider.h>
+#include <yt/yql/providers/yt/gateway/file/yql_yt_file.h>
+#include <yt/yql/providers/yt/gateway/file/yql_yt_file_services.h>
#include <yql/essentials/providers/common/provider/yql_provider_names.h>
#include <yql/essentials/ast/yql_ast_annotation.h>
#include <yql/essentials/ast/yql_expr.h>
diff --git a/yql/essentials/core/ut/yql_expr_providers_ut.cpp b/yql/essentials/core/ut/yql_expr_providers_ut.cpp
index 2d2c79f49f..ba98ccc8f9 100644
--- a/yql/essentials/core/ut/yql_expr_providers_ut.cpp
+++ b/yql/essentials/core/ut/yql_expr_providers_ut.cpp
@@ -7,9 +7,9 @@
#include <yql/essentials/core/yql_expr_type_annotation.h>
#include <yql/essentials/core/facade/yql_facade.h>
#include <yql/essentials/providers/common/provider/yql_provider_names.h>
-#include <contrib/ydb/library/yql/providers/yt/provider/yql_yt_provider.h>
-#include <contrib/ydb/library/yql/providers/yt/gateway/file/yql_yt_file.h>
-#include <contrib/ydb/library/yql/providers/yt/gateway/file/yql_yt_file_services.h>
+#include <yt/yql/providers/yt/provider/yql_yt_provider.h>
+#include <yt/yql/providers/yt/gateway/file/yql_yt_file.h>
+#include <yt/yql/providers/yt/gateway/file/yql_yt_file_services.h>
#include <yql/essentials/minikql/invoke_builtins/mkql_builtins.h>
#include <library/cpp/testing/unittest/registar.h>
diff --git a/yql/essentials/core/ut/yql_qplayer_ut.cpp b/yql/essentials/core/ut/yql_qplayer_ut.cpp
index 89d27699d8..11dca7b68c 100644
--- a/yql/essentials/core/ut/yql_qplayer_ut.cpp
+++ b/yql/essentials/core/ut/yql_qplayer_ut.cpp
@@ -1,7 +1,7 @@
#include <yql/essentials/minikql/invoke_builtins/mkql_builtins.h>
-#include <contrib/ydb/library/yql/providers/yt/provider/yql_yt_provider.h>
-#include <contrib/ydb/library/yql/providers/yt/gateway/file/yql_yt_file.h>
-#include <contrib/ydb/library/yql/providers/yt/gateway/file/yql_yt_file_services.h>
+#include <yt/yql/providers/yt/provider/yql_yt_provider.h>
+#include <yt/yql/providers/yt/gateway/file/yql_yt_file.h>
+#include <yt/yql/providers/yt/gateway/file/yql_yt_file_services.h>
#include <yql/essentials/core/cbo/simple/cbo_simple.h>
#include <yql/essentials/core/facade/yql_facade.h>
#include <yql/essentials/core/qplayer/storage/memory/yql_qstorage_memory.h>
diff --git a/yql/essentials/core/ut_common/yql_ut_common.h b/yql/essentials/core/ut_common/yql_ut_common.h
index 09ad67cb03..ddee02690a 100644
--- a/yql/essentials/core/ut_common/yql_ut_common.h
+++ b/yql/essentials/core/ut_common/yql_ut_common.h
@@ -2,8 +2,8 @@
#include <yql/essentials/core/yql_expr_type_annotation.h>
-#include <contrib/ydb/library/yql/providers/yt/gateway/file/yql_yt_file.h>
-#include <contrib/ydb/library/yql/providers/yt/provider/yql_yt_provider.h>
+#include <yt/yql/providers/yt/gateway/file/yql_yt_file.h>
+#include <yt/yql/providers/yt/provider/yql_yt_provider.h>
#include <util/system/tempfile.h>
diff --git a/yql/essentials/minikql/protobuf_udf/ut/type_builder_ut.cpp b/yql/essentials/minikql/protobuf_udf/ut/type_builder_ut.cpp
index 6af14e753b..8e1d20662d 100644
--- a/yql/essentials/minikql/protobuf_udf/ut/type_builder_ut.cpp
+++ b/yql/essentials/minikql/protobuf_udf/ut/type_builder_ut.cpp
@@ -2,8 +2,8 @@
//#include <alice/wonderlogs/protos/wonderlogs.pb.h>
#include <yql/essentials/minikql/protobuf_udf/ut/protobuf_ut.pb.h>
-#include <contrib/ydb/library/yql/providers/yt/lib/schema/schema.h>
-#include <contrib/ydb/library/yql/providers/yt/common/yql_names.h>
+#include <yt/yql/providers/yt/lib/schema/schema.h>
+#include <yt/yql/providers/yt/common/yql_names.h>
#include <yql/essentials/providers/common/schema/mkql/yql_mkql_schema.h>
#include <yql/essentials/minikql/mkql_alloc.h>
diff --git a/yql/essentials/minikql/protobuf_udf/ut/ya.make b/yql/essentials/minikql/protobuf_udf/ut/ya.make
index d7480199d1..dd4741870f 100644
--- a/yql/essentials/minikql/protobuf_udf/ut/ya.make
+++ b/yql/essentials/minikql/protobuf_udf/ut/ya.make
@@ -9,8 +9,8 @@ SRCS(
)
PEERDIR(
- contrib/ydb/library/yql/providers/yt/lib/schema
- contrib/ydb/library/yql/providers/yt/common
+ yt/yql/providers/yt/lib/schema
+ yt/yql/providers/yt/common
yql/essentials/public/udf/service/exception_policy
yql/essentials/minikql
yql/essentials/public/udf
diff --git a/yql/essentials/public/purecalc/common/no_llvm/ya.make b/yql/essentials/public/purecalc/common/no_llvm/ya.make
index 96820516b7..fe3f3d56cb 100644
--- a/yql/essentials/public/purecalc/common/no_llvm/ya.make
+++ b/yql/essentials/public/purecalc/common/no_llvm/ya.make
@@ -3,7 +3,7 @@ LIBRARY()
INCLUDE(../ya.make.inc)
PEERDIR(
- contrib/ydb/library/yql/providers/yt/codec/codegen/no_llvm
+ yt/yql/providers/yt/codec/codegen/no_llvm
yql/essentials/providers/config
yql/essentials/minikql/computation/no_llvm
yql/essentials/minikql/invoke_builtins/no_llvm
diff --git a/yql/essentials/public/purecalc/common/ya.make b/yql/essentials/public/purecalc/common/ya.make
index 98d002f2a5..bf2ccdfcc8 100644
--- a/yql/essentials/public/purecalc/common/ya.make
+++ b/yql/essentials/public/purecalc/common/ya.make
@@ -3,7 +3,7 @@ LIBRARY()
INCLUDE(ya.make.inc)
PEERDIR(
- contrib/ydb/library/yql/providers/yt/codec/codegen
+ yt/yql/providers/yt/codec/codegen
yql/essentials/providers/config
yql/essentials/minikql/computation/llvm14
yql/essentials/minikql/invoke_builtins/llvm14
diff --git a/yql/essentials/public/purecalc/no_llvm/ya.make b/yql/essentials/public/purecalc/no_llvm/ya.make
index 2b3bd87031..1cff51e09e 100644
--- a/yql/essentials/public/purecalc/no_llvm/ya.make
+++ b/yql/essentials/public/purecalc/no_llvm/ya.make
@@ -15,7 +15,7 @@ SRCS(
PEERDIR(
yql/essentials/public/udf/service/exception_policy
yql/essentials/public/purecalc/common/no_llvm
- contrib/ydb/library/yql/providers/yt/codec/codegen/no_llvm
+ yt/yql/providers/yt/codec/codegen/no_llvm
yql/essentials/minikql/codegen/no_llvm
yql/essentials/minikql/computation/no_llvm
yql/essentials/minikql/invoke_builtins/no_llvm
diff --git a/yql/essentials/tools/pgrun/pgrun.cpp b/yql/essentials/tools/pgrun/pgrun.cpp
index 404f129717..65e4da83d8 100644
--- a/yql/essentials/tools/pgrun/pgrun.cpp
+++ b/yql/essentials/tools/pgrun/pgrun.cpp
@@ -5,17 +5,17 @@
#include <yql/essentials/core/facade/yql_facade.h>
#include <yql/essentials/core/yql_opt_utils.h>
#include <yql/essentials/core/yql_expr_optimize.h>
-#include <contrib/ydb/library/yql/providers/yt/gateway/file/yql_yt_file.h>
-#include <contrib/ydb/library/yql/providers/yt/gateway/file/yql_yt_file_services.h>
+#include <yt/yql/providers/yt/gateway/file/yql_yt_file.h>
+#include <yt/yql/providers/yt/gateway/file/yql_yt_file_services.h>
#include <yql/essentials/providers/common/provider/yql_provider_names.h>
#include <yql/essentials/providers/common/udf_resolve/yql_simple_udf_resolver.h>
#include <yql/essentials/providers/common/proto/gateways_config.pb.h>
-#include "contrib/ydb/library/yql/providers/yt/common/yql_names.h"
-#include <contrib/ydb/library/yql/providers/yt/provider/yql_yt_provider.h>
+#include "yt/yql/providers/yt/common/yql_names.h"
+#include <yt/yql/providers/yt/provider/yql_yt_provider.h>
#include <yql/essentials/providers/pg/provider/yql_pg_provider.h>
#include <yql/essentials/public/issue/yql_issue.h>
#include <yql/essentials/parser/pg_wrapper/interface/utils.h>
-#include <contrib/ydb/library/yql/providers/yt/lib/schema/schema.h>
+#include <yt/yql/providers/yt/lib/schema/schema.h>
#include <yql/essentials/core/services/mounts/yql_mounts.h>
#include <library/cpp/getopt/last_getopt.h>
diff --git a/yql/essentials/tools/pgrun/ya.make b/yql/essentials/tools/pgrun/ya.make
index 57d407bdad..75b63c79e0 100644
--- a/yql/essentials/tools/pgrun/ya.make
+++ b/yql/essentials/tools/pgrun/ya.make
@@ -34,11 +34,11 @@ PEERDIR(
yql/essentials/providers/common/provider
yql/essentials/providers/common/udf_resolve
contrib/ydb/library/yql/providers/dq/provider
- contrib/ydb/library/yql/providers/yt/common
- contrib/ydb/library/yql/providers/yt/lib/schema
- contrib/ydb/library/yql/providers/yt/gateway/file
- contrib/ydb/library/yql/providers/yt/comp_nodes/llvm14
- contrib/ydb/library/yql/providers/yt/codec/codegen
+ yt/yql/providers/yt/common
+ yt/yql/providers/yt/lib/schema
+ yt/yql/providers/yt/gateway/file
+ yt/yql/providers/yt/comp_nodes/llvm14
+ yt/yql/providers/yt/codec/codegen
yql/essentials/providers/pg/provider
yql/essentials/core/url_preprocessing
yql/essentials/parser/pg_wrapper
diff --git a/yt/yql/providers/yt/comp_nodes/ya.make.inc b/yt/yql/providers/yt/comp_nodes/ya.make.inc
new file mode 100644
index 0000000000..0029a16701
--- /dev/null
+++ b/yt/yql/providers/yt/comp_nodes/ya.make.inc
@@ -0,0 +1,45 @@
+INCLUDE(${ARCADIA_ROOT}/yql/essentials/minikql/computation/header.ya.make.inc)
+INCLUDE(${ARCADIA_ROOT}/yql/essentials/minikql/invoke_builtins/header.ya.make.inc)
+
+SET(ORIG_SRC_DIR ${ARCADIA_ROOT}/yt/yql/providers/yt/comp_nodes)
+
+SET(ORIG_SOURCES
+ yql_mkql_file_input_state.cpp
+ yql_mkql_file_list.cpp
+ yql_mkql_input_stream.cpp
+ yql_mkql_input.cpp
+ yql_mkql_output.cpp
+ yql_mkql_table_content.cpp
+ yql_mkql_table.cpp
+ yql_mkql_ungrouping_list.cpp
+)
+
+PEERDIR(
+ library/cpp/streams/brotli
+ yql/essentials/minikql
+ yql/essentials/public/udf
+ yql/essentials/utils
+ yql/essentials/providers/common/codec
+ yql/essentials/providers/common/mkql
+ yt/yql/providers/yt/codec
+ yt/yql/providers/yt/expr_nodes
+)
+
+YQL_LAST_ABI_VERSION()
+
+ADDINCL(
+ ${ORIG_SRC_DIR}
+)
+
+COPY(
+ WITH_CONTEXT
+ AUTO
+ FROM ${ORIG_SRC_DIR}
+ ${ORIG_SOURCES}
+ OUTPUT_INCLUDES
+ ${BINDIR}/yql/essentials/minikql/computation/mkql_computation_node_codegen.h
+ ${BINDIR}/yql/essentials/minikql/invoke_builtins/mkql_builtins_codegen.h
+ ${BINDIR}/yql/essentials/minikql/invoke_builtins/mkql_builtins_decimal.h
+)
+
+PROVIDES(YT_COMP_NODES)