Skip to content

Merge stream lookup changes #12292

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
Dec 6, 2024
Merged

Merge stream lookup changes #12292

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
081215a
allow to keep rows order for stream lookup join (#12233)
ssmike Dec 3, 2024
53ff978
fix various problems in stream lookup (#12218)
gridnevvvit Dec 4, 2024
c5b59c7
feat(kqp): add pragma for sequential reads (#11715)
ulya-sidorina Nov 19, 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
1 change: 1 addition & 0 deletions ydb/core/kqp/executer_actor/kqp_tasks_graph.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,6 +415,7 @@ void BuildStreamLookupChannels(TKqpTasksGraph& graph, const TStageInfo& stageInf
}

settings->SetLookupStrategy(streamLookup.GetLookupStrategy());
settings->SetKeepRowsOrder(streamLookup.GetKeepRowsOrder());

TTransform streamLookupTransform;
streamLookupTransform.Type = "StreamLookupInputTransformer";
Expand Down
5 changes: 5 additions & 0 deletions ydb/core/kqp/opt/physical/kqp_opt_phy_source.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,11 @@ TExprBase KqpRewriteReadTable(TExprBase node, TExprContext& ctx, const TKqpOptim
matched->Settings = settings.BuildNode(ctx, matched->Settings.Pos());
}

if (kqpCtx.Config->HasMaxSequentialReadsInFlight()) {
settings.SequentialInFlight = *kqpCtx.Config->MaxSequentialReadsInFlight.Get();
matched->Settings = settings.BuildNode(ctx, matched->Settings.Pos());
}

TVector<TExprBase> inputs;
TVector<TCoArgument> args;
TNodeOnNodeOwnedMap argReplaces;
Expand Down
10 changes: 10 additions & 0 deletions ydb/core/kqp/provider/yql_kikimr_settings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ TKikimrConfiguration::TKikimrConfiguration() {
REGISTER_SETTING(*this, OptimizerHints).Parser([](const TString& v) { return NYql::TOptimizerHints::Parse(v); });
REGISTER_SETTING(*this, OverridePlanner);
REGISTER_SETTING(*this, UseGraceJoinCoreForMap);
REGISTER_SETTING(*this, EnableOrderPreservingLookupJoin);

REGISTER_SETTING(*this, OptUseFinalizeByKey);
REGISTER_SETTING(*this, CostBasedOptimizationLevel);
Expand All @@ -96,6 +97,7 @@ TKikimrConfiguration::TKikimrConfiguration() {
REGISTER_SETTING(*this, MaxDPccpDPTableSize);

REGISTER_SETTING(*this, MaxTasksPerStage);
REGISTER_SETTING(*this, MaxSequentialReadsInFlight);

/* Runtime */
REGISTER_SETTING(*this, ScanQuery);
Expand All @@ -120,6 +122,10 @@ bool TKikimrSettings::SpillingEnabled() const {
return GetFlagValue(_KqpEnableSpilling.Get());
}

bool TKikimrSettings::OrderPreservingLookupJoinEnabled() const {
return GetFlagValue(EnableOrderPreservingLookupJoin.Get());
}

bool TKikimrSettings::DisableLlvmForUdfStages() const {
return GetFlagValue(_KqpDisableLlvmForUdfStages.Get());
}
Expand Down Expand Up @@ -148,6 +154,10 @@ bool TKikimrSettings::HasOptUseFinalizeByKey() const {
return GetFlagValue(OptUseFinalizeByKey.Get().GetOrElse(true)) != EOptionalFlag::Disabled;
}

bool TKikimrSettings::HasMaxSequentialReadsInFlight() const {
return !MaxSequentialReadsInFlight.Get().Empty();
}

EOptionalFlag TKikimrSettings::GetOptPredicateExtract() const {
return GetOptionalFlagValue(OptEnablePredicateExtract.Get());
}
Expand Down
5 changes: 4 additions & 1 deletion ydb/core/kqp/provider/yql_kikimr_settings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ struct TKikimrSettings {
NCommon::TConfSetting<ui64, false> EnableSpillingNodes;
NCommon::TConfSetting<TString, false> OverridePlanner;
NCommon::TConfSetting<bool, false> UseGraceJoinCoreForMap;
NCommon::TConfSetting<bool, false> EnableOrderPreservingLookupJoin;

NCommon::TConfSetting<TString, false> OptOverrideStatistics;
NCommon::TConfSetting<NYql::TOptimizerHints, false> OptimizerHints;
Expand All @@ -72,6 +73,7 @@ struct TKikimrSettings {


NCommon::TConfSetting<ui32, false> MaxTasksPerStage;
NCommon::TConfSetting<ui32, false> MaxSequentialReadsInFlight;

/* Runtime */
NCommon::TConfSetting<bool, true> ScanQuery;
Expand All @@ -88,7 +90,8 @@ struct TKikimrSettings {
bool HasOptEnableOlapPushdown() const;
bool HasOptEnableOlapProvideComputeSharding() const;
bool HasOptUseFinalizeByKey() const;

bool HasMaxSequentialReadsInFlight() const;
bool OrderPreservingLookupJoinEnabled() const;
EOptionalFlag GetOptPredicateExtract() const;
EOptionalFlag GetUseLlvm() const;
NDq::EHashJoinMode GetHashJoinMode() const;
Expand Down
1 change: 1 addition & 0 deletions ydb/core/kqp/query_compiler/kqp_query_compiler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1277,6 +1277,7 @@ class TKqpQueryCompiler : public IKqpQueryCompiler {
YQL_ENSURE(streamLookup.LookupStrategy().Maybe<TCoAtom>());
TString lookupStrategy = streamLookup.LookupStrategy().Maybe<TCoAtom>().Cast().StringValue();
streamLookupProto.SetLookupStrategy(GetStreamLookupStrategy(lookupStrategy));
streamLookupProto.SetKeepRowsOrder(Config->OrderPreservingLookupJoinEnabled());

switch (streamLookupProto.GetLookupStrategy()) {
case NKqpProto::EStreamLookupStrategy::LOOKUP: {
Expand Down
3 changes: 3 additions & 0 deletions ydb/core/kqp/runtime/kqp_stream_lookup_actor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,8 @@ class TKqpStreamLookupActor : public NActors::TActorBootstrapped<TKqpStreamLooku
RuntimeError(TStringBuilder() << "Unexpected event: " << ev->GetTypeRewrite(),
NYql::NDqProto::StatusIds::INTERNAL_ERROR);
}
} catch (const NKikimr::TMemoryLimitExceededException& e) {
RuntimeError("Memory limit exceeded at stream lookup", NYql::NDqProto::StatusIds::PRECONDITION_FAILED);
} catch (const yexception& e) {
RuntimeError(e.what(), NYql::NDqProto::StatusIds::INTERNAL_ERROR);
}
Expand Down Expand Up @@ -400,6 +402,7 @@ class TKqpStreamLookupActor : public NActors::TActorBootstrapped<TKqpStreamLooku
}
}

auto guard = BindAllocator();
StreamLookupWorker->AddResult(TKqpStreamLookupWorker::TShardReadResult{
read.ShardId, THolder<TEventHandle<TEvDataShard::TEvReadResult>>(ev.Release())
});
Expand Down
Loading
Loading