Skip to content

Commit d7d78a4

Browse files
baibaichenbaibaichen
committed
Spark: Initial support for 4.1.0
2 parents 9b3d303 + d2ee788 commit d7d78a4

43 files changed

Lines changed: 1703 additions & 53 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/util/install-spark-resources.sh‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,11 @@ case "$1" in
119119
cd ${INSTALL_DIR} && \
120120
install_spark "4.0.1" "3" "2.12"
121121
;;
122+
4.1)
123+
# Spark-4.x, scala 2.12 // using 2.12 as a hack as 4.0 does not have 2.13 suffix
124+
cd ${INSTALL_DIR} && \
125+
install_spark "4.1.0" "3" "2.12"
126+
;;
122127
*)
123128
echo "Spark version is expected to be specified."
124129
exit 1

‎.github/workflows/velox_backend_x86.yml‎

Lines changed: 106 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1483,3 +1483,109 @@ jobs:
14831483
**/target/*.log
14841484
**/gluten-ut/**/hs_err_*.log
14851485
**/gluten-ut/**/core.*
1486+
1487+
spark-test-spark41:
1488+
needs: build-native-lib-centos-7
1489+
runs-on: ubuntu-22.04
1490+
env:
1491+
SPARK_TESTING: true
1492+
container: apache/gluten:centos-8-jdk17
1493+
steps:
1494+
- uses: actions/checkout@v2
1495+
- name: Download All Artifacts
1496+
uses: actions/download-artifact@v4
1497+
with:
1498+
name: velox-native-lib-centos-7-${{github.sha}}
1499+
path: ./cpp/build/releases
1500+
- name: Download Arrow Jars
1501+
uses: actions/download-artifact@v4
1502+
with:
1503+
name: arrow-jars-centos-7-${{github.sha}}
1504+
path: /root/.m2/repository/org/apache/arrow/
1505+
- name: Prepare
1506+
run: |
1507+
dnf module -y install python39 && \
1508+
alternatives --set python3 /usr/bin/python3.9 && \
1509+
pip3 install setuptools==77.0.3 && \
1510+
pip3 install pyspark==3.5.5 cython && \
1511+
pip3 install pandas==2.2.3 pyarrow==20.0.0
1512+
- name: Prepare Spark Resources for Spark 4.1.0 #TODO remove after image update
1513+
run: |
1514+
rm -rf /opt/shims/spark41
1515+
bash .github/workflows/util/install-spark-resources.sh 4.1
1516+
mv /opt/shims/spark41/spark_home/assembly/target/scala-2.12 /opt/shims/spark41/spark_home/assembly/target/scala-2.13
1517+
- name: Build and Run unit test for Spark 4.1.0 with scala-2.13 (other tests)
1518+
run: |
1519+
cd $GITHUB_WORKSPACE/
1520+
export SPARK_SCALA_VERSION=2.13
1521+
yum install -y java-17-openjdk-devel
1522+
export JAVA_HOME=/usr/lib/jvm/java-17-openjdk
1523+
export PATH=$JAVA_HOME/bin:$PATH
1524+
java -version
1525+
$MVN_CMD clean test -Pspark-4.1 -Pscala-2.13 -Pjava-17 -Pbackends-velox \
1526+
-Pspark-ut -DargLine="-Dspark.test.home=/opt/shims/spark41/spark_home/" \
1527+
-DtagsToExclude=org.apache.spark.tags.ExtendedSQLTest,org.apache.gluten.tags.UDFTest,org.apache.gluten.tags.EnhancedFeaturesTest,org.apache.gluten.tags.SkipTest
1528+
- name: Upload test report
1529+
if: always()
1530+
uses: actions/upload-artifact@v4
1531+
with:
1532+
name: ${{ github.job }}-report
1533+
path: '**/surefire-reports/TEST-*.xml'
1534+
- name: Upload unit tests log files
1535+
if: ${{ !success() }}
1536+
uses: actions/upload-artifact@v4
1537+
with:
1538+
name: ${{ github.job }}-test-log
1539+
path: |
1540+
**/target/*.log
1541+
**/gluten-ut/**/hs_err_*.log
1542+
**/gluten-ut/**/core.*
1543+
1544+
spark-test-spark41-slow:
1545+
needs: build-native-lib-centos-7
1546+
runs-on: ubuntu-22.04
1547+
env:
1548+
SPARK_TESTING: true
1549+
container: apache/gluten:centos-8-jdk17
1550+
steps:
1551+
- uses: actions/checkout@v2
1552+
- name: Download All Artifacts
1553+
uses: actions/download-artifact@v4
1554+
with:
1555+
name: velox-native-lib-centos-7-${{github.sha}}
1556+
path: ./cpp/build/releases
1557+
- name: Download Arrow Jars
1558+
uses: actions/download-artifact@v4
1559+
with:
1560+
name: arrow-jars-centos-7-${{github.sha}}
1561+
path: /root/.m2/repository/org/apache/arrow/
1562+
- name: Prepare Spark Resources for Spark 4.1.0 #TODO remove after image update
1563+
run: |
1564+
rm -rf /opt/shims/spark41
1565+
bash .github/workflows/util/install-spark-resources.sh 4.1
1566+
mv /opt/shims/spark41/spark_home/assembly/target/scala-2.12 /opt/shims/spark41/spark_home/assembly/target/scala-2.13
1567+
- name: Build and Run unit test for Spark 4.0 (slow tests)
1568+
run: |
1569+
cd $GITHUB_WORKSPACE/
1570+
yum install -y java-17-openjdk-devel
1571+
export JAVA_HOME=/usr/lib/jvm/java-17-openjdk
1572+
export PATH=$JAVA_HOME/bin:$PATH
1573+
java -version
1574+
$MVN_CMD clean test -Pspark-4.1 -Pscala-2.13 -Pjava-17 -Pbackends-velox -Pspark-ut \
1575+
-DargLine="-Dspark.test.home=/opt/shims/spark41/spark_home/" \
1576+
-DtagsToInclude=org.apache.spark.tags.ExtendedSQLTest
1577+
- name: Upload test report
1578+
if: always()
1579+
uses: actions/upload-artifact@v4
1580+
with:
1581+
name: ${{ github.job }}-report
1582+
path: '**/surefire-reports/TEST-*.xml'
1583+
- name: Upload unit tests log files
1584+
if: ${{ !success() }}
1585+
uses: actions/upload-artifact@v4
1586+
with:
1587+
name: ${{ github.job }}-test-log
1588+
path: |
1589+
**/target/*.log
1590+
**/gluten-ut/**/hs_err_*.log
1591+
**/gluten-ut/**/core.*

