Skip to content

Commit 7fe71f5

Browse files
REASYkou
andauthored
ARROW-16584: [Java] Java JNI with S3 support (#13157)
macOS development target is changed to 10.13 from 10.11. See also the discussion on mailing list: https://lists.apache.org/thread/pjgjrl716gvqzql586cnnoxb38nb0j5w Lead-authored-by: Artavazd Balaian <[email protected]> Co-authored-by: Sutou Kouhei <[email protected]> Co-authored-by: Sutou Kouhei <[email protected]> Signed-off-by: Sutou Kouhei <[email protected]>
1 parent fa7e7a3 commit 7fe71f5

5 files changed

Lines changed: 18 additions & 2 deletions

File tree

‎ci/docker/java-jni-manylinux-201x.dockerfile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ RUN vcpkg install \
2828
--x-feature=gcs \
2929
--x-feature=json \
3030
--x-feature=parquet \
31-
--x-feature=gandiva
31+
--x-feature=gandiva \
32+
--x-feature=s3
3233

3334
# Install Java
3435
ARG java=1.8.0

‎ci/docker/linux-apt-jni.dockerfile‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ RUN apt-get update -y -q && \
4747
g++ \
4848
gcc \
4949
libboost-all-dev \
50+
libcurl4-openssl-dev \
5051
libgflags-dev \
5152
libgoogle-glog-dev \
5253
libgtest-dev \
@@ -81,6 +82,7 @@ ENV ARROW_BUILD_TESTS=ON \
8182
ARROW_PARQUET=ON \
8283
ARROW_PLASMA_JAVA_CLIENT=ON \
8384
ARROW_PLASMA=ON \
85+
ARROW_S3=ON \
8486
ARROW_USE_CCACHE=ON \
8587
CC=gcc \
8688
CXX=g++ \

‎ci/scripts/java_jni_macos_build.sh‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ echo "=== Building Arrow C++ libraries ==="
3939
: ${ARROW_PLASMA_JAVA_CLIENT:=ON}
4040
: ${ARROW_PLASMA:=ON}
4141
: ${ARROW_PYTHON:=OFF}
42+
: ${ARROW_S3:=ON}
4243
: ${CMAKE_BUILD_TYPE:=Release}
4344
: ${CMAKE_UNITY_BUILD:=ON}
4445

@@ -71,10 +72,12 @@ cmake \
7172
-DARROW_PLASMA_JAVA_CLIENT=${ARROW_PLASMA_JAVA_CLIENT} \
7273
-DARROW_PROTOBUF_USE_SHARED=OFF \
7374
-DARROW_PYTHON=${ARROW_PYTHON} \
75+
-DARROW_S3=${ARROW_S3} \
7476
-DARROW_SNAPPY_USE_SHARED=OFF \
7577
-DARROW_THRIFT_USE_SHARED=OFF \
7678
-DARROW_UTF8PROC_USE_SHARED=OFF \
7779
-DARROW_ZSTD_USE_SHARED=OFF \
80+
-DAWSSDK_SOURCE=BUNDLED \
7881
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} \
7982
-DCMAKE_INSTALL_LIBDIR=lib \
8083
-DCMAKE_INSTALL_PREFIX=${build_dir}/cpp \
@@ -110,11 +113,13 @@ echo "=== Checking shared dependencies for libraries ==="
110113

111114
pushd ${dist_dir}
112115
archery linking check-dependencies \
116+
--allow CoreFoundation \
113117
--allow libSystem \
114118
--allow libarrow_cdata_jni \
115119
--allow libarrow_dataset_jni \
116120
--allow libarrow_orc_jni \
117121
--allow libc++ \
122+
--allow libcurl \
118123
--allow libgandiva_jni \
119124
--allow libncurses \
120125
--allow libz \

‎ci/scripts/java_jni_manylinux_build.sh‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ devtoolset_include_cpp="/opt/rh/devtoolset-${devtoolset_version}/root/usr/includ
4343
: ${ARROW_PLASMA:=ON}
4444
: ${ARROW_PLASMA_JAVA_CLIENT:=ON}
4545
: ${ARROW_PYTHON:=OFF}
46+
: ${ARROW_S3:=ON}
4647
: ${ARROW_BUILD_TESTS:=OFF}
4748
: ${CMAKE_BUILD_TYPE:=Release}
4849
: ${CMAKE_UNITY_BUILD:=ON}
@@ -83,6 +84,7 @@ cmake \
8384
-DARROW_PROTOBUF_USE_SHARED=OFF \
8485
-DARROW_PYTHON=${ARROW_PYTHON} \
8586
-DARROW_RPATH_ORIGIN=${ARROW_RPATH_ORIGIN} \
87+
-DARROW_S3=${ARROW_S3} \
8688
-DARROW_SNAPPY_USE_SHARED=OFF \
8789
-DARROW_THRIFT_USE_SHARED=OFF \
8890
-DARROW_UTF8PROC_USE_SHARED=OFF \

‎dev/tasks/java-jars/github.yml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,20 @@ jobs:
4747
name: Build C++ Libs MacOS
4848
runs-on: macos-latest
4949
env:
50-
MACOSX_DEPLOYMENT_TARGET: "10.11"
50+
MACOSX_DEPLOYMENT_TARGET: "10.13"
5151
steps:
5252
{{ macros.github_checkout_arrow()|indent }}
5353
{{ macros.github_install_archery()|indent }}
5454
- name: Install Dependencies
5555
run: |
5656
brew install --overwrite git
5757
brew bundle --file=arrow/cpp/Brewfile
58+
# We want to link aws-sdk-cpp statically but Homebrew's
59+
# aws-sdk-cpp provides only shared library. If we have
60+
# Homebrew's aws-sdk-cpp, our build mix Homebrew's
61+
# aws-sdk-cpp and bundled aws-sdk-cpp. We uninstall Homebrew's
62+
# aws-sdk-cpp to ensure using only bundled aws-sdk-cpp.
63+
brew uninstall aws-sdk-cpp
5864
- name: Build C++ Libs
5965
run: |
6066
set -e

0 commit comments

Comments
 (0)