diff options
author | Kousuke Saruta <sarutak@oss.nttdata.co.jp> | 2014-11-15 22:23:47 -0800 |
---|---|---|
committer | Reynold Xin <rxin@databricks.com> | 2014-11-15 22:24:05 -0800 |
commit | 24287014f6ae7fe6f4b3090d24fe42d8c70f1084 (patch) | |
tree | e2c51327a473463a3e16395f943fb737c7aa621f /sql | |
parent | 06c29bccb68f116effe85e3ab1f605a2dfa36a31 (diff) | |
download | spark-24287014f6ae7fe6f4b3090d24fe42d8c70f1084.tar.gz spark-24287014f6ae7fe6f4b3090d24fe42d8c70f1084.tar.bz2 spark-24287014f6ae7fe6f4b3090d24fe42d8c70f1084.zip |
[SPARK-4426][SQL][Minor] The symbol of BitwiseOr is wrong, should not be '&'
The symbol of BitwiseOr is defined as '&' but I think it's wrong. It should be '|'.
Author: Kousuke Saruta <sarutak@oss.nttdata.co.jp>
Closes #3284 from sarutak/bitwise-or-symbol-fix and squashes the following commits:
aff4be5 [Kousuke Saruta] Fixed symbol of BitwiseOr
(cherry picked from commit 84468b2e2031d646dcf035cb18947170ba326ccd)
Signed-off-by: Reynold Xin <rxin@databricks.com>
Diffstat (limited to 'sql')
-rw-r--r-- | sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/arithmetic.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/arithmetic.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/arithmetic.scala index 8574cabc43..d17c9553ac 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/arithmetic.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/arithmetic.scala @@ -142,7 +142,7 @@ case class BitwiseAnd(left: Expression, right: Expression) extends BinaryArithme * A function that calculates bitwise or(|) of two numbers. */ case class BitwiseOr(left: Expression, right: Expression) extends BinaryArithmetic { - def symbol = "&" + def symbol = "|" override def evalInternal(evalE1: EvaluatedType, evalE2: EvaluatedType): Any = dataType match { case ByteType => (evalE1.asInstanceOf[Byte] | evalE2.asInstanceOf[Byte]).toByte |