Jakub Klinkovský pushed to branch main at Arch Linux / Packaging / Packages /
arrow
Commits:
21ad9d6a by Jakub Klinkovský at 2025-01-06T23:42:43+01:00
Fix broken parquet encryption test
- - - - -
3 changed files:
- .SRCINFO
- PKGBUILD
- + fix-repetition-levels-for-encryption-test.patch
Changes:
=====================================
.SRCINFO
=====================================
@@ -5,6 +5,7 @@ pkgbase = arrow
url = https://arrow.apache.org
arch = x86_64
license = Apache-2.0
+ checkdepends = python
makedepends = boost
makedepends = cmake
makedepends = flatbuffers
@@ -36,6 +37,7 @@ pkgbase = arrow
source =
https://archive.apache.org/dist/arrow/arrow-18.1.0/apache-arrow-18.1.0.tar.gz.asc
source = git+https://github.com/apache/parquet-testing.git
source = git+https://github.com/apache/arrow-testing.git
+ source = fix-repetition-levels-for-encryption-test.patch
validpgpkeys = 265F80AB84FE03127E14F01125BCCA5220D84079
validpgpkeys = 08D3564B7C6A9CAFBFF6A66791D18FCF079F8007
validpgpkeys = AF6AADA4C9835B75973FF5DA275C532289DD0F4A
@@ -43,5 +45,6 @@ pkgbase = arrow
sha512sums = SKIP
sha512sums = SKIP
sha512sums = SKIP
+ sha512sums =
225c1d3b513ab3f82ffa946c22a2aebc7f43af0cdbbede55cbbd9746637d8a032a2e7b888bed6d6e152d28d6d78c842a298187fab94d8864867ba436eeee835d
pkgname = arrow
=====================================
PKGBUILD
=====================================
@@ -38,21 +38,33 @@ makedepends=(
rapidjson
xsimd
)
+checkdepends=(
+ python
+)
provides=(parquet-cpp)
conflicts=(parquet-cpp)
source=(
https://archive.apache.org/dist/$pkgname/$pkgname-$pkgver/apache-$pkgname-$pkgver.tar.gz{,.asc}
git+https://github.com/apache/parquet-testing.git
git+https://github.com/apache/arrow-testing.git
+ fix-repetition-levels-for-encryption-test.patch
)
sha512sums=('7249c03a6097bc64fb0092143e4d4aaef3227565147e6254f026ddd504177c8dd565a184a0df39743dc989070dc3785e5b66f738c8e310ed9c982b61c2ec4914'
'SKIP'
'SKIP'
- 'SKIP')
+ 'SKIP'
+
'225c1d3b513ab3f82ffa946c22a2aebc7f43af0cdbbede55cbbd9746637d8a032a2e7b888bed6d6e152d28d6d78c842a298187fab94d8864867ba436eeee835d')
validpgpkeys=(265F80AB84FE03127E14F01125BCCA5220D84079 # Krisztian Szucs
(apache) <szucs.kriszt...@gmail.com>
08D3564B7C6A9CAFBFF6A66791D18FCF079F8007 # Kouhei Sutou
<k...@cozmixng.org>
AF6AADA4C9835B75973FF5DA275C532289DD0F4A) # Raúl Cumplido
Domínguez (CODE SIGNING KEY) <rau...@apache.org>
+prepare() {
+ cd apache-$pkgname-$pkgver
+ # Fix generation of repetition levels for encryption test data
https://github.com/apache/arrow/pull/45074
+ # (needed due to a change https://github.com/apache/parquet-testing/pull/65
in parquet-testing)
+ patch -Np1 -i ../fix-repetition-levels-for-encryption-test.patch
+}
+
build() {
# Arrow options are defined in
https://github.com/apache/arrow/blob/main/cpp/cmake_modules/DefineOptions.cmake
# Documentation for building from source:
https://arrow.apache.org/docs/developers/cpp/building.html
=====================================
fix-repetition-levels-for-encryption-test.patch
=====================================
@@ -0,0 +1,26 @@
+From fd74d43f8dadb72a6dc2ec5170e7a5e4600ba1b7 Mon Sep 17 00:00:00 2001
+From: Adam Reeve <adre...@gmail.com>
+Date: Thu, 19 Dec 2024 14:01:13 +1300
+Subject: [PATCH 1/2] Fix generation of repetition levels for encryption test
+ data
+
+---
+ cpp/src/parquet/encryption/test_encryption_util.cc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cpp/src/parquet/encryption/test_encryption_util.cc
b/cpp/src/parquet/encryption/test_encryption_util.cc
+index 4fa215312f265..cf863da60a1d6 100644
+--- a/cpp/src/parquet/encryption/test_encryption_util.cc
++++ b/cpp/src/parquet/encryption/test_encryption_util.cc
+@@ -116,9 +116,9 @@ ColumnData<Int64Type> GenerateSampleData<Int64Type>(int
rows) {
+ int64_t value = i * 1000 * 1000;
+ value *= 1000 * 1000;
+ int16_t definition_level = 1;
+- int16_t repetition_level = 0;
++ int16_t repetition_level = 1;
+ if ((i % 2) == 0) {
+- repetition_level = 1; // start of a new record
++ repetition_level = 0; // start of a new record
+ }
+ int64_col.values.push_back(value);
+ int64_col.definition_levels.push_back(definition_level);
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/arrow/-/commit/21ad9d6a5d25a94b7d4deac18a757c1a2342fd72
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/arrow/-/commit/21ad9d6a5d25a94b7d4deac18a757c1a2342fd72
You're receiving this email because of your account on gitlab.archlinux.org.
