Skip to content

Commit 464b6ca

Browse files
committed
Fixed issues
1 parent 2b02448 commit 464b6ca

File tree

2 files changed

+10
-9
lines changed

2 files changed

+10
-9
lines changed

ydb/core/kqp/ut/federated_query/datastreams/datastreams_ut.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1860,8 +1860,8 @@ Y_UNIT_TEST_SUITE(KqpStreamingQueriesDdl) {
18601860
.ResultFactory = [&]() {
18611861
readSplitsCount += 1;
18621862
const auto payloadColumn = readSplitsCount < 3
1863-
? std::vector<std::string>{"P1", "P2", "P3"}
1864-
: std::vector<std::string>{"P4", "P5", "P6"};
1863+
? std::vector<std::string>{"P1", "P2", "P3"}
1864+
: std::vector<std::string>{"P4", "P5", "P6"};
18651865

18661866
return MakeRecordBatch(
18671867
MakeArray<arrow::BinaryBuilder>("fqdn", fqdnColumn, arrow::binary()),

ydb/library/yql/dq/opt/dq_opt_phy.cpp

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3486,12 +3486,8 @@ bool ValidateStreamLookupJoinFlags(const TDqJoin& join, TExprContext& ctx) {
34863486
}
34873487

34883488
if (!rightAny) {
3489-
if (false) { // Temporarily change to warning to allow for smooth transition
3490-
ctx.AddError(TIssue(ctx.GetPosition(join.Pos()), "Streamlookup: must be LEFT JOIN /*+streamlookup(...)*/ ANY"));
3491-
return false;
3492-
} else {
3493-
ctx.AddWarning(TIssue(ctx.GetPosition(join.Pos()), "(Deprecation) Streamlookup: must be LEFT JOIN /*+streamlookup(...)*/ ANY"));
3494-
}
3489+
ctx.AddError(TIssue(ctx.GetPosition(join.Pos()), "Streamlookup: must be LEFT JOIN /*+streamlookup(...)*/ ANY"));
3490+
return false;
34953491
}
34963492

34973493
return true;
@@ -3505,7 +3501,6 @@ TMaybeNode<TExprBase> DqRewriteStreamLookupJoin(TExprBase node, TExprContext& ct
35053501
return node;
35063502
}
35073503

3508-
const auto pos = node.Pos();
35093504
const auto left = join.LeftInput().Maybe<TDqConnection>();
35103505
if (!left) {
35113506
return node;
@@ -3534,19 +3529,25 @@ TMaybeNode<TExprBase> DqRewriteStreamLookupJoin(TExprBase node, TExprContext& ct
35343529
}
35353530
}
35363531

3532+
const auto pos = node.Pos();
3533+
35373534
if (!ttl) {
35383535
ttl = ctx.NewAtom(pos, 300);
35393536
}
3537+
35403538
if (!maxCachedRows) {
35413539
maxCachedRows = ctx.NewAtom(pos, 1'000'000);
35423540
}
3541+
35433542
if (!maxDelayedRows) {
35443543
maxDelayedRows = ctx.NewAtom(pos, 1'000'000);
35453544
}
3545+
35463546
auto rightInput = join.RightInput().Ptr();
35473547
if (auto maybe = TExprBase(rightInput).Maybe<TCoExtractMembers>()) {
35483548
rightInput = maybe.Cast().Input().Ptr();
35493549
}
3550+
35503551
auto leftLabel = join.LeftLabel().Maybe<NNodes::TCoAtom>() ? join.LeftLabel().Cast<NNodes::TCoAtom>().Ptr() : ctx.NewAtom(pos, "");
35513552
Y_ENSURE(join.RightLabel().Maybe<NNodes::TCoAtom>());
35523553
auto cn = Build<TDqCnStreamLookup>(ctx, pos)

0 commit comments

Comments
 (0)