From 474d1320c9b93c501710ad1cfa836b8284562a2c Mon Sep 17 00:00:00 2001
From: MechCoder <manojkumarsivaraj334@gmail.com>
Date: Mon, 23 Mar 2015 13:30:21 -0700
Subject: [PATCH] [SPARK-6308] [MLlib] [Sql] Override TypeName in VectorUDT and
MatrixUDT
Author: MechCoder <manojkumarsivaraj334@gmail.com>
Closes #5118 from MechCoder/spark-6308 and squashes the following commits:
6c8ffab [MechCoder] Add test for simpleString
b966242 [MechCoder] [SPARK-6308] [MLlib][Sql] VectorUDT is displayed as vecto in dtypes
---
.../src/main/scala/org/apache/spark/mllib/linalg/Matrices.scala | 2 ++
.../src/main/scala/org/apache/spark/mllib/linalg/Vectors.scala | 2 ++
.../scala/org/apache/spark/mllib/linalg/MatricesSuite.scala | 2 ++
.../test/scala/org/apache/spark/mllib/linalg/VectorsSuite.scala | 2 ++
4 files changed, 8 insertions(+)
diff --git a/mllib/src/main/scala/org/apache/spark/mllib/linalg/Matrices.scala b/mllib/src/main/scala/org/apache/spark/mllib/linalg/Matrices.scala
index 849f44295f..d1a174063c 100644
--- a/mllib/src/main/scala/org/apache/spark/mllib/linalg/Matrices.scala
+++ b/mllib/src/main/scala/org/apache/spark/mllib/linalg/Matrices.scala
@@ -187,6 +187,8 @@ private[spark] class MatrixUDT extends UserDefinedType[Matrix] {
override def hashCode(): Int = 1994
+ override def typeName: String = "matrix"
+
private[spark] override def asNullable: MatrixUDT = this
}
diff --git a/mllib/src/main/scala/org/apache/spark/mllib/linalg/Vectors.scala b/mllib/src/main/scala/org/apache/spark/mllib/linalg/Vectors.scala
index 2cda9b252e..328dbe2ce1 100644
--- a/mllib/src/main/scala/org/apache/spark/mllib/linalg/Vectors.scala
+++ b/mllib/src/main/scala/org/apache/spark/mllib/linalg/Vectors.scala
@@ -185,6 +185,8 @@ private[spark] class VectorUDT extends UserDefinedType[Vector] {
override def hashCode: Int = 7919
+ override def typeName: String = "vector"
+
private[spark] override def asNullable: VectorUDT = this
}
diff --git a/mllib/src/test/scala/org/apache/spark/mllib/linalg/MatricesSuite.scala b/mllib/src/test/scala/org/apache/spark/mllib/linalg/MatricesSuite.scala
index 96f677db3f..0d2cec58e2 100644
--- a/mllib/src/test/scala/org/apache/spark/mllib/linalg/MatricesSuite.scala
+++ b/mllib/src/test/scala/org/apache/spark/mllib/linalg/MatricesSuite.scala
@@ -436,5 +436,7 @@ class MatricesSuite extends FunSuite {
Seq(dm1, dm2, dm3, sm1, sm2, sm3).foreach {
mat => assert(mat.toArray === mUDT.deserialize(mUDT.serialize(mat)).toArray)
}
+ assert(mUDT.typeName == "matrix")
+ assert(mUDT.simpleString == "matrix")
}
}
diff --git a/mllib/src/test/scala/org/apache/spark/mllib/linalg/VectorsSuite.scala b/mllib/src/test/scala/org/apache/spark/mllib/linalg/VectorsSuite.scala
index 5def899cea..2839c4c289 100644
--- a/mllib/src/test/scala/org/apache/spark/mllib/linalg/VectorsSuite.scala
+++ b/mllib/src/test/scala/org/apache/spark/mllib/linalg/VectorsSuite.scala
@@ -187,6 +187,8 @@ class VectorsSuite extends FunSuite {
for (v <- Seq(dv0, dv1, sv0, sv1)) {
assert(v === udt.deserialize(udt.serialize(v)))
}
+ assert(udt.typeName == "vector")
+ assert(udt.simpleString == "vector")
}
test("fromBreeze") {
--
GitLab