Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix unit-tests for Spark-340 and Add spark-versions to gh-workflow #503

Merged
merged 3 commits into from
Aug 22, 2023
+17 −8
Merged

Fix unit-tests for Spark-340 and Add spark-versions to gh-workflow #503

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
56db281
Fix unit-tests for Spark-340
amahussein Aug 22, 2023
8c41a5f
Fix the unit-test for spark-320-330
amahussein Aug 22, 2023
bc3a004
Merge branch 'dev' into spark-rapids-tools-498
amahussein Aug 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions .github/workflows/mvn-verify-check.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@ on:
jobs:
build:
runs-on: ubuntu-latest

strategy:
matrix:
spark-version: ['311', '320', '330', '341']
steps:
- uses: actions/checkout@v3

Expand All @@ -32,5 +34,5 @@ jobs:
distribution: adopt
java-version: 8

- name: Run mvn verify
run: cd core && mvn verify
- name: Run mvn verify with Spark ${{ matrix.spark-version }}
run: cd core && mvn -Dbuildver=${{ matrix.spark-version }} verify
4 changes: 2 additions & 2 deletions core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@
<spark332.version>3.3.2</spark332.version>
<spark333.version>3.3.3-SNAPSHOT</spark333.version>
<spark340.version>3.4.0</spark340.version>
<spark341.version>3.4.1-SNAPSHOT</spark341.version>
<spark341.version>3.4.1</spark341.version>
<spark350.version>3.5.0-SNAPSHOT</spark350.version>
<scala.binary.version>2.12</scala.binary.version>
<scala.plugin.version>4.3.0</scala.plugin.version>
Expand Down Expand Up @@ -361,7 +361,7 @@
<delta21x.version>2.1.1</delta21x.version>
<delta22x.version>2.2.0</delta22x.version>
<delta23x.version>2.3.0</delta23x.version>
<delta24x.version>2.4.0rc1</delta24x.version>
<delta24x.version>2.4.0</delta24x.version>
<delta.core.version>${delta10x.version}</delta.core.version>
<java.version>1.8</java.version>
<maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
Expand Down
2 changes: 0 additions & 2 deletions core/src/main/scala/com/nvidia/spark/rapids/tool/profiling/AutoTuner.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -763,8 +763,6 @@ class AutoTuner(
&& appInfoProvider.getRedundantReadSize > DEF_READ_SIZE_THRESHOLD) {
appendRecommendation("spark.rapids.filecache.enabled", "true")
appendComment("Enable file cache only if Spark local disks bandwidth is > 1 GB/s")
} else {
null
}
}

Expand Down
11 changes: 10 additions & 1 deletion core/src/test/scala/com/nvidia/spark/rapids/tool/qualification/QualificationSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1154,7 +1154,16 @@ class QualificationSuite extends BaseTestSuite {
try {
val lines = inputSource.getLines.toSeq
// 1 for header, 1 for values
assert(lines.size == 6)

val expLinesSize =
if (ToolUtils.isSpark340OrLater()) {
8
} else if (!ToolUtils.isSpark320OrLater()) {
6
} else {
7
}
assert(lines.size == expLinesSize)
assert(lines.head.contains("App ID,Unsupported Type,"))
assert(lines(1).contains("\"Read\",\"JSON\",\"Types not supported - bigint:int\""))
} finally {
Expand Down