diff options
author | mrlolthe1st <mrlolthe1st@yandex-team.com> | 2023-02-18 15:05:39 +0300 |
---|---|---|
committer | mrlolthe1st <mrlolthe1st@yandex-team.com> | 2023-02-18 15:05:39 +0300 |
commit | 32e9a06cb4641872dac807017e54e2a32b848222 (patch) | |
tree | 63bfd67225480218e38003e564848ff1eef2acb5 | |
parent | 9d73f0e9632244e22689bbdfe0b51aaf5d214bd7 (diff) | |
download | ydb-32e9a06cb4641872dac807017e54e2a32b848222.tar.gz |
fix
-rw-r--r-- | ydb/library/yql/providers/common/arrow/arrow_reader_impl.cpp | 2 | ||||
-rw-r--r-- | ydb/library/yql/providers/s3/actors/yql_s3_read_actor.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ydb/library/yql/providers/common/arrow/arrow_reader_impl.cpp b/ydb/library/yql/providers/common/arrow/arrow_reader_impl.cpp index 081a26be28..c1875d67d9 100644 --- a/ydb/library/yql/providers/common/arrow/arrow_reader_impl.cpp +++ b/ydb/library/yql/providers/common/arrow/arrow_reader_impl.cpp @@ -87,7 +87,7 @@ public: std::bind(&OnResult, promise, std::placeholders::_1), {}, RetryPolicy); - return arrow::Buffer::FromString(std::move(promise.GetFuture().GetValueSync())); + return arrow::Buffer::FromString(promise.GetFuture().ExtractValueSync()); } catch (const std::exception& e) { return arrow::Status::UnknownError(e.what()); } 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 b6ec7eecbf..2c10403ba7 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 @@ -867,18 +867,18 @@ private: template<typename EvType> void WaitEvent() { - auto event = WaitForSpecificEvent<TEvPrivate::TEvFutureResolved, TEvPrivate::TEvPause, TEvPrivate::TEvContinue, TEvPrivate::TEvBlockProcessed, NActors::TEvents::TEvPoison>(); + auto event = WaitForEvent(); TVector<THolder<IEventBase>> otherEvents; while (!event->CastAsLocal<EvType>()) { if (event->CastAsLocal<NActors::TEvents::TEvPoison>()) { throw TS3ReadAbort(); } - if (!event->CastAsLocal<TEvPrivate::TEvPause>() && !event->CastAsLocal<TEvPrivate::TEvContinue>()) { + if (!event->CastAsLocal<TEvPrivate::TEvPause>() && !event->CastAsLocal<TEvPrivate::TEvContinue>() && !event->CastAsLocal<TEvPrivate::TEvReadFinished>()) { otherEvents.push_back(event->ReleaseBase()); } - event = WaitForSpecificEvent<TEvPrivate::TEvFutureResolved, TEvPrivate::TEvPause, TEvPrivate::TEvContinue, TEvPrivate::TEvBlockProcessed, NActors::TEvents::TEvPoison>(); + event = WaitForEvent(); } for (auto& e: otherEvents) { |