‎backends-velox/src/main/scala/org/apache/gluten/extension/ArrowConvertorRule.scala‎

Lines changed: 9 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@ import org.apache.spark.sql.catalyst.rules.Rule
2929
import org.apache.spark.sql.catalyst.util.PermissiveMode
3030
import org.apache.spark.sql.execution.datasources.{HadoopFsRelation, LogicalRelation}
3131
import org.apache.spark.sql.execution.datasources.csv.CSVFileFormat
32-
import org.apache.spark.sql.execution.datasources.v2.DataSourceV2Relation
33-
import org.apache.spark.sql.execution.datasources.v2.csv.CSVTable
32+
import org.apache.spark.sql.execution.datasources.v2.DataSourceV2RelationShim.CSVTableExtractor
3433
import org.apache.spark.sql.types.StructType
3534
import org.apache.spark.sql.utils.SparkArrowUtil
3635

@@ -56,25 +55,15 @@ case class ArrowConvertorRule(session: SparkSession) extends Rule[LogicalPlan] {
5655
l.copy(relation = r.copy(fileFormat = new ArrowCSVFileFormat(csvOptions))(session))
5756
case _ => l
5857
}
59-
case d @ DataSourceV2Relation(
60-
t @ CSVTable(
61-
name,
62-
sparkSession,
63-
options,
64-
paths,
65-
userSpecifiedSchema,
66-
fallbackFileFormat),
67-
_,
68-
_,
69-
_,
70-
_) if validate(session, t.dataSchema, options.asCaseSensitiveMap().toMap) =>
58+
case CSVTableExtractor(d, t)
59+
if validate(session, t.dataSchema, t.options.asCaseSensitiveMap().toMap) =>
7160
d.copy(table = ArrowCSVTable(
72-
"arrow" + name,
73-
sparkSession,
74-
options,
75-
paths,
76-
userSpecifiedSchema,
77-
fallbackFileFormat))
61+
"arrow" + t.name,
62+
t.sparkSession,
63+
t.options,
64+
t.paths,
65+
t.userSpecifiedSchema,
66+
t.fallbackFileFormat))
7867
case r =>
7968
r
8069
}

