From d2580136ebd9ea557811b57ee516c13452c6087c Mon Sep 17 00:00:00 2001 From: bomeng Date: Tue, 22 Mar 2016 14:47:13 -0700 Subject: [PATCH] remove the unnecessary logical operation --- .../org/apache/spark/sql/execution/basicOperators.scala | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/basicOperators.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/basicOperators.scala index 6e2a5aa4f97c7..d5b0177c0c03b 100644 --- a/sql/core/src/main/scala/org/apache/spark/sql/execution/basicOperators.scala +++ b/sql/core/src/main/scala/org/apache/spark/sql/execution/basicOperators.scala @@ -22,7 +22,7 @@ import org.apache.spark.sql.catalyst.InternalRow import org.apache.spark.sql.catalyst.expressions._ import org.apache.spark.sql.catalyst.expressions.codegen.{CodegenContext, ExprCode, ExpressionCanonicalizer} import org.apache.spark.sql.catalyst.plans.physical._ -import org.apache.spark.sql.execution.metric.{LongSQLMetricValue, SQLMetrics} +import org.apache.spark.sql.execution.metric.SQLMetrics import org.apache.spark.sql.types.LongType import org.apache.spark.util.random.PoissonSampler @@ -126,9 +126,13 @@ case class Filter(condition: Expression, child: SparkPlan) } else { s"" } + val filterCheck = ev.value match { + case x if x.startsWith("(!(") && x.endsWith("))") => x.substring(3, x.length - 2) + case y => s"!$y" + } s""" |${ev.code} - |if (${nullCheck}!${ev.value}) continue; + |if ($nullCheck$filterCheck) continue; """.stripMargin }.mkString("\n")