Repository: incubator-samza Updated Branches: refs/heads/master 16be58360 -> f68716d56
SAMZA-271; remove dead code from kafka system consumer Project: http://git-wip-us.apache.org/repos/asf/incubator-samza/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-samza/commit/f68716d5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-samza/tree/f68716d5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-samza/diff/f68716d5 Branch: refs/heads/master Commit: f68716d563a2fbdf5f5cdb0de331ca867a072517 Parents: 16be583 Author: Yan Fang <[email protected]> Authored: Fri May 30 10:19:53 2014 -0700 Committer: Chris Riccomini <[email protected]> Committed: Fri May 30 10:19:53 2014 -0700 ---------------------------------------------------------------------- .../org/apache/samza/system/kafka/KafkaSystemConsumer.scala | 1 - .../scala/org/apache/samza/system/kafka/KafkaSystemFactory.scala | 1 - .../org/apache/samza/system/kafka/TestKafkaSystemConsumer.scala | 4 ++-- 3 files changed, 2 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/f68716d5/samza-kafka/src/main/scala/org/apache/samza/system/kafka/KafkaSystemConsumer.scala ---------------------------------------------------------------------- diff --git a/samza-kafka/src/main/scala/org/apache/samza/system/kafka/KafkaSystemConsumer.scala b/samza-kafka/src/main/scala/org/apache/samza/system/kafka/KafkaSystemConsumer.scala index 1825fbb..f1edda0 100644 --- a/samza-kafka/src/main/scala/org/apache/samza/system/kafka/KafkaSystemConsumer.scala +++ b/samza-kafka/src/main/scala/org/apache/samza/system/kafka/KafkaSystemConsumer.scala @@ -53,7 +53,6 @@ object KafkaSystemConsumer { */ private[kafka] class KafkaSystemConsumer( systemName: String, - brokerListString: String, metrics: KafkaSystemConsumerMetrics, metadataStore: TopicMetadataStore, clientId: String = "undefined-client-id-%s" format UUID.randomUUID.toString, http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/f68716d5/samza-kafka/src/main/scala/org/apache/samza/system/kafka/KafkaSystemFactory.scala ---------------------------------------------------------------------- diff --git a/samza-kafka/src/main/scala/org/apache/samza/system/kafka/KafkaSystemFactory.scala b/samza-kafka/src/main/scala/org/apache/samza/system/kafka/KafkaSystemFactory.scala index a5e8614..f4dc1c1 100644 --- a/samza-kafka/src/main/scala/org/apache/samza/system/kafka/KafkaSystemFactory.scala +++ b/samza-kafka/src/main/scala/org/apache/samza/system/kafka/KafkaSystemFactory.scala @@ -54,7 +54,6 @@ class KafkaSystemFactory extends SystemFactory { new KafkaSystemConsumer( systemName = systemName, - brokerListString = brokerListString, metrics = metrics, metadataStore = metadataStore, clientId = clientId, http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/f68716d5/samza-kafka/src/test/scala/org/apache/samza/system/kafka/TestKafkaSystemConsumer.scala ---------------------------------------------------------------------- diff --git a/samza-kafka/src/test/scala/org/apache/samza/system/kafka/TestKafkaSystemConsumer.scala b/samza-kafka/src/test/scala/org/apache/samza/system/kafka/TestKafkaSystemConsumer.scala index e05fd0b..23e3e35 100644 --- a/samza-kafka/src/test/scala/org/apache/samza/system/kafka/TestKafkaSystemConsumer.scala +++ b/samza-kafka/src/test/scala/org/apache/samza/system/kafka/TestKafkaSystemConsumer.scala @@ -33,7 +33,7 @@ class TestKafkaSystemConsumer { @Test def testFetchThresholdShouldDivideEvenlyAmongPartitions { val metadataStore = new MockMetadataStore - val consumer = new KafkaSystemConsumer("", "", new KafkaSystemConsumerMetrics, metadataStore, fetchThreshold = 50000) { + val consumer = new KafkaSystemConsumer("", new KafkaSystemConsumerMetrics, metadataStore, fetchThreshold = 50000) { override def refreshBrokers(topicPartitionsAndOffsets: Map[TopicAndPartition, String]) { } } @@ -58,7 +58,7 @@ class TestKafkaSystemConsumer { val metadataStore = new MockMetadataStore(Map(streamName -> TopicMetadata(streamName, Seq.empty, 0))) var hosts = List[String]() var getHostPortCount = 0 - val consumer = new KafkaSystemConsumer(systemName, streamName, metrics, metadataStore) { + val consumer = new KafkaSystemConsumer(systemName, metrics, metadataStore) { override def getHostPort(topicMetadata: TopicMetadata, partition: Int): Option[(String, Int)] = { // Generate a unique host every time getHostPort is called. getHostPortCount += 1
