Repository: samza Updated Branches: refs/heads/master 7e1c92c08 -> 9930e5fee
SAMZA-469: Update Scala version to 2.11 Author: McIntosh, Craig <[email protected]> Reviewers: Yi Pan <[email protected]>, Shanthoosh Venkataraman <[email protected]> Closes #28 from craigtmc/master-scala-2.11 and squashes the following commits: 2705376 [McIntosh, Craig] Fix scala version array in check-all.sh 94f1f7c [McIntosh, Craig] SAMZA-469: Update Scala version to 2.11 Project: http://git-wip-us.apache.org/repos/asf/samza/repo Commit: http://git-wip-us.apache.org/repos/asf/samza/commit/9930e5fe Tree: http://git-wip-us.apache.org/repos/asf/samza/tree/9930e5fe Diff: http://git-wip-us.apache.org/repos/asf/samza/diff/9930e5fe Branch: refs/heads/master Commit: 9930e5fee9670ab09807c6437fe0c72567c1aa3c Parents: 7e1c92c Author: McIntosh, Craig <[email protected]> Authored: Wed Dec 21 17:25:31 2016 -0800 Committer: Yi Pan (Data Infrastructure) <[email protected]> Committed: Wed Dec 21 17:25:31 2016 -0800 ---------------------------------------------------------------------- README.md | 4 +-- bin/check-all.sh | 2 +- gradle.properties | 2 +- gradle/dependency-versions-scala-2.11.gradle | 29 ++++++++++++++++++++ .../org/apache/samza/config/TaskConfigJava.java | 2 +- .../apache/samza/container/RunLoopFactory.java | 2 +- .../org/apache/samza/task/AsyncRunLoop.java | 4 +-- 7 files changed, 37 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/samza/blob/9930e5fe/README.md ---------------------------------------------------------------------- diff --git a/README.md b/README.md index 672f220..9522390 100644 --- a/README.md +++ b/README.md @@ -28,9 +28,9 @@ After the bootstrap script has completed, the regular gradlew instructions below #### Scala and YARN -Samza builds with [Scala](http://www.scala-lang.org/) 2.10 and [YARN](http://hadoop.apache.org/docs/current/hadoop-yarn/hadoop-yarn-site/YARN.html) 2.6.1, by default. Use the -PscalaVersion switches to change Scala versions. Samza supports building Scala with 2.10. +Samza builds with [Scala](http://www.scala-lang.org/) 2.10 or 2.11 and [YARN](http://hadoop.apache.org/docs/current/hadoop-yarn/hadoop-yarn-site/YARN.html) 2.6.1, by default. Use the -PscalaVersion switches to change Scala versions. Samza supports building Scala with 2.10 and 2.11. - ./gradlew -PscalaVersion=2.10 clean build + ./gradlew -PscalaVersion=2.11 clean build ### Testing Samza http://git-wip-us.apache.org/repos/asf/samza/blob/9930e5fe/bin/check-all.sh ---------------------------------------------------------------------- diff --git a/bin/check-all.sh b/bin/check-all.sh index cb72247..b612ae5 100755 --- a/bin/check-all.sh +++ b/bin/check-all.sh @@ -21,7 +21,7 @@ set -e -SCALAs=( "2.10" ) +SCALAs=( "2.10" "2.11" ) JDKs=( "JAVA7_HOME" "JAVA8_HOME" ) YARNs=( "2.6.1" "2.7.1" ) http://git-wip-us.apache.org/repos/asf/samza/blob/9930e5fe/gradle.properties ---------------------------------------------------------------------- diff --git a/gradle.properties b/gradle.properties index d977832..49812f4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,7 +16,7 @@ # under the License. group=org.apache.samza version=0.11.1-SNAPSHOT -scalaVersion=2.10 +scalaVersion=2.11 gradleVersion=2.8 http://git-wip-us.apache.org/repos/asf/samza/blob/9930e5fe/gradle/dependency-versions-scala-2.11.gradle ---------------------------------------------------------------------- diff --git a/gradle/dependency-versions-scala-2.11.gradle b/gradle/dependency-versions-scala-2.11.gradle new file mode 100644 index 0000000..e033a86 --- /dev/null +++ b/gradle/dependency-versions-scala-2.11.gradle @@ -0,0 +1,29 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +ext { + scalaVersion = "2.11" + scalaLibVersion = "2.11.8" + // Extra options for the compiler: + // -feature: Give detailed warnings about language feature use (rather than just 'there were 4 warnings') + // -language:implicitConversions: Allow the use of implicit conversions without warning or library import + // -language:reflectiveCalls: Allow the automatic use of reflection to access fields without warning or library import + scalaOptions = "-feature -language:implicitConversions -language:reflectiveCalls" + scalatraVersion = "2.5.0" + jettyVersion = "9.2.7.v20150116" +} http://git-wip-us.apache.org/repos/asf/samza/blob/9930e5fe/samza-core/src/main/java/org/apache/samza/config/TaskConfigJava.java ---------------------------------------------------------------------- diff --git a/samza-core/src/main/java/org/apache/samza/config/TaskConfigJava.java b/samza-core/src/main/java/org/apache/samza/config/TaskConfigJava.java index 021d42a..648fe58 100644 --- a/samza-core/src/main/java/org/apache/samza/config/TaskConfigJava.java +++ b/samza-core/src/main/java/org/apache/samza/config/TaskConfigJava.java @@ -112,7 +112,7 @@ public class TaskConfigJava extends MapConfig { Set<SystemStream> allInputSS = new HashSet<>(); TaskConfig taskConfig = TaskConfig.Config2Task(this); - allInputSS.addAll(JavaConversions.asJavaSet(taskConfig.getInputStreams())); + allInputSS.addAll(JavaConversions.setAsJavaSet(taskConfig.getInputStreams())); allInputSS.addAll(getBroadcastSystemStreams()); return Collections.unmodifiableSet(allInputSS); http://git-wip-us.apache.org/repos/asf/samza/blob/9930e5fe/samza-core/src/main/java/org/apache/samza/container/RunLoopFactory.java ---------------------------------------------------------------------- diff --git a/samza-core/src/main/java/org/apache/samza/container/RunLoopFactory.java b/samza-core/src/main/java/org/apache/samza/container/RunLoopFactory.java index 1c66c82..23a68cb 100644 --- a/samza-core/src/main/java/org/apache/samza/container/RunLoopFactory.java +++ b/samza-core/src/main/java/org/apache/samza/container/RunLoopFactory.java @@ -100,7 +100,7 @@ public class RunLoopFactory { log.info("Run loop in asynchronous mode."); return new AsyncRunLoop( - JavaConversions.asJavaMap(asyncStreamTaskInstances), + JavaConversions.mapAsJavaMap(asyncStreamTaskInstances), threadPool, consumerMultiplexer, taskMaxConcurrency, http://git-wip-us.apache.org/repos/asf/samza/blob/9930e5fe/samza-core/src/main/java/org/apache/samza/task/AsyncRunLoop.java ---------------------------------------------------------------------- diff --git a/samza-core/src/main/java/org/apache/samza/task/AsyncRunLoop.java b/samza-core/src/main/java/org/apache/samza/task/AsyncRunLoop.java index 0376a37..16f1563 100644 --- a/samza-core/src/main/java/org/apache/samza/task/AsyncRunLoop.java +++ b/samza-core/src/main/java/org/apache/samza/task/AsyncRunLoop.java @@ -115,7 +115,7 @@ public class AsyncRunLoop implements Runnable, Throttleable { Map<TaskName, TaskInstance<AsyncStreamTask>> taskInstances, Map<TaskName, AsyncTaskWorker> taskWorkers) { Map<SystemStreamPartition, List<AsyncTaskWorker>> sspToWorkerMap = new HashMap<>(); for (TaskInstance<AsyncStreamTask> task : taskInstances.values()) { - Set<SystemStreamPartition> ssps = JavaConversions.asJavaSet(task.systemStreamPartitions()); + Set<SystemStreamPartition> ssps = JavaConversions.setAsJavaSet(task.systemStreamPartitions()); for (SystemStreamPartition ssp : ssps) { if (sspToWorkerMap.get(ssp) == null) { sspToWorkerMap.put(ssp, new ArrayList<AsyncTaskWorker>()); @@ -354,7 +354,7 @@ public class AsyncRunLoop implements Runnable, Throttleable { */ private Set<SystemStreamPartition> getWorkingSSPSet(TaskInstance<AsyncStreamTask> task) { - Set<SystemStreamPartition> allPartitions = new HashSet<>(JavaConversions.asJavaSet(task.systemStreamPartitions())); + Set<SystemStreamPartition> allPartitions = new HashSet<>(JavaConversions.setAsJavaSet(task.systemStreamPartitions())); // filter only those SSPs that are not at end of stream. Set<SystemStreamPartition> workingSSPSet = allPartitions.stream().filter(ssp -> !consumerMultiplexer.isEndOfStream(ssp)).collect(Collectors.toSet());
