fix format failures

apache · Dec 23, 2024 · afcd76d · afcd76d
1 parent 331a5f9
commit afcd76d
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 34 deletions.
diff --git a/ci/scripts/java_build.sh b/ci/scripts/java_build.sh
@@ -49,13 +49,13 @@ cp -r "${source_dir}/dev" "${build_dir}"
 
 poms=$(find "${source_dir}" -not \( -path "${source_dir}"/build -prune \) -type f -name pom.xml)
 if [[ "$OSTYPE" == "darwin"* ]]; then
-    poms=$(echo "$poms" | xargs -n1 python -c "import sys; import os.path; print(os.path.relpath(sys.argv[1], '${source_dir}'))")
+  poms=$(echo "$poms" | xargs -n1 python -c "import sys; import os.path; print(os.path.relpath(sys.argv[1], '${source_dir}'))")
 else
-    poms=$(echo "$poms" | xargs -n1 realpath -s --relative-to="${source_dir}")
+  poms=$(echo "$poms" | xargs -n1 realpath -s --relative-to="${source_dir}")
 fi
 
 for source_root in $(echo "${poms}" | awk -F/ '{print $1}' | sort -u); do
-    cp -r "${source_dir}/${source_root}" "${build_dir}"
+  cp -r "${source_dir}/${source_root}" "${build_dir}"
 done
 
 pushd "${build_dir}"

diff --git a/ci/scripts/java_jni_build.sh b/ci/scripts/java_jni_build.sh
@@ -27,54 +27,54 @@ prefix_dir="${build_dir}/java-jni"
 
 echo "=== Clear output directories and leftovers ==="
 # Clear output directories and leftovers
-rm -rf ${build_dir}
+rm -rf "${build_dir}"
 
 echo "=== Building Arrow Java C Data Interface native library ==="
 mkdir -p "${build_dir}"
 pushd "${build_dir}"
 
 case "$(uname)" in
-  Linux)
-    n_jobs=$(nproc)
-    ;;
-  Darwin)
-    n_jobs=$(sysctl -n hw.logicalcpu)
-    ;;
-  *)
-    n_jobs=${NPROC:-1}
-    ;;
+Linux)
+  n_jobs=$(nproc)
+  ;;
+Darwin)
+  n_jobs=$(sysctl -n hw.logicalcpu)
+  ;;
+*)
+  n_jobs=${NPROC:-1}
+  ;;
 esac
 
-: ${ARROW_JAVA_BUILD_TESTS:=${ARROW_BUILD_TESTS:-OFF}}
-: ${CMAKE_BUILD_TYPE:=release}
+: "${ARROW_JAVA_BUILD_TESTS:=${ARROW_BUILD_TESTS:-OFF}}"
+: "${CMAKE_BUILD_TYPE:=release}"
 cmake \
-  -DARROW_JAVA_JNI_ENABLE_DATASET=${ARROW_DATASET:-OFF} \
-  -DARROW_JAVA_JNI_ENABLE_GANDIVA=${ARROW_GANDIVA:-OFF} \
-  -DARROW_JAVA_JNI_ENABLE_ORC=${ARROW_ORC:-OFF} \
-  -DBUILD_TESTING=${ARROW_JAVA_BUILD_TESTS} \
-  -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} \
-  -DCMAKE_PREFIX_PATH=${arrow_install_dir} \
-  -DCMAKE_INSTALL_PREFIX=${prefix_dir} \
-  -DCMAKE_UNITY_BUILD=${CMAKE_UNITY_BUILD:-OFF} \
+  -DARROW_JAVA_JNI_ENABLE_DATASET="${ARROW_DATASET:-OFF}" \
+  -DARROW_JAVA_JNI_ENABLE_GANDIVA="${ARROW_GANDIVA:-OFF}" \
+  -DARROW_JAVA_JNI_ENABLE_ORC="${ARROW_ORC:-OFF}" \
+  -DBUILD_TESTING="${ARROW_JAVA_BUILD_TESTS}" \
+  -DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}" \
+  -DCMAKE_PREFIX_PATH="${arrow_install_dir}" \
+  -DCMAKE_INSTALL_PREFIX="${prefix_dir}" \
+  -DCMAKE_UNITY_BUILD="${CMAKE_UNITY_BUILD:-OFF}" \
   -DProtobuf_USE_STATIC_LIBS=ON \
   -GNinja \
-  ${JAVA_JNI_CMAKE_ARGS:-} \
-  ${arrow_dir}
+  "${JAVA_JNI_CMAKE_ARGS:-}" \
+  "${arrow_dir}"
 export CMAKE_BUILD_PARALLEL_LEVEL=${n_jobs}
-cmake --build . --config ${CMAKE_BUILD_TYPE}
+cmake --build . --config "${CMAKE_BUILD_TYPE}"
 if [ "${ARROW_JAVA_BUILD_TESTS}" = "ON" ]; then
   ctest \
     --output-on-failure \
-    --parallel ${n_jobs} \
+    --parallel "${n_jobs}" \
     --timeout 300
 fi
-cmake --build . --config ${CMAKE_BUILD_TYPE} --target install
+cmake --build . --config "${CMAKE_BUILD_TYPE}" --target install
 popd
 
-mkdir -p ${dist_dir}
+mkdir -p "${dist_dir}"
 # For Windows. *.dll are installed into bin/ on Windows.
 if [ -d "${prefix_dir}/bin" ]; then
-  mv ${prefix_dir}/bin/* ${dist_dir}/
+  mv "${prefix_dir}"/bin/* "${dist_dir}"/
 else
-  mv ${prefix_dir}/lib/* ${dist_dir}/
+  mv "${prefix_dir}"/lib/* "${dist_dir}"/
 fi
diff --git a/ci/scripts/java_test.sh b/ci/scripts/java_test.sh
@@ -42,9 +42,12 @@ if [ "${ARROW_JAVA_JNI}" = "ON" ]; then
 fi
 if [ "${#projects[@]}" -gt 0 ]; then
   ${mvn} clean test \
-         -Parrow-jni \
-         -pl "$(IFS=,; echo \""${projects[*]}"\")" \
-         -Darrow.cpp.build.dir="${java_jni_dist_dir}"
+    -Parrow-jni \
+    -pl "$(
+      IFS=,
+      echo \""${projects[*]}"\"
+    )" \
+    -Darrow.cpp.build.dir="${java_jni_dist_dir}"
 fi
 
 if [ "${ARROW_JAVA_CDATA}" = "ON" ]; then