File tree Expand file tree Collapse file tree 3 files changed +6
-1
lines changed
Expand file tree Collapse file tree 3 files changed +6
-1
lines changed Original file line number Diff line number Diff line change @@ -50,11 +50,15 @@ Darwin)
5050esac
5151
5252: " ${ARROW_JAVA_BUILD_TESTS:= ${ARROW_BUILD_TESTS:- ON} } "
53+ : " ${ARROW_VCPKG:= OFF} "
5354: " ${CMAKE_BUILD_TYPE:= release} "
5455read -ra EXTRA_CMAKE_OPTIONS <<< " ${JAVA_JNI_CMAKE_ARGS:-}"
56+ # Must set ARROW_VCPKG because upstream Findutf8proc.cmake checks that to
57+ # determine what to do
5558cmake \
5659 -S " ${source_dir} " \
5760 -B " ${build_dir} " \
61+ -DARROW_VCPKG=" ${ARROW_VCPKG} " \
5862 -DARROW_JAVA_JNI_ENABLE_DATASET=" ${ARROW_DATASET:- OFF} " \
5963 -DARROW_JAVA_JNI_ENABLE_GANDIVA=" ${ARROW_GANDIVA:- OFF} " \
6064 -DARROW_JAVA_JNI_ENABLE_ORC=" ${ARROW_ORC:- OFF} " \
Original file line number Diff line number Diff line change @@ -71,6 +71,7 @@ export ARROW_GANDIVA
7171export ARROW_ORC
7272: " ${ARROW_PARQUET:= ON} "
7373: " ${ARROW_S3:= ON} "
74+ export ARROW_VCPKG=ON # influences jni_build.sh
7475: " ${CMAKE_BUILD_TYPE:= release} "
7576: " ${CMAKE_UNITY_BUILD:= ON} "
7677: " ${VCPKG_ROOT:=/ opt/ vcpkg} "
Original file line number Diff line number Diff line change @@ -221,7 +221,7 @@ DataTypePtr ProtoTypeToDataType(const gandiva::types::ExtGandivaType& ext_type)
221221 return arrow::date64 ();
222222 case gandiva::types::DECIMAL:
223223 // TODO: error handling
224- return arrow::decimal (ext_type.precision (), ext_type.scale ());
224+ return arrow::decimal128 (ext_type.precision (), ext_type.scale ());
225225 case gandiva::types::TIME32:
226226 return ProtoTypeToTime32 (ext_type);
227227 case gandiva::types::TIME64:
You can’t perform that action at this time.
0 commit comments