‎backends-velox/src/main/scala/org/apache/gluten/utils/ParquetMetadataUtils.scala‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import org.apache.gluten.sql.shims.SparkShimLoader
2121

2222
import org.apache.spark.internal.Logging
2323
import org.apache.spark.sql.execution.datasources.DataSourceUtils
24-
import org.apache.spark.sql.execution.datasources.parquet.{ParquetFooterReader, ParquetOptions}
24+
import org.apache.spark.sql.execution.datasources.parquet.{ParquetFooterReaderShim, ParquetOptions}
2525

2626
import org.apache.hadoop.conf.Configuration
2727
import org.apache.hadoop.fs.{FileSystem, LocatedFileStatus, Path}
@@ -135,7 +135,7 @@ object ParquetMetadataUtils extends Logging {
135135
parquetOptions: ParquetOptions): Option[String] = {
136136
val footer =
137137
try {
138-
ParquetFooterReader.readFooter(conf, fileStatus, ParquetMetadataConverter.NO_FILTER)
138+
ParquetFooterReaderShim.readFooter(conf, fileStatus, ParquetMetadataConverter.NO_FILTER)
139139
} catch {
140140
case e: Exception if ExceptionUtils.hasCause(e, classOf[ParquetCryptoRuntimeException]) =>
141141
return Some("Encrypted Parquet footer detected.")

‎backends-velox/src/test/scala/org/apache/gluten/execution/MiscOperatorSuite.scala‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -753,7 +753,11 @@ class MiscOperatorSuite extends VeloxWholeStageTransformerSuite with AdaptiveSpa
753753
val df = sql("SELECT 1")
754754
checkAnswer(df, Row(1))
755755
val plan = df.queryExecution.executedPlan
756-
assert(plan.find(_.isInstanceOf[RDDScanExec]).isDefined)
756+
if (isSparkVersionGE("4.1")) {
757+
assert(plan.find(_.getClass.getSimpleName == "OneRowRelationExec").isDefined)
758+
} else {
759+
assert(plan.find(_.isInstanceOf[RDDScanExec]).isDefined)
760+
}
757761
assert(plan.find(_.isInstanceOf[ProjectExecTransformer]).isDefined)
758762
assert(plan.find(_.isInstanceOf[RowToVeloxColumnarExec]).isDefined)
759763
}

‎backends-velox/src/test/scala/org/apache/gluten/execution/VeloxHashJoinSuite.scala‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,12 +92,9 @@ class VeloxHashJoinSuite extends VeloxWholeStageTransformerSuite {
9292

9393
// The computing is combined into one single whole stage transformer.
9494
val wholeStages = plan.collect { case wst: WholeStageTransformer => wst }
95-
if (SparkShimLoader.getSparkVersion.startsWith("3.2.")) {
95+
if (isSparkVersionLE("3.2")) {
9696
assert(wholeStages.length == 1)
97-
} else if (
98-
SparkShimLoader.getSparkVersion.startsWith("3.5.") ||
99-
SparkShimLoader.getSparkVersion.startsWith("4.0.")
100-
) {
97+
} else if (isSparkVersionGE("3.5")) {
10198
assert(wholeStages.length == 5)
10299
} else {
103100
assert(wholeStages.length == 3)

‎backends-velox/src/test/scala/org/apache/gluten/execution/VeloxStringFunctionsSuite.scala‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -544,7 +544,8 @@ class VeloxStringFunctionsSuite extends VeloxWholeStageTransformerSuite {
544544
s"from $LINEITEM_TABLE limit 5") { _ => }
545545
}
546546

547-
testWithMinSparkVersion("split", "3.4") {
547+
// TODO: fix on spark-4.1
548+
testWithSpecifiedSparkVersion("split", "3.4", "3.5") {
548549
runQueryAndCompare(
549550
s"select l_orderkey, l_comment, split(l_comment, '') " +
550551
s"from $LINEITEM_TABLE limit 5") {

‎backends-velox/src/test/scala/org/apache/gluten/execution/python/ArrowEvalPythonExecSuite.scala‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ class ArrowEvalPythonExecSuite extends WholeStageTransformerSuite {
3939
.set("spark.executor.cores", "1")
4040
}
4141

42-
test("arrow_udf test: without projection") {
42+
// TODO: fix on spark-4.1
43+
testWithMaxSparkVersion("arrow_udf test: without projection", "4.0") {
4344
lazy val base =
4445
Seq(("1", 1), ("1", 2), ("2", 1), ("2", 2), ("3", 1), ("3", 2), ("0", 1), ("3", 0))
4546
.toDF("a", "b")
@@ -59,7 +60,8 @@ class ArrowEvalPythonExecSuite extends WholeStageTransformerSuite {
5960
checkAnswer(df2, expected)
6061
}
6162

62-
test("arrow_udf test: with unrelated projection") {
63+
// TODO: fix on spark-4.1
64+
testWithMaxSparkVersion("arrow_udf test: with unrelated projection", "4.0") {
6365
lazy val base =
6466
Seq(("1", 1), ("1", 2), ("2", 1), ("2", 2), ("3", 1), ("3", 2), ("0", 1), ("3", 0))
6567
.toDF("a", "b")

‎gluten-core/src/main/scala/org/apache/gluten/extension/caller/CallerInfo.scala‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ package org.apache.gluten.extension.caller
1818

1919
import org.apache.spark.sql.execution.adaptive.AdaptiveSparkPlanExec
2020
import org.apache.spark.sql.execution.columnar.InMemoryRelation
21-
import org.apache.spark.sql.execution.streaming.StreamExecution
21+
import org.apache.spark.util.SparkVersionUtil
2222

2323
/**
2424
* Helper API that stores information about the call site of the columnar rule. Specific columnar
@@ -70,7 +70,12 @@ object CallerInfo {
7070
}
7171

7272
private def inStreamingCall(stack: Seq[StackTraceElement]): Boolean = {
73-
stack.exists(_.getClassName.equals(StreamExecution.getClass.getName.split('$').head))
73+
val streamName = if (SparkVersionUtil.gteSpark41) {
74+
"org.apache.spark.sql.execution.streaming.runtime.StreamExecution"
75+
} else {
76+
"org.apache.spark.sql.execution.streaming.StreamExecution"
77+
}
78+
stack.exists(_.getClassName.equals(streamName))
7479
}
7580

7681
private def inBloomFilterStatFunctionCall(stack: Seq[StackTraceElement]): Boolean = {

‎gluten-core/src/main/scala/org/apache/spark/util/SparkVersionUtil.scala‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ object SparkVersionUtil {
2525
val gteSpark33: Boolean = comparedWithSpark33 >= 0
2626
val gteSpark35: Boolean = comparedWithSpark35 >= 0
2727
val gteSpark40: Boolean = compareMajorMinorVersion((4, 0)) >= 0
28+
val gteSpark41: Boolean = compareMajorMinorVersion((4, 1)) >= 0
2829

2930
// Returns X. X < 0 if one < other, x == 0 if one == other, x > 0 if one > other.
3031
def compareMajorMinorVersion(other: (Int, Int)): Int = {

0 commit comments

Comments
 (0)