From 5c2fbbee4326dadfbeb9a323bcf5c6d3c898d498 Mon Sep 17 00:00:00 2001 From: Grigoriy Pisarenko Date: Wed, 13 Mar 2024 11:31:51 +0000 Subject: [PATCH 1/2] Fixed error during poison handling --- ydb/library/yql/providers/s3/actors/yql_s3_read_actor.cpp | 5 ++++- ydb/tests/tools/kqprun/.gitignore | 1 + ydb/tests/tools/kqprun/kqprun.cpp | 3 +++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ydb/library/yql/providers/s3/actors/yql_s3_read_actor.cpp b/ydb/library/yql/providers/s3/actors/yql_s3_read_actor.cpp index a37326d3310a..18bb7844f184 100644 --- a/ydb/library/yql/providers/s3/actors/yql_s3_read_actor.cpp +++ b/ydb/library/yql/providers/s3/actors/yql_s3_read_actor.cpp @@ -2165,7 +2165,10 @@ class TS3ReadCoroImpl : public TActorCoroImpl { hFunc(TEvPrivate::TEvContinue, Handle); hFunc(TEvPrivate::TEvReadResult2, Handle); hFunc(NActors::TEvents::TEvPoison, Handle); - , catch (const std::exception& e) { + , catch (const TS3ReadAbort& e) { + // Poison handler + throw e; + } 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)); } diff --git a/ydb/tests/tools/kqprun/.gitignore b/ydb/tests/tools/kqprun/.gitignore index 0733e58da5be..e240c8c1f76b 100644 --- a/ydb/tests/tools/kqprun/.gitignore +++ b/ydb/tests/tools/kqprun/.gitignore @@ -2,5 +2,6 @@ sync_dir example udfs *.log +*.json *.sql *.bin diff --git a/ydb/tests/tools/kqprun/kqprun.cpp b/ydb/tests/tools/kqprun/kqprun.cpp index d2b620d1dae6..efb4f6cb5acb 100644 --- a/ydb/tests/tools/kqprun/kqprun.cpp +++ b/ydb/tests/tools/kqprun/kqprun.cpp @@ -48,6 +48,7 @@ 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"; } @@ -61,6 +62,8 @@ void RunScript(const TExecutionOptions& executionOptions, const NKqpRun::TRunner if (executionOptions.HasResults()) { runner.PrintScriptResults(); } + + Cout << colors.Yellow() << "Finalization of kqp runner..." << colors.Default() << Endl; } From 9e73e3f25d54d6583e124d663ad6cb316c227dac Mon Sep 17 00:00:00 2001 From: Grigoriy Pisarenko Date: Wed, 13 Mar 2024 11:46:05 +0000 Subject: [PATCH 2/2] Removed exception handling --- .../yql/providers/s3/actors/yql_s3_read_actor.cpp | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/ydb/library/yql/providers/s3/actors/yql_s3_read_actor.cpp b/ydb/library/yql/providers/s3/actors/yql_s3_read_actor.cpp index 18bb7844f184..3bc188426052 100644 --- a/ydb/library/yql/providers/s3/actors/yql_s3_read_actor.cpp +++ b/ydb/library/yql/providers/s3/actors/yql_s3_read_actor.cpp @@ -2158,20 +2158,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 TS3ReadAbort& e) { - // Poison handler - throw e; - } 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() {