From 2ecca4e00ee9accd2b8612a11474ba31ad6a4f32 Mon Sep 17 00:00:00 2001 From: Vasily Nemkov Date: Wed, 15 Feb 2023 19:15:37 +0400 Subject: [PATCH 1/6] Scheduled CI/CD run 00:00 every Sunday --- .github/workflows/release_branches.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/release_branches.yml b/.github/workflows/release_branches.yml index d210c8ac7103..1a101bc064d6 100644 --- a/.github/workflows/release_branches.yml +++ b/.github/workflows/release_branches.yml @@ -20,6 +20,8 @@ on: # yamllint disable-line rule:truthy push: branches: - 'releases/22.8**' + schedule: + - cron: '0 0 * * 0' jobs: # DockerHubPushAarch64: From 6b004a61ae53083acac1a3f05b5e37c7a13e44cf Mon Sep 17 00:00:00 2001 From: avogar Date: Fri, 20 Jan 2023 16:40:33 +0000 Subject: [PATCH 2/6] Fix aborts in arrow lib --- contrib/arrow | 2 +- src/Processors/Formats/Impl/ArrowBufferedStreams.cpp | 7 +++++++ src/Processors/Formats/Impl/ArrowBufferedStreams.h | 3 +++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/contrib/arrow b/contrib/arrow index 450a56387043..d03245f801f7 160000 --- a/contrib/arrow +++ b/contrib/arrow @@ -1 +1 @@ -Subproject commit 450a5638704386356f8e520080468fc9bc8bcaf8 +Subproject commit d03245f801f798c63ee9a7d2b8914a9e5c5cd666 diff --git a/src/Processors/Formats/Impl/ArrowBufferedStreams.cpp b/src/Processors/Formats/Impl/ArrowBufferedStreams.cpp index ebd9783b4fd4..96ed2a7021e0 100644 --- a/src/Processors/Formats/Impl/ArrowBufferedStreams.cpp +++ b/src/Processors/Formats/Impl/ArrowBufferedStreams.cpp @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include @@ -95,6 +96,12 @@ arrow::Result> RandomAccessFileFromSeekableReadBu return buffer; } +arrow::Future> RandomAccessFileFromSeekableReadBuffer::ReadAsync(const arrow::io::IOContext &, int64_t position, int64_t nbytes) +{ + /// Just a stub to to avoid using internal arrow thread pool + return arrow::Future>::MakeFinished(ReadAt(position, nbytes)); +} + arrow::Status RandomAccessFileFromSeekableReadBuffer::Seek(int64_t position) { seekable_in.seek(position, SEEK_SET); diff --git a/src/Processors/Formats/Impl/ArrowBufferedStreams.h b/src/Processors/Formats/Impl/ArrowBufferedStreams.h index da0382837313..b1494d853fe2 100644 --- a/src/Processors/Formats/Impl/ArrowBufferedStreams.h +++ b/src/Processors/Formats/Impl/ArrowBufferedStreams.h @@ -62,6 +62,9 @@ class RandomAccessFileFromSeekableReadBuffer : public arrow::io::RandomAccessFil arrow::Result> Read(int64_t nbytes) override; + /// Override async reading to not use internal arrow thread pool. + arrow::Future> ReadAsync(const arrow::io::IOContext&, int64_t position, int64_t nbytes) override; + arrow::Status Seek(int64_t position) override; private: From 2a6d87564fee59c5dc5c3021c7a1a0226f2c53f9 Mon Sep 17 00:00:00 2001 From: avogar Date: Fri, 20 Jan 2023 16:41:59 +0000 Subject: [PATCH 3/6] Better comment --- src/Processors/Formats/Impl/ArrowBufferedStreams.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Processors/Formats/Impl/ArrowBufferedStreams.h b/src/Processors/Formats/Impl/ArrowBufferedStreams.h index b1494d853fe2..cae871bb8a68 100644 --- a/src/Processors/Formats/Impl/ArrowBufferedStreams.h +++ b/src/Processors/Formats/Impl/ArrowBufferedStreams.h @@ -62,7 +62,7 @@ class RandomAccessFileFromSeekableReadBuffer : public arrow::io::RandomAccessFil arrow::Result> Read(int64_t nbytes) override; - /// Override async reading to not use internal arrow thread pool. + /// Override async reading to avoid using internal arrow thread pool. arrow::Future> ReadAsync(const arrow::io::IOContext&, int64_t position, int64_t nbytes) override; arrow::Status Seek(int64_t position) override; From a02b8ab9c9e5c049f2af601384b676bad5173067 Mon Sep 17 00:00:00 2001 From: Kruglov Pavel <48961922+Avogar@users.noreply.github.com> Date: Mon, 23 Jan 2023 15:31:07 +0100 Subject: [PATCH 4/6] Better comment --- src/Processors/Formats/Impl/ArrowBufferedStreams.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Processors/Formats/Impl/ArrowBufferedStreams.h b/src/Processors/Formats/Impl/ArrowBufferedStreams.h index cae871bb8a68..3be31e91f0be 100644 --- a/src/Processors/Formats/Impl/ArrowBufferedStreams.h +++ b/src/Processors/Formats/Impl/ArrowBufferedStreams.h @@ -63,6 +63,8 @@ class RandomAccessFileFromSeekableReadBuffer : public arrow::io::RandomAccessFil arrow::Result> Read(int64_t nbytes) override; /// Override async reading to avoid using internal arrow thread pool. + /// In our code we don't use async reading, so implementation is sync, + /// we just call ReadAt and return future with rady value. arrow::Future> ReadAsync(const arrow::io::IOContext&, int64_t position, int64_t nbytes) override; arrow::Status Seek(int64_t position) override; From c28462f5cb206da492af50ba05033e621ef535c5 Mon Sep 17 00:00:00 2001 From: Kruglov Pavel <48961922+Avogar@users.noreply.github.com> Date: Mon, 23 Jan 2023 17:13:16 +0100 Subject: [PATCH 5/6] Fix typo --- src/Processors/Formats/Impl/ArrowBufferedStreams.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Processors/Formats/Impl/ArrowBufferedStreams.h b/src/Processors/Formats/Impl/ArrowBufferedStreams.h index 3be31e91f0be..4169ce8fc80e 100644 --- a/src/Processors/Formats/Impl/ArrowBufferedStreams.h +++ b/src/Processors/Formats/Impl/ArrowBufferedStreams.h @@ -64,7 +64,7 @@ class RandomAccessFileFromSeekableReadBuffer : public arrow::io::RandomAccessFil /// Override async reading to avoid using internal arrow thread pool. /// In our code we don't use async reading, so implementation is sync, - /// we just call ReadAt and return future with rady value. + /// we just call ReadAt and return future with ready value. arrow::Future> ReadAsync(const arrow::io::IOContext&, int64_t position, int64_t nbytes) override; arrow::Status Seek(int64_t position) override; From 217b88eca8626483388ad5c7dd3b1cf672085ef1 Mon Sep 17 00:00:00 2001 From: Vasily Nemkov Date: Thu, 23 Mar 2023 17:57:04 +0100 Subject: [PATCH 6/6] Removed scheduled run --- .github/workflows/release_branches.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/release_branches.yml b/.github/workflows/release_branches.yml index 8ef94e1582af..a06264449dfc 100644 --- a/.github/workflows/release_branches.yml +++ b/.github/workflows/release_branches.yml @@ -24,8 +24,6 @@ on: # yamllint disable-line rule:truthy push: branches: - 'releases/22.8**' - schedule: - - cron: '0 0 * * 0' jobs: # DockerHubPushAarch64: