diff options
author | Weiqing Yang <yangweiqing001@gmail.com> | 2016-06-04 22:44:03 +0100 |
---|---|---|
committer | Sean Owen <sowen@cloudera.com> | 2016-06-04 22:44:03 +0100 |
commit | 0f307db5e17e1e8a655cfa751218ac4ed88717a7 (patch) | |
tree | 62686104c93b6dbf6597eccf8b762255dc8826ff | |
parent | 091f81e1f7ef1581376c71e3872ce06f4c1713bd (diff) | |
download | spark-0f307db5e17e1e8a655cfa751218ac4ed88717a7.tar.gz spark-0f307db5e17e1e8a655cfa751218ac4ed88717a7.tar.bz2 spark-0f307db5e17e1e8a655cfa751218ac4ed88717a7.zip |
[SPARK-15707][SQL] Make Code Neat - Use map instead of if check.
## What changes were proposed in this pull request?
In forType function of object RandomDataGenerator, the code following:
if (maybeSqlTypeGenerator.isDefined){
....
Some(generator)
} else{
None
}
will be changed. Instead, maybeSqlTypeGenerator.map will be used.
## How was this patch tested?
All of the current unit tests passed.
Author: Weiqing Yang <yangweiqing001@gmail.com>
Closes #13448 from Sherry302/master.
-rw-r--r-- | sql/catalyst/src/test/scala/org/apache/spark/sql/RandomDataGenerator.scala | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/sql/catalyst/src/test/scala/org/apache/spark/sql/RandomDataGenerator.scala b/sql/catalyst/src/test/scala/org/apache/spark/sql/RandomDataGenerator.scala index 711e870711..8508697995 100644 --- a/sql/catalyst/src/test/scala/org/apache/spark/sql/RandomDataGenerator.scala +++ b/sql/catalyst/src/test/scala/org/apache/spark/sql/RandomDataGenerator.scala @@ -236,9 +236,8 @@ object RandomDataGenerator { // convert it to catalyst value to call udt's deserialize. val toCatalystType = CatalystTypeConverters.createToCatalystConverter(udt.sqlType) - if (maybeSqlTypeGenerator.isDefined) { - val sqlTypeGenerator = maybeSqlTypeGenerator.get - val generator = () => { + maybeSqlTypeGenerator.map { sqlTypeGenerator => + () => { val generatedScalaValue = sqlTypeGenerator.apply() if (generatedScalaValue == null) { null @@ -246,9 +245,6 @@ object RandomDataGenerator { udt.deserialize(toCatalystType(generatedScalaValue)) } } - Some(generator) - } else { - None } case unsupportedType => None } |