Skip to content

[SPARK-7863][Core] Create SimpleDateFormat for every SimpleDateParam instance because it's not thread-safe #6406

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
zsxwing wants to merge 3 commits into from
Closed

[SPARK-7863][Core] Create SimpleDateFormat for every SimpleDateParam instance because it's not thread-safe #6406

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9680a15
Create SimpleDateFormat for each SimpleDateParam instance because it'…
zsxwing May 26, 2015
8cdd986
Inline formats
zsxwing May 26, 2015
aeed4c1
Rewrite SimpleDateParam
zsxwing May 26, 2015
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
49 changes: 21 additions & 28 deletions core/src/main/scala/org/apache/spark/status/api/v1/SimpleDateParam.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,40 +16,33 @@
*/
package org.apache.spark.status.api.v1

import java.text.SimpleDateFormat
import java.text.{ParseException, SimpleDateFormat}
import java.util.TimeZone
import javax.ws.rs.WebApplicationException
import javax.ws.rs.core.Response
import javax.ws.rs.core.Response.Status

import scala.util.Try

private[v1] class SimpleDateParam(val originalValue: String) {
val timestamp: Long = {
SimpleDateParam.formats.collectFirst {
case fmt if Try(fmt.parse(originalValue)).isSuccess =>
fmt.parse(originalValue).getTime()
}.getOrElse(
throw new WebApplicationException(
Response
.status(Status.BAD_REQUEST)
.entity("Couldn't parse date: " + originalValue)
.build()
)
)
}
}

private[v1] object SimpleDateParam {

val formats: Seq[SimpleDateFormat] = {

val gmtDay = new SimpleDateFormat("yyyy-MM-dd")
gmtDay.setTimeZone(TimeZone.getTimeZone("GMT"))

Seq(
new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSz"),
gmtDay
)
val timestamp: Long = {
val format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSz")
try {
format.parse(originalValue).getTime()
} catch {
case _: ParseException =>
val gmtDay = new SimpleDateFormat("yyyy-MM-dd")
gmtDay.setTimeZone(TimeZone.getTimeZone("GMT"))
try {
gmtDay.parse(originalValue).getTime()
} catch {
case _: ParseException =>
throw new WebApplicationException(
Response
.status(Status.BAD_REQUEST)
.entity("Couldn't parse date: " + originalValue)
.build()
)
}
Copy link
Contributor

@andrewor14 andrewor14 May 26, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why not just make this a def makeFormats or something and add a comment explaining why it needs to be a def? It would be good to not inline it because the old code is more readable.

}
}
}
5 changes: 5 additions & 0 deletions core/src/test/scala/org/apache/spark/status/api/v1/SimpleDateParamSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
*/
package org.apache.spark.status.api.v1

import javax.ws.rs.WebApplicationException

import org.scalatest.{Matchers, FunSuite}

class SimpleDateParamSuite extends FunSuite with Matchers {
Expand All @@ -24,6 +26,9 @@ class SimpleDateParamSuite extends FunSuite with Matchers {
new SimpleDateParam("2015-02-20T23:21:17.190GMT").timestamp should be (1424474477190L)
new SimpleDateParam("2015-02-20T17:21:17.190EST").timestamp should be (1424470877190L)
new SimpleDateParam("2015-02-20").timestamp should be (1424390400000L) // GMT
intercept[WebApplicationException] {
new SimpleDateParam("invalid date")
}
}

}