Skip to content

YQ-4053 support parallel s3 import #14060

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 2 commits into from
Feb 3, 2025
Merged

YQ-4053 support parallel s3 import #14060

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2507d44
Supported multi thread export
GrigoriyPA Jan 31, 2025
ac7dc5f
Fixed unit test
GrigoriyPA Jan 31, 2025
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
9 changes: 5 additions & 4 deletions ydb/core/kqp/ut/federated_query/s3/kqp_s3_plan_ut.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,14 +143,15 @@ Y_UNIT_TEST_SUITE(KqpS3PlanTest) {
UNIT_ASSERT(NJson::ReadJsonTree(*queryResult.GetStats()->GetPlan(), &plan));

const auto& writeStagePlan = plan["Plan"]["Plans"][0]["Plans"][0];
UNIT_ASSERT_VALUES_EQUAL(writeStagePlan["Node Type"].GetStringSafe(), "Limit-Sink");
UNIT_ASSERT(writeStagePlan["Operators"].GetArraySafe().size() >= 2);
const auto& sinkOp = writeStagePlan["Operators"].GetArraySafe()[1];
UNIT_ASSERT_VALUES_EQUAL(writeStagePlan["Node Type"].GetStringSafe(), "Stage-Sink");
UNIT_ASSERT(writeStagePlan["Operators"].GetArraySafe().size() >= 1);
const auto& sinkOp = writeStagePlan["Operators"].GetArraySafe()[0];
UNIT_ASSERT_VALUES_EQUAL(sinkOp["ExternalDataSource"].GetStringSafe(), "write_data_source");
UNIT_ASSERT_VALUES_EQUAL(sinkOp["Compression"].GetStringSafe(), "gzip");

const auto& readStagePlan = plan["Plan"]["Plans"][0]["Plans"][0]["Plans"][0]["Plans"][0]["Plans"][0];
const auto& readStagePlan = plan["Plan"]["Plans"][0]["Plans"][0]["Plans"][0]["Plans"][0]["Plans"][0]["Plans"][0]["Plans"][0];
UNIT_ASSERT_VALUES_EQUAL(readStagePlan["Node Type"].GetStringSafe(), "Source");
UNIT_ASSERT(readStagePlan["Operators"].GetArraySafe().size() >= 1);
const auto& sourceOp = readStagePlan["Operators"].GetArraySafe()[0];
UNIT_ASSERT_VALUES_EQUAL(sourceOp["ExternalDataSource"].GetStringSafe(), "read_data_source");

Expand Down
29 changes: 19 additions & 10 deletions ydb/library/yql/providers/s3/actors/yql_s3_write_actor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -573,15 +573,15 @@ class TS3WriteActor : public TActorBootstrapped<TS3WriteActor>, public IDqComput
const auto& key = MakePartitionKey(row);
const auto [keyIt, insertedNew] = FileWriteActors.emplace(key, std::vector<TS3FileWriteActor*>());
if (insertedNew || keyIt->second.empty() || keyIt->second.back()->IsFinishing()) {
auto fileWrite = std::make_unique<TS3FileWriteActor>(
TxId,
Gateway,
Credentials,
key,
NS3Util::UrlEscapeRet(Url + Path + key + MakeOutputName() + Extension),
Compression,
RetryPolicy, DirtyWrite, Token);
keyIt->second.emplace_back(fileWrite.get());
auto fileWrite = std::make_unique<TS3FileWriteActor>(
TxId,
Gateway,
Credentials,
key,
NS3Util::UrlEscapeRet(Url + Path + key + MakeOutputName() + Extension),
Compression,
RetryPolicy, DirtyWrite, Token);
keyIt->second.emplace_back(fileWrite.get());
RegisterWithSameMailbox(fileWrite.release());
}

Expand Down Expand Up @@ -619,6 +619,10 @@ class TS3WriteActor : public TActorBootstrapped<TS3WriteActor>, public IDqComput
NDqProto::StatusIds::StatusCode statusCode = result->Get()->StatusCode;
if (statusCode == NDqProto::StatusIds::UNSPECIFIED) {
statusCode = StatusFromS3ErrorCode(result->Get()->S3ErrorCode);
if (statusCode == NDqProto::StatusIds::UNSPECIFIED) {
statusCode = NDqProto::StatusIds::INTERNAL_ERROR;
result->Get()->Issues.AddIssue("Got upload error with unspecified error code.");
}
}

Callbacks->OnAsyncOutputError(OutputIndex, result->Get()->Issues, statusCode);
Expand All @@ -640,10 +644,15 @@ class TS3WriteActor : public TActorBootstrapped<TS3WriteActor>, public IDqComput
if (const auto ft = std::find_if(it->second.cbegin(), it->second.cend(), [&](TS3FileWriteActor* actor){ return result->Get()->Url == actor->GetUrl(); }); it->second.cend() != ft) {
(*ft)->PassAway();
it->second.erase(ft);
if (it->second.empty())
if (it->second.empty()) {
FileWriteActors.erase(it);
}
}
}
if (!Finished && GetFreeSpace() > 0) {
LOG_D("TS3WriteActor", "Has free space, notify owner");
Callbacks->ResumeExecution();
}
FinishIfNeeded();
}

