Skip to content

rework solomon sink type ann #6636

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 14, 2024
Merged

rework solomon sink type ann #6636

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
57baa2d
rework solomon sink type ann
uzhastik Jul 12, 2024
feee689
revert useless change
uzhastik Jul 12, 2024
005d402
fix build
uzhastik Jul 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ydb/library/yql/providers/solomon/expr_nodes/yql_solomon_expr_nodes.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,8 @@
{"Index": 1, "Name": "Project", "Type": "TCoAtom"},
{"Index": 2, "Name": "Cluster", "Type": "TCoAtom"},
{"Index": 3, "Name": "Service", "Type": "TCoAtom"},
{"Index": 4, "Name": "Token", "Type": "TCoSecureParam", "Optional": true}
{"Index": 4, "Name": "RowType", "Type": "TExprBase"},
Copy link
Collaborator

@dorooleg dorooleg Jul 15, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

А это можно тестами покрыть?

Copy link
Collaborator Author

@uzhastik uzhastik Jul 29, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

так покрыто уже

{"Index": 5, "Name": "Token", "Type": "TCoSecureParam", "Optional": true}
]
}
]
Expand Down
6 changes: 5 additions & 1 deletion ydb/library/yql/providers/solomon/provider/yql_solomon_datasink_type_ann.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ class TSolomonDataSinkTypeAnnotationTransformer : public TVisitorTransformerBase
TStatus HandleSoShard(TExprBase input, TExprContext& ctx) {
YQL_ENSURE(!State_->IsRtmrMode(), "SoShard can't be used in rtmr mode");

if (!EnsureMinArgsCount(input.Ref(), 4, ctx) || !EnsureMaxArgsCount(input.Ref(), 5, ctx)) {
if (!EnsureMinMaxArgsCount(input.Ref(), 5, 6, ctx)) {
return TStatus::Error;
}

Expand All @@ -137,6 +137,10 @@ class TSolomonDataSinkTypeAnnotationTransformer : public TVisitorTransformerBase
return TStatus::Error;
}

if (!EnsureType(shard.RowType().Ref(), ctx)) {
return TStatus::Error;
}

if (shard.Token() && !EnsureCallable(shard.Token().Ref(), ctx)) {
return TStatus::Error;
}
Expand Down
15 changes: 1 addition & 14 deletions ydb/library/yql/providers/solomon/provider/yql_solomon_dq_integration.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,19 +44,6 @@ NSo::NProto::ESolomonClusterType MapClusterType(TSolomonClusterConfig::ESolomonC
}
}

const TTypeAnnotationNode* GetItemType(const TExprNode& node) {
const TTypeAnnotationNode* typeAnn = node.GetTypeAnn();
switch (typeAnn->GetKind()) {
case ETypeAnnotationKind::Flow:
return typeAnn->Cast<TFlowExprType>()->GetItemType();
case ETypeAnnotationKind::Stream:
return typeAnn->Cast<TStreamExprType>()->GetItemType();
default: break;
}
YQL_ENSURE(false, "Invalid solomon sink type " << typeAnn->GetKind());
return nullptr;
}

void FillScheme(const TTypeAnnotationNode& itemType, NSo::NProto::TDqSolomonShardScheme& scheme) {
int index = 0;
for (const TItemExprType* structItem : itemType.Cast<TStructExprType>()->GetItems()) {
Expand Down Expand Up @@ -316,7 +303,7 @@ class TSolomonDqIntegration: public TDqIntegrationBase {
shardDesc.SetClusterType(MapClusterType(clusterDesc->GetClusterType()));
shardDesc.SetUseSsl(clusterDesc->GetUseSsl());

const TTypeAnnotationNode* itemType = GetItemType(node);
const TTypeAnnotationNode* itemType = shard.RowType().Ref().GetTypeAnn()->Cast<TTypeExprType>()->GetType();
FillScheme(*itemType, *shardDesc.MutableScheme());

if (auto maybeToken = shard.Token()) {
Expand Down
42 changes: 16 additions & 26 deletions ydb/library/yql/providers/solomon/provider/yql_solomon_physical_optimize.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,14 @@ class TSoPhysicalOptProposalTransformer : public TOptimizeTransformerBase {
YQL_CLOG(INFO, ProviderSolomon) << "Optimize SoWriteToShard";

const auto solomonCluster = TString(write.DataSink().Cluster().Value());
auto shard = BuildSolomonShard(write.Shard().Cast<TCoAtom>(), ctx, solomonCluster);
auto* typeAnn = write.Input().Ref().GetTypeAnn();
const TTypeAnnotationNode* inputItemType = nullptr;
if (!EnsureNewSeqType<false, true, false>(write.Input().Pos(), *typeAnn, ctx, &inputItemType)) {
return {};
}

auto rowTypeNode = ExpandType(write.Pos(), *inputItemType, ctx);
auto shard = BuildSolomonShard(write.Shard().Cast<TCoAtom>(), TExprBase(rowTypeNode), ctx, solomonCluster);

auto dqSink = Build<TDqSink>(ctx, write.Pos())
.DataSink(write.DataSink())
Expand Down Expand Up @@ -131,7 +138,7 @@ class TSoPhysicalOptProposalTransformer : public TOptimizeTransformerBase {
}

private:
TCallable BuildSolomonShard(TCoAtom shardNode, TExprContext& ctx, TString solomonCluster) const {
TCallable BuildSolomonShard(TCoAtom shardNode, TExprBase rowType, TExprContext& ctx, TString solomonCluster) const {
const auto* clusterDesc = State_->Configuration->ClusterConfigs.FindPtr(solomonCluster);
YQL_ENSURE(clusterDesc, "Unknown cluster " << solomonCluster);

Expand All @@ -148,31 +155,14 @@ class TSoPhysicalOptProposalTransformer : public TOptimizeTransformerBase {
}
YQL_ENSURE(!cluster.empty(), "Cluster is not defined. You can define it inside connection, or inside query.");

auto solomonClusterAtom = Build<TCoAtom>(ctx, shardNode.Pos())
.Value(solomonCluster)
.Done();

auto projectAtom = Build<TCoAtom>(ctx, shardNode.Pos())
.Value(project)
.Done();

auto clusterAtom = Build<TCoAtom>(ctx, shardNode.Pos())
.Value(cluster)
return Build<TSoShard>(ctx, shardNode.Pos())
.SolomonCluster<TCoAtom>().Value(solomonCluster).Build()
.Project<TCoAtom>().Value(project).Build()
.Cluster<TCoAtom>().Value(cluster).Build()
.Service<TCoAtom>().Value(service).Build()
.RowType(rowType)
.Token<TCoSecureParam>().Name().Build("cluster:default_" + solomonCluster).Build()
.Done();

auto serviceAtom = Build<TCoAtom>(ctx, shardNode.Pos())
.Value(service)
.Done();

auto dqSoShardBuilder = Build<TSoShard>(ctx, shardNode.Pos());
dqSoShardBuilder.SolomonCluster(solomonClusterAtom);
dqSoShardBuilder.Project(projectAtom);
dqSoShardBuilder.Cluster(clusterAtom);
dqSoShardBuilder.Service(serviceAtom);

dqSoShardBuilder.Token<TCoSecureParam>().Name().Build("cluster:default_" + solomonCluster).Build();

return dqSoShardBuilder.Done();
}

private:
Expand Down