WIP: Fix ORC segfault in pyarrow test

apache · Mar 17, 2024 · 0c91267 · 0c91267
1 parent b448b33
commit 0c91267
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 5 deletions.
diff --git a/.github/workflows/java_jni.yml b/.github/workflows/java_jni.yml
@@ -52,7 +52,7 @@ jobs:
  name: AMD64 manylinux2014 Java JNI
  runs-on: ubuntu-latest
  if: ${{ !contains(github.event.pull_request.title, 'WIP') }}
- timeout-minutes: 500
+ timeout-minutes: 90
  steps:
  - name: Checkout Arrow
  uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0

diff --git a/appveyor.yml b/appveyor.yml
@@ -44,6 +44,7 @@ environment:
  ARROW_BUILD_FLIGHT_SQL: "ON"
  ARROW_BUILD_GANDIVA: "ON"
  ARROW_GCS: "ON"
+ ARROW_ORC: "ON"
  ARROW_S3: "ON"
  GENERATOR: Ninja
  PYTHON: "3.10"

diff --git a/ci/appveyor-cpp-build.bat b/ci/appveyor-cpp-build.bat
@@ -80,7 +80,7 @@ cmake -G "%GENERATOR%" %ARROW_CMAKE_ARGS% ^
  -DARROW_HDFS=ON ^
  -DARROW_JSON=ON ^
  -DARROW_MIMALLOC=ON ^
- -DARROW_ORC=ON ^
+ -DARROW_ORC=%ARROW_ORC% ^
  -DARROW_PARQUET=ON ^
  -DARROW_S3=%ARROW_S3% ^
  -DARROW_SUBSTRAIT=ON ^
@@ -125,6 +125,7 @@ set PYARROW_WITH_DATASET=ON
 set PYARROW_WITH_FLIGHT=%ARROW_BUILD_FLIGHT%
 set PYARROW_WITH_GANDIVA=%ARROW_BUILD_GANDIVA%
 set PYARROW_WITH_GCS=%ARROW_GCS%
+set PYARROW_WITH_ORC=%ARROW_ORC%
 set PYARROW_WITH_PARQUET=ON
 set PYARROW_WITH_PARQUET_ENCRYPTION=ON
 set PYARROW_WITH_S3=%ARROW_S3%

diff --git a/ci/docker/python-wheel-windows-vs2019.dockerfile b/ci/docker/python-wheel-windows-vs2019.dockerfile
@@ -66,6 +66,7 @@ RUN vcpkg install \
  --x-feature=flight \
  --x-feature=gcs \
  --x-feature=json \
+ --x-feature=orc \
  --x-feature=parquet \
  --x-feature=s3
 

diff --git a/ci/scripts/python_wheel_windows_build.bat b/ci/scripts/python_wheel_windows_build.bat
@@ -36,7 +36,7 @@ set ARROW_FLIGHT=ON
 set ARROW_GANDIVA=OFF
 set ARROW_GCS=ON
 set ARROW_HDFS=ON
-set ARROW_ORC=OFF
+set ARROW_ORC=ON
 set ARROW_PARQUET=ON
 set PARQUET_REQUIRE_ENCRYPTION=ON
 set ARROW_MIMALLOC=ON

diff --git a/ci/scripts/python_wheel_windows_test.bat b/ci/scripts/python_wheel_windows_test.bat
@@ -24,7 +24,7 @@ set PYARROW_TEST_FLIGHT=ON
 set PYARROW_TEST_GANDIVA=OFF
 set PYARROW_TEST_GCS=ON
 set PYARROW_TEST_HDFS=ON
-set PYARROW_TEST_ORC=OFF
+set PYARROW_TEST_ORC=ON
 set PYARROW_TEST_PARQUET=ON
 set PYARROW_TEST_PARQUET_ENCRYPTION=ON
 set PYARROW_TEST_SUBSTRAIT=ON
@@ -56,6 +56,7 @@ python -c "import pyarrow.dataset" || exit /B 1
 python -c "import pyarrow.flight" || exit /B 1
 python -c "import pyarrow.fs" || exit /B 1
 python -c "import pyarrow.json" || exit /B 1
+python -c "import pyarrow.orc" || exit /B 1
 python -c "import pyarrow.parquet" || exit /B 1
 python -c "import pyarrow.substrait" || exit /B 1
 

diff --git a/cpp/src/arrow/adapters/orc/adapter.cc b/cpp/src/arrow/adapters/orc/adapter.cc
@@ -491,7 +491,7 @@ class ORCFileReader::Impl {
  if (!include_indices.empty()) {
  RETURN_NOT_OK(SelectIndices(&opts, include_indices));
  }
- StripeInformation stripe_info({0, 0, 0, 0});
+ StripeInformation stripe_info{0, 0, 0, 0};
  RETURN_NOT_OK(SelectStripeWithRowNumber(&opts, current_row_, &stripe_info));
  ARROW_ASSIGN_OR_RAISE(auto schema, ReadSchema(opts));
  std::unique_ptr<liborc::RowReader> row_reader;