Skip to content

Commit 9917960

Browse files
koukou
authored
ARROW-17560: [Java][Gandiva] Move JNI build configuration from cpp/ to java/ (apache#14159)
Authored-by: Sutou Kouhei <kou@clear-code.com> Signed-off-by: Sutou Kouhei <kou@clear-code.com>
1 parent 80676df commit 9917960

30 files changed

Lines changed: 160 additions & 317 deletions

‎ci/docker/fedora-35-cpp.dockerfile‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ ENV absl_SOURCE=BUNDLED \
8080
ARROW_DEPENDENCY_SOURCE=SYSTEM \
8181
ARROW_DATASET=ON \
8282
ARROW_FLIGHT=ON \
83-
ARROW_GANDIVA_JAVA=ON \
8483
ARROW_GANDIVA=ON \
8584
ARROW_GCS=ON \
8685
ARROW_HOME=/usr/local \

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@ RUN yum install -y java-$java-openjdk-devel rh-maven35 && yum clean all
3838
ENV JAVA_HOME=/usr/lib/jvm/java-$java-openjdk/
3939

4040
# For ci/scripts/{cpp,java}_*.sh
41-
ENV ARROW_GANDIVA_JAVA=ON \
42-
ARROW_HOME=/tmp/local \
41+
ENV ARROW_HOME=/tmp/local \
4342
ARROW_JAVA_CDATA=ON \
4443
ARROW_JNI=ON \
4544
ARROW_PLASMA=ON \

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ ENV PATH=/opt/cmake-${cmake}-Linux-x86_64/bin:$PATH
7373
ENV ARROW_BUILD_TESTS=ON \
7474
ARROW_DATASET=ON \
7575
ARROW_FLIGHT=OFF \
76-
ARROW_GANDIVA_JAVA=ON \
7776
ARROW_GANDIVA=ON \
7877
ARROW_HOME=/usr/local \
7978
ARROW_JAVA_CDATA=ON \

‎ci/scripts/cpp_build.sh‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ cmake \
9191
-DARROW_FLIGHT=${ARROW_FLIGHT:-OFF} \
9292
-DARROW_FLIGHT_SQL=${ARROW_FLIGHT_SQL:-OFF} \
9393
-DARROW_FUZZING=${ARROW_FUZZING:-OFF} \
94-
-DARROW_GANDIVA_JAVA=${ARROW_GANDIVA_JAVA:-OFF} \
9594
-DARROW_GANDIVA_PC_CXX_FLAGS=${ARROW_GANDIVA_PC_CXX_FLAGS:-} \
9695
-DARROW_GANDIVA=${ARROW_GANDIVA:-OFF} \
9796
-DARROW_GCS=${ARROW_GCS:-OFF} \

‎ci/scripts/java_build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ if [ "${ARROW_JAVA_CDATA}" = "ON" ]; then
8787
${mvn} -Darrow.c.jni.dist.dir=${java_jni_dist_dir} -Parrow-c-data install
8888
fi
8989

90-
if [ "${ARROW_GANDIVA_JAVA}" = "ON" ]; then
90+
if [ "${ARROW_JNI}" = "ON" ]; then
9191
${mvn} -Darrow.cpp.build.dir=${java_jni_dist_dir} -Parrow-jni install
9292
fi
9393

‎ci/scripts/java_jni_build.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ esac
4949
: ${CMAKE_BUILD_TYPE:=release}
5050
cmake \
5151
-DARROW_JAVA_JNI_ENABLE_DATASET=${ARROW_DATASET:-ON} \
52+
-DARROW_JAVA_JNI_ENABLE_GANDIVA=${ARROW_GANDIVA:-ON} \
5253
-DBUILD_TESTING=${ARROW_JAVA_BUILD_TESTS} \
5354
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} \
5455
-DCMAKE_PREFIX_PATH=${arrow_install_dir} \

