From b48d46becbad994e6cb82ed00dedb115d879e0e3 Mon Sep 17 00:00:00 2001 From: Kaleb S. KEITHLEY Date: Aug 08 2022 17:00:59 +0000 Subject: rebuild with libarrow-9.0.0 --- diff --git a/SOURCES/0023-src-s3select-include-s3select_parquet_intrf.h.patch b/SOURCES/0023-src-s3select-include-s3select_parquet_intrf.h.patch new file mode 100644 index 0000000..66299aa --- /dev/null +++ b/SOURCES/0023-src-s3select-include-s3select_parquet_intrf.h.patch @@ -0,0 +1,40 @@ +--- ceph-17.2.3/src/s3select/include/s3select_parquet_intrf.h.orig 2022-08-03 18:31:07.578235502 -0400 ++++ ceph-17.2.3/src/s3select/include/s3select_parquet_intrf.h 2022-08-05 11:14:16.114933605 -0400 +@@ -196,8 +196,8 @@ + bool write_only) override { + RETURN_NOT_OK(SetFileName(path)); + +- ARROW_ASSIGN_OR_RAISE(fd_, ::arrow::internal::FileOpenWritable(file_name_, write_only, +- truncate, append)); ++ fd_ = ::arrow::internal::FileOpenWritable(file_name_, write_only, ++ truncate, append)->fd(); + is_open_ = true; + mode_ = write_only ? FileMode::WRITE : FileMode::READWRITE; + +@@ -229,7 +229,7 @@ + Status OpenReadable(const std::string& path) override { + RETURN_NOT_OK(SetFileName(path)); + +- ARROW_ASSIGN_OR_RAISE(fd_, ::arrow::internal::FileOpenReadable(file_name_)); ++ fd_ = ::arrow::internal::FileOpenReadable(file_name_)->fd(); + ARROW_ASSIGN_OR_RAISE(size_, ::arrow::internal::FileGetSize(fd_)); + + is_open_ = true; +@@ -970,7 +970,7 @@ + CryptoContext ctx(col->has_dictionary_page(), row_group_ordinal_, + static_cast(i), meta_decryptor, data_decryptor); + return PageReader::Open(stream, col->num_values(), col->compression(), +- properties_.memory_pool(), &ctx); ++ false, properties_.memory_pool(), &ctx); + } + + // The column is encrypted with its own key +@@ -985,7 +985,7 @@ + CryptoContext ctx(col->has_dictionary_page(), row_group_ordinal_, + static_cast(i), meta_decryptor, data_decryptor); + return PageReader::Open(stream, col->num_values(), col->compression(), +- properties_.memory_pool(), &ctx); ++ false, properties_.memory_pool(), &ctx); + } + + private: diff --git a/SPECS/ceph.spec b/SPECS/ceph.spec index dac5e98..db8b19d 100644 --- a/SPECS/ceph.spec +++ b/SPECS/ceph.spec @@ -160,7 +160,7 @@ ################################################################################# Name: ceph Version: 17.2.3 -Release: 1%{?dist} +Release: 2%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 2 %endif @@ -188,6 +188,7 @@ Patch0017: 0017-gcc-12-omnibus.patch Patch0018: 0018-src-rgw-store-dbstore-CMakeLists.txt.patch Patch0019: 0019-cmake-modules-CheckCxxAtomic.cmake.patch Patch0020: 0020-src-arrow-cpp-cmake_modules-ThirdpartyToolchain.cmake.patch +Patch0023: 0023-src-s3select-include-s3select_parquet_intrf.h.patch # ceph 14.0.1 does not support 32-bit architectures, bugs #1727788, #1727787 ExcludeArch: i686 armv7hl @@ -2596,6 +2597,9 @@ exit 0 %config %{_sysconfdir}/prometheus/ceph/ceph_default_alerts.yml %changelog +* Mon Aug 8 2022 Kaleb S. KEITHLEY - 2:17.2.3-2 +- rebuild with libarrow-9.0.0 + * Fri Jul 29 2022 Kaleb S. KEITHLEY - 2:17.2.3-1 - 17.2.3 GA