Repository: spark Updated Branches: refs/heads/master de7af295c -> 1f24ceee6
[SPARK-21832][TEST] Merge SQLBuilderTest into ExpressionSQLBuilderSuite ## What changes were proposed in this pull request? After [SPARK-19025](https://github.com/apache/spark/pull/16869), there is no need to keep SQLBuilderTest. ExpressionSQLBuilderSuite is the only place to use it. This PR aims to remove SQLBuilderTest. ## How was this patch tested? Pass the updated `ExpressionSQLBuilderSuite`. Author: Dongjoon Hyun <dongj...@apache.org> Closes #19044 from dongjoon-hyun/SPARK-21832. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/1f24ceee Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/1f24ceee Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/1f24ceee Branch: refs/heads/master Commit: 1f24ceee606f17c4f3ca969fa4b5631256fa09e8 Parents: de7af29 Author: Dongjoon Hyun <dongj...@apache.org> Authored: Fri Aug 25 08:59:48 2017 -0700 Committer: gatorsmile <gatorsm...@gmail.com> Committed: Fri Aug 25 08:59:48 2017 -0700 ---------------------------------------------------------------------- .../catalyst/ExpressionSQLBuilderSuite.scala | 23 ++++++++-- .../spark/sql/catalyst/SQLBuilderTest.scala | 44 -------------------- 2 files changed, 20 insertions(+), 47 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/1f24ceee/sql/hive/src/test/scala/org/apache/spark/sql/catalyst/ExpressionSQLBuilderSuite.scala ---------------------------------------------------------------------- diff --git a/sql/hive/src/test/scala/org/apache/spark/sql/catalyst/ExpressionSQLBuilderSuite.scala b/sql/hive/src/test/scala/org/apache/spark/sql/catalyst/ExpressionSQLBuilderSuite.scala index 90f9059..d9cf1f3 100644 --- a/sql/hive/src/test/scala/org/apache/spark/sql/catalyst/ExpressionSQLBuilderSuite.scala +++ b/sql/hive/src/test/scala/org/apache/spark/sql/catalyst/ExpressionSQLBuilderSuite.scala @@ -19,12 +19,29 @@ package org.apache.spark.sql.catalyst import java.sql.Timestamp +import org.apache.spark.sql.QueryTest import org.apache.spark.sql.catalyst.dsl.expressions._ -import org.apache.spark.sql.catalyst.expressions.{If, Literal, SpecifiedWindowFrame, TimeAdd, - TimeSub, WindowSpecDefinition} +import org.apache.spark.sql.catalyst.expressions._ +import org.apache.spark.sql.hive.test.TestHiveSingleton import org.apache.spark.unsafe.types.CalendarInterval -class ExpressionSQLBuilderSuite extends SQLBuilderTest { +class ExpressionSQLBuilderSuite extends QueryTest with TestHiveSingleton { + protected def checkSQL(e: Expression, expectedSQL: String): Unit = { + val actualSQL = e.sql + try { + assert(actualSQL == expectedSQL) + } catch { + case cause: Throwable => + fail( + s"""Wrong SQL generated for the following expression: + | + |${e.prettyName} + | + |$cause + """.stripMargin) + } + } + test("literal") { checkSQL(Literal("foo"), "'foo'") checkSQL(Literal("\"foo\""), "'\"foo\"'") http://git-wip-us.apache.org/repos/asf/spark/blob/1f24ceee/sql/hive/src/test/scala/org/apache/spark/sql/catalyst/SQLBuilderTest.scala ---------------------------------------------------------------------- diff --git a/sql/hive/src/test/scala/org/apache/spark/sql/catalyst/SQLBuilderTest.scala b/sql/hive/src/test/scala/org/apache/spark/sql/catalyst/SQLBuilderTest.scala deleted file mode 100644 index 157783a..0000000 --- a/sql/hive/src/test/scala/org/apache/spark/sql/catalyst/SQLBuilderTest.scala +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.spark.sql.catalyst - -import scala.util.control.NonFatal - -import org.apache.spark.sql.{DataFrame, Dataset, QueryTest} -import org.apache.spark.sql.catalyst.expressions.Expression -import org.apache.spark.sql.catalyst.plans.logical.LogicalPlan -import org.apache.spark.sql.hive.test.TestHiveSingleton - - -abstract class SQLBuilderTest extends QueryTest with TestHiveSingleton { - protected def checkSQL(e: Expression, expectedSQL: String): Unit = { - val actualSQL = e.sql - try { - assert(actualSQL === expectedSQL) - } catch { - case cause: Throwable => - fail( - s"""Wrong SQL generated for the following expression: - | - |${e.prettyName} - | - |$cause - """.stripMargin) - } - } -} --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org