Repository: spark Updated Branches: refs/heads/branch-2.1 915a20104 -> 0ebb3b843
[SPARK-21114][TEST][2.1] Fix test failure in Spark 2.1/2.0 due to name mismatch ## What changes were proposed in this pull request? Name mismatch between 2.1/2.0 and 2.2. Thus, the test cases failed after we backport a fix to 2.1/2.0. This PR is to fix the issue. https://amplab.cs.berkeley.edu/jenkins/view/Spark%20QA%20Test/job/spark-branch-2.1-test-maven-hadoop-2.7/lastCompletedBuild/testReport/org.apache.spark.sql/SQLQueryTestSuite/arithmetic_sql/ https://amplab.cs.berkeley.edu/jenkins/view/Spark%20QA%20Test/job/spark-branch-2.0-test-maven-hadoop-2.2/lastCompletedBuild/testReport/org.apache.spark.sql/SQLQueryTestSuite/arithmetic_sql/ ## How was this patch tested? N/A Author: gatorsmile <gatorsm...@gmail.com> Closes #18319 from gatorsmile/fixDecimal. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/0ebb3b84 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/0ebb3b84 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/0ebb3b84 Branch: refs/heads/branch-2.1 Commit: 0ebb3b843aaaaa7eb97aac953646a6955fe10a1c Parents: 915a201 Author: gatorsmile <gatorsm...@gmail.com> Authored: Fri Jun 16 12:19:55 2017 +0800 Committer: Wenchen Fan <wenc...@databricks.com> Committed: Fri Jun 16 12:19:55 2017 +0800 ---------------------------------------------------------------------- .../src/test/resources/sql-tests/results/arithmetic.sql.out | 6 +++--- .../src/test/resources/sql-tests/results/inner-join.sql.out | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/0ebb3b84/sql/core/src/test/resources/sql-tests/results/arithmetic.sql.out ---------------------------------------------------------------------- diff --git a/sql/core/src/test/resources/sql-tests/results/arithmetic.sql.out b/sql/core/src/test/resources/sql-tests/results/arithmetic.sql.out index 3811cd2..5418d47 100644 --- a/sql/core/src/test/resources/sql-tests/results/arithmetic.sql.out +++ b/sql/core/src/test/resources/sql-tests/results/arithmetic.sql.out @@ -281,7 +281,7 @@ struct<CEIL(CAST(1 AS DOUBLE)):bigint> -- !query 34 select ceil(1234567890123456) -- !query 34 schema -struct<CEIL(1234567890123456):bigint> +struct<CEIL(CAST(1234567890123456 AS DOUBLE)):bigint> -- !query 34 output 1234567890123456 @@ -289,7 +289,7 @@ struct<CEIL(1234567890123456):bigint> -- !query 35 select ceiling(1234567890123456) -- !query 35 schema -struct<CEIL(1234567890123456):bigint> +struct<CEIL(CAST(1234567890123456 AS DOUBLE)):bigint> -- !query 35 output 1234567890123456 @@ -329,7 +329,7 @@ struct<FLOOR(CAST(1 AS DOUBLE)):bigint> -- !query 40 select floor(1234567890123456) -- !query 40 schema -struct<FLOOR(1234567890123456):bigint> +struct<FLOOR(CAST(1234567890123456 AS DOUBLE)):bigint> -- !query 40 output 1234567890123456 http://git-wip-us.apache.org/repos/asf/spark/blob/0ebb3b84/sql/core/src/test/resources/sql-tests/results/inner-join.sql.out ---------------------------------------------------------------------- diff --git a/sql/core/src/test/resources/sql-tests/results/inner-join.sql.out b/sql/core/src/test/resources/sql-tests/results/inner-join.sql.out index aa20537..8d56ebe 100644 --- a/sql/core/src/test/resources/sql-tests/results/inner-join.sql.out +++ b/sql/core/src/test/resources/sql-tests/results/inner-join.sql.out @@ -1,5 +1,5 @@ -- Automatically generated by SQLQueryTestSuite --- Number of queries: 13 +-- Number of queries: 7 -- !query 0 @@ -65,4 +65,3 @@ struct<a:int,tag:string> 1 a 1 b 1 b - --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org