Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Column like and rlike #299

Merged
merged 1 commit into from
May 20, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions dataset/src/main/scala/frameless/TypedColumn.scala
Original file line number Diff line number Diff line change
Expand Up @@ -520,6 +520,34 @@ abstract class AbstractTypedColumn[T, U]
w2: With.Aux[W1, TT2, W2]): ThisType[W2, String] =
typed(self.untyped.substr(startPos.untyped, len.untyped))

/** SQL like expression. Returns a boolean column based on a SQL LIKE match.
* {{{
* val ds = TypedDataset.create(X2("foo", "bar") :: Nil)
* // true
* ds.select(ds('a).like("foo"))
*
* // Selected column has value "bar"
* ds.select(when(ds('a).like("f"), ds('a)).otherwise(ds('b))
* }}}
* apache/spark
*/
def like(literal: String)(implicit ev: U =:= String): ThisType[T, Boolean] =
typed(self.untyped.like(literal))

/** SQL RLIKE expression (LIKE with Regex). Returns a boolean column based on a regex match.
* {{{
* val ds = TypedDataset.create(X1("foo") :: Nil)
* // true
* ds.select(ds('a).rlike("foo"))
*
* // true
* ds.select(ds('a).rlike(".*))
* }}}
* apache/spark
*/
def rlike(literal: String)(implicit ev: U =:= String): ThisType[T, Boolean] =
typed(self.untyped.rlike(literal))

/** String contains another string literal.
* {{{
* df.filter ( df.col('a).contains("foo") )
Expand Down
68 changes: 65 additions & 3 deletions dataset/src/test/scala/frameless/ColumnTests.scala
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,68 @@ class ColumnTests extends TypedDatasetSuite {
illTyped("""ds1.select(ds1('_1).substr(ds1('_2), ds1('_3)))""")
}

test("like") {
val spark = session
import spark.implicits._

check {
forAll { (a: String, b: String) =>
val ds = TypedDataset.create(X2(a, b) :: Nil)

val typedLike = ds
.select(ds('a).like(a), ds('b).like(a))
.collect()
.run()
.toList

val untypedDs = ds.toDF()
val untypedLike = untypedDs
.select(untypedDs("a").like(a), untypedDs("b").like(a))
.as[(Boolean, Boolean)]
.collect()
.toList

typedLike ?= untypedLike
}
}

val ds = TypedDataset.create((1, false, 2.0) :: Nil)
illTyped("""ds.select(ds('_1).like("foo"))""")
illTyped("""ds.select(ds('_2).like("foo"))""")
illTyped("""ds.select(ds('_3).like("foo"))""")
}

test("rlike") {
val spark = session
import spark.implicits._

check {
forAll { (a: String, b: String) =>
val ds = TypedDataset.create(X2(a, b) :: Nil)

val typedLike = ds
.select(ds('a).rlike(a), ds('b).rlike(a), ds('a).rlike(".*"))
.collect()
.run()
.toList

val untypedDs = ds.toDF()
val untypedLike = untypedDs
.select(untypedDs("a").rlike(a), untypedDs("b").rlike(a), untypedDs("a").rlike(".*"))
.as[(Boolean, Boolean, Boolean)]
.collect()
.toList

(typedLike ?= untypedLike)
}
}

val ds = TypedDataset.create((1, false, 2.0) :: Nil)
illTyped("""ds.select(ds('_1).rlike("foo"))""")
illTyped("""ds.select(ds('_2).rlike("foo"))""")
illTyped("""ds.select(ds('_3).rlike("foo"))""")
}

test("contains") {
val spark = session
import spark.implicits._
Expand All @@ -184,7 +246,7 @@ class ColumnTests extends TypedDatasetSuite {
}
}

val ds1 = TypedDataset.create((1, false, 2.0) :: Nil)
val ds = TypedDataset.create((1, false, 2.0) :: Nil)
illTyped("""ds.select(ds('_1).contains("foo"))""")
illTyped("""ds.select(ds('_2).contains("foo"))""")
illTyped("""ds.select(ds('_3).contains("foo"))""")
Expand Down Expand Up @@ -215,7 +277,7 @@ class ColumnTests extends TypedDatasetSuite {
}
}

val ds1 = TypedDataset.create((1, false, 2.0) :: Nil)
val ds = TypedDataset.create((1, false, 2.0) :: Nil)
illTyped("""ds.select(ds('_1).startsWith("foo"))""")
illTyped("""ds.select(ds('_2).startsWith("foo"))""")
illTyped("""ds.select(ds('_3).startsWith("foo"))""")
Expand Down Expand Up @@ -245,7 +307,7 @@ class ColumnTests extends TypedDatasetSuite {
}
}

val ds1 = TypedDataset.create((1, false, 2.0) :: Nil)
val ds = TypedDataset.create((1, false, 2.0) :: Nil)
illTyped("""ds.select(ds('_1).endsWith("foo"))""")
illTyped("""ds.select(ds('_2).endsWith("foo"))""")
illTyped("""ds.select(ds('_3).endsWith("foo"))""")
Expand Down