aboutsummaryrefslogtreecommitdiff
path: root/sql/core
diff options
context:
space:
mode:
authorscwf <wangfei1@huawei.com>2014-08-31 14:02:11 -0700
committerMatei Zaharia <matei@databricks.com>2014-08-31 14:02:11 -0700
commit725715cbf3c1834b81aa91ea751fd04d307f504d (patch)
treeb614b7657e7aa0cbad9d95e63aec22f3d862e579 /sql/core
parentc567a68a59f086ed13f38a8a847afb2c7d35697c (diff)
downloadspark-725715cbf3c1834b81aa91ea751fd04d307f504d.tar.gz
spark-725715cbf3c1834b81aa91ea751fd04d307f504d.tar.bz2
spark-725715cbf3c1834b81aa91ea751fd04d307f504d.zip
[SPARK-3010] fix redundant conditional
https://issues.apache.org/jira/browse/SPARK-3010 this pr is to fix redundant conditional in spark, such as 1. private[spark] def codegenEnabled: Boolean = if (getConf(CODEGEN_ENABLED, "false") == "true") true else false 2. x => if (x == 2) true else false ... Author: scwf <wangfei1@huawei.com> Author: wangfei <wangfei_hello@126.com> Closes #1992 from scwf/condition and squashes the following commits: b2a044a [scwf] merge SecurityManager e16239c [scwf] fix confilct 6811401 [scwf] fix merge confilct 0824df4 [scwf] Merge branch 'master' of https://github.com/apache/spark into patch-4 e274515 [scwf] fix redundant conditions d032bf9 [wangfei] [SQL]Excess judgment
Diffstat (limited to 'sql/core')
-rw-r--r--sql/core/src/main/scala/org/apache/spark/sql/columnar/ColumnType.scala4
1 files changed, 1 insertions, 3 deletions
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/columnar/ColumnType.scala b/sql/core/src/main/scala/org/apache/spark/sql/columnar/ColumnType.scala
index 794bc60d0e..9a61600115 100644
--- a/sql/core/src/main/scala/org/apache/spark/sql/columnar/ColumnType.scala
+++ b/sql/core/src/main/scala/org/apache/spark/sql/columnar/ColumnType.scala
@@ -158,9 +158,7 @@ private[sql] object BOOLEAN extends NativeColumnType(BooleanType, 4, 1) {
buffer.put(if (v) 1.toByte else 0.toByte)
}
- override def extract(buffer: ByteBuffer) = {
- if (buffer.get() == 1) true else false
- }
+ override def extract(buffer: ByteBuffer) = buffer.get() == 1
override def setField(row: MutableRow, ordinal: Int, value: Boolean) {
row.setBoolean(ordinal, value)