‎ci/scripts/java_jni_macos_build.sh‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ install_dir=${build_dir}/cpp-install
3333
: ${ARROW_BUILD_TESTS:=ON}
3434
: ${ARROW_DATASET:=ON}
3535
: ${ARROW_FILESYSTEM:=ON}
36-
: ${ARROW_GANDIVA_JAVA:=ON}
3736
: ${ARROW_GANDIVA:=ON}
3837
: ${ARROW_ORC:=ON}
3938
: ${ARROW_PARQUET:=ON}
@@ -65,7 +64,6 @@ cmake \
6564
-DARROW_DEPENDENCY_USE_SHARED=OFF \
6665
-DARROW_FILESYSTEM=${ARROW_FILESYSTEM} \
6766
-DARROW_GANDIVA=${ARROW_GANDIVA} \
68-
-DARROW_GANDIVA_JAVA=${ARROW_GANDIVA_JAVA} \
6967
-DARROW_GANDIVA_STATIC_LIBSTDCPP=ON \
7068
-DARROW_JNI=ON \
7169
-DARROW_ORC=${ARROW_ORC} \
@@ -117,7 +115,6 @@ fi
117115
echo "=== Copying libraries to the distribution folder ==="
118116
mkdir -p "${dist_dir}"
119117
cp -L ${install_dir}/lib/libarrow_orc_jni.dylib ${dist_dir}
120-
cp -L ${install_dir}/lib/libgandiva_jni.dylib ${dist_dir}
121118
cp -L ${build_dir}/cpp/*/libplasma_java.dylib ${dist_dir}
122119

123120
echo "=== Checking shared dependencies for libraries ==="

‎ci/scripts/java_jni_manylinux_build.sh‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ devtoolset_include_cpp="/opt/rh/devtoolset-${devtoolset_version}/root/usr/includ
3535
: ${ARROW_BUILD_TESTS:=ON}
3636
: ${ARROW_DATASET:=ON}
3737
: ${ARROW_GANDIVA:=ON}
38-
: ${ARROW_GANDIVA_JAVA:=ON}
3938
: ${ARROW_FILESYSTEM:=ON}
4039
: ${ARROW_JEMALLOC:=ON}
4140
: ${ARROW_RPATH_ORIGIN:=ON}
@@ -73,7 +72,6 @@ cmake \
7372
-DARROW_DEPENDENCY_SOURCE="VCPKG" \
7473
-DARROW_DEPENDENCY_USE_SHARED=OFF \
7574
-DARROW_FILESYSTEM=${ARROW_FILESYSTEM} \
76-
-DARROW_GANDIVA_JAVA=${ARROW_GANDIVA_JAVA} \
7775
-DARROW_GANDIVA_PC_CXX_FLAGS=${GANDIVA_CXX_FLAGS} \
7876
-DARROW_GANDIVA=${ARROW_GANDIVA} \
7977
-DARROW_JEMALLOC=${ARROW_JEMALLOC} \
@@ -137,7 +135,6 @@ fi
137135

138136
echo "=== Copying libraries to the distribution folder ==="
139137
cp -L ${ARROW_HOME}/lib/libarrow_orc_jni.so ${dist_dir}
140-
cp -L ${ARROW_HOME}/lib/libgandiva_jni.so ${dist_dir}
141138
cp -L ${build_dir}/cpp/*/libplasma_java.so ${dist_dir}
142139

143140
echo "=== Checking shared dependencies for libraries ==="

‎cpp/build-support/lint_exclusions.txt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
1-
*_generated*
21
*.grpc.fb.*
2+
*.pb.*
3+
*RcppExports.cpp*
4+
*_generated*
35
*arrowExports.cpp*
46
*parquet_constants.*
57
*parquet_types.*
68
*pyarrow_api.h
79
*pyarrow_lib.h
810
*python/config.h
911
*python/platform.h
10-
*RcppExports.cpp*
1112
*thirdparty/*
1213
*vendored/*
1314
*windows_compatibility.h

‎cpp/cmake_modules/DefineOptions.cmake‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -470,8 +470,6 @@ Always OFF if building binaries" OFF)
470470
#----------------------------------------------------------------------
471471
set_option_category("Gandiva")
472472

473-
define_option(ARROW_GANDIVA_JAVA "Build the Gandiva JNI wrappers" OFF)
474-
475473
# ARROW-3860: Temporary workaround
476474
define_option(ARROW_GANDIVA_STATIC_LIBSTDCPP
477475
"Include -static-libstdc++ -static-libgcc when linking with;Gandiva static libraries"

0 commit comments

Comments
 (0)