spark-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From marmb...@apache.org
Subject git commit: [SPARK-3291][SQL]TestcaseName in createQueryTest should not contain ":"
Date Fri, 29 Aug 2014 22:38:04 GMT
Repository: spark
Updated Branches:
  refs/heads/branch-1.1 9bae345ab -> c1333b852


[SPARK-3291][SQL]TestcaseName in createQueryTest should not contain ":"

":" is not allowed to appear in a file name of Windows system. If file name contains ":",
this file can't be checked out in a Windows system and developers using Windows must be careful
to not commit the deletion of such files, Which is very inconvenient.

Author: qiping.lqp <qiping.lqp@alibaba-inc.com>

Closes #2191 from chouqin/querytest and squashes the following commits:

0e943a1 [qiping.lqp] rename golden file
60a863f [qiping.lqp] TestcaseName in createQueryTest should not contain ":"

(cherry picked from commit 634d04b87c2744d645e9c26e746ba2006371d9b5)
Signed-off-by: Michael Armbrust <michael@databricks.com>


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

Branch: refs/heads/branch-1.1
Commit: c1333b85292636c8db24ca08401bd559ed2c71f9
Parents: 9bae345
Author: qiping.lqp <qiping.lqp@alibaba-inc.com>
Authored: Fri Aug 29 15:37:43 2014 -0700
Committer: Michael Armbrust <michael@databricks.com>
Committed: Fri Aug 29 15:38:00 2014 -0700

----------------------------------------------------------------------
 ...uery Hive table-0-5d14d21a239daa42b086cc895215009a | 14 ++++++++++++++
 ...ity: Hive table-0-5d14d21a239daa42b086cc895215009a | 14 --------------
 .../spark/sql/hive/execution/HiveComparisonTest.scala |  3 +++
 .../spark/sql/hive/execution/HiveQuerySuite.scala     |  2 +-
 4 files changed, 18 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/c1333b85/sql/hive/src/test/resources/golden/case
sensitivity when query Hive table-0-5d14d21a239daa42b086cc895215009a
----------------------------------------------------------------------
diff --git a/sql/hive/src/test/resources/golden/case sensitivity when query Hive table-0-5d14d21a239daa42b086cc895215009a
b/sql/hive/src/test/resources/golden/case sensitivity when query Hive table-0-5d14d21a239daa42b086cc895215009a
new file mode 100644
index 0000000..4d7127c
--- /dev/null
+++ b/sql/hive/src/test/resources/golden/case sensitivity when query Hive table-0-5d14d21a239daa42b086cc895215009a

@@ -0,0 +1,14 @@
+0	val_0
+4	val_4
+12	val_12
+8	val_8
+0	val_0
+0	val_0
+10	val_10
+5	val_5
+11	val_11
+5	val_5
+2	val_2
+12	val_12
+5	val_5
+9	val_9

http://git-wip-us.apache.org/repos/asf/spark/blob/c1333b85/sql/hive/src/test/resources/golden/case
sensitivity: Hive table-0-5d14d21a239daa42b086cc895215009a
----------------------------------------------------------------------
diff --git a/sql/hive/src/test/resources/golden/case sensitivity: Hive table-0-5d14d21a239daa42b086cc895215009a
b/sql/hive/src/test/resources/golden/case sensitivity: Hive table-0-5d14d21a239daa42b086cc895215009a
deleted file mode 100644
index 4d7127c..0000000
--- a/sql/hive/src/test/resources/golden/case sensitivity: Hive table-0-5d14d21a239daa42b086cc895215009a

+++ /dev/null
@@ -1,14 +0,0 @@
-0	val_0
-4	val_4
-12	val_12
-8	val_8
-0	val_0
-0	val_0
-10	val_10
-5	val_5
-11	val_11
-5	val_5
-2	val_2
-12	val_12
-5	val_5
-9	val_9

http://git-wip-us.apache.org/repos/asf/spark/blob/c1333b85/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/HiveComparisonTest.scala
----------------------------------------------------------------------
diff --git a/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/HiveComparisonTest.scala
b/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/HiveComparisonTest.scala
index 502ce8f..671c3b1 100644
--- a/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/HiveComparisonTest.scala
+++ b/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/HiveComparisonTest.scala
@@ -195,6 +195,9 @@ abstract class HiveComparisonTest
 
   val installHooksCommand = "(?i)SET.*hooks".r
   def createQueryTest(testCaseName: String, sql: String, reset: Boolean = true) {
+    // testCaseName must not contain ':', which is not allowed to appear in a filename of
Windows
+    assert(!testCaseName.contains(":"))
+
     // If test sharding is enable, skip tests that are not in the correct shard.
     shardInfo.foreach {
       case (shardId, numShards) if testCaseName.hashCode % numShards != shardId => return

http://git-wip-us.apache.org/repos/asf/spark/blob/c1333b85/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/HiveQuerySuite.scala
----------------------------------------------------------------------
diff --git a/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/HiveQuerySuite.scala
b/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/HiveQuerySuite.scala
index 6d925e5..c4abb3e 100644
--- a/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/HiveQuerySuite.scala
+++ b/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/HiveQuerySuite.scala
@@ -309,7 +309,7 @@ class HiveQuerySuite extends HiveComparisonTest {
     }
   }
 
-  createQueryTest("case sensitivity: Hive table",
+  createQueryTest("case sensitivity when query Hive table",
     "SELECT srcalias.KEY, SRCALIAS.value FROM sRc SrCAlias WHERE SrCAlias.kEy < 15")
 
   test("case sensitivity: registered table") {


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


Mime
View raw message