You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by we...@apache.org on 2017/07/03 05:28:54 UTC

spark git commit: [SPARK-21282][TEST][2.0] Fix test failure in 2.0

Repository: spark
Updated Branches:
  refs/heads/branch-2.0 44a97f70f -> 4229e1605


[SPARK-21282][TEST][2.0] Fix test failure in 2.0

### What changes were proposed in this pull request?

There is a test failure after backporting a fix from 2.2 to 2.0, because the automatically generated column names are different between 2.2 and 2.0
https://amplab.cs.berkeley.edu/jenkins/view/Spark%20QA%20Test/job/spark-branch-2.0-test-maven-hadoop-2.2/lastCompletedBuild/testReport/

This PR is to re-generate the result file.

### How was this patch tested?
N/A

Author: gatorsmile <ga...@gmail.com>

Closes #18506 from gatorsmile/fixFailure.


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/4229e160
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/4229e160
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/4229e160

Branch: refs/heads/branch-2.0
Commit: 4229e16058f355e90dc1d177563c21e88d412c2b
Parents: 44a97f7
Author: gatorsmile <ga...@gmail.com>
Authored: Mon Jul 3 13:28:51 2017 +0800
Committer: Wenchen Fan <we...@databricks.com>
Committed: Mon Jul 3 13:28:51 2017 +0800

----------------------------------------------------------------------
 .../src/test/resources/sql-tests/results/arithmetic.sql.out    | 6 +++---
 sql/core/src/test/resources/sql-tests/results/array.sql.out    | 5 ++++-
 2 files changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/4229e160/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 23281c6..c2e9bd5 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/4229e160/sql/core/src/test/resources/sql-tests/results/array.sql.out
----------------------------------------------------------------------
diff --git a/sql/core/src/test/resources/sql-tests/results/array.sql.out b/sql/core/src/test/resources/sql-tests/results/array.sql.out
index 499a3d5..981b250 100644
--- a/sql/core/src/test/resources/sql-tests/results/array.sql.out
+++ b/sql/core/src/test/resources/sql-tests/results/array.sql.out
@@ -1,5 +1,5 @@
 -- Automatically generated by SQLQueryTestSuite
--- Number of queries: 10
+-- Number of queries: 12
 
 
 -- !query 0
@@ -124,6 +124,7 @@ struct<sort_array(boolean_array, true):array<boolean>,sort_array(tinyint_array,
 -- !query 8 output
 [true]	[1,2]	[1,2]	[1,2]	[1,2]	[9223372036854775808,9223372036854775809]	[1.0,2.0]	[1.0,2.0]	[2016-03-13,2016-03-14]	[2016-11-12 20:54:00.0,2016-11-15 20:54:00.0]
 
+
 -- !query 9
 select sort_array(array('b', 'd'), '1')
 -- !query 9 schema
@@ -132,6 +133,7 @@ struct<>
 org.apache.spark.sql.AnalysisException
 cannot resolve 'sort_array(array('b', 'd'), '1')' due to data type mismatch: Sort order in second argument requires a boolean literal.; line 1 pos 7
 
+
 -- !query 10
 select sort_array(array('b', 'd'), cast(NULL as boolean))
 -- !query 10 schema
@@ -140,6 +142,7 @@ struct<>
 org.apache.spark.sql.AnalysisException
 cannot resolve 'sort_array(array('b', 'd'), CAST(NULL AS BOOLEAN))' due to data type mismatch: Sort order in second argument requires a boolean literal.; line 1 pos 7
 
+
 -- !query 11
 select
   size(boolean_array),


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org