Skip to content

[SPARK-16318][SQL] Implement all remaining xpath functions #13991

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.

Sign up for GitHub

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

Closed
petermaxlee wants to merge 8 commits into from
Closed

[SPARK-16318][SQL] Implement all remaining xpath functions #13991

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
39e0d0a
[SPARK-16318][SQL] Implement various xpath functions
petermaxlee Jun 30, 2016
4908840
Better error handling, test coverage.
petermaxlee Jul 8, 2016
ad3d851
Shorten test cases
petermaxlee Jul 8, 2016
8fa67c8
Added xpath (list)
petermaxlee Jul 8, 2016
2f36ccd
end-to-end tests
petermaxlee Jul 8, 2016
9ac6397
Remove RuntimeReplaceable
petermaxlee Jul 8, 2016
fecc293
Fix test
petermaxlee Jul 8, 2016
0c60d87
Merge remote-tracking branch 'apache/master' into SPARK-16318
petermaxlee Jul 8, 2016
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
Prev Previous commit
Next Next commit
end-to-end tests
  • Loading branch information
@petermaxlee
petermaxlee committed Jul 8, 2016
commit 2f36ccd4c12cdc50af461a8bc52afa4e510d9fb0
1 change: 1 addition & 0 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/FunctionRegistry.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,6 +309,7 @@ object FunctionRegistry {
expression[UnBase64]("unbase64"),
expression[Unhex]("unhex"),
expression[Upper]("upper"),
expression[XPathList]("xpath"),
expression[XPathBoolean]("xpath_boolean"),
expression[XPathDouble]("xpath_double"),
expression[XPathDouble]("xpath_number"),
Expand Down
27 changes: 19 additions & 8 deletions sql/core/src/test/scala/org/apache/spark/sql/XPathFunctionsSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,26 +26,37 @@ class XPathFunctionsSuite extends QueryTest with SharedSQLContext {
import testImplicits._

test("xpath_boolean") {
val df = Seq("<a><b>b</b></a>" -> "a/b").toDF("xml", "path")
checkAnswer(df.selectExpr("xpath_boolean(xml, path)"), Row(true))
val df = Seq("<a><b>b</b></a>").toDF("xml")
checkAnswer(df.selectExpr("xpath_boolean(xml, 'a/b')"), Row(true))
}

test("xpath_short, xpath_int, xpath_long") {
val df = Seq("<a><b>1</b><b>2</b></a>" -> "sum(a/b)").toDF("xml", "path")
val df = Seq("<a><b>1</b><b>2</b></a>").toDF("xml")
checkAnswer(
df.selectExpr("xpath_short(xml, path)", "xpath_int(xml, path)", "xpath_long(xml, path)"),
df.selectExpr(
"xpath_short(xml, 'sum(a/b)')",
"xpath_int(xml, 'sum(a/b)')",
"xpath_long(xml, 'sum(a/b)')"),
Row(3.toShort, 3, 3L))
}

test("xpath_float, xpath_double, xpath_number") {
val df = Seq("<a><b>1.0</b><b>2.1</b></a>" -> "sum(a/b)").toDF("xml", "path")
val df = Seq("<a><b>1.0</b><b>2.1</b></a>").toDF("xml")
checkAnswer(
df.selectExpr("xpath_float(xml, path)", "xpath_double(xml, path)", "xpath_number(xml, path)"),
df.selectExpr(
"xpath_float(xml, 'sum(a/b)')",
"xpath_double(xml, 'sum(a/b)')",
"xpath_number(xml, 'sum(a/b)')"),
Row(3.1.toFloat, 3.1, 3.1))
}

test("xpath_string") {
val df = Seq("<a><b>b</b><c>cc</c></a>" -> "a/c").toDF("xml", "path")
checkAnswer(df.selectExpr("xpath_string(xml, path)"), Row("cc"))
val df = Seq("<a><b>b</b><c>cc</c></a>").toDF("xml")
checkAnswer(df.selectExpr("xpath_string(xml, 'a/c')"), Row("cc"))
}

test("xpath") {
val df = Seq("<a><b>b1</b><b>b2</b><b>b3</b><c>c1</c><c>c2</c></a>").toDF("xml")
checkAnswer(df.selectExpr("xpath(xml, 'a/*/text()')"), Row(Seq("b1", "b2", "b3", "c1", "c2")))
}
}