Skip to content

Commit

Permalink
Support for Spark 2.4.3. (#108)
Browse files Browse the repository at this point in the history
  • Loading branch information
imback82 committed Jun 3, 2019
1 parent aa3eb13 commit eb26baa
Show file tree
Hide file tree
Showing 6 changed files with 47 additions and 6 deletions.
32 changes: 32 additions & 0 deletions README.md
Expand Up @@ -12,6 +12,7 @@

## Table of Contents

- [Supported Apache Spark](#supported-apache-spark)
- [Get Started](#get-started)
- [Build Status](#build-status)
- [Building from Source](#building-from-source)
Expand All @@ -23,6 +24,37 @@
- [Code of Conduct](#code-of-conduct)
- [License](#license)

## Supported Apache Spark

<table>
<thead>
<tr>
<th>Apache Spark</th>
<th>.NET for Apache Spark</th>
</tr>
</thead>
<tbody align="center">
<tr>
<td >2.3.*</td>
<td rowspan=3><a href="https://github.com/dotnet/spark/releases/tag/v0.2.0">v0.2.0</a></td>
</tr>
<tr>
<td>2.4.0</td>
</tr>
<tr>
<td>2.4.1</td>
</tr>
<tr>
<td>2.4.2</td>
<td><a href="https://github.com/dotnet/spark/issues/60">Not supported</a></td>
</tr>
<tr>
<td>2.4.3</td>
<td>master branch</td>
</tr>
</tbody>
</table>

## Get Started
These instructions will show you how to run a .NET for Apache Spark app using .NET Core.
- [Windows Instructions](docs/getting-started/windows-instructions.md)
Expand Down
11 changes: 11 additions & 0 deletions azure-pipelines.yml
Expand Up @@ -123,6 +123,17 @@ jobs:
HADOOP_HOME: $(Build.BinariesDirectory)\hadoop
DOTNET_WORKER_DIR: $(Build.ArtifactStagingDirectory)\Microsoft.Spark.Worker\netcoreapp2.1\win-x64

- task: DotNetCoreCLI@2
displayName: 'E2E tests for Spark 2.4.3'
inputs:
command: test
projects: '**/Microsoft.Spark.E2ETest/*.csproj'
arguments: '--configuration $(buildConfiguration) /p:CollectCoverage=true /p:CoverletOutputFormat=cobertura'
env:
SPARK_HOME: $(Build.BinariesDirectory)\spark-2.4.3-bin-hadoop2.7
HADOOP_HOME: $(Build.BinariesDirectory)\hadoop
DOTNET_WORKER_DIR: $(Build.ArtifactStagingDirectory)\Microsoft.Spark.Worker\netcoreapp2.1\win-x64

- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
- task: CopyFiles@2
displayName: Stage .NET artifacts
Expand Down
5 changes: 1 addition & 4 deletions docs/release-notes/0.2/release-0.2.md
Expand Up @@ -38,10 +38,7 @@ The following table outlines the supported Spark versions along with the microso
</tr>
<tr>
<td>2.4.0</td>
<td rowspan=4>microsoft-spark-2.4.x-0.2.0.jar</td>
</tr>
<tr>
<td>2.4.0</td>
<td rowspan=2>microsoft-spark-2.4.x-0.2.0.jar</td>
</tr>
<tr>
<td>2.4.1</td>
Expand Down
1 change: 1 addition & 0 deletions script/download-spark-distros.cmd
Expand Up @@ -19,5 +19,6 @@ curl -k -L -o spark-2.3.2.tgz https://archive.apache.org/dist/spark/spark-2.3.2/
curl -k -L -o spark-2.3.3.tgz https://archive.apache.org/dist/spark/spark-2.3.3/spark-2.3.3-bin-hadoop2.7.tgz && tar xzvf spark-2.3.3.tgz
curl -k -L -o spark-2.4.0.tgz https://archive.apache.org/dist/spark/spark-2.4.0/spark-2.4.0-bin-hadoop2.7.tgz && tar xzvf spark-2.4.0.tgz
curl -k -L -o spark-2.4.1.tgz https://archive.apache.org/dist/spark/spark-2.4.1/spark-2.4.1-bin-hadoop2.7.tgz && tar xzvf spark-2.4.1.tgz
curl -k -L -o spark-2.4.3.tgz https://archive.apache.org/dist/spark/spark-2.4.3/spark-2.4.3-bin-hadoop2.7.tgz && tar xzvf spark-2.4.3.tgz

endlocal
2 changes: 1 addition & 1 deletion src/scala/microsoft-spark-2.4.x/pom.xml
Expand Up @@ -12,7 +12,7 @@
<encoding>UTF-8</encoding>
<scala.version>2.11.8</scala.version>
<scala.binary.version>2.11</scala.binary.version>
<spark.version>2.4.1</spark.version>
<spark.version>2.4.3</spark.version>
</properties>

<dependencies>
Expand Down
Expand Up @@ -33,7 +33,7 @@ import scala.util.Try
*/
object DotnetRunner extends Logging {
private val DEBUG_PORT = 5567
private val supportedSparkVersions = Set[String]("2.4.0", "2.4.1")
private val supportedSparkVersions = Set[String]("2.4.0", "2.4.1", "2.4.3")

val SPARK_VERSION = DotnetUtils.normalizeSparkVersion(spark.SPARK_VERSION)

Expand Down

0 comments on commit eb26baa

Please sign in to comment.