Rename our toIterator method into asIterator to prevent confusion with the

Scala collection one, which often *copies* a collection.
This commit is contained in:
root 2012-09-21 06:02:55 +00:00
Родитель a642051ade
Коммит 6d28dde370
2 изменённых файлов: 4 добавлений и 5 удалений

Просмотреть файл

@ -43,7 +43,7 @@ trait SerializerInstance {
def deserializeMany(buffer: ByteBuffer): Iterator[Any] = {
// Default implementation uses deserializeStream
buffer.rewind()
deserializeStream(new ByteBufferInputStream(buffer)).toIterator
deserializeStream(new ByteBufferInputStream(buffer)).asIterator
}
}
@ -74,7 +74,7 @@ trait DeserializationStream {
* Read the elements of this stream through an iterator. This can only be called once, as
* reading each element will consume data from the input source.
*/
def toIterator: Iterator[Any] = new Iterator[Any] {
def asIterator: Iterator[Any] = new Iterator[Any] {
var gotNext = false
var finished = false
var nextValue: Any = null

Просмотреть файл

@ -614,10 +614,9 @@ class BlockManager(val master: BlockManagerMaster, val serializer: Serializer, m
}
def dataDeserialize(bytes: ByteBuffer): Iterator[Any] = {
/*serializer.newInstance().deserializeMany(bytes)*/
val ser = serializer.newInstance()
bytes.rewind()
return ser.deserializeStream(new ByteBufferInputStream(bytes)).toIterator
val ser = serializer.newInstance()
return ser.deserializeStream(new ByteBufferInputStream(bytes)).asIterator
}
def stop() {