Skip to content

Commit 04fbf39

Browse files
authored
Merge 5c2fbbe into c0a403c
2 parents c0a403c + 5c2fbbe commit 04fbf39

File tree

3 files changed

+8
-1
lines changed

3 files changed

+8
-1
lines changed

ydb/library/yql/providers/s3/actors/yql_s3_read_actor.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2165,7 +2165,10 @@ class TS3ReadCoroImpl : public TActorCoroImpl {
21652165
hFunc(TEvPrivate::TEvContinue, Handle);
21662166
hFunc(TEvPrivate::TEvReadResult2, Handle);
21672167
hFunc(NActors::TEvents::TEvPoison, Handle);
2168-
, catch (const std::exception& e) {
2168+
, catch (const TS3ReadAbort& e) {
2169+
// Poison handler
2170+
throw e;
2171+
} catch (const std::exception& e) {
21692172
TIssues issues{TIssue{TStringBuilder() << "An unknown exception has occurred: '" << e.what() << "'"}};
21702173
Send(ComputeActorId, new IDqComputeActorAsyncInput::TEvAsyncInputError(InputIndex, issues, NYql::NDqProto::StatusIds::INTERNAL_ERROR));
21712174
}

ydb/tests/tools/kqprun/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@ sync_dir
22
example
33
udfs
44
*.log
5+
*.json
56
*.sql
67
*.bin

ydb/tests/tools/kqprun/kqprun.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ void RunScript(const TExecutionOptions& executionOptions, const NKqpRun::TRunner
4848
if (!runner.ExecuteScript(executionOptions.ScriptQuery, executionOptions.ScriptQueryAction, executionOptions.ScriptTraceId)) {
4949
ythrow yexception() << "Script execution failed";
5050
}
51+
Cout << colors.Yellow() << "Fetching script results..." << colors.Default() << Endl;
5152
if (!runner.FetchScriptResults()) {
5253
ythrow yexception() << "Fetch script results failed";
5354
}
@@ -61,6 +62,8 @@ void RunScript(const TExecutionOptions& executionOptions, const NKqpRun::TRunner
6162
if (executionOptions.HasResults()) {
6263
runner.PrintScriptResults();
6364
}
65+
66+
Cout << colors.Yellow() << "Finalization of kqp runner..." << colors.Default() << Endl;
6467
}
6568

6669

0 commit comments

Comments
 (0)