Skip to content

[SPARK-29532][SQL] Simplify interval string parsing #26190

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
cloud-fan wants to merge 11 commits into from
Closed

[SPARK-29532][SQL] Simplify interval string parsing #26190

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
c8d81e3
simplify interval string parsing
cloud-fan Oct 17, 2019
87417d9
address comments
cloud-fan Oct 21, 2019
a5f355f
fix test
cloud-fan Oct 22, 2019
10aa751
re-generate golden file
cloud-fan Oct 22, 2019
5c5e251
address comments
cloud-fan Oct 23, 2019
03e90e4
update benchmark
cloud-fan Oct 23, 2019
836e868
fix
cloud-fan Oct 23, 2019
33ceedc
update
cloud-fan Oct 23, 2019
f759fd5
Regenerated result on EC2 (#14)
dongjoon-hyun Oct 24, 2019
77f69a1
Merge remote-tracking branch 'origin/master' into parser
cloud-fan Oct 24, 2019
48b7ef4
more tests
cloud-fan Oct 24, 2019
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
more tests
  • Loading branch information
@cloud-fan
cloud-fan committed Oct 24, 2019
commit 48b7ef4c42c2bf98ffda16e77e2ef10bd78f5d9f
19 changes: 18 additions & 1 deletion sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/util/IntervalUtilsSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import org.apache.spark.unsafe.types.CalendarInterval._

class IntervalUtilsSuite extends SparkFunSuite {

test("fromString") {
test("fromString: basic") {
testSingleUnit("YEAR", 3, 36, 0)
testSingleUnit("Month", 3, 3, 0)
testSingleUnit("Week", 3, 0, 3 * MICROS_PER_WEEK)
Expand Down Expand Up @@ -60,6 +60,23 @@ class IntervalUtilsSuite extends SparkFunSuite {
}
}

test("fromString: random order field") {
val input = "1 day 1 year"
val result = new CalendarInterval(12, MICROS_PER_DAY)
assert(fromString(input) == result)
}

test("fromString: duplicated fields") {
val input = "1 day 1 day"
val result = new CalendarInterval(0, 2 * MICROS_PER_DAY)
assert(fromString(input) == result)
}

test("fromString: value with +/-") {
val input = "+1 year -1 day"
val result = new CalendarInterval(12, -MICROS_PER_DAY)
assert(fromString(input) == result)
}

private def testSingleUnit(unit: String, number: Int, months: Int, microseconds: Long): Unit = {
for (prefix <- Seq("interval ", "")) {
Expand Down