From 1bd166fd8c1f943077278fa8b26c547df5f10b89 Mon Sep 17 00:00:00 2001 From: tedyu Date: Mon, 17 Aug 2015 16:46:43 -0700 Subject: [PATCH 1/3] Include Float in @specialized annotation --- .../apache/spark/util/collection/PrimitiveKeyOpenHashMap.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/scala/org/apache/spark/util/collection/PrimitiveKeyOpenHashMap.scala b/core/src/main/scala/org/apache/spark/util/collection/PrimitiveKeyOpenHashMap.scala index b4ec4ea521253..90b5ad6843f89 100644 --- a/core/src/main/scala/org/apache/spark/util/collection/PrimitiveKeyOpenHashMap.scala +++ b/core/src/main/scala/org/apache/spark/util/collection/PrimitiveKeyOpenHashMap.scala @@ -28,7 +28,7 @@ import scala.reflect._ */ private[spark] class PrimitiveKeyOpenHashMap[@specialized(Long, Int) K: ClassTag, - @specialized(Long, Int, Double) V: ClassTag]( + @specialized(Long, Int, Double, Float) V: ClassTag]( initialCapacity: Int) extends Iterable[(K, V)] with Serializable { From e7259deba85d3b9846455d7fdb045090720ac6f6 Mon Sep 17 00:00:00 2001 From: tedyu Date: Mon, 17 Aug 2015 16:53:27 -0700 Subject: [PATCH 2/3] Include Float in @specialized annotation --- core/src/main/scala/org/apache/spark/util/MutablePair.scala | 4 ++-- .../scala/org/apache/spark/util/collection/OpenHashMap.scala | 2 +- .../org/apache/spark/graphx/impl/EdgePartitionBuilder.scala | 4 ++-- .../org/apache/spark/graphx/impl/VertexPartitionBase.scala | 2 +- .../util/collection/GraphXPrimitiveKeyOpenHashMap.scala | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/core/src/main/scala/org/apache/spark/util/MutablePair.scala b/core/src/main/scala/org/apache/spark/util/MutablePair.scala index 3d95b7869f494..390ae2163f115 100644 --- a/core/src/main/scala/org/apache/spark/util/MutablePair.scala +++ b/core/src/main/scala/org/apache/spark/util/MutablePair.scala @@ -28,8 +28,8 @@ import org.apache.spark.annotation.DeveloperApi * @param _2 Element 2 of this MutablePair */ @DeveloperApi -case class MutablePair[@specialized(Int, Long, Double, Char, Boolean/* , AnyRef */) T1, - @specialized(Int, Long, Double, Char, Boolean/* , AnyRef */) T2] +case class MutablePair[@specialized(Int, Long, Double, Float, Char, Boolean/* , AnyRef */) T1, + @specialized(Int, Long, Double, Float, Char, Boolean/* , AnyRef */) T2] (var _1: T1, var _2: T2) extends Product2[T1, T2] { diff --git a/core/src/main/scala/org/apache/spark/util/collection/OpenHashMap.scala b/core/src/main/scala/org/apache/spark/util/collection/OpenHashMap.scala index efc2482c74ddf..4f8b7b5133bfb 100644 --- a/core/src/main/scala/org/apache/spark/util/collection/OpenHashMap.scala +++ b/core/src/main/scala/org/apache/spark/util/collection/OpenHashMap.scala @@ -31,7 +31,7 @@ import org.apache.spark.annotation.DeveloperApi */ @DeveloperApi private[spark] -class OpenHashMap[K : ClassTag, @specialized(Long, Int, Double) V: ClassTag]( +class OpenHashMap[K : ClassTag, @specialized(Long, Int, Double, Float) V: ClassTag]( initialCapacity: Int) extends Iterable[(K, V)] with Serializable { diff --git a/graphx/src/main/scala/org/apache/spark/graphx/impl/EdgePartitionBuilder.scala b/graphx/src/main/scala/org/apache/spark/graphx/impl/EdgePartitionBuilder.scala index 906d42328fcb9..3e64c8422be5f 100644 --- a/graphx/src/main/scala/org/apache/spark/graphx/impl/EdgePartitionBuilder.scala +++ b/graphx/src/main/scala/org/apache/spark/graphx/impl/EdgePartitionBuilder.scala @@ -25,7 +25,7 @@ import org.apache.spark.util.collection.{SortDataFormat, Sorter, PrimitiveVector /** Constructs an EdgePartition from scratch. */ private[graphx] -class EdgePartitionBuilder[@specialized(Long, Int, Double) ED: ClassTag, VD: ClassTag]( +class EdgePartitionBuilder[@specialized(Long, Int, Double, Float) ED: ClassTag, VD: ClassTag]( size: Int = 64) { private[this] val edges = new PrimitiveVector[Edge[ED]](size) @@ -81,7 +81,7 @@ class EdgePartitionBuilder[@specialized(Long, Int, Double) ED: ClassTag, VD: Cla */ private[impl] class ExistingEdgePartitionBuilder[ - @specialized(Long, Int, Double) ED: ClassTag, VD: ClassTag]( + @specialized(Long, Int, Double, Float) ED: ClassTag, VD: ClassTag]( global2local: GraphXPrimitiveKeyOpenHashMap[VertexId, Int], local2global: Array[VertexId], vertexAttrs: Array[VD], diff --git a/graphx/src/main/scala/org/apache/spark/graphx/impl/VertexPartitionBase.scala b/graphx/src/main/scala/org/apache/spark/graphx/impl/VertexPartitionBase.scala index 5ad6390a56c4f..1d80aa5c5a198 100644 --- a/graphx/src/main/scala/org/apache/spark/graphx/impl/VertexPartitionBase.scala +++ b/graphx/src/main/scala/org/apache/spark/graphx/impl/VertexPartitionBase.scala @@ -60,7 +60,7 @@ private[graphx] object VertexPartitionBase { * `VertexPartitionBaseOpsConstructor` typeclass (for example, * [[VertexPartition.VertexPartitionOpsConstructor]]). */ -private[graphx] abstract class VertexPartitionBase[@specialized(Long, Int, Double) VD: ClassTag] +private[graphx] abstract class VertexPartitionBase[@specialized(Long, Int, Double, Float) VD: ClassTag] extends Serializable { def index: VertexIdToIndexMap diff --git a/graphx/src/main/scala/org/apache/spark/graphx/util/collection/GraphXPrimitiveKeyOpenHashMap.scala b/graphx/src/main/scala/org/apache/spark/graphx/util/collection/GraphXPrimitiveKeyOpenHashMap.scala index e2754ea699da9..d76f15b21ebe2 100644 --- a/graphx/src/main/scala/org/apache/spark/graphx/util/collection/GraphXPrimitiveKeyOpenHashMap.scala +++ b/graphx/src/main/scala/org/apache/spark/graphx/util/collection/GraphXPrimitiveKeyOpenHashMap.scala @@ -30,7 +30,7 @@ import scala.reflect._ */ private[graphx] class GraphXPrimitiveKeyOpenHashMap[@specialized(Long, Int) K: ClassTag, - @specialized(Long, Int, Double) V: ClassTag]( + @specialized(Long, Int, Double, Float) V: ClassTag]( val keySet: OpenHashSet[K], var _values: Array[V]) extends Iterable[(K, V)] with Serializable { From cc2021a5063136d9c013588e77eec26ce5268bfb Mon Sep 17 00:00:00 2001 From: tedyu Date: Mon, 17 Aug 2015 17:44:50 -0700 Subject: [PATCH 3/3] Adjust long line --- .../org/apache/spark/graphx/impl/VertexPartitionBase.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/graphx/src/main/scala/org/apache/spark/graphx/impl/VertexPartitionBase.scala b/graphx/src/main/scala/org/apache/spark/graphx/impl/VertexPartitionBase.scala index 1d80aa5c5a198..f1a897c9c4ebf 100644 --- a/graphx/src/main/scala/org/apache/spark/graphx/impl/VertexPartitionBase.scala +++ b/graphx/src/main/scala/org/apache/spark/graphx/impl/VertexPartitionBase.scala @@ -60,8 +60,8 @@ private[graphx] object VertexPartitionBase { * `VertexPartitionBaseOpsConstructor` typeclass (for example, * [[VertexPartition.VertexPartitionOpsConstructor]]). */ -private[graphx] abstract class VertexPartitionBase[@specialized(Long, Int, Double, Float) VD: ClassTag] - extends Serializable { +private[graphx] abstract class VertexPartitionBase[@specialized(Long, Int, Double, Float) + VD: ClassTag] extends Serializable { def index: VertexIdToIndexMap def values: Array[VD]