Skip to content

Commit 5f44598

Browse files
nepalnepal
authored
[YQL-19309] Switch YT provider to DQ nodes from yql/essentials (#12158)
1 parent 42575b9 commit 5f44598

File tree

12 files changed

+33
-27
lines changed

12 files changed

+33
-27
lines changed

‎ydb/library/yql/providers/yt/gateway/file/yql_yt_file_mkql_compiler.cpp‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
#include "yql_yt_file_mkql_compiler.h"
22

3-
#include <ydb/library/yql/providers/dq/expr_nodes/dqs_expr_nodes.h>
43
#include <ydb/library/yql/providers/yt/expr_nodes/yql_yt_expr_nodes.h>
54
#include <ydb/library/yql/providers/yt/provider/yql_yt_table.h>
65
#include <ydb/library/yql/providers/yt/provider/yql_yt_helpers.h>
76
#include <ydb/library/yql/providers/yt/provider/yql_yt_mkql_compiler.h>
8-
#include <ydb/library/yql/dq/expr_nodes/dq_expr_nodes.h>
7+
98
#include <yql/essentials/providers/result/expr_nodes/yql_res_expr_nodes.h>
109
#include <yql/essentials/providers/common/mkql/yql_type_mkql.h>
1110
#include <yql/essentials/providers/common/schema/mkql/yql_mkql_schema.h>
11+
#include <yql/essentials/core/dq_expr_nodes/dq_expr_nodes.h>
12+
#include <yql/essentials/core/dqs_expr_nodes/dqs_expr_nodes.h>
1213
#include <yql/essentials/core/expr_nodes/yql_expr_nodes.h>
1314
#include <yql/essentials/core/yql_opt_utils.h>
1415
#include <yql/essentials/utils/yql_panic.h>
@@ -31,6 +32,7 @@ namespace NYql {
3132
using namespace NKikimr;
3233
using namespace NKikimr::NMiniKQL;
3334
using namespace NNodes;
35+
using namespace NNodes::NDq;
3436

3537
namespace {
3638

‎ydb/library/yql/providers/yt/gateway/native/ya.make‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@ PEERDIR(
4040
yql/essentials/providers/common/provider
4141
yql/essentials/providers/common/schema/expr
4242
yql/essentials/providers/result/expr_nodes
43-
ydb/library/yql/providers/stat/expr_nodes
44-
ydb/library/yql/providers/stat/uploader
4543
ydb/library/yql/providers/yt/codec
4644
ydb/library/yql/providers/yt/common
4745
ydb/library/yql/providers/yt/expr_nodes

‎ydb/library/yql/providers/yt/gateway/native/yql_yt_native.cpp‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,11 @@
3333
#include <yql/essentials/providers/common/schema/expr/yql_expr_schema.h>
3434
#include <yql/essentials/providers/common/proto/gateways_config.pb.h>
3535
#include <yql/essentials/providers/result/expr_nodes/yql_res_expr_nodes.h>
36-
#include <ydb/library/yql/providers/stat/expr_nodes/yql_stat_expr_nodes.h>
37-
#include <ydb/library/yql/providers/stat/uploader/yql_stat_uploader.h>
3836

3937
#include <yql/essentials/ast/yql_expr.h>
4038
#include <yql/essentials/core/issue/yql_issue.h>
4139
#include <yql/essentials/core/yql_type_helpers.h>
4240
#include <yql/essentials/core/yql_graph_transformer.h>
43-
#include <ydb/library/yql/providers/dq/expr_nodes/dqs_expr_nodes.h>
4441
#include <yql/essentials/utils/log/log.h>
4542
#include <yql/essentials/minikql/mkql_node.h>
4643
#include <yql/essentials/minikql/mkql_node_cast.h>

‎ydb/library/yql/providers/yt/provider/phy_opt/yql_yt_phy_opt_key_range.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@
22
#include "yql_yt_phy_opt_helper.h"
33

44
#include <ydb/library/yql/providers/yt/provider/yql_yt_helpers.h>
5-
#include <ydb/library/yql/dq/expr_nodes/dq_expr_nodes.h>
65

6+
#include <yql/essentials/core/dq_expr_nodes/dq_expr_nodes.h>
77
#include <yql/essentials/utils/log/log.h>
88

99
namespace NYql {
1010

1111
using namespace NNodes;
12+
using namespace NNodes::NDq;
1213
using namespace NPrivate;
1314

1415
// All keyFilter settings are combined by OR.

‎ydb/library/yql/providers/yt/provider/phy_opt/yql_yt_phy_opt_write.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@
55
#include <ydb/library/yql/providers/yt/provider/yql_yt_optimize.h>
66
#include <ydb/library/yql/providers/yt/opt/yql_yt_key_selector.h>
77
#include <ydb/library/yql/providers/stat/expr_nodes/yql_stat_expr_nodes.h>
8-
#include <ydb/library/yql/providers/dq/expr_nodes/dqs_expr_nodes.h>
9-
#include <yql/essentials/providers/common/codec/yql_codec_type_flags.h>
10-
11-
#include <ydb/library/yql/dq/expr_nodes/dq_expr_nodes.h>
128

9+
#include <yql/essentials/core/dq_expr_nodes/dq_expr_nodes.h>
10+
#include <yql/essentials/core/dqs_expr_nodes/dqs_expr_nodes.h>
1311
#include <yql/essentials/core/yql_opt_utils.h>
1412
#include <yql/essentials/core/yql_type_helpers.h>
13+
#include <yql/essentials/providers/common/codec/yql_codec_type_flags.h>
1514

1615
namespace NYql {
1716

1817
using namespace NNodes;
18+
using namespace NNodes::NDq;
1919
using namespace NPrivate;
2020

2121
TMaybeNode<TExprBase> TYtPhysicalOptProposalTransformer::DqWrite(TExprBase node, TExprContext& ctx, IOptimizationContext& optCtx, const TGetParents& getParents) const {

‎ydb/library/yql/providers/yt/provider/ya.make‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,8 @@ PEERDIR(
7777
yql/essentials/utils
7878
yql/essentials/utils/log
7979
yql/essentials/core
80+
yql/essentials/core/dq_expr_nodes
81+
yql/essentials/core/dqs_expr_nodes
8082
yql/essentials/core/expr_nodes
8183
yql/essentials/core/issue
8284
yql/essentials/core/issue/protos
@@ -96,8 +98,6 @@ PEERDIR(
9698
yql/essentials/providers/common/schema/expr
9799
yql/essentials/providers/common/structured_token
98100
yql/essentials/providers/common/transform
99-
ydb/library/yql/dq/expr_nodes
100-
ydb/library/yql/providers/dq/expr_nodes
101101
yql/essentials/providers/result/expr_nodes
102102
ydb/library/yql/providers/stat/expr_nodes
103103
ydb/library/yql/providers/yt/common

‎ydb/library/yql/providers/yt/provider/yql_yt_dq_hybrid.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99
#include <yql/essentials/providers/common/provider/yql_provider_names.h>
1010
#include <yql/essentials/providers/common/provider/yql_provider.h>
1111
#include <yql/essentials/providers/common/transform/yql_optimize.h>
12-
#include <ydb/library/yql/providers/dq/expr_nodes/dqs_expr_nodes.h>
12+
#include <yql/essentials/core/dq_expr_nodes/dq_expr_nodes.h>
13+
#include <yql/essentials/core/dqs_expr_nodes/dqs_expr_nodes.h>
1314
#include <yql/essentials/core/expr_nodes/yql_expr_nodes.h>
1415
#include <yql/essentials/core/yql_expr_type_annotation.h>
1516
#include <yql/essentials/core/yql_expr_optimize.h>
1617
#include <yql/essentials/core/yql_opt_utils.h>
1718
#include <yql/essentials/core/yql_type_helpers.h>
1819
#include <yql/essentials/core/yql_data_provider.h>
19-
#include <ydb/library/yql/dq/expr_nodes/dq_expr_nodes.h>
2020
#include <yql/essentials/utils/log/log.h>
2121
#include <yql/essentials/utils/yql_panic.h>
2222
#include <yql/essentials/minikql/mkql_program_builder.h>
@@ -31,7 +31,7 @@ namespace NYql {
3131
namespace {
3232

3333
using namespace NNodes;
34-
using namespace NDq;
34+
using namespace NNodes::NDq;
3535

3636
class TYtDqHybridTransformer : public TOptimizeTransformerBase {
3737
public:

‎ydb/library/yql/providers/yt/provider/yql_yt_dq_integration.cpp‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
#include <yql/essentials/providers/common/dq/yql_dq_integration_impl.h>
1414
#include <yql/essentials/providers/common/codec/yql_codec_type_flags.h>
1515
#include <yql/essentials/providers/common/config/yql_dispatch.h>
16-
#include <ydb/library/yql/providers/dq/expr_nodes/dqs_expr_nodes.h>
17-
#include <ydb/library/yql/dq/expr_nodes/dq_expr_nodes.h>
1816
#include <yql/essentials/providers/result/expr_nodes/yql_res_expr_nodes.h>
1917
#include <yql/essentials/ast/yql_expr.h>
18+
#include <yql/essentials/core/dq_expr_nodes/dq_expr_nodes.h>
19+
#include <yql/essentials/core/dqs_expr_nodes/dqs_expr_nodes.h>
2020
#include <yql/essentials/core/yql_type_helpers.h>
2121
#include <yql/essentials/core/yql_expr_optimize.h>
2222
#include <yql/essentials/core/yql_opt_utils.h>
@@ -39,6 +39,7 @@ static const THashSet<TStringBuf> UNSUPPORTED_YT_PRAGMAS = {"maxrowweight", "la
3939
static const THashSet<TStringBuf> POOL_TREES_WHITELIST = {"physical", "cloud", "cloud_default"};
4040

4141
using namespace NNodes;
42+
using namespace NNodes::NDq;
4243

4344
bool CheckSupportedTypesOld(const TTypeAnnotationNode::TListType& typesToCheck, const TSet<TString>& supportedTypes, const TSet<NUdf::EDataSlot>& supportedDataTypes, std::function<void(const TString&)> unsupportedTypeHandler) {
4445
TSet<ETypeAnnotationKind> supported;

‎ydb/library/yql/providers/yt/provider/yql_yt_dq_optimize.cpp‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,17 @@
33
#include "yql_yt_optimize.h"
44

55
#include <ydb/library/yql/providers/yt/expr_nodes/yql_yt_expr_nodes.h>
6-
#include <yql/essentials/providers/common/dq/yql_dq_optimization_impl.h>
7-
#include <ydb/library/yql/providers/dq/expr_nodes/dqs_expr_nodes.h>
6+
7+
#include <yql/essentials/core/dqs_expr_nodes/dqs_expr_nodes.h>
88
#include <yql/essentials/core/yql_expr_optimize.h>
9+
#include <yql/essentials/providers/common/dq/yql_dq_optimization_impl.h>
910
#include <yql/essentials/utils/log/log.h>
1011

1112

1213
namespace NYql {
1314

1415
using namespace NNodes;
16+
using namespace NNodes::NDq;
1517

1618
class TYtDqOptimizers: public TDqOptimizationBase {
1719
public:

‎ydb/library/yql/providers/yt/provider/yql_yt_helpers.cpp‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
#include "yql_yt_op_hash.h"
55
#include "yql_yt_optimize.h"
66

7-
#include <ydb/library/yql/providers/dq/expr_nodes/dqs_expr_nodes.h>
8-
#include <ydb/library/yql/dq/expr_nodes/dq_expr_nodes.h>
97
#include <ydb/library/yql/providers/yt/lib/mkql_helpers/mkql_helpers.h>
108
#include <ydb/library/yql/providers/yt/common/yql_configuration.h>
119
#include <ydb/library/yql/providers/yt/opt/yql_yt_key_selector.h>
1210
#include <yql/essentials/providers/common/provider/yql_provider.h>
1311
#include <yql/essentials/providers/common/codec/yql_codec_type_flags.h>
1412
#include <yql/essentials/providers/common/codec/yql_codec.h>
13+
#include <yql/essentials/core/dq_expr_nodes/dq_expr_nodes.h>
14+
#include <yql/essentials/core/dqs_expr_nodes/dqs_expr_nodes.h>
1515
#include <yql/essentials/core/expr_nodes/yql_expr_nodes.h>
1616
#include <yql/essentials/core/type_ann/type_ann_expr.h>
1717
#include <yql/essentials/core/type_ann/type_ann_core.h>
@@ -37,6 +37,7 @@
3737
namespace NYql {
3838

3939
using namespace NNodes;
40+
using namespace NNodes::NDq;
4041

4142
namespace {
4243

0 commit comments

Comments
 (0)