forked from apache/spark
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into char_varchar
# Conflicts: # sql/core/src/test/resources/sql-tests/results/group-by-all-mosha.sql.out
- Loading branch information
Showing
46 changed files
with
3,834 additions
and
835 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| # | ||
| # 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. | ||
| # | ||
|
|
||
| name: "Build / Python-only (master, Python 3.11, MacOS)" | ||
|
|
||
| on: | ||
| schedule: | ||
| - cron: '0 21 * * *' | ||
|
|
||
| jobs: | ||
| run-build: | ||
| permissions: | ||
| packages: write | ||
| name: Run | ||
| uses: ./.github/workflows/python_macos_test.yml | ||
| if: github.repository == 'apache/spark' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,165 @@ | ||
| # | ||
| # 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. | ||
| # | ||
|
|
||
| name: Build and test PySpark on macOS | ||
|
|
||
| on: | ||
| workflow_call: | ||
| inputs: | ||
| java: | ||
| required: false | ||
| type: string | ||
| default: 17 | ||
| python: | ||
| required: false | ||
| type: string | ||
| default: 3.11 | ||
| branch: | ||
| description: Branch to run the build against | ||
| required: false | ||
| type: string | ||
| default: master | ||
| hadoop: | ||
| description: Hadoop version to run with. HADOOP_PROFILE environment variable should accept it. | ||
| required: false | ||
| type: string | ||
| default: hadoop3 | ||
| envs: | ||
| description: Additional environment variables to set when running the tests. Should be in JSON format. | ||
| required: false | ||
| type: string | ||
| default: '{}' | ||
| jobs: | ||
| build: | ||
| name: "PySpark test on macos: ${{ matrix.modules }}" | ||
| runs-on: macos-15 | ||
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| java: | ||
| - ${{ inputs.java }} | ||
| python: | ||
| - ${{inputs.python}} | ||
| modules: | ||
| - >- | ||
| pyspark-sql, pyspark-resource, pyspark-testing | ||
| - >- | ||
| pyspark-core, pyspark-errors, pyspark-streaming | ||
| - >- | ||
| pyspark-mllib, pyspark-ml, pyspark-ml-connect | ||
| - >- | ||
| pyspark-connect | ||
| - >- | ||
| pyspark-pandas | ||
| - >- | ||
| pyspark-pandas-slow | ||
| - >- | ||
| pyspark-pandas-connect-part0 | ||
| - >- | ||
| pyspark-pandas-connect-part1 | ||
| - >- | ||
| pyspark-pandas-connect-part2 | ||
| - >- | ||
| pyspark-pandas-connect-part3 | ||
| env: | ||
| MODULES_TO_TEST: ${{ matrix.modules }} | ||
| PYTHON_TO_TEST: python${{inputs.python}} | ||
| HADOOP_PROFILE: ${{ inputs.hadoop }} | ||
| HIVE_PROFILE: hive2.3 | ||
| # GitHub Actions' default miniconda to use in pip packaging test. | ||
| CONDA_PREFIX: /usr/share/miniconda | ||
| GITHUB_PREV_SHA: ${{ github.event.before }} | ||
| SPARK_LOCAL_IP: localhost | ||
| SKIP_UNIDOC: true | ||
| SKIP_MIMA: true | ||
| SKIP_PACKAGING: true | ||
| METASPACE_SIZE: 1g | ||
| BRANCH: ${{ inputs.branch }} | ||
| steps: | ||
| - name: Checkout Spark repository | ||
| uses: actions/checkout@v4 | ||
| # In order to fetch changed files | ||
| with: | ||
| fetch-depth: 0 | ||
| repository: apache/spark | ||
| ref: ${{ inputs.branch }} | ||
| - name: Sync the current branch with the latest in Apache Spark | ||
| if: github.repository != 'apache/spark' | ||
| run: | | ||
| echo "APACHE_SPARK_REF=$(git rev-parse HEAD)" >> $GITHUB_ENV | ||
| git fetch https://github.com/$GITHUB_REPOSITORY.git ${GITHUB_REF#refs/heads/} | ||
| git -c user.name='Apache Spark Test Account' -c user.email='[email protected]' merge --no-commit --progress --squash FETCH_HEAD | ||
| git -c user.name='Apache Spark Test Account' -c user.email='[email protected]' commit -m "Merged commit" --allow-empty | ||
| # Cache local repositories. Note that GitHub Actions cache has a 10G limit. | ||
| - name: Cache SBT and Maven | ||
| uses: actions/cache@v4 | ||
| with: | ||
| path: | | ||
| build/apache-maven-* | ||
| build/*.jar | ||
| ~/.sbt | ||
| key: build-${{ hashFiles('**/pom.xml', 'project/build.properties', 'build/mvn', 'build/sbt', 'build/sbt-launch-lib.bash', 'build/spark-build-info') }} | ||
| restore-keys: | | ||
| build- | ||
| - name: Cache Coursier local repository | ||
| uses: actions/cache@v4 | ||
| with: | ||
| path: ~/.cache/coursier | ||
| key: pyspark-coursier-${{ hashFiles('**/pom.xml', '**/plugins.sbt') }} | ||
| restore-keys: | | ||
| pyspark-coursier- | ||
| - name: Install Java ${{ matrix.java }} | ||
| uses: actions/setup-java@v4 | ||
| with: | ||
| distribution: zulu | ||
| java-version: ${{ matrix.java }} | ||
| - name: Install Python packages (Python ${{matrix.python}}) | ||
| run: | | ||
| python${{matrix.python}} -m pip install --ignore-installed 'blinker>=1.6.2' | ||
| python${{matrix.python}} -m pip install --ignore-installed 'six==1.16.0' | ||
| python${{matrix.python}} -m pip install py-cpuinfo && \ | ||
| python${{matrix.python}} -m pip install numpy 'pyarrow>=15.0.0' 'six==1.16.0' 'pandas==2.2.3' scipy 'plotly>=4.8' 'mlflow>=2.8.1' coverage matplotlib openpyxl 'memory-profiler>=0.61.0' 'scikit-learn>=1.3.2' unittest-xml-reporting && \ | ||
| python${{matrix.python}} -m pip install 'grpcio==1.67.0' 'grpcio-status==1.67.0' 'protobuf==5.28.3' 'googleapis-common-protos==1.65.0' 'graphviz==0.20.3' && \ | ||
| python${{matrix.python}} -m pip install torch torchvision --index-url https://download.pytorch.org/whl/cpu && \ | ||
| python${{matrix.python}} -m pip install deepspeed torcheval && \ | ||
| python${{matrix.python}} -m pip cache purge && \ | ||
| python${{matrix.python}} -m pip list | ||
| # Run the tests. | ||
| - name: Run tests | ||
| env: ${{ fromJSON(inputs.envs) }} | ||
| run: | | ||
| if [[ "$MODULES_TO_TEST" == *"pyspark-errors"* ]]; then | ||
| export SKIP_PACKAGING=false | ||
| echo "Python Packaging Tests Enabled!" | ||
| fi | ||
| ./dev/run-tests --parallelism 1 --modules "$MODULES_TO_TEST" --python-executables "$PYTHON_TO_TEST" | ||
| - name: Upload test results to report | ||
| env: ${{ fromJSON(inputs.envs) }} | ||
| if: always() | ||
| uses: actions/upload-artifact@v4 | ||
| with: | ||
| name: test-results-${{ matrix.modules }}--${{ matrix.java }}-${{ inputs.hadoop }}-hive2.3-${{ env.PYTHON_TO_TEST }} | ||
| path: "**/target/test-reports/*.xml" | ||
| - name: Upload unit tests log files | ||
| env: ${{ fromJSON(inputs.envs) }} | ||
| if: ${{ !success() }} | ||
| uses: actions/upload-artifact@v4 | ||
| with: | ||
| name: unit-tests-log-${{ matrix.modules }}--${{ matrix.java }}-${{ inputs.hadoop }}-hive2.3-${{ env.PYTHON_TO_TEST }} | ||
| path: "**/target/unit-tests.log" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| # | ||
| # 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. | ||
| # | ||
|
|
||
| # Image for building and testing Spark branches. Based on Ubuntu 22.04. | ||
| # See also in https://hub.docker.com/_/ubuntu | ||
| FROM ubuntu:jammy-20240911.1 | ||
| LABEL org.opencontainers.image.authors="Apache Spark project <[email protected]>" | ||
| LABEL org.opencontainers.image.licenses="Apache-2.0" | ||
| LABEL org.opencontainers.image.ref.name="Apache Spark Infra Image for SparkR" | ||
| # Overwrite this label to avoid exposing the underlying Ubuntu OS version label | ||
| LABEL org.opencontainers.image.version="" | ||
|
|
||
| ENV FULL_REFRESH_DATE 20241114 | ||
|
|
||
| ENV DEBIAN_FRONTEND noninteractive | ||
| ENV DEBCONF_NONINTERACTIVE_SEEN true | ||
|
|
||
| RUN apt-get update && apt-get install -y \ | ||
| build-essential \ | ||
| ca-certificates \ | ||
| curl \ | ||
| gfortran \ | ||
| git \ | ||
| gnupg \ | ||
| libcurl4-openssl-dev \ | ||
| libfontconfig1-dev \ | ||
| libfreetype6-dev \ | ||
| libfribidi-dev \ | ||
| libgit2-dev \ | ||
| libharfbuzz-dev \ | ||
| libjpeg-dev \ | ||
| liblapack-dev \ | ||
| libopenblas-dev \ | ||
| libpng-dev \ | ||
| libpython3-dev \ | ||
| libssl-dev \ | ||
| libtiff5-dev \ | ||
| libxml2-dev \ | ||
| pandoc \ | ||
| pkg-config \ | ||
| qpdf \ | ||
| r-base \ | ||
| software-properties-common \ | ||
| wget \ | ||
| zlib1g-dev \ | ||
| && rm -rf /var/lib/apt/lists/* | ||
|
|
||
| RUN echo 'deb https://cloud.r-project.org/bin/linux/ubuntu jammy-cran40/' >> /etc/apt/sources.list | ||
| RUN gpg --keyserver hkps://keyserver.ubuntu.com --recv-key E298A3A825C0D65DFD57CBB651716619E084DAB9 | ||
| RUN gpg -a --export E084DAB9 | apt-key add - | ||
| RUN add-apt-repository 'deb https://cloud.r-project.org/bin/linux/ubuntu jammy-cran40/' | ||
|
|
||
| # See more in SPARK-39959, roxygen2 < 7.2.1 | ||
| RUN Rscript -e "install.packages(c('devtools', 'knitr', 'markdown', \ | ||
| 'rmarkdown', 'testthat', 'devtools', 'e1071', 'survival', 'arrow', \ | ||
| 'ggplot2', 'mvtnorm', 'statmod', 'xml2'), repos='https://cloud.r-project.org/')" && \ | ||
| Rscript -e "devtools::install_version('roxygen2', version='7.2.0', repos='https://cloud.r-project.org')" && \ | ||
| Rscript -e "devtools::install_version('lintr', version='2.0.1', repos='https://cloud.r-project.org')" && \ | ||
| Rscript -e "devtools::install_version('pkgdown', version='2.0.1', repos='https://cloud.r-project.org')" && \ | ||
| Rscript -e "devtools::install_version('preferably', version='0.4', repos='https://cloud.r-project.org')" | ||
|
|
||
| # See more in SPARK-39735 | ||
| ENV R_LIBS_SITE "/usr/local/lib/R/site-library:${R_LIBS_SITE}:/usr/lib/R/library" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.