From a3e639dd0c8d4c32fdb716591fdda0b06379e3b5 Mon Sep 17 00:00:00 2001 From: Liang-Chi Hsieh Date: Thu, 31 Dec 2015 12:03:02 +0800 Subject: [PATCH 1/2] Move the test for arrayOfUDT. --- .../sql/catalyst/encoders/RowEncoderSuite.scala | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/encoders/RowEncoderSuite.scala b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/encoders/RowEncoderSuite.scala index 0ea51ece4bc5..562e4907380d 100644 --- a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/encoders/RowEncoderSuite.scala +++ b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/encoders/RowEncoderSuite.scala @@ -128,19 +128,8 @@ class RowEncoderSuite extends SparkFunSuite { .add("structOfMap", new StructType().add("map", mapOfString)) .add("structOfArrayAndMap", new StructType().add("array", arrayOfString).add("map", mapOfString)) - .add("structOfUDT", structOfUDT)) - - test(s"encode/decode: arrayOfUDT") { - val schema = new StructType() - .add("arrayOfUDT", arrayOfUDT) - - val encoder = RowEncoder(schema) - - val input: Row = Row(Seq(new ExamplePoint(0.1, 0.2), new ExamplePoint(0.3, 0.4))) - val row = encoder.toRow(input) - val convertedBack = encoder.fromRow(row) - assert(input.getSeq[ExamplePoint](0) == convertedBack.getSeq[ExamplePoint](0)) - } + .add("structOfUDT", structOfUDT) + .add("arrayOfUDT", arrayOfUDT)) test(s"encode/decode: Product") { val schema = new StructType() From 8d107037ce654b37193f95043411950a016aba14 Mon Sep 17 00:00:00 2001 From: Liang-Chi Hsieh Date: Thu, 31 Dec 2015 12:56:16 +0800 Subject: [PATCH 2/2] Move test. --- .../spark/sql/catalyst/encoders/RowEncoderSuite.scala | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/encoders/RowEncoderSuite.scala b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/encoders/RowEncoderSuite.scala index 562e4907380d..8f4faab7bace 100644 --- a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/encoders/RowEncoderSuite.scala +++ b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/encoders/RowEncoderSuite.scala @@ -108,7 +108,8 @@ class RowEncoderSuite extends SparkFunSuite { .add("arrayOfArrayOfString", ArrayType(arrayOfString)) .add("arrayOfArrayOfInt", ArrayType(ArrayType(IntegerType))) .add("arrayOfMap", ArrayType(mapOfString)) - .add("arrayOfStruct", ArrayType(structOfString))) + .add("arrayOfStruct", ArrayType(structOfString)) + .add("arrayOfUDT", arrayOfUDT)) encodeDecodeTest( new StructType() @@ -128,8 +129,7 @@ class RowEncoderSuite extends SparkFunSuite { .add("structOfMap", new StructType().add("map", mapOfString)) .add("structOfArrayAndMap", new StructType().add("array", arrayOfString).add("map", mapOfString)) - .add("structOfUDT", structOfUDT) - .add("arrayOfUDT", arrayOfUDT)) + .add("structOfUDT", structOfUDT)) test(s"encode/decode: Product") { val schema = new StructType()