You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by ne...@apache.org on 2015/01/26 04:28:22 UTC
kafka git commit: KAFKA-1818 KAFKA-1818 clean up code to more
idiomatic scala usage; reviewed by Neha Narkhede and Gwen Shapira
Repository: kafka
Updated Branches:
refs/heads/trunk 0b171dee1 -> 0f6cc0a05
KAFKA-1818 KAFKA-1818 clean up code to more idiomatic scala usage; reviewed by Neha Narkhede and Gwen Shapira
Project: http://git-wip-us.apache.org/repos/asf/kafka/repo
Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/0f6cc0a0
Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/0f6cc0a0
Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/0f6cc0a0
Branch: refs/heads/trunk
Commit: 0f6cc0a058bbd2736f1e638448fc64b58a9f6b41
Parents: 0b171de
Author: Eric Olander <ol...@gmail.com>
Authored: Sun Jan 25 19:27:54 2015 -0800
Committer: Neha Narkhede <ne...@gmail.com>
Committed: Sun Jan 25 19:28:14 2015 -0800
----------------------------------------------------------------------
.../scala/kafka/utils/ReplicationUtils.scala | 32 ++++++++------------
.../unit/kafka/utils/ReplicationUtilsTest.scala | 10 ++++++
2 files changed, 22 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kafka/blob/0f6cc0a0/core/src/main/scala/kafka/utils/ReplicationUtils.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/kafka/utils/ReplicationUtils.scala b/core/src/main/scala/kafka/utils/ReplicationUtils.scala
index 7157673..6068733 100644
--- a/core/src/main/scala/kafka/utils/ReplicationUtils.scala
+++ b/core/src/main/scala/kafka/utils/ReplicationUtils.scala
@@ -61,30 +61,22 @@ object ReplicationUtils extends Logging {
def getLeaderIsrAndEpochForPartition(zkClient: ZkClient, topic: String, partition: Int):Option[LeaderIsrAndControllerEpoch] = {
val leaderAndIsrPath = ZkUtils.getTopicPartitionLeaderAndIsrPath(topic, partition)
- val leaderAndIsrInfo = ZkUtils.readDataMaybeNull(zkClient, leaderAndIsrPath)
- val leaderAndIsrOpt = leaderAndIsrInfo._1
- val stat = leaderAndIsrInfo._2
- leaderAndIsrOpt match {
- case Some(leaderAndIsrStr) => parseLeaderAndIsr(leaderAndIsrStr, leaderAndIsrPath, stat)
- case None => None
- }
+ val (leaderAndIsrOpt, stat) = ZkUtils.readDataMaybeNull(zkClient, leaderAndIsrPath)
+ leaderAndIsrOpt.flatMap(leaderAndIsrStr => parseLeaderAndIsr(leaderAndIsrStr, leaderAndIsrPath, stat))
}
private def parseLeaderAndIsr(leaderAndIsrStr: String, path: String, stat: Stat)
: Option[LeaderIsrAndControllerEpoch] = {
- Json.parseFull(leaderAndIsrStr) match {
- case Some(m) =>
- val leaderIsrAndEpochInfo = m.asInstanceOf[Map[String, Any]]
- val leader = leaderIsrAndEpochInfo.get("leader").get.asInstanceOf[Int]
- val epoch = leaderIsrAndEpochInfo.get("leader_epoch").get.asInstanceOf[Int]
- val isr = leaderIsrAndEpochInfo.get("isr").get.asInstanceOf[List[Int]]
- val controllerEpoch = leaderIsrAndEpochInfo.get("controller_epoch").get.asInstanceOf[Int]
- val zkPathVersion = stat.getVersion
- debug("Leader %d, Epoch %d, Isr %s, Zk path version %d for leaderAndIsrPath %s".format(leader, epoch,
- isr.toString(), zkPathVersion, path))
- Some(LeaderIsrAndControllerEpoch(LeaderAndIsr(leader, epoch, isr, zkPathVersion), controllerEpoch))
- case None => None
- }
+ Json.parseFull(leaderAndIsrStr).flatMap {m =>
+ val leaderIsrAndEpochInfo = m.asInstanceOf[Map[String, Any]]
+ val leader = leaderIsrAndEpochInfo.get("leader").get.asInstanceOf[Int]
+ val epoch = leaderIsrAndEpochInfo.get("leader_epoch").get.asInstanceOf[Int]
+ val isr = leaderIsrAndEpochInfo.get("isr").get.asInstanceOf[List[Int]]
+ val controllerEpoch = leaderIsrAndEpochInfo.get("controller_epoch").get.asInstanceOf[Int]
+ val zkPathVersion = stat.getVersion
+ debug("Leader %d, Epoch %d, Isr %s, Zk path version %d for leaderAndIsrPath %s".format(leader, epoch,
+ isr.toString(), zkPathVersion, path))
+ Some(LeaderIsrAndControllerEpoch(LeaderAndIsr(leader, epoch, isr, zkPathVersion), controllerEpoch))}
}
}
http://git-wip-us.apache.org/repos/asf/kafka/blob/0f6cc0a0/core/src/test/scala/unit/kafka/utils/ReplicationUtilsTest.scala
----------------------------------------------------------------------
diff --git a/core/src/test/scala/unit/kafka/utils/ReplicationUtilsTest.scala b/core/src/test/scala/unit/kafka/utils/ReplicationUtilsTest.scala
index 84e0855..305498a 100644
--- a/core/src/test/scala/unit/kafka/utils/ReplicationUtilsTest.scala
+++ b/core/src/test/scala/unit/kafka/utils/ReplicationUtilsTest.scala
@@ -17,6 +17,7 @@
package kafka.utils
+import kafka.controller.LeaderIsrAndControllerEpoch
import kafka.server.{ReplicaFetcherManager, KafkaConfig}
import kafka.api.LeaderAndIsr
import kafka.zk.ZooKeeperTestHarness
@@ -42,6 +43,8 @@ class ReplicationUtilsTest extends JUnit3Suite with ZooKeeperTestHarness {
val topicDataMismatch = Json.encode(Map("controller_epoch" -> 1, "leader" -> 1,
"versions" -> 2, "leader_epoch" -> 2,"isr" -> List(1,2)))
+ val topicDataLeaderIsrAndControllerEpoch = LeaderIsrAndControllerEpoch(LeaderAndIsr(1,leaderEpoch,List(1,2),0), controllerEpoch)
+
override def setUp() {
super.setUp()
@@ -92,4 +95,11 @@ class ReplicationUtilsTest extends JUnit3Suite with ZooKeeperTestHarness {
assertEquals(newZkVersion3,-1)
}
+ @Test
+ def testGetLeaderIsrAndEpochForPartition() {
+ val leaderIsrAndControllerEpoch = ReplicationUtils.getLeaderIsrAndEpochForPartition(zkClient, topic, partitionId)
+ assertEquals(topicDataLeaderIsrAndControllerEpoch, leaderIsrAndControllerEpoch.get)
+ assertEquals(None, ReplicationUtils.getLeaderIsrAndEpochForPartition(zkClient, topic, partitionId + 1))
+ }
+
}