Fix merge-rightlib-260724-0100 (#47742)

13 files changed, 14 insertions, 14 deletions

diff --git a/ydb/core/kqp/gateway/behaviour/streaming_query/common/utils.cpp b/ydb/core/kqp/gateway/behaviour/streaming_query/common/utils.cpp
index d577dfab5ee..fb042a365f3 100644
--- a/ydb/core/kqp/gateway/behaviour/streaming_query/common/utils.cpp
+++ b/ydb/core/kqp/gateway/behaviour/streaming_query/common/utils.cpp
@@ -5,7 +5,7 @@
 #include <ydb/library/yql/providers/pq/proto/dq_io.pb.h>
 #include <ydb/library/yverify_stream/yverify_stream.h>
 
-#include <yql/essentials/sql/v1/node.h>
+#include <yql/essentials/sql/v1/translation/node.h>
 
 namespace NKikimr::NKqp {
 
diff --git a/ydb/core/kqp/gateway/behaviour/streaming_query/common/utils.h b/ydb/core/kqp/gateway/behaviour/streaming_query/common/utils.h
index 43266c59b3c..709fc59ab41 100644
--- a/ydb/core/kqp/gateway/behaviour/streaming_query/common/utils.h
+++ b/ydb/core/kqp/gateway/behaviour/streaming_query/common/utils.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <yql/essentials/sql/v1/node.h>
+#include <yql/essentials/sql/v1/translation/node.h>
 
 #include <util/generic/string.h>
 
diff --git a/ydb/core/kqp/gateway/behaviour/streaming_query/common/ya.make b/ydb/core/kqp/gateway/behaviour/streaming_query/common/ya.make
index f3a32df4191..0c1225f1657 100644
--- a/ydb/core/kqp/gateway/behaviour/streaming_query/common/ya.make
+++ b/ydb/core/kqp/gateway/behaviour/streaming_query/common/ya.make
@@ -9,7 +9,7 @@ PEERDIR(
     ydb/core/protos
     ydb/library/yql/providers/pq/proto
     ydb/library/yverify_stream
-    yql/essentials/sql/v1
+    yql/essentials/sql/v1/translation
 )
 
 YQL_LAST_ABI_VERSION()
diff --git a/ydb/core/kqp/host/kqp_translate.cpp b/ydb/core/kqp/host/kqp_translate.cpp
index 0aa37c789eb..eae2c1a6acf 100644
--- a/ydb/core/kqp/host/kqp_translate.cpp
+++ b/ydb/core/kqp/host/kqp_translate.cpp
@@ -10,7 +10,7 @@
 #include <yql/essentials/parser/pg_wrapper/interface/parser.h>
 #include <yql/essentials/sql/sql.h>
 #include <yql/essentials/sql/v0/sql.h>
-#include <yql/essentials/sql/v1/sql.h>
+#include <yql/essentials/sql/v1/translation/sql.h>
 #include <yql/essentials/sql/v1/lexer/antlr4/lexer.h>
 #include <yql/essentials/sql/v1/lexer/antlr4_ansi/lexer.h>
 #include <yql/essentials/sql/v1/proto_parser/antlr4/proto_parser.h>
diff --git a/ydb/core/kqp/host/ya.make b/ydb/core/kqp/host/ya.make
index 77508d71f21..38bedbf13ea 100644
--- a/ydb/core/kqp/host/ya.make
+++ b/ydb/core/kqp/host/ya.make
@@ -39,7 +39,7 @@ PEERDIR(
     yql/essentials/providers/result/provider
     yql/essentials/sql
     yql/essentials/sql/v0
-    yql/essentials/sql/v1
+    yql/essentials/sql/v1/translation
     yql/essentials/sql/v1/lexer/antlr4
     yql/essentials/sql/v1/lexer/antlr4_ansi
     yql/essentials/sql/v1/proto_parser/antlr4
diff --git a/ydb/core/kqp/provider/rewrite_io_utils.cpp b/ydb/core/kqp/provider/rewrite_io_utils.cpp
index 949bdab11e4..c7395e1c142 100644
--- a/ydb/core/kqp/provider/rewrite_io_utils.cpp
+++ b/ydb/core/kqp/provider/rewrite_io_utils.cpp
@@ -7,7 +7,7 @@
 #include <yql/essentials/providers/common/provider/yql_provider.h>
 #include <yql/essentials/providers/common/provider/yql_provider_names.h>
 #include <yql/essentials/sql/sql.h>
-#include <yql/essentials/sql/v1/sql.h>
+#include <yql/essentials/sql/v1/translation/sql.h>
 #include <yql/essentials/sql/v1/lexer/antlr4/lexer.h>
 #include <yql/essentials/sql/v1/lexer/antlr4_ansi/lexer.h>
 #include <yql/essentials/sql/v1/proto_parser/antlr4/proto_parser.h>
diff --git a/ydb/core/kqp/provider/ut/ya.make b/ydb/core/kqp/provider/ut/ya.make
index 792f8e46fc4..57a273b04d3 100644
--- a/ydb/core/kqp/provider/ut/ya.make
+++ b/ydb/core/kqp/provider/ut/ya.make
@@ -11,7 +11,7 @@ PEERDIR(
     ydb/core/resource_pools
     yql/essentials/ast
     yql/essentials/sql/pg_dummy
-    yql/essentials/sql/v1
+    yql/essentials/sql/v1/translation
     library/cpp/testing/gmock_in_unittest
 )
 
diff --git a/ydb/core/kqp/provider/ya.make b/ydb/core/kqp/provider/ya.make
index 3c33ef7668c..5178285b863 100644
--- a/ydb/core/kqp/provider/ya.make
+++ b/ydb/core/kqp/provider/ya.make
@@ -68,7 +68,7 @@ PEERDIR(
     yql/essentials/types/dynumber
     yql/essentials/sql
     yql/essentials/sql/settings
-    yql/essentials/sql/v1
+    yql/essentials/sql/v1/translation
     yql/essentials/sql/v1/lexer/antlr4
     yql/essentials/sql/v1/lexer/antlr4_ansi
     yql/essentials/sql/v1/proto_parser/antlr4
diff --git a/ydb/core/kqp/provider/yql_kikimr_provider_ut.cpp b/ydb/core/kqp/provider/yql_kikimr_provider_ut.cpp
index 69e863caaa5..ff7a23d7651 100644
--- a/ydb/core/kqp/provider/yql_kikimr_provider_ut.cpp
+++ b/ydb/core/kqp/provider/yql_kikimr_provider_ut.cpp
@@ -4,8 +4,8 @@
 
 #include <yql/essentials/ast/yql_expr.h>
 #include <yql/essentials/providers/common/provider/yql_provider.h>
-#include <yql/essentials/sql/v1/context.h>
-#include <yql/essentials/sql/v1/source.h>
+#include <yql/essentials/sql/v1/translation/context.h>
+#include <yql/essentials/sql/v1/translation/source.h>
 
 #include <library/cpp/testing/unittest/registar.h>
 
diff --git a/ydb/core/kqp/ut/view/view_ut.cpp b/ydb/core/kqp/ut/view/view_ut.cpp
index 1ee9c807329..65494977fa3 100644
--- a/ydb/core/kqp/ut/view/view_ut.cpp
+++ b/ydb/core/kqp/ut/view/view_ut.cpp
@@ -1,6 +1,6 @@
 #include <ydb/core/kqp/ut/common/kqp_ut_common.h>
 #include <yql/essentials/sql/sql.h>
-#include <yql/essentials/sql/v1/sql.h>
+#include <yql/essentials/sql/v1/translation/sql.h>
 #include <yql/essentials/sql/v1/lexer/antlr4/lexer.h>
 #include <yql/essentials/sql/v1/lexer/antlr4_ansi/lexer.h>
 #include <yql/essentials/sql/v1/proto_parser/antlr4/proto_parser.h>
diff --git a/ydb/core/kqp/ut/view/ya.make b/ydb/core/kqp/ut/view/ya.make
index 629eee463ce..8ccdbde0609 100644
--- a/ydb/core/kqp/ut/view/ya.make
+++ b/ydb/core/kqp/ut/view/ya.make
@@ -12,7 +12,7 @@ SRCS(
 PEERDIR(
     ydb/core/kqp/ut/common
     yql/essentials/sql
-    yql/essentials/sql/v1
+    yql/essentials/sql/v1/translation
     yql/essentials/sql/v1/lexer/antlr4
     yql/essentials/sql/v1/lexer/antlr4_ansi
     yql/essentials/sql/v1/proto_parser/antlr4
diff --git a/ydb/core/sys_view/show_create/create_view_formatter.cpp b/ydb/core/sys_view/show_create/create_view_formatter.cpp
index 6cf4f389788..a1bc478407b 100644
--- a/ydb/core/sys_view/show_create/create_view_formatter.cpp
+++ b/ydb/core/sys_view/show_create/create_view_formatter.cpp
@@ -9,7 +9,7 @@
 #include <yql/essentials/sql/v1/lexer/antlr4_ansi/lexer.h>
 #include <yql/essentials/sql/v1/proto_parser/antlr4/proto_parser.h>
 #include <yql/essentials/sql/v1/proto_parser/antlr4_ansi/proto_parser.h>
-#include <yql/essentials/sql/v1/sql.h>
+#include <yql/essentials/sql/v1/translation/sql.h>
 
 #include <library/cpp/protobuf/util/simple_reflection.h>
 
diff --git a/ydb/core/sys_view/show_create/ya.make b/ydb/core/sys_view/show_create/ya.make
index 634cc276d36..fef09611b36 100644
--- a/ydb/core/sys_view/show_create/ya.make
+++ b/ydb/core/sys_view/show_create/ya.make
@@ -28,7 +28,7 @@ PEERDIR(
     yql/essentials/ast
     yql/essentials/public/issue
     yql/essentials/sql/settings
-    yql/essentials/sql/v1
+    yql/essentials/sql/v1/translation
     yql/essentials/sql/v1/lexer/antlr4
     yql/essentials/sql/v1/lexer/antlr4_ansi
     yql/essentials/sql/v1/proto_parser/antlr4