You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@samza.apache.org by ja...@apache.org on 2018/02/21 19:43:46 UTC
samza git commit: Fixes to get the build working with Scala 2.10 build
Repository: samza
Updated Branches:
refs/heads/master 6dc89e100 -> 6270e40b2
Fixes to get the build working with Scala 2.10 build
The fixes needed to get the build working with the Scala 2.10.
Author: Srinivasulu Punuru <sp...@linkedin.com>
Reviewers: Jagadish <ja...@apache.org>, Jacob M<jm...@apache.org>, Bharath K<bk...@linkedin.com>, Xinyu L<xi...@linkedin.com>
Closes #424 from srinipunuru/rel-fixes.1
Project: http://git-wip-us.apache.org/repos/asf/samza/repo
Commit: http://git-wip-us.apache.org/repos/asf/samza/commit/6270e40b
Tree: http://git-wip-us.apache.org/repos/asf/samza/tree/6270e40b
Diff: http://git-wip-us.apache.org/repos/asf/samza/diff/6270e40b
Branch: refs/heads/master
Commit: 6270e40b2943523e75de1e919dd864e876038f5c
Parents: 6dc89e1
Author: Srinivasulu Punuru <sp...@linkedin.com>
Authored: Wed Feb 21 11:45:23 2018 -0800
Committer: Jagadish <jv...@linkedin.com>
Committed: Wed Feb 21 11:45:23 2018 -0800
----------------------------------------------------------------------
build.gradle | 8 ++++++++
.../main/java/org/apache/samza/system/SystemAdmins.java | 5 ++---
.../org/apache/samza/checkpoint/TestOffsetManager.scala | 10 +++++-----
.../org/apache/samza/system/kafka/MockKafkaProducer.java | 2 +-
4 files changed, 16 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/samza/blob/6270e40b/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 68e9bcf..d357645 100644
--- a/build.gradle
+++ b/build.gradle
@@ -115,6 +115,13 @@ subprojects {
apply plugin: 'project-report'
apply plugin: 'jacoco'
+ tasks.withType(ScalaCompile) {
+ // show compile errors in console output
+ logging.setLevel LogLevel.WARN
+ scalaCompileOptions.fork = false
+ scalaCompileOptions.useAnt = true
+ }
+
tasks.withType(Test) {
test {
testLogging {
@@ -373,6 +380,7 @@ project(":samza-kafka_$scalaVersion") {
dependencies {
compile project(':samza-api')
compile project(":samza-core_$scalaVersion")
+ compile "log4j:log4j:$log4jVersion"
compile "org.scala-lang:scala-library:$scalaLibVersion"
compile "com.101tec:zkclient:$zkClientVersion"
compile "org.apache.zookeeper:zookeeper:$zookeeperVersion"
http://git-wip-us.apache.org/repos/asf/samza/blob/6270e40b/samza-core/src/main/java/org/apache/samza/system/SystemAdmins.java
----------------------------------------------------------------------
diff --git a/samza-core/src/main/java/org/apache/samza/system/SystemAdmins.java b/samza-core/src/main/java/org/apache/samza/system/SystemAdmins.java
index ae96b2d..7e8f527 100644
--- a/samza-core/src/main/java/org/apache/samza/system/SystemAdmins.java
+++ b/samza-core/src/main/java/org/apache/samza/system/SystemAdmins.java
@@ -43,13 +43,13 @@ public class SystemAdmins {
}
public void start() {
- for (SystemAdmin systemAdmin: systemAdminMap.values()) {
+ for (SystemAdmin systemAdmin : systemAdminMap.values()) {
systemAdmin.start();
}
}
public void stop() {
- for (SystemAdmin systemAdmin: systemAdminMap.values()) {
+ for (SystemAdmin systemAdmin : systemAdminMap.values()) {
systemAdmin.stop();
}
}
@@ -60,5 +60,4 @@ public class SystemAdmins {
}
return systemAdminMap.get(systemName);
}
-
}
http://git-wip-us.apache.org/repos/asf/samza/blob/6270e40b/samza-core/src/test/scala/org/apache/samza/checkpoint/TestOffsetManager.scala
----------------------------------------------------------------------
diff --git a/samza-core/src/test/scala/org/apache/samza/checkpoint/TestOffsetManager.scala b/samza-core/src/test/scala/org/apache/samza/checkpoint/TestOffsetManager.scala
index 64c0088..a4dcc46 100644
--- a/samza-core/src/test/scala/org/apache/samza/checkpoint/TestOffsetManager.scala
+++ b/samza-core/src/test/scala/org/apache/samza/checkpoint/TestOffsetManager.scala
@@ -61,7 +61,7 @@ class TestOffsetManager {
val config = new MapConfig
val checkpointManager = getCheckpointManager(systemStreamPartition, taskName)
val systemAdmins = Map("test-system" -> getSystemAdmin)
- val offsetManager = OffsetManager(systemStreamMetadata, config, checkpointManager, new SystemAdmins(systemAdmins.asJava), Map(), new OffsetManagerMetrics)
+ val offsetManager = OffsetManager(systemStreamMetadata, config, checkpointManager, new SystemAdmins(systemAdmins.asJava.asInstanceOf[java.util.Map[String, SystemAdmin]]), Map(), new OffsetManagerMetrics)
offsetManager.register(taskName, Set(systemStreamPartition))
offsetManager.start
assertTrue(checkpointManager.isStarted)
@@ -94,7 +94,7 @@ class TestOffsetManager {
val systemStreamMetadata = Map(systemStream -> testStreamMetadata)
val config = new MapConfig
val checkpointManager = getCheckpointManager(systemStreamPartition, taskName)
- val systemAdmins = new SystemAdmins(Map("test-system" -> getSystemAdmin).asJava)
+ val systemAdmins = new SystemAdmins(Map("test-system" -> getSystemAdmin).asJava.asInstanceOf[java.util.Map[String, SystemAdmin]])
val offsetManager = OffsetManager(systemStreamMetadata, config, checkpointManager, systemAdmins, Map(), new OffsetManagerMetrics)
offsetManager.register(taskName, Set(systemStreamPartition))
offsetManager.start
@@ -152,7 +152,7 @@ class TestOffsetManager {
val checkpointManager = getCheckpointManager(systemStreamPartition1, taskName1)
val systemAdmins = Map("test-system" -> getSystemAdmin)
val config = new MapConfig
- val offsetManager = OffsetManager(systemStreamMetadata, config, checkpointManager, new SystemAdmins(systemAdmins.asJava))
+ val offsetManager = OffsetManager(systemStreamMetadata, config, checkpointManager, new SystemAdmins(systemAdmins.asJava.asInstanceOf[java.util.Map[String, SystemAdmin]]))
// Register both partitions. Partition 2 shouldn't have a checkpoint.
offsetManager.register(taskName1, Set(systemStreamPartition1))
offsetManager.register(taskName2, Set(systemStreamPartition2))
@@ -261,7 +261,7 @@ class TestOffsetManager {
Map()
val offsetManager = OffsetManager(systemStreamMetadata, config, checkpointManager,
- new SystemAdmins(systemAdmins.asJava), checkpointListeners, new OffsetManagerMetrics)
+ new SystemAdmins(systemAdmins.asJava.asInstanceOf[java.util.Map[String, SystemAdmin]]), checkpointListeners, new OffsetManagerMetrics)
offsetManager.register(taskName, Set(systemStreamPartition, systemStreamPartition2))
offsetManager.start
@@ -307,7 +307,7 @@ class TestOffsetManager {
val systemStreamMetadata = Map(systemStream -> testStreamMetadata)
val checkpointManager = getCheckpointManager(systemStreamPartition, taskName)
val systemAdmins = Map("test-system" -> getSystemAdmin)
- val offsetManager = OffsetManager(systemStreamMetadata, new MapConfig, checkpointManager, new SystemAdmins(systemAdmins.asJava), Map(), new OffsetManagerMetrics)
+ val offsetManager = OffsetManager(systemStreamMetadata, new MapConfig, checkpointManager, new SystemAdmins(systemAdmins.asJava.asInstanceOf[java.util.Map[String, SystemAdmin]]), Map(), new OffsetManagerMetrics)
offsetManager.register(taskName, Set(systemStreamPartition))
offsetManager.start
http://git-wip-us.apache.org/repos/asf/samza/blob/6270e40b/samza-kafka/src/test/java/org/apache/samza/system/kafka/MockKafkaProducer.java
----------------------------------------------------------------------
diff --git a/samza-kafka/src/test/java/org/apache/samza/system/kafka/MockKafkaProducer.java b/samza-kafka/src/test/java/org/apache/samza/system/kafka/MockKafkaProducer.java
index e66b7c3..789617c 100644
--- a/samza-kafka/src/test/java/org/apache/samza/system/kafka/MockKafkaProducer.java
+++ b/samza-kafka/src/test/java/org/apache/samza/system/kafka/MockKafkaProducer.java
@@ -209,7 +209,7 @@ public class MockKafkaProducer implements Producer<byte[], byte[]> {
}
public void sendOffsetsToTransaction(Map<TopicPartition, OffsetAndMetadata> offsets, String consumerGroupId) {
-
+
}
private static class FutureFailure implements Future<RecordMetadata> {