From 80c32a846e1b57979aa9b78f1721cbabf4b2d566 Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Fri, 5 Aug 2022 11:15:59 -0400 Subject: [PATCH] ceph-17.2.3 rebuild with libarrow-9.0.0 Signed-off-by: Kaleb S. KEITHLEY --- ...ect-include-s3select_parquet_intrf.h.patch | 40 +++++++++++++++++++ ceph.spec | 1 + sources | 1 - 3 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 0023-src-s3select-include-s3select_parquet_intrf.h.patch diff --git a/0023-src-s3select-include-s3select_parquet_intrf.h.patch b/0023-src-s3select-include-s3select_parquet_intrf.h.patch new file mode 100644 index 0000000..66299aa --- /dev/null +++ b/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/ceph.spec b/ceph.spec index 8663f80..0d0d12b 100644 --- a/ceph.spec +++ b/ceph.spec @@ -190,6 +190,7 @@ Patch0019: 0019-cmake-modules-CheckCxxAtomic.cmake.patch Patch0020: 0020-src-arrow-cpp-cmake_modules-ThirdpartyToolchain.cmake.patch Patch0021: 0021-cephfs-shell.patch Patch0022: 0022-mon-Replace-deprecated-use-of-format_to.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 %if 0%{?suse_version} diff --git a/sources b/sources index 8664e57..a1a5efc 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (ceph-17.2.2.tar.gz) = aa7b4071b33065a79d287de4bda7822250a62c2e950c029006f4d94c4094e55ac7f663b43e50ccd69b39324db06957e6853de0721922e28d73ad9780fc2d6a46 SHA512 (ceph-17.2.3.tar.gz) = fd6e057ba8440f69423e870dddb2705d68015089ff8d97356bdc359c2ab41e19351fb1c914330de6ba05180f48e328e3ea4c877e9dd80be049e2ec5895068595