Skip to content

Commit 2217e0b

Browse files
committed
YQL-20086 core (part1)
commit_hash:12dbda4defcaef8dd708a69552fc19eba832ce2f
1 parent b1545e7 commit 2217e0b

File tree

173 files changed

+6693
-6475
lines changed

Some content is hidden

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

173 files changed

+6693
-6475
lines changed

yql/essentials/core/arrow_kernels/registry/registry.cpp

Lines changed: 63 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -7,79 +7,79 @@
77
namespace NYql {
88

99
namespace {
10-
class TLoader : std::enable_shared_from_this<TLoader> {
11-
public:
12-
TLoader()
13-
: Alloc_(__LOCATION__)
14-
, Env_(Alloc_)
15-
{
16-
Alloc_.Release();
17-
}
10+
class TLoader: std::enable_shared_from_this<TLoader> {
11+
public:
12+
TLoader()
13+
: Alloc_(__LOCATION__)
14+
, Env_(Alloc_)
15+
{
16+
Alloc_.Release();
17+
}
1818

19-
void Init(const TString& serialized,
20-
const NKikimr::NMiniKQL::IFunctionRegistry& functionRegistry,
21-
const NKikimr::NMiniKQL::TComputationNodeFactory& nodeFactory,
22-
TLangVersion langver) {
23-
TGuard<NKikimr::NMiniKQL::TScopedAlloc> allocGuard(Alloc_);
24-
Pgm_ = NKikimr::NMiniKQL::DeserializeRuntimeNode(serialized, Env_);
25-
auto pgmTop = AS_CALLABLE("BlockAsTuple", Pgm_);
26-
MKQL_ENSURE(pgmTop->GetInputsCount() == 2, "Expected tuple of 2 items");
27-
auto argsNode = pgmTop->GetInput(0);
28-
MKQL_ENSURE(!argsNode.IsImmediate() && argsNode.GetNode()->GetType()->IsCallable(), "Expected callable");
29-
auto argsCallable = static_cast<NKikimr::NMiniKQL::TCallable*>(argsNode.GetNode());
19+
void Init(const TString& serialized,
20+
const NKikimr::NMiniKQL::IFunctionRegistry& functionRegistry,
21+
const NKikimr::NMiniKQL::TComputationNodeFactory& nodeFactory,
22+
TLangVersion langver) {
23+
TGuard<NKikimr::NMiniKQL::TScopedAlloc> allocGuard(Alloc_);
24+
Pgm_ = NKikimr::NMiniKQL::DeserializeRuntimeNode(serialized, Env_);
25+
auto pgmTop = AS_CALLABLE("BlockAsTuple", Pgm_);
26+
MKQL_ENSURE(pgmTop->GetInputsCount() == 2, "Expected tuple of 2 items");
27+
auto argsNode = pgmTop->GetInput(0);
28+
MKQL_ENSURE(!argsNode.IsImmediate() && argsNode.GetNode()->GetType()->IsCallable(), "Expected callable");
29+
auto argsCallable = static_cast<NKikimr::NMiniKQL::TCallable*>(argsNode.GetNode());
3030

31-
Explorer_.Walk(Pgm_.GetNode(), Env_);
32-
NKikimr::NMiniKQL::TComputationPatternOpts opts(Alloc_.Ref(), Env_, nodeFactory,
33-
&functionRegistry, NUdf::EValidateMode::None, NUdf::EValidatePolicy::Exception, "OFF",
34-
NKikimr::NMiniKQL::EGraphPerProcess::Multi, nullptr, nullptr, nullptr, nullptr, langver);
35-
std::vector<NKikimr::NMiniKQL::TNode*> entryPoints;
36-
if (argsCallable->GetType()->GetName() == "BlockAsTuple") {
37-
for (ui32 i = 0; i < argsCallable->GetInputsCount(); ++i) {
38-
entryPoints.emplace_back(argsCallable->GetInput(i).GetNode());
39-
}
31+
Explorer_.Walk(Pgm_.GetNode(), Env_);
32+
NKikimr::NMiniKQL::TComputationPatternOpts opts(Alloc_.Ref(), Env_, nodeFactory,
33+
&functionRegistry, NUdf::EValidateMode::None, NUdf::EValidatePolicy::Exception, "OFF",
34+
NKikimr::NMiniKQL::EGraphPerProcess::Multi, nullptr, nullptr, nullptr, nullptr, langver);
35+
std::vector<NKikimr::NMiniKQL::TNode*> entryPoints;
36+
if (argsCallable->GetType()->GetName() == "BlockAsTuple") {
37+
for (ui32 i = 0; i < argsCallable->GetInputsCount(); ++i) {
38+
entryPoints.emplace_back(argsCallable->GetInput(i).GetNode());
4039
}
40+
}
4141

42-
Alloc_.Ref().UseRefLocking = true;
43-
Pattern_ = NKikimr::NMiniKQL::MakeComputationPattern(Explorer_, Pgm_, entryPoints, opts);
44-
RandomProvider_ = CreateDefaultRandomProvider();
45-
TimeProvider_ = CreateDefaultTimeProvider();
42+
Alloc_.Ref().UseRefLocking = true;
43+
Pattern_ = NKikimr::NMiniKQL::MakeComputationPattern(Explorer_, Pgm_, entryPoints, opts);
44+
RandomProvider_ = CreateDefaultRandomProvider();
45+
TimeProvider_ = CreateDefaultTimeProvider();
4646

47-
Graph_ = Pattern_->Clone(opts.ToComputationOptions(*RandomProvider_, *TimeProvider_));
48-
NKikimr::NMiniKQL::TBindTerminator terminator(Graph_->GetTerminator());
49-
Topology_ = Graph_->GetKernelsTopology();
50-
MKQL_ENSURE(Topology_->Items.size() >= 3, "Expected at least 3 kernels");
51-
}
47+
Graph_ = Pattern_->Clone(opts.ToComputationOptions(*RandomProvider_, *TimeProvider_));
48+
NKikimr::NMiniKQL::TBindTerminator terminator(Graph_->GetTerminator());
49+
Topology_ = Graph_->GetKernelsTopology();
50+
MKQL_ENSURE(Topology_->Items.size() >= 3, "Expected at least 3 kernels");
51+
}
5252

53-
~TLoader() {
54-
Alloc_.Acquire();
55-
}
53+
~TLoader() {
54+
Alloc_.Acquire();
55+
}
5656

57-
ui32 GetKernelsCount() const {
58-
return Topology_->Items.size() - 3;
59-
}
57+
ui32 GetKernelsCount() const {
58+
return Topology_->Items.size() - 3;
59+
}
6060

61-
const arrow::compute::ScalarKernel* GetKernel(ui32 index) const {
62-
MKQL_ENSURE(index < Topology_->Items.size() - 3, "Bad kernel index");
63-
return &Topology_->Items[index].Node->GetArrowKernel();
64-
}
61+
const arrow::compute::ScalarKernel* GetKernel(ui32 index) const {
62+
MKQL_ENSURE(index < Topology_->Items.size() - 3, "Bad kernel index");
63+
return &Topology_->Items[index].Node->GetArrowKernel();
64+
}
6565

66-
private:
67-
NKikimr::NMiniKQL::TScopedAlloc Alloc_;
68-
NKikimr::NMiniKQL::TTypeEnvironment Env_;
69-
NKikimr::NMiniKQL::TRuntimeNode Pgm_;
70-
NKikimr::NMiniKQL::TExploringNodeVisitor Explorer_;
71-
NKikimr::NMiniKQL::IComputationPattern::TPtr Pattern_;
72-
TIntrusivePtr<IRandomProvider> RandomProvider_;
73-
TIntrusivePtr<ITimeProvider> TimeProvider_;
74-
THolder<NKikimr::NMiniKQL::IComputationGraph> Graph_;
75-
const NKikimr::NMiniKQL::TArrowKernelsTopology* Topology_;
76-
};
77-
}
66+
private:
67+
NKikimr::NMiniKQL::TScopedAlloc Alloc_;
68+
NKikimr::NMiniKQL::TTypeEnvironment Env_;
69+
NKikimr::NMiniKQL::TRuntimeNode Pgm_;
70+
NKikimr::NMiniKQL::TExploringNodeVisitor Explorer_;
71+
NKikimr::NMiniKQL::IComputationPattern::TPtr Pattern_;
72+
TIntrusivePtr<IRandomProvider> RandomProvider_;
73+
TIntrusivePtr<ITimeProvider> TimeProvider_;
74+
THolder<NKikimr::NMiniKQL::IComputationGraph> Graph_;
75+
const NKikimr::NMiniKQL::TArrowKernelsTopology* Topology_;
76+
};
77+
} // namespace
7878

7979
std::vector<std::shared_ptr<const arrow::compute::ScalarKernel>> LoadKernels(const TString& serialized,
80-
const NKikimr::NMiniKQL::IFunctionRegistry& functionRegistry,
81-
const NKikimr::NMiniKQL::TComputationNodeFactory& nodeFactory,
82-
TLangVersion langver) {
80+
const NKikimr::NMiniKQL::IFunctionRegistry& functionRegistry,
81+
const NKikimr::NMiniKQL::TComputationNodeFactory& nodeFactory,
82+
TLangVersion langver) {
8383
auto loader = std::make_shared<TLoader>();
8484
loader->Init(serialized, functionRegistry, nodeFactory, langver);
8585
std::vector<std::shared_ptr<const arrow::compute::ScalarKernel>> ret(loader->GetKernelsCount());
@@ -91,4 +91,4 @@ std::vector<std::shared_ptr<const arrow::compute::ScalarKernel>> LoadKernels(con
9191
return ret;
9292
}
9393

94-
}
94+
} // namespace NYql

yql/essentials/core/arrow_kernels/registry/registry.h

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,8 @@
99
namespace NYql {
1010

1111
std::vector<std::shared_ptr<const arrow::compute::ScalarKernel>> LoadKernels(const TString& serialized,
12-
const NKikimr::NMiniKQL::IFunctionRegistry& functionRegistry,
13-
const NKikimr::NMiniKQL::TComputationNodeFactory& nodeFactory,
14-
TLangVersion langver = MinLangVersion);
15-
16-
}
12+
const NKikimr::NMiniKQL::IFunctionRegistry& functionRegistry,
13+
const NKikimr::NMiniKQL::TComputationNodeFactory& nodeFactory,
14+
TLangVersion langver = MinLangVersion);
1715

16+
} // namespace NYql

0 commit comments

Comments
 (0)