Repository: spark
Updated Branches:
  refs/heads/branch-1.3 5a957fe0d -> d85164637


[SPARK-6633][SQL] Should be "Contains" instead of "EndsWith" when constructing 
sources.StringContains

Author: Liang-Chi Hsieh <vii...@gmail.com>

Closes #5299 from viirya/stringcontains and squashes the following commits:

c1ece4c [Liang-Chi Hsieh] Should be Contains instead of EndsWith.

(cherry picked from commit 2036bc5993022da550f0cb1c0485ae92ec3e6fb0)
Signed-off-by: Reynold Xin <r...@databricks.com>


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

Branch: refs/heads/branch-1.3
Commit: d851646375616bb5dbcf2c3fe4f64702894d26e1
Parents: 5a957fe
Author: Liang-Chi Hsieh <vii...@gmail.com>
Authored: Tue Mar 31 13:18:07 2015 -0700
Committer: Reynold Xin <r...@databricks.com>
Committed: Tue Mar 31 13:18:47 2015 -0700

----------------------------------------------------------------------
 .../scala/org/apache/spark/sql/sources/DataSourceStrategy.scala    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/d8516463/sql/core/src/main/scala/org/apache/spark/sql/sources/DataSourceStrategy.scala
----------------------------------------------------------------------
diff --git 
a/sql/core/src/main/scala/org/apache/spark/sql/sources/DataSourceStrategy.scala 
b/sql/core/src/main/scala/org/apache/spark/sql/sources/DataSourceStrategy.scala
index 83b603a..e13759b 100644
--- 
a/sql/core/src/main/scala/org/apache/spark/sql/sources/DataSourceStrategy.scala
+++ 
b/sql/core/src/main/scala/org/apache/spark/sql/sources/DataSourceStrategy.scala
@@ -173,7 +173,7 @@ private[sql] object DataSourceStrategy extends Strategy {
       case expressions.EndsWith(a: Attribute, Literal(v: String, StringType)) 
=>
         Some(sources.StringEndsWith(a.name, v))
 
-      case expressions.EndsWith(a: Attribute, Literal(v: String, StringType)) 
=>
+      case expressions.Contains(a: Attribute, Literal(v: String, StringType)) 
=>
         Some(sources.StringContains(a.name, v))
 
       case _ => None


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

Reply via email to