aboutsummaryrefslogtreecommitdiff
path: root/sql/catalyst/src/main/scala/org/apache
diff options
context:
space:
mode:
authorShivansh <shiv4nsh@gmail.com>2016-09-04 12:39:26 +0100
committerSean Owen <sowen@cloudera.com>2016-09-04 12:39:26 +0100
commite75c162e9e510d74b07f28ccf6c7948ac317a7c6 (patch)
tree3d424bc7733e9d7ccca8e929e914ceeced4c8e19 /sql/catalyst/src/main/scala/org/apache
parent6b156e2fcf9c0c1ed0770a7ad9c54fa374760e17 (diff)
downloadspark-e75c162e9e510d74b07f28ccf6c7948ac317a7c6.tar.gz
spark-e75c162e9e510d74b07f28ccf6c7948ac317a7c6.tar.bz2
spark-e75c162e9e510d74b07f28ccf6c7948ac317a7c6.zip
[SPARK-17308] Improved the spark core code by replacing all pattern match on boolean value by if/else block.
## What changes were proposed in this pull request? Improved the code quality of spark by replacing all pattern match on boolean value by if/else block. ## How was this patch tested? By running the tests Author: Shivansh <shiv4nsh@gmail.com> Closes #14873 from shiv4nsh/SPARK-17308.
Diffstat (limited to 'sql/catalyst/src/main/scala/org/apache')
-rw-r--r--sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/trees/TreeNode.scala7
-rw-r--r--sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/util/StringKeyHashMap.scala7
2 files changed, 8 insertions, 6 deletions
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/trees/TreeNode.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/trees/TreeNode.scala
index 24a2dc9d3b..037f8cb287 100644
--- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/trees/TreeNode.scala
+++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/trees/TreeNode.scala
@@ -103,9 +103,10 @@ abstract class TreeNode[BaseType <: TreeNode[BaseType]] extends Product {
* Find the first [[TreeNode]] that satisfies the condition specified by `f`.
* The condition is recursively applied to this node and all of its children (pre-order).
*/
- def find(f: BaseType => Boolean): Option[BaseType] = f(this) match {
- case true => Some(this)
- case false => children.foldLeft(Option.empty[BaseType]) { (l, r) => l.orElse(r.find(f)) }
+ def find(f: BaseType => Boolean): Option[BaseType] = if (f(this)) {
+ Some(this)
+ } else {
+ children.foldLeft(Option.empty[BaseType]) { (l, r) => l.orElse(r.find(f)) }
}
/**
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/util/StringKeyHashMap.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/util/StringKeyHashMap.scala
index d5d151a580..a7ac613683 100644
--- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/util/StringKeyHashMap.scala
+++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/util/StringKeyHashMap.scala
@@ -22,9 +22,10 @@ package org.apache.spark.sql.catalyst.util
* sensitive or insensitive.
*/
object StringKeyHashMap {
- def apply[T](caseSensitive: Boolean): StringKeyHashMap[T] = caseSensitive match {
- case false => new StringKeyHashMap[T](_.toLowerCase)
- case true => new StringKeyHashMap[T](identity)
+ def apply[T](caseSensitive: Boolean): StringKeyHashMap[T] = if (caseSensitive) {
+ new StringKeyHashMap[T](identity)
+ } else {
+ new StringKeyHashMap[T](_.toLowerCase)
}
}