Repository: spark
Updated Branches:
refs/heads/branch-2.0 7e4c9dd55 -> 32a64d8fc
[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 <[email protected]>
Closes #13448 from Sherry302/master.
(cherry picked from commit 0f307db5e17e1e8a655cfa751218ac4ed88717a7)
Signed-off-by: Sean Owen <[email protected]>
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/32a64d8f
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/32a64d8f
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/32a64d8f
Branch: refs/heads/branch-2.0
Commit: 32a64d8fc9e7ddaf993bdd7e679113dc605a69a7
Parents: 7e4c9dd
Author: Weiqing Yang <[email protected]>
Authored: Sat Jun 4 22:44:03 2016 +0100
Committer: Sean Owen <[email protected]>
Committed: Sat Jun 4 22:44:12 2016 +0100
----------------------------------------------------------------------
.../scala/org/apache/spark/sql/RandomDataGenerator.scala | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/32a64d8f/sql/catalyst/src/test/scala/org/apache/spark/sql/RandomDataGenerator.scala
----------------------------------------------------------------------
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 711e870..8508697 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
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
