Skip to content

Commit

Permalink
YQ-2957 fix error in s3 stream read actor (ydb-platform#2702)
Browse files Browse the repository at this point in the history
  • Loading branch information
GrigoriyPA authored and EgorkaZ committed Apr 5, 2024
1 parent 4f667ab commit 686bc8d
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 5 deletions.
6 changes: 1 addition & 5 deletions ydb/library/yql/providers/s3/actors/yql_s3_read_actor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2039,17 +2039,13 @@ class TS3ReadCoroImpl : public TActorCoroImpl {
LOG_CORO_D("RunCoroBlockArrowParserOverFile - FINISHED");
}

STRICT_STFUNC_EXC(StateFunc,
STRICT_STFUNC(StateFunc,
hFunc(TEvPrivate::TEvReadStarted, Handle);
hFunc(TEvPrivate::TEvDataPart, Handle);
hFunc(TEvPrivate::TEvReadFinished, Handle);
hFunc(TEvPrivate::TEvContinue, Handle);
hFunc(TEvPrivate::TEvReadResult2, Handle);
hFunc(NActors::TEvents::TEvPoison, Handle);
, catch (const std::exception& e) {
TIssues issues{TIssue{TStringBuilder() << "An unknown exception has occurred: '" << e.what() << "'"}};
Send(ComputeActorId, new IDqComputeActorAsyncInput::TEvAsyncInputError(InputIndex, issues, NYql::NDqProto::StatusIds::INTERNAL_ERROR));
}
)

void ProcessOneEvent() {
Expand Down
1 change: 1 addition & 0 deletions ydb/tests/tools/kqprun/.gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
sync_dir
*.log
*.json
*.sql
6 changes: 6 additions & 0 deletions ydb/tests/tools/kqprun/kqprun.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,10 @@ void RunScript(const TExecutionOptions& executionOptions, const NKqpRun::TRunner
if (!runner.ExecuteScript(executionOptions.ScriptQuery, executionOptions.ScriptQueryAction, executionOptions.ScriptTraceId)) {
ythrow yexception() << "Script execution failed";
}
Cout << colors.Yellow() << "Fetching script results..." << colors.Default() << Endl;
if (!runner.FetchScriptResults()) {
ythrow yexception() << "Fetch script results failed";
}
} else {
if (!runner.ExecuteQuery(executionOptions.ScriptQuery, executionOptions.ScriptQueryAction, executionOptions.ScriptTraceId)) {
ythrow yexception() << "Query execution failed";
Expand All @@ -59,6 +63,8 @@ void RunScript(const TExecutionOptions& executionOptions, const NKqpRun::TRunner
ythrow yexception() << "Writing script results failed";
}
}

Cout << colors.Yellow() << "Finalization of kqp runner..." << colors.Default() << Endl;
}


Expand Down

0 comments on commit 686bc8d

Please sign in to comment.