kou commented on a change in pull request #10189: URL: https://github.com/apache/arrow/pull/10189#discussion_r623385104
########## File path: dev/tasks/gandiva-jars/check_shared_dependencies.sh ########## @@ -0,0 +1,54 @@ +#!/bin/bash + +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +set -e + +CPP_BUILD_DIR=$GITHUB_WORKSPACE/arrow/dist/ + +if [[ $OS_NAME == "linux" ]]; then + SO_DEP=ldd + GANDIVA_LIB="$CPP_BUILD_DIR"libgandiva_jni.so + WHITELIST=(linux-vdso libz librt libdl libpthread libstdc++ libm libgcc_s libc ld-linux-x86-64) +else + SO_DEP="otool -L" + GANDIVA_LIB="$CPP_BUILD_DIR"libgandiva_jni.dylib + WHITELIST=(libgandiva_jni libz libncurses libSystem libc++) +fi + +# print the shared library dependencies +eval "$SO_DEP" "$GANDIVA_LIB" Review comment: It seem that this `eval` is redundant: ```suggestion $SO_DEP "$GANDIVA_LIB" ``` ########## File path: dev/tasks/gandiva-jars/check_shared_dependencies.sh ########## @@ -0,0 +1,54 @@ +#!/bin/bash + +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +set -e + +CPP_BUILD_DIR=$GITHUB_WORKSPACE/arrow/dist/ + +if [[ $OS_NAME == "linux" ]]; then + SO_DEP=ldd + GANDIVA_LIB="$CPP_BUILD_DIR"libgandiva_jni.so + WHITELIST=(linux-vdso libz librt libdl libpthread libstdc++ libm libgcc_s libc ld-linux-x86-64) +else + SO_DEP="otool -L" + GANDIVA_LIB="$CPP_BUILD_DIR"libgandiva_jni.dylib + WHITELIST=(libgandiva_jni libz libncurses libSystem libc++) +fi + +# print the shared library dependencies +eval "$SO_DEP" "$GANDIVA_LIB" + +if [[ $CHECK_SHARED_DEPENDENCIES ]] ; then + # exit if any shared library not in whitelisted set is found + echo "Checking shared dependencies" + while read -r line + do + found=false + for item in "${WHITELIST[@]}" + do + if [[ "$line" == *"$item"* ]] ; then + found=true + fi + done + if [[ "$found" == false ]] ; then + echo "Unexpected shared dependency found" + exit 1 Review comment: Could you indent them? ```suggestion echo "Unexpected shared dependency found" exit 1 ``` ########## File path: dev/tasks/gandiva-jars/check_shared_dependencies.sh ########## @@ -0,0 +1,54 @@ +#!/bin/bash Review comment: Could you use `-` instead of `_` as word separator in file name? Because existing `build-java.sh` uses `-`. `check-shared-dependencies.sh` ########## File path: dev/tasks/gandiva-jars/github.linux.macos.yml ########## @@ -0,0 +1,111 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +{% import 'macros.jinja' as macros with context %} + +{{ macros.github_header() }} + +jobs: + build-cpp-ubuntu: + name: Build C++ Gandiva Libs Ubuntu + runs-on: ubuntu-18.04 + steps: + - name: Checkout Arrow + run: | + git clone --no-checkout {{ arrow.remote }} arrow + git -C arrow fetch -t {{ arrow.remote }} {{ arrow.branch }} + if [ $CROSSBOW_USE_COMMIT_ID = true ]; then git -C arrow checkout {{ arrow.head }}; else git -C arrow checkout FETCH_HEAD; fi + git -C arrow submodule update --init --recursive + - name: Build Gandiva + run: | + python3 -VV + cd arrow + mkdir -p dist + export CC="gcc-4.9" CXX="g++-4.9" + ulimit -c unlimited -S + set -e + docker run -v $PWD:/arrow quay.io/anthonylouisbsb/arrow:gandivadocker /arrow/dev/tasks/gandiva-jars/build-cpp-linux.sh + dev/tasks/gandiva-jars/check_shared_dependencies.sh + env: + OS_NAME: "linux" + CHECK_SHARED_DEPENDENCIES: true + - name: Upload Artifacts + uses: actions/upload-artifact@v2 + with: + name: ubuntu-shared-lib-{{ '${{ github.sha }}' }} + path: {{ '${{ github.workspace }}' }}/arrow/dist/libgandiva_jni.so + build-cpp-macos: + name: Build C++ Gandiva Libs MacOS + runs-on: macos-latest + steps: + - name: Checkout Arrow + run: | + git clone --no-checkout {{ arrow.remote }} arrow + git -C arrow fetch -t {{ arrow.remote }} {{ arrow.branch }} + if [ $CROSSBOW_USE_COMMIT_ID = true ]; then git -C arrow checkout {{ arrow.head }}; else git -C arrow checkout FETCH_HEAD; fi + git -C arrow submodule update --init --recursive + - name: Build Gandiva + run: | + cd arrow + mkdir -p dist + export ARROW_TEST_DATA=$PWD/testing/data + set -e + dev/tasks/gandiva-jars/build-cpp-osx.sh + dev/tasks/gandiva-jars/check_shared_dependencies.sh + env: + OS_NAME: "osx" + CHECK_SHARED_DEPENDENCIES: true + MACOSX_DEPLOYMENT_TARGET: "10.11" + - name: Upload Artifacts + uses: actions/upload-artifact@v2 + with: + name: macos-shared-lib-{{ '${{ github.sha }}' }} + path: {{ '${{ github.workspace }}' }}/arrow/dist/libgandiva_jni.dylib + package-jar: + name: Build Gandiva Jar + runs-on: macos-latest + needs: [build-cpp-macos, build-cpp-ubuntu] + steps: + - name: Checkout Arrow + run: | + git clone --no-checkout {{ arrow.remote }} arrow + git -C arrow fetch -t {{ arrow.remote }} {{ arrow.branch }} + if [ $CROSSBOW_USE_COMMIT_ID = true ]; then git -C arrow checkout {{ arrow.head }}; else git -C arrow checkout FETCH_HEAD; fi + git -C arrow submodule update --init --recursive + mkdir -p arrow/dist + - name: Download Linux Gandiva Library + uses: actions/download-artifact@v2 + with: + name: ubuntu-shared-lib-{{ '${{ github.sha }}' }} + path: {{ '${{ github.workspace }}' }}/arrow/dist + - name: Download MacOS Gandiva Library + uses: actions/download-artifact@v2 + with: + name: macos-shared-lib-{{ '${{ github.sha }}' }} + path: {{ '${{ github.workspace }}' }}/arrow/dist Review comment: Ditto. ########## File path: dev/tasks/gandiva-jars/github.linux.macos.yml ########## @@ -0,0 +1,111 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +{% import 'macros.jinja' as macros with context %} + +{{ macros.github_header() }} + +jobs: + build-cpp-ubuntu: + name: Build C++ Gandiva Libs Ubuntu + runs-on: ubuntu-18.04 + steps: + - name: Checkout Arrow + run: | + git clone --no-checkout {{ arrow.remote }} arrow + git -C arrow fetch -t {{ arrow.remote }} {{ arrow.branch }} + if [ $CROSSBOW_USE_COMMIT_ID = true ]; then git -C arrow checkout {{ arrow.head }}; else git -C arrow checkout FETCH_HEAD; fi + git -C arrow submodule update --init --recursive + - name: Build Gandiva + run: | + python3 -VV + cd arrow + mkdir -p dist + export CC="gcc-4.9" CXX="g++-4.9" + ulimit -c unlimited -S + set -e + docker run -v $PWD:/arrow quay.io/anthonylouisbsb/arrow:gandivadocker /arrow/dev/tasks/gandiva-jars/build-cpp-linux.sh + dev/tasks/gandiva-jars/check_shared_dependencies.sh + env: + OS_NAME: "linux" + CHECK_SHARED_DEPENDENCIES: true + - name: Upload Artifacts + uses: actions/upload-artifact@v2 + with: + name: ubuntu-shared-lib-{{ '${{ github.sha }}' }} + path: {{ '${{ github.workspace }}' }}/arrow/dist/libgandiva_jni.so + build-cpp-macos: + name: Build C++ Gandiva Libs MacOS + runs-on: macos-latest + steps: + - name: Checkout Arrow + run: | + git clone --no-checkout {{ arrow.remote }} arrow + git -C arrow fetch -t {{ arrow.remote }} {{ arrow.branch }} + if [ $CROSSBOW_USE_COMMIT_ID = true ]; then git -C arrow checkout {{ arrow.head }}; else git -C arrow checkout FETCH_HEAD; fi + git -C arrow submodule update --init --recursive + - name: Build Gandiva + run: | + cd arrow + mkdir -p dist + export ARROW_TEST_DATA=$PWD/testing/data + set -e + dev/tasks/gandiva-jars/build-cpp-osx.sh + dev/tasks/gandiva-jars/check_shared_dependencies.sh + env: + OS_NAME: "osx" + CHECK_SHARED_DEPENDENCIES: true + MACOSX_DEPLOYMENT_TARGET: "10.11" + - name: Upload Artifacts + uses: actions/upload-artifact@v2 + with: + name: macos-shared-lib-{{ '${{ github.sha }}' }} + path: {{ '${{ github.workspace }}' }}/arrow/dist/libgandiva_jni.dylib Review comment: Ditto. ########## File path: dev/tasks/tasks.yml ########## @@ -1137,15 +1137,9 @@ tasks: ############################## Gandiva Tasks ################################ - gandiva-jar-ubuntu: + gandiva-jar: ci: github - template: gandiva-jars/github.linux.yml - artifacts: - - arrow-gandiva-{no_rc_version}-SNAPSHOT.jar - - gandiva-jar-osx: - ci: github - template: gandiva-jars/github.osx.yml + template: gandiva-jars/github.linux.macos.yml Review comment: We can omit platform name from file name: ```suggestion template: gandiva-jars/github.yml ``` ########## File path: dev/tasks/gandiva-jars/check_shared_dependencies.sh ########## @@ -0,0 +1,54 @@ +#!/bin/bash + +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +set -e + +CPP_BUILD_DIR=$GITHUB_WORKSPACE/arrow/dist/ + +if [[ $OS_NAME == "linux" ]]; then + SO_DEP=ldd Review comment: Could you use 2 spaces for indent? Because existing `build-java.sh` uses 2 spaces. ########## File path: dev/tasks/gandiva-jars/github.linux.macos.yml ########## @@ -0,0 +1,111 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +{% import 'macros.jinja' as macros with context %} + +{{ macros.github_header() }} + +jobs: + build-cpp-ubuntu: + name: Build C++ Gandiva Libs Ubuntu + runs-on: ubuntu-18.04 + steps: + - name: Checkout Arrow + run: | + git clone --no-checkout {{ arrow.remote }} arrow + git -C arrow fetch -t {{ arrow.remote }} {{ arrow.branch }} + if [ $CROSSBOW_USE_COMMIT_ID = true ]; then git -C arrow checkout {{ arrow.head }}; else git -C arrow checkout FETCH_HEAD; fi + git -C arrow submodule update --init --recursive + - name: Build Gandiva + run: | + python3 -VV + cd arrow + mkdir -p dist + export CC="gcc-4.9" CXX="g++-4.9" + ulimit -c unlimited -S + set -e + docker run -v $PWD:/arrow quay.io/anthonylouisbsb/arrow:gandivadocker /arrow/dev/tasks/gandiva-jars/build-cpp-linux.sh + dev/tasks/gandiva-jars/check_shared_dependencies.sh + env: + OS_NAME: "linux" + CHECK_SHARED_DEPENDENCIES: true + - name: Upload Artifacts + uses: actions/upload-artifact@v2 + with: + name: ubuntu-shared-lib-{{ '${{ github.sha }}' }} + path: {{ '${{ github.workspace }}' }}/arrow/dist/libgandiva_jni.so + build-cpp-macos: + name: Build C++ Gandiva Libs MacOS + runs-on: macos-latest + steps: + - name: Checkout Arrow + run: | + git clone --no-checkout {{ arrow.remote }} arrow + git -C arrow fetch -t {{ arrow.remote }} {{ arrow.branch }} + if [ $CROSSBOW_USE_COMMIT_ID = true ]; then git -C arrow checkout {{ arrow.head }}; else git -C arrow checkout FETCH_HEAD; fi + git -C arrow submodule update --init --recursive + - name: Build Gandiva + run: | + cd arrow + mkdir -p dist + export ARROW_TEST_DATA=$PWD/testing/data + set -e + dev/tasks/gandiva-jars/build-cpp-osx.sh + dev/tasks/gandiva-jars/check_shared_dependencies.sh + env: + OS_NAME: "osx" + CHECK_SHARED_DEPENDENCIES: true + MACOSX_DEPLOYMENT_TARGET: "10.11" + - name: Upload Artifacts + uses: actions/upload-artifact@v2 + with: + name: macos-shared-lib-{{ '${{ github.sha }}' }} + path: {{ '${{ github.workspace }}' }}/arrow/dist/libgandiva_jni.dylib + package-jar: + name: Build Gandiva Jar + runs-on: macos-latest + needs: [build-cpp-macos, build-cpp-ubuntu] + steps: + - name: Checkout Arrow + run: | + git clone --no-checkout {{ arrow.remote }} arrow + git -C arrow fetch -t {{ arrow.remote }} {{ arrow.branch }} + if [ $CROSSBOW_USE_COMMIT_ID = true ]; then git -C arrow checkout {{ arrow.head }}; else git -C arrow checkout FETCH_HEAD; fi + git -C arrow submodule update --init --recursive + mkdir -p arrow/dist + - name: Download Linux Gandiva Library + uses: actions/download-artifact@v2 + with: + name: ubuntu-shared-lib-{{ '${{ github.sha }}' }} + path: {{ '${{ github.workspace }}' }}/arrow/dist Review comment: It seems that `{{ '${{ github.workspace }}' }}/` is redundant: ```suggestion path: arrow/dist ``` ########## File path: dev/tasks/gandiva-jars/check_shared_dependencies.sh ########## @@ -0,0 +1,54 @@ +#!/bin/bash + +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +set -e + +CPP_BUILD_DIR=$GITHUB_WORKSPACE/arrow/dist/ + +if [[ $OS_NAME == "linux" ]]; then + SO_DEP=ldd + GANDIVA_LIB="$CPP_BUILD_DIR"libgandiva_jni.so + WHITELIST=(linux-vdso libz librt libdl libpthread libstdc++ libm libgcc_s libc ld-linux-x86-64) +else + SO_DEP="otool -L" + GANDIVA_LIB="$CPP_BUILD_DIR"libgandiva_jni.dylib + WHITELIST=(libgandiva_jni libz libncurses libSystem libc++) +fi + +# print the shared library dependencies +eval "$SO_DEP" "$GANDIVA_LIB" + +if [[ $CHECK_SHARED_DEPENDENCIES ]] ; then + # exit if any shared library not in whitelisted set is found + echo "Checking shared dependencies" + while read -r line + do + found=false + for item in "${WHITELIST[@]}" + do + if [[ "$line" == *"$item"* ]] ; then + found=true + fi + done + if [[ "$found" == false ]] ; then + echo "Unexpected shared dependency found" + exit 1 + fi + done < <(eval "$SO_DEP" "$GANDIVA_LIB" | awk '{print $1}') Review comment: Can we unify multiple `$SO_DEP $GANDIVA_LIB`? ```shell # print and store the shared library dependencies $SO_DEP "$GANDIVA_LIB" | tee dependencies.txt # ... awk '{print $1}' dependencies.txt | while read -r line # ... ``` ########## File path: dev/tasks/gandiva-jars/github.linux.macos.yml ########## @@ -0,0 +1,111 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +{% import 'macros.jinja' as macros with context %} + +{{ macros.github_header() }} + +jobs: + build-cpp-ubuntu: + name: Build C++ Gandiva Libs Ubuntu + runs-on: ubuntu-18.04 + steps: + - name: Checkout Arrow + run: | + git clone --no-checkout {{ arrow.remote }} arrow + git -C arrow fetch -t {{ arrow.remote }} {{ arrow.branch }} + if [ $CROSSBOW_USE_COMMIT_ID = true ]; then git -C arrow checkout {{ arrow.head }}; else git -C arrow checkout FETCH_HEAD; fi + git -C arrow submodule update --init --recursive + - name: Build Gandiva + run: | + python3 -VV + cd arrow + mkdir -p dist + export CC="gcc-4.9" CXX="g++-4.9" + ulimit -c unlimited -S + set -e + docker run -v $PWD:/arrow quay.io/anthonylouisbsb/arrow:gandivadocker /arrow/dev/tasks/gandiva-jars/build-cpp-linux.sh + dev/tasks/gandiva-jars/check_shared_dependencies.sh + env: + OS_NAME: "linux" + CHECK_SHARED_DEPENDENCIES: true + - name: Upload Artifacts + uses: actions/upload-artifact@v2 + with: + name: ubuntu-shared-lib-{{ '${{ github.sha }}' }} + path: {{ '${{ github.workspace }}' }}/arrow/dist/libgandiva_jni.so Review comment: It seems that `{{ '${{ github.workspace }}' }}/` is redundant: ```suggestion path: arrow/dist/libgandiva_jni.so ``` ########## File path: dev/tasks/gandiva-jars/github.linux.macos.yml ########## @@ -0,0 +1,111 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +{% import 'macros.jinja' as macros with context %} + +{{ macros.github_header() }} + +jobs: + build-cpp-ubuntu: + name: Build C++ Gandiva Libs Ubuntu + runs-on: ubuntu-18.04 + steps: + - name: Checkout Arrow + run: | + git clone --no-checkout {{ arrow.remote }} arrow + git -C arrow fetch -t {{ arrow.remote }} {{ arrow.branch }} + if [ $CROSSBOW_USE_COMMIT_ID = true ]; then git -C arrow checkout {{ arrow.head }}; else git -C arrow checkout FETCH_HEAD; fi + git -C arrow submodule update --init --recursive + - name: Build Gandiva + run: | + python3 -VV + cd arrow + mkdir -p dist + export CC="gcc-4.9" CXX="g++-4.9" + ulimit -c unlimited -S + set -e + docker run -v $PWD:/arrow quay.io/anthonylouisbsb/arrow:gandivadocker /arrow/dev/tasks/gandiva-jars/build-cpp-linux.sh + dev/tasks/gandiva-jars/check_shared_dependencies.sh + env: + OS_NAME: "linux" + CHECK_SHARED_DEPENDENCIES: true + - name: Upload Artifacts + uses: actions/upload-artifact@v2 + with: + name: ubuntu-shared-lib-{{ '${{ github.sha }}' }} Review comment: Why do we need `-{{ '${{ github.sha }}' }}`? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
