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

Jump to bottom

[BEAM-3875] Update Spark runner to use Spark version 2.3.0 #4893

Merged
merged 1 commit into from
Apr 4, 2018
Merged

[BEAM-3875] Update Spark runner to use Spark version 2.3.0 #4893

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion build_rules.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ def grpc_google_common_protos = "0.1.9"
def hamcrest_version = "1.3"
def hadoop_version = "2.7.3"
def jackson_version = "2.8.9"
def spark_version = "2.2.1"
def spark_version = "2.3.0"
def pubsub_grpc_version = "0.1.18"
def apex_core_version = "3.6.0"
def apex_malhar_version = "3.4.0"
Expand Down
2 changes: 1 addition & 1 deletion examples/java/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@
<id>spark-runner</id>
<properties>
<!-- Spark uses a different netty version than Beam's. -->
<netty.version>4.0.43.Final</netty.version>
<netty.version>4.1.17.Final</netty.version>
</properties>
<dependencies>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@
<pubsub.version>v1-rev10-1.22.0</pubsub.version>
<slf4j.version>1.7.25</slf4j.version>
<spanner.version>0.20.0b-beta</spanner.version>
<spark.version>2.2.1</spark.version>
<spark.version>2.3.0</spark.version>
<spring.version>4.3.5.RELEASE</spring.version>
<stax2.version>3.1.4</stax2.version>
<storage.version>v1-rev71-1.22.0</storage.version>
Expand Down
22 changes: 0 additions & 22 deletions ...s/spark/src/main/java/org/apache/beam/runners/spark/aggregators/metrics/package-info.java
View file
Open in desktop

This file was deleted.

4 changes: 1 addition & 3 deletions runners/spark/src/main/java/org/apache/beam/runners/spark/translation/TranslationUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,11 +385,9 @@ public static Map<TupleTag<?>, Coder<WindowedValue<?>>> getTupleTagCoders(
/**
* checking if we can avoid Serialization - relevant to RDDs. DStreams are memory ser in spark.
* @param level StorageLevel required
* @return
* @return true if the level is memory only
*/
public static boolean avoidRddSerialization(StorageLevel level) {
return level.equals(StorageLevel.MEMORY_ONLY()) || level.equals(StorageLevel.MEMORY_ONLY_2());
}


}
2 changes: 1 addition & 1 deletion sdks/java/io/hadoop-input-format/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
<profile>
<id>spark-runner</id>
<properties>
<netty.version>4.0.43.Final</netty.version>
<netty.version>4.1.17.Final</netty.version>
</properties>
<dependencies>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion sdks/java/io/jdbc/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<profile>
<id>spark-runner</id>
<properties>
<netty.version>4.0.43.Final</netty.version>
<netty.version>4.1.17.Final</netty.version>
</properties>
<dependencies>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@
<!-- Makes the SparkRunner available when running a pipeline. Additionally,
overrides some Spark dependencies to Beam-compatible versions. -->
<properties>
<netty.version>4.0.43.Final</netty.version>
<netty.version>4.1.17.Final</netty.version>
</properties>
<dependencies>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion sdks/java/nexmark/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
<id>spark-runner</id>
<properties>
<!-- Spark uses a different netty version than Beam's. -->
<netty.version>4.0.43.Final</netty.version>
<netty.version>4.1.17.Final</netty.version>
</properties>
<dependencies>
<dependency>
Expand Down