Code cleanup. Deleted a constructor from ByteBufferMessageSet and an …

…overloaded method from MessageSet
ramdhanyk · Jul 22, 2011 · e039b8e · e039b8e
1 parent fab1263
commit e039b8e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 26 deletions.
diff --git a/core/src/main/scala/kafka/message/ByteBufferMessageSet.scala b/core/src/main/scala/kafka/message/ByteBufferMessageSet.scala
@@ -61,25 +61,6 @@ class ByteBufferMessageSet(val buffer: ByteBuffer,
       }, 0L, ErrorMapping.NoError, true)
   }
 
-  def this(compressionCodec: CompressionCodec, messages: Iterable[Message]) {
-    this(
-      compressionCodec match {
-        case NoCompressionCodec =>
-          val buffer = ByteBuffer.allocate(MessageSet.messageSetSize(messages))
-          for (message <- messages) {
-            message.serializeTo(buffer)
-          }
-          buffer.rewind
-          buffer
-        case _ =>
-          val message = CompressionUtils.compress(messages, compressionCodec)
-          val buffer = ByteBuffer.allocate(message.serializedSize)
-          message.serializeTo(buffer)
-          buffer.rewind
-          buffer
-      }, 0L, ErrorMapping.NoError, true)
-  }
-
   def getDeepIterate = deepIterate
 
   def getBuffer = buffer
@@ -120,7 +101,7 @@ class ByteBufferMessageSet(val buffer: ByteBuffer,
     case false => shallowIterator
   }
 
-  def shallowIterator(): Iterator[MessageOffset] = {
+  private def shallowIterator(): Iterator[MessageOffset] = {
     ErrorMapping.maybeThrowException(errorCode)
     new IteratorTemplate[MessageOffset] {
       var iter = buffer.slice()
@@ -151,7 +132,7 @@ class ByteBufferMessageSet(val buffer: ByteBuffer,
   }
 
 
-  def deepIterator(): Iterator[MessageOffset] = {
+  private def deepIterator(): Iterator[MessageOffset] = {
     ErrorMapping.maybeThrowException(errorCode)
     new IteratorTemplate[MessageOffset] {
       var topIter = buffer.slice()

diff --git a/core/src/main/scala/kafka/message/MessageSet.scala b/core/src/main/scala/kafka/message/MessageSet.scala
@@ -30,10 +30,7 @@ object MessageSet {
   /**
    * The size of a message set containing the given messages
    */
-  def messageSetSize(messages: Seq[Message]): Int = 
-    messages.foldLeft(0)(_ + entrySize(_))
-
-  def messageSetSize(messages: Iterable[Message]): Int = 
+  def messageSetSize(messages: Iterable[Message]): Int =
     messages.foldLeft(0)(_ + entrySize(_))
 
   /**

diff --git a/core/src/test/scala/unit/kafka/message/CompressionUtilsTest.scala b/core/src/test/scala/unit/kafka/message/CompressionUtilsTest.scala
@@ -18,7 +18,6 @@ class CompressionUtilTest extends TestCase {
     TestUtils.checkLength(decompressedMessages.iterator,3)
 
     TestUtils.checkEquals(messages.iterator, decompressedMessages.iterator)
-    TestUtils.checkEquals(messages.iterator, decompressedMessages.deepIterator)
   }
 
   def testComplexCompressDecompress() {