Skip to content

Commit deada87

Browse files
nepalnepal
authored
Missing bits from Arcadia (YQL embedded and YT provider) (#12023)
1 parent 46e4a14 commit deada87

File tree

150 files changed

+121
-13489
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

150 files changed

+121
-13489
lines changed

‎ydb/core/fq/libs/row_dispatcher/common.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#include <util/system/mutex.h>
44

5-
#include <ydb/library/yql/public/purecalc/common/interface.h>
5+
#include <yql/essentials/public/purecalc/common/interface.h>
66

77
namespace NFq {
88

‎ydb/core/fq/libs/row_dispatcher/common.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#include <util/generic/ptr.h>
44
#include <util/system/mutex.h>
55

6-
#include <ydb/library/yql/public/purecalc/common/fwd.h>
6+
#include <yql/essentials/public/purecalc/common/fwd.h>
77

88
namespace NFq {
99

‎ydb/core/fq/libs/row_dispatcher/json_filter.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#include <yql/essentials/providers/common/schema/parser/yql_type_parser.h>
22
#include <yql/essentials/public/udf/udf_version.h>
3-
#include <ydb/library/yql/public/purecalc/purecalc.h>
4-
#include <ydb/library/yql/public/purecalc/io_specs/mkql/spec.h>
3+
#include <yql/essentials/public/purecalc/purecalc.h>
54
#include <yql/essentials/minikql/mkql_alloc.h>
65
#include <yql/essentials/minikql/computation/mkql_computation_node_holders.h>
76
#include <yql/essentials/minikql/mkql_terminator.h>

‎ydb/core/fq/libs/row_dispatcher/purecalc_no_pg_wrapper/ya.make

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
LIBRARY()
22

3-
INCLUDE(../../../../../library/yql/public/purecalc/common/ya.make.inc)
3+
INCLUDE(${ARCADIA_ROOT}/yql/essentials/public/purecalc/common/ya.make.inc)
44

55
END()

‎ydb/core/fq/libs/row_dispatcher/row_dispatcher.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include <ydb/library/actors/core/interconnect.h>
99
#include <ydb/library/yql/dq/actors/common/retry_queue.h>
1010
#include <ydb/library/yql/providers/dq/counters/counters.h>
11-
#include <ydb/library/yql/public/purecalc/common/interface.h>
11+
#include <yql/essentials/public/purecalc/common/interface.h>
1212

1313
#include <ydb/core/base/appdata_fwd.h>
1414
#include <ydb/core/fq/libs/actors/logging/log.h>

‎ydb/core/fq/libs/row_dispatcher/topic_session.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
#include <ydb/core/fq/libs/row_dispatcher/json_parser.h>
1818
#include <ydb/core/fq/libs/row_dispatcher/json_filter.h>
19-
#include <ydb/library/yql/public/purecalc/purecalc.h>
19+
#include <yql/essentials/public/purecalc/purecalc.h>
2020

2121
namespace NFq {
2222

‎ydb/core/kqp/host/kqp_host.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#include <yql/essentials/providers/common/codec/yql_codec.h>
1818
#include <yql/essentials/providers/common/provider/yql_provider_names.h>
1919
#include <yql/essentials/providers/common/udf_resolve/yql_simple_udf_resolver.h>
20+
#include <ydb/library/yql/dq/opt/dq_opt_join_cbo_factory.h>
2021
#include <ydb/library/yql/providers/s3/expr_nodes/yql_s3_expr_nodes.h>
2122
#include <ydb/library/yql/providers/s3/provider/yql_s3_provider.h>
2223
#include <ydb/library/yql/providers/generic/expr_nodes/yql_generic_expr_nodes.h>
@@ -1817,7 +1818,7 @@ class TKqpHost : public IKqpHost {
18171818
}
18181819

18191820
TString sessionId = CreateGuidAsString();
1820-
auto [ytState, statWriter] = CreateYtNativeState(FederatedQuerySetup->YtGateway, userName, sessionId, &FederatedQuerySetup->YtGatewayConfig, TypesCtx);
1821+
auto [ytState, statWriter] = CreateYtNativeState(FederatedQuerySetup->YtGateway, userName, sessionId, &FederatedQuerySetup->YtGatewayConfig, TypesCtx, NDq::MakeCBOOptimizerFactory());
18211822

18221823
ytState->PassiveExecution = true;
18231824
ytState->Gateway->OpenSession(

‎ydb/core/kqp/host/ya.make

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ PEERDIR(
2424
yql/essentials/sql
2525
yql/essentials/core
2626
yql/essentials/providers/common/codec
27+
ydb/library/yql/dq/opt
2728
ydb/library/yql/providers/common/http_gateway
2829
yql/essentials/providers/common/udf_resolve
2930
yql/essentials/providers/config

‎ydb/core/kqp/opt/logical/kqp_opt_log.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#include <ydb/library/yql/dq/opt/dq_opt_join.h>
1212
#include <ydb/library/yql/dq/opt/dq_opt_log.h>
1313
#include <ydb/library/yql/dq/opt/dq_opt_hopping.h>
14+
#include <ydb/library/yql/dq/opt/dq_opt_join_cost_based.h>
1415
#include <yql/essentials/utils/log/log.h>
1516
#include <yql/essentials/providers/common/transform/yql_optimize.h>
1617
#include <ydb/library/yql/providers/dq/common/yql_dq_settings.h>

‎ydb/library/yql/dq/opt/dq_cbo_ut.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include <yql/essentials/providers/common/provider/yql_provider.h>
55
#include <yql/essentials/parser/pg_wrapper/interface/optimizer.h>
66

7-
#include "dq_opt_log.h"
7+
#include "dq_opt_join_cost_based.h"
88
#include "dq_opt_join.h"
99

1010
using namespace NYql;

0 commit comments

Comments
 (0)