From 7809d1ce09993f2392b36fd75fecf1c1a98a8fb4 Mon Sep 17 00:00:00 2001 From: Gang Wu Date: Wed, 13 Mar 2024 23:03:22 +0800 Subject: [PATCH 1/5] GH-40507: [C++][ORC] Upgrade ORC to 2.0.0 --- cpp/thirdparty/versions.txt | 4 ++-- java/adapter/orc/pom.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cpp/thirdparty/versions.txt b/cpp/thirdparty/versions.txt index 18bb6c9b6e0..7354732cd4d 100644 --- a/cpp/thirdparty/versions.txt +++ b/cpp/thirdparty/versions.txt @@ -90,8 +90,8 @@ ARROW_OPENTELEMETRY_BUILD_VERSION=v1.8.1 ARROW_OPENTELEMETRY_BUILD_SHA256_CHECKSUM=3d640201594b07f08dade9cd1017bd0b59674daca26223b560b9bb6bf56264c2 ARROW_OPENTELEMETRY_PROTO_BUILD_VERSION=v0.17.0 ARROW_OPENTELEMETRY_PROTO_BUILD_SHA256_CHECKSUM=f269fbcb30e17b03caa1decd231ce826e59d7651c0f71c3b28eb5140b4bb5412 -ARROW_ORC_BUILD_VERSION=1.9.2 -ARROW_ORC_BUILD_SHA256_CHECKSUM=7f46f2c184ecefd6791f1a53fb062286818bd8710c3f08b94dd3cac365e240ee +ARROW_ORC_BUILD_VERSION=2.0.0 +ARROW_ORC_BUILD_SHA256_CHECKSUM=9107730919c29eb39efaff1b9e36166634d1d4d9477e5fee76bfd6a8fec317df ARROW_PROTOBUF_BUILD_VERSION=v21.3 ARROW_PROTOBUF_BUILD_SHA256_CHECKSUM=2f723218f6cb709ae4cdc4fb5ed56a5951fc5d466f0128ce4c946b8c78c8c49f # Because of https://github.com/Tencent/rapidjson/pull/1323, we require diff --git a/java/adapter/orc/pom.xml b/java/adapter/orc/pom.xml index e7a2bfe872e..9ff6858d2d8 100644 --- a/java/adapter/orc/pom.xml +++ b/java/adapter/orc/pom.xml @@ -38,7 +38,7 @@ org.apache.orc orc-core - 1.9.2 + 2.0.0 test From 847def9ab71c7acf1e1d7462d14b0d55472493fc Mon Sep 17 00:00:00 2001 From: Gang Wu Date: Thu, 28 Mar 2024 09:49:49 +0800 Subject: [PATCH 2/5] Update java/adapter/orc/pom.xml --- java/adapter/orc/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/adapter/orc/pom.xml b/java/adapter/orc/pom.xml index 9ff6858d2d8..e7a2bfe872e 100644 --- a/java/adapter/orc/pom.xml +++ b/java/adapter/orc/pom.xml @@ -38,7 +38,7 @@ org.apache.orc orc-core - 2.0.0 + 1.9.2 test From 5a5f093ab28bd6574ed90dba75553b76f2d18c01 Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Thu, 28 Mar 2024 14:18:36 +0100 Subject: [PATCH 3/5] Debug pb compiler versions --- ci/scripts/python_wheel_macos_build.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/ci/scripts/python_wheel_macos_build.sh b/ci/scripts/python_wheel_macos_build.sh index bea54091007..c3945be5dd7 100755 --- a/ci/scripts/python_wheel_macos_build.sh +++ b/ci/scripts/python_wheel_macos_build.sh @@ -91,6 +91,13 @@ echo "=== (${PYTHON_VERSION}) Building Arrow C++ libraries ===" : ${VCPKG_FEATURE_FLAGS:=-manifests} : ${VCPKG_TARGET_TRIPLET:=${VCPKG_DEFAULT_TRIPLET:-x64-osx-static-${CMAKE_BUILD_TYPE}}} +echo "=== Protobuf compiler versions on PATH ===" +which -a protoc || echo "no protoc on PATH!" + +echo "=== Protobuf compiler version from vcpkg ===" +_pbc=${VCPKG_ROOT}/installed/${VCPKG_TARGET_TRIPLET}/tools/protobuf/protoc +echo "$_pbc: `$_pbc --version`" + mkdir -p ${build_dir}/build pushd ${build_dir}/build @@ -122,6 +129,7 @@ cmake \ -DARROW_SUBSTRAIT=${ARROW_SUBSTRAIT} \ -DARROW_TENSORFLOW=${ARROW_TENSORFLOW} \ -DARROW_USE_CCACHE=ON \ + -DARROW_VERBOSE_THIRDPARTY_BUILD=ON \ -DARROW_WITH_BROTLI=${ARROW_WITH_BROTLI} \ -DARROW_WITH_BZ2=${ARROW_WITH_BZ2} \ -DARROW_WITH_LZ4=${ARROW_WITH_LZ4} \ From a96c669b239894fbad64b9db0c926745ade4ae49 Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Thu, 28 Mar 2024 14:45:16 +0100 Subject: [PATCH 4/5] List homebrew packages --- dev/tasks/python-wheels/github.osx.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dev/tasks/python-wheels/github.osx.yml b/dev/tasks/python-wheels/github.osx.yml index 11bdf031f51..e7b6d789810 100644 --- a/dev/tasks/python-wheels/github.osx.yml +++ b/dev/tasks/python-wheels/github.osx.yml @@ -47,6 +47,10 @@ jobs: brew install bash bison coreutils ninja echo "$(brew --prefix bison)/bin" >> $GITHUB_PATH + - name: Homebrew packages + run: | + brew list + - name: Retrieve VCPKG version from arrow/.env run: | vcpkg_version=$(cat "arrow/.env" | grep "VCPKG" | cut -d "=" -f2 | tr -d '"') From 48f6387c5d80d2f828205a34d130462c54145895 Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Thu, 28 Mar 2024 16:10:09 +0100 Subject: [PATCH 5/5] Remove unused CMake variable --- ci/scripts/python_wheel_macos_build.sh | 1 - ci/scripts/python_wheel_manylinux_build.sh | 1 - 2 files changed, 2 deletions(-) diff --git a/ci/scripts/python_wheel_macos_build.sh b/ci/scripts/python_wheel_macos_build.sh index c3945be5dd7..a94dac40e93 100755 --- a/ci/scripts/python_wheel_macos_build.sh +++ b/ci/scripts/python_wheel_macos_build.sh @@ -142,7 +142,6 @@ cmake \ -DCMAKE_INSTALL_PREFIX=${build_dir}/install \ -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES} \ -DCMAKE_UNITY_BUILD=${CMAKE_UNITY_BUILD} \ - -DORC_PROTOBUF_EXECUTABLE=${VCPKG_ROOT}/installed/${VCPKG_TARGET_TRIPLET}/tools/protobuf/protoc \ -DORC_SOURCE=BUNDLED \ -DPARQUET_REQUIRE_ENCRYPTION=${PARQUET_REQUIRE_ENCRYPTION} \ -DVCPKG_MANIFEST_MODE=OFF \ diff --git a/ci/scripts/python_wheel_manylinux_build.sh b/ci/scripts/python_wheel_manylinux_build.sh index 4d4d4fb694e..6e29ef58d23 100755 --- a/ci/scripts/python_wheel_manylinux_build.sh +++ b/ci/scripts/python_wheel_manylinux_build.sh @@ -123,7 +123,6 @@ cmake \ -DCMAKE_INSTALL_LIBDIR=lib \ -DCMAKE_INSTALL_PREFIX=/tmp/arrow-dist \ -DCMAKE_UNITY_BUILD=${CMAKE_UNITY_BUILD} \ - -DORC_PROTOBUF_EXECUTABLE=${VCPKG_ROOT}/installed/${VCPKG_TARGET_TRIPLET}/tools/protobuf/protoc \ -DORC_SOURCE=BUNDLED \ -DPARQUET_REQUIRE_ENCRYPTION=${PARQUET_REQUIRE_ENCRYPTION} \ -DVCPKG_MANIFEST_MODE=OFF \