Expand Down
71 changes: 32 additions & 39 deletions ydb/library/yql/providers/s3/provider/yql_s3_phy_opt.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,13 +124,15 @@ class TS3PhysicalOptProposalTransformer : public TOptimizeTransformerBase {
auto keys = GetPartitionKeys(partBy);

auto sinkSettingsBuilder = Build<TExprList>(ctx, target.Pos());
if (partBy)
if (partBy) {
sinkSettingsBuilder.Add(std::move(partBy));
}

auto compression = GetCompression(settings);
const auto& extension = GetExtension(target.Format().Value(), compression ? compression->Tail().Content() : ""sv);
if (compression)
if (compression) {
sinkSettingsBuilder.Add(std::move(compression));
}

auto sinkOutputSettingsBuilder = Build<TExprList>(ctx, target.Pos());
if (auto csvDelimiter = GetCsvDelimiter(settings)) {
Expand Down Expand Up @@ -199,31 +201,17 @@ class TS3PhysicalOptProposalTransformer : public TOptimizeTransformerBase {
}
}

if (!FindNode(input.Ptr(), [] (const TExprNode::TPtr& node) { return node->IsCallable(TCoDataSource::CallableName()); })) {
if (IsDqPureExpr(input)) {
YQL_CLOG(INFO, ProviderS3) << "Rewrite pure S3WriteObject `" << cluster << "`.`" << target.Path().StringValue() << "` as stage with sink.";
auto shouldBePassedAsInput = FindNode(input.Ptr(), [] (const TExprNode::TPtr& node) { return node->IsCallable(TDqStage::CallableName()); });

auto stageInputs = Build<TExprList>(ctx, writePos);
auto toFlow = Build<TCoToFlow>(ctx, writePos);
TVector<TCoArgument> args;

if (shouldBePassedAsInput) {
auto arg = Build<TCoArgument>(ctx, writePos).Name("in").Done();
stageInputs.Add(input);
args.push_back(arg);
toFlow.Input(arg);
}
else {
toFlow.Input(input);
}

return keys.empty() ?
Build<TDqStage>(ctx, writePos)
.Inputs(stageInputs.Done())
.Inputs().Build()
.Program<TCoLambda>()
.Args(args)
.Args({})
.Body<TS3SinkOutput>()
.Input(toFlow.Done())
.Input<TCoToFlow>()
.Input(input)
.Build()
.Format(target.Format())
.KeyColumns().Build()
.Settings(sinkOutputSettingsBuilder.Done())
Expand Down Expand Up @@ -251,10 +239,12 @@ class TS3PhysicalOptProposalTransformer : public TOptimizeTransformerBase {
.Add<TDqCnHashShuffle>()
.Output<TDqOutput>()
.Stage<TDqStage>()
.Inputs(stageInputs.Done())
.Inputs().Build()
.Program<TCoLambda>()
.Args(args)
.Body(toFlow.Done())
.Args({})
.Body<TCoToFlow>()
.Input(input)
.Build()
.Build()
.Settings().Build()
.Build()
Expand Down Expand Up @@ -317,23 +307,26 @@ class TS3PhysicalOptProposalTransformer : public TOptimizeTransformerBase {
.Build()
.Done();

auto outputsBuilder = Build<TDqStageOutputsList>(ctx, target.Pos());
if (inputStage.Outputs() && keys.empty()) {
outputsBuilder.InitFrom(inputStage.Outputs().Cast());
}
outputsBuilder.Add(sink);
auto outputsBuilder = Build<TDqStageOutputsList>(ctx, target.Pos())
.Add(sink);

if (keys.empty()) {
const auto outputBuilder = Build<TS3SinkOutput>(ctx, target.Pos())
.Input(inputStage.Program().Body().Ptr())
.Format(target.Format())
.KeyColumns().Add(std::move(keys)).Build()
.Settings(sinkOutputSettingsBuilder.Done())
.Done();

return Build<TDqStage>(ctx, writePos)
.InitFrom(inputStage)
.Program(ctx.DeepCopyLambda(inputStage.Program().Ref(), outputBuilder.Ptr()))
.Inputs()
.Add<TDqCnMap>()
.Output(dqUnion.Output())
.Build()
.Build()
.Program<TCoLambda>()
.Args({"in"})
.Body<TS3SinkOutput>()
.Input("in")
.Format(target.Format())
.KeyColumns().Add(std::move(keys)).Build()
.Settings(sinkOutputSettingsBuilder.Done())
.Build()
.Build()
.Settings().Build()
.Outputs(outputsBuilder.Done())
.Done();
} else {
Expand Down
Loading