Skip to content

Commit ae15550

Browse files
zml1206zml1206
authored
Merge branch 'branch-1.5' into 11021-1.5
2 parents 165c7e9 + a292d8a commit ae15550

50 files changed

Lines changed: 84 additions & 83 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/build_bundle_package.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
ccache-centos7-release-default
5757
- name: Build Gluten velox third party
5858
run: |
59-
docker run -v $GITHUB_WORKSPACE:/work -w /work apache/gluten:vcpkg-centos-7 bash -c "
59+
docker run -v $GITHUB_WORKSPACE:/work -w /work apache/gluten:1.5-vcpkg-centos-7 bash -c "
6060
df -a
6161
cd /work
6262
export CCACHE_DIR=/work/.ccache

‎.github/workflows/build_release.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ jobs:
2828
- uses: actions/checkout@v4
2929
- name: Build
3030
run: |
31-
docker pull apache/gluten:vcpkg-centos-7
32-
docker run -v $GITHUB_WORKSPACE:/workspace -w /work apache/gluten:vcpkg-centos-7 bash -c "
31+
docker pull apache/gluten:1.5-vcpkg-centos-7
32+
docker run -v $GITHUB_WORKSPACE:/workspace -w /work apache/gluten:1.5-vcpkg-centos-7 bash -c "
3333
set -e
3434
cd /workspace
3535
bash dev/release/build-release.sh

‎.github/workflows/flink.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ env:
3535
jobs:
3636
flink-test:
3737
runs-on: ubuntu-22.04
38-
container: apache/gluten:centos-8-jdk17
38+
container: apache/gluten:1.5-centos-8-jdk17
3939
steps:
4040
- uses: actions/checkout@v2
4141
- name: Prepare

‎.github/workflows/velox_backend_arm.yml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ concurrency:
5252
jobs:
5353
build-native-lib-centos-8:
5454
runs-on: ubuntu-24.04-arm
55-
container: apache/gluten:vcpkg-centos-8
55+
container: apache/gluten:1.5-vcpkg-centos-8
5656
steps:
5757
- uses: actions/checkout@v4
5858
- name: Get Ccache
@@ -146,8 +146,8 @@ jobs:
146146
--extra-conf=spark.gluten.ras.enabled=true
147147
148148
cpp-test-udf-test:
149-
runs-on: ubuntu-24.04-arm
150-
container: apache/gluten:centos-8-jdk8
149+
runs-on: ubuntu-22.04-arm
150+
container: apache/gluten:1.5-centos-8-jdk8
151151
steps:
152152
- uses: actions/checkout@v2
153153
- name: Get Ccache
@@ -181,8 +181,9 @@ jobs:
181181
export JAVA_HOME=/usr/lib/jvm/java-17-openjdk
182182
export PATH=$JAVA_HOME/bin:$PATH
183183
java -version
184+
export MAVEN_OPTS="-XX:-UseContainerSupport"
184185
$MVN_CMD test -Pspark-3.5 -Pbackends-velox -Pjava-17 -Piceberg -Pdelta -Ppaimon -DtagsToExclude=None \
185-
-DtagsToInclude=org.apache.gluten.tags.UDFTest
186+
-DtagsToInclude=org.apache.gluten.tags.UDFTest
186187
- name: Upload test report
187188
uses: actions/upload-artifact@v4
188189
with:

‎.github/workflows/velox_backend_cache.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
ccache-centos7-release-default
4343
- name: Build Gluten native libraries
4444
run: |
45-
docker run -v $GITHUB_WORKSPACE:/work -w /work apache/gluten:vcpkg-centos-7 bash -c "
45+
docker run -v $GITHUB_WORKSPACE:/work -w /work apache/gluten:1.5-vcpkg-centos-7 bash -c "
4646
export CCACHE_DIR=/work/.ccache
4747
mkdir -p /work/.ccache
4848
bash dev/ci-velox-buildstatic-centos-7.sh
@@ -56,7 +56,7 @@ jobs:
5656

5757
cache-native-lib-centos-8:
5858
runs-on: ${{ matrix.os }}
59-
container: apache/gluten:vcpkg-centos-8
59+
container: apache/gluten:1.5-vcpkg-centos-8
6060
strategy:
6161
matrix:
6262
os: [ ubuntu-22.04, ubuntu-24.04-arm ]
@@ -84,7 +84,7 @@ jobs:
8484
strategy:
8585
matrix:
8686
os: [ ubuntu-22.04, ubuntu-24.04-arm ]
87-
container: apache/gluten:centos-8-jdk8
87+
container: apache/gluten:1.5-centos-8-jdk8
8888
steps:
8989
- uses: actions/checkout@v2
9090
- name: Get Ccache
@@ -119,7 +119,7 @@ jobs:
119119
ccache-enhanced-centos7-release-default
120120
- name: Build Gluten native libraries
121121
run: |
122-
docker run -v $GITHUB_WORKSPACE:/work -w /work apache/gluten:vcpkg-centos-7 bash -c "
122+
docker run -v $GITHUB_WORKSPACE:/work -w /work apache/gluten:1.5-vcpkg-centos-7 bash -c "
123123
export CCACHE_DIR=/work/.ccache
124124
mkdir -p /work/.ccache
125125
bash dev/ci-velox-buildstatic-centos-7-enhanced-features.sh
@@ -136,7 +136,7 @@ jobs:
136136
strategy:
137137
matrix:
138138
os: [ ubuntu-22.04 ]
139-
container: apache/gluten:centos-9-jdk8-cudf
139+
container: apache/gluten:1.5-centos-9-jdk8-cudf
140140
steps:
141141
- uses: actions/checkout@v2
142142
- name: Get Ccache

‎.github/workflows/velox_backend_enhanced_features.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ jobs:
6262
ccache-enhanced-centos7-release-default
6363
- name: Build Gluten native libraries
6464
run: |
65-
docker pull apache/gluten:vcpkg-centos-7
66-
docker run -v $GITHUB_WORKSPACE:/work -w /work apache/gluten:vcpkg-centos-7 bash -c "
65+
docker pull apache/gluten:1.5-vcpkg-centos-7
66+
docker run -v $GITHUB_WORKSPACE:/work -w /work apache/gluten:1.5-vcpkg-centos-7 bash -c "
6767
set -e
6868
yum install tzdata -y
6969
df -a
@@ -96,7 +96,7 @@ jobs:
9696
spark-test-spark34:
9797
needs: build-native-lib-centos-7
9898
runs-on: ubuntu-22.04
99-
container: apache/gluten:centos-8-jdk8
99+
container: apache/gluten:1.5-centos-8-jdk8
100100
steps:
101101
- uses: actions/checkout@v2
102102
- name: Download All Artifacts
@@ -154,7 +154,7 @@ jobs:
154154
spark-test-spark35:
155155
needs: build-native-lib-centos-7
156156
runs-on: ubuntu-22.04
157-
container: apache/gluten:centos-8-jdk8
157+
container: apache/gluten:1.5-centos-8-jdk8
158158
steps:
159159
- uses: actions/checkout@v2
160160
- name: Download All Artifacts
@@ -212,7 +212,7 @@ jobs:
212212
spark-test-spark35-slow:
213213
needs: build-native-lib-centos-7
214214
runs-on: ubuntu-22.04
215-
container: apache/gluten:centos-8-jdk8
215+
container: apache/gluten:1.5-centos-8-jdk8
216216
steps:
217217
- uses: actions/checkout@v2
218218
- name: Download All Artifacts

‎.github/workflows/velox_backend_x86.yml‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ jobs:
6565
ccache-centos7-release-default
6666
- name: Build Gluten native libraries
6767
run: |
68-
docker pull apache/gluten:vcpkg-centos-7
69-
docker run -v $GITHUB_WORKSPACE:/work -w /work apache/gluten:vcpkg-centos-7 bash -c "
68+
docker pull apache/gluten:1.5-vcpkg-centos-7
69+
docker run -v $GITHUB_WORKSPACE:/work -w /work apache/gluten:1.5-vcpkg-centos-7 bash -c "
7070
set -e
7171
yum install tzdata -y
7272
df -a
@@ -506,7 +506,7 @@ jobs:
506506
uniffle: [ "0.9.2" ]
507507
hadoop: [ "2.8.5" ]
508508
runs-on: ubuntu-22.04
509-
container: apache/gluten:centos-8-jdk8
509+
container: apache/gluten:1.5-centos-8-jdk8
510510
steps:
511511
- uses: actions/checkout@v2
512512
- name: Download All Native Artifacts
@@ -556,7 +556,7 @@ jobs:
556556
spark: [ "spark-3.2" ]
557557
celeborn: [ "celeborn-0.6.0", "celeborn-0.5.4", "celeborn-0.4.3"]
558558
runs-on: ubuntu-22.04
559-
container: apache/gluten:centos-8-jdk8
559+
container: apache/gluten:1.5-centos-8-jdk8
560560
steps:
561561
- uses: actions/checkout@v2
562562
- name: Download All Native Artifacts
@@ -612,7 +612,7 @@ jobs:
612612
spark-test-spark32:
613613
needs: build-native-lib-centos-7
614614
runs-on: ubuntu-22.04
615-
container: apache/gluten:centos-8-jdk8
615+
container: apache/gluten:1.5-centos-8-jdk8
616616
steps:
617617
- uses: actions/checkout@v2
618618
- uses: actions/download-artifact@v4
@@ -662,7 +662,7 @@ jobs:
662662
spark-test-spark32-slow:
663663
needs: build-native-lib-centos-7
664664
runs-on: ubuntu-22.04
665-
container: apache/gluten:centos-8-jdk8
665+
container: apache/gluten:1.5-centos-8-jdk8
666666
steps:
667667
- uses: actions/checkout@v2
668668
- name: Download All Artifacts
@@ -699,7 +699,7 @@ jobs:
699699
spark-test-spark33:
700700
needs: build-native-lib-centos-7
701701
runs-on: ubuntu-22.04
702-
container: apache/gluten:centos-8-jdk8
702+
container: apache/gluten:1.5-centos-8-jdk8
703703
steps:
704704
- uses: actions/checkout@v2
705705
- name: Download All Artifacts
@@ -755,7 +755,7 @@ jobs:
755755
spark-test-spark33-slow:
756756
needs: build-native-lib-centos-7
757757
runs-on: ubuntu-22.04
758-
container: apache/gluten:centos-8-jdk8
758+
container: apache/gluten:1.5-centos-8-jdk8
759759
steps:
760760
- uses: actions/checkout@v2
761761
- name: Download All Artifacts
@@ -798,7 +798,7 @@ jobs:
798798
spark-test-spark34:
799799
needs: build-native-lib-centos-7
800800
runs-on: ubuntu-22.04
801-
container: apache/gluten:centos-8-jdk8
801+
container: apache/gluten:1.5-centos-8-jdk8
802802
steps:
803803
- uses: actions/checkout@v2
804804
- name: Download All Artifacts
@@ -856,7 +856,7 @@ jobs:
856856
spark-test-spark34-slow:
857857
needs: build-native-lib-centos-7
858858
runs-on: ubuntu-22.04
859-
container: apache/gluten:centos-8-jdk8
859+
container: apache/gluten:1.5-centos-8-jdk8
860860
steps:
861861
- uses: actions/checkout@v2
862862
- name: Download All Artifacts
@@ -900,7 +900,7 @@ jobs:
900900
spark-test-spark35:
901901
needs: build-native-lib-centos-7
902902
runs-on: ubuntu-22.04
903-
container: apache/gluten:centos-8-jdk8
903+
container: apache/gluten:1.5-centos-8-jdk8
904904
steps:
905905
- uses: actions/checkout@v2
906906
- name: Download All Artifacts
@@ -956,7 +956,7 @@ jobs:
956956
spark-test-spark35-scala213:
957957
needs: build-native-lib-centos-7
958958
runs-on: ubuntu-22.04
959-
container: apache/gluten:centos-8-jdk8
959+
container: apache/gluten:1.5-centos-8-jdk8
960960
steps:
961961
- uses: actions/checkout@v2
962962
- name: Download All Artifacts
@@ -1006,7 +1006,7 @@ jobs:
10061006
spark-test-spark35-slow:
10071007
needs: build-native-lib-centos-7
10081008
runs-on: ubuntu-22.04
1009-
container: apache/gluten:centos-8-jdk8
1009+
container: apache/gluten:1.5-centos-8-jdk8
10101010
steps:
10111011
- uses: actions/checkout@v2
10121012
- name: Download All Artifacts
@@ -1052,7 +1052,7 @@ jobs:
10521052
spark-test-spark35-ras:
10531053
needs: build-native-lib-centos-7
10541054
runs-on: ubuntu-22.04
1055-
container: apache/gluten:centos-8-jdk8
1055+
container: apache/gluten:1.5-centos-8-jdk8
10561056
steps:
10571057
- uses: actions/checkout@v2
10581058
- name: Download All Artifacts
@@ -1105,7 +1105,7 @@ jobs:
11051105
spark-test-spark35-slow-ras:
11061106
needs: build-native-lib-centos-7
11071107
runs-on: ubuntu-22.04
1108-
container: apache/gluten:centos-8-jdk8
1108+
container: apache/gluten:1.5-centos-8-jdk8
11091109
steps:
11101110
- uses: actions/checkout@v2
11111111
- name: Download All Artifacts
@@ -1150,7 +1150,7 @@ jobs:
11501150
spark-test-spark35-smj:
11511151
needs: build-native-lib-centos-7
11521152
runs-on: ubuntu-22.04
1153-
container: apache/gluten:centos-8-jdk8
1153+
container: apache/gluten:1.5-centos-8-jdk8
11541154
steps:
11551155
- uses: actions/checkout@v2
11561156
- name: Download All Artifacts
@@ -1203,7 +1203,7 @@ jobs:
12031203
spark-test-spark35-slow-smj:
12041204
needs: build-native-lib-centos-7
12051205
runs-on: ubuntu-22.04
1206-
container: apache/gluten:centos-8-jdk8
1206+
container: apache/gluten:1.5-centos-8-jdk8
12071207
steps:
12081208
- uses: actions/checkout@v2
12091209
- name: Download All Artifacts
@@ -1247,7 +1247,7 @@ jobs:
12471247
12481248
cpp-test-udf-test:
12491249
runs-on: ubuntu-22.04
1250-
container: apache/gluten:centos-8-jdk8
1250+
container: apache/gluten:1.5-centos-8-jdk8
12511251
steps:
12521252
- uses: actions/checkout@v2
12531253
- name: Get Ccache
@@ -1298,7 +1298,7 @@ jobs:
12981298

12991299
build-cudf-centos-9:
13001300
runs-on: ubuntu-22.04
1301-
container: apache/gluten:centos-9-jdk8-cudf
1301+
container: apache/gluten:1.5-centos-9-jdk8-cudf
13021302
steps:
13031303
- uses: actions/checkout@v2
13041304
- name: Get Ccache

‎.github/workflows/velox_nightly.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
ccache-centos7-release-default
4949
- name: Build Gluten velox third party
5050
run: |
51-
docker run -v $GITHUB_WORKSPACE:/work -w /work apache/gluten:vcpkg-centos-7 bash -c "
51+
docker run -v $GITHUB_WORKSPACE:/work -w /work apache/gluten:1.5-vcpkg-centos-7 bash -c "
5252
df -a
5353
cd /work
5454
export CCACHE_DIR=/work/.ccache
@@ -173,7 +173,7 @@ jobs:
173173
#TODO: split ARM section into different file
174174
build-native-lib-centos-8-arm64:
175175
runs-on: ubuntu-24.04-arm
176-
container: apache/gluten:vcpkg-centos-8
176+
container: apache/gluten:1.5-vcpkg-centos-8
177177
steps:
178178
- uses: actions/checkout@v4
179179
- name: Get Ccache

‎backends-clickhouse/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<artifactId>gluten-parent</artifactId>
2323
<groupId>org.apache.gluten</groupId>
24-
<version>1.5.0</version>
24+
<version>1.5.1-SNAPSHOT</version>
2525
</parent>
2626
<modelVersion>4.0.0</modelVersion>
2727

‎backends-velox/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<artifactId>gluten-parent</artifactId>
2323
<groupId>org.apache.gluten</groupId>
24-
<version>1.5.0</version>
24+
<version>1.5.1-SNAPSHOT</version>
2525
</parent>
2626
<modelVersion>4.0.0</modelVersion>
2727

0 commit comments

Comments
 (0)