Skip to content

[SPARK-46611][CORE] Remove ThreadLocal by replace SimpleDateFormat with DateTimeFormatter #44613

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
beliefer wants to merge 2 commits into from
Closed

[SPARK-46611][CORE] Remove ThreadLocal by replace SimpleDateFormat with DateTimeFormatter #44613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
40183c1
[CORE] Remove ThreadLocal by replace SimpleDateFormat with DateTimeFo…
beliefer Jan 5, 2024
33868f4
Update code
beliefer Jan 7, 2024
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
47 changes: 22 additions & 25 deletions core/src/main/scala/org/apache/spark/ui/UIUtils.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ import java.{util => ju}
import java.lang.{Long => JLong}
import java.net.URLDecoder
import java.nio.charset.StandardCharsets.UTF_8
import java.text.SimpleDateFormat
import java.time.{Instant, ZoneId}
import java.time.format.DateTimeFormatter
import java.util.{Date, Locale, TimeZone}
import javax.servlet.http.HttpServletRequest
import javax.ws.rs.core.{MediaType, MultivaluedMap, Response}
Expand All @@ -42,15 +43,14 @@ private[spark] object UIUtils extends Logging {
val TABLE_CLASS_STRIPED = TABLE_CLASS_NOT_STRIPED + " table-striped"
val TABLE_CLASS_STRIPED_SORTABLE = TABLE_CLASS_STRIPED + " sortable"

// SimpleDateFormat is not thread-safe. Don't expose it to avoid improper use.
private val dateFormat = new ThreadLocal[SimpleDateFormat]() {
override def initialValue(): SimpleDateFormat =
new SimpleDateFormat("yyyy/MM/dd HH:mm:ss", Locale.US)
}
private val dateTimeFormatter = DateTimeFormatter
.ofPattern("yyyy/MM/dd HH:mm:ss", Locale.US)
.withZone(ZoneId.systemDefault())

def formatDate(date: Date): String = dateFormat.get.format(date)
def formatDate(date: Date): String = dateTimeFormatter.format(date.toInstant)

def formatDate(timestamp: Long): String = dateFormat.get.format(new Date(timestamp))
def formatDate(timestamp: Long): String =
dateTimeFormatter.format(Instant.ofEpochMilli(timestamp))

def formatDuration(milliseconds: Long): String = {
if (milliseconds < 100) {
Expand Down Expand Up @@ -124,16 +124,13 @@ private[spark] object UIUtils extends Logging {
}
}

// SimpleDateFormat is not thread-safe. Don't expose it to avoid improper use.
private val batchTimeFormat = new ThreadLocal[SimpleDateFormat]() {
override def initialValue(): SimpleDateFormat =
new SimpleDateFormat("yyyy/MM/dd HH:mm:ss", Locale.US)
}
private val batchTimeFormat = DateTimeFormatter
.ofPattern("yyyy/MM/dd HH:mm:ss", Locale.US)
.withZone(ZoneId.systemDefault())

private val batchTimeFormatWithMilliseconds = new ThreadLocal[SimpleDateFormat]() {
override def initialValue(): SimpleDateFormat =
new SimpleDateFormat("yyyy/MM/dd HH:mm:ss.SSS", Locale.US)
}
private val batchTimeFormatWithMilliseconds = DateTimeFormatter
.ofPattern("yyyy/MM/dd HH:mm:ss.SSS", Locale.US)
.withZone(ZoneId.systemDefault())

/**
* If `batchInterval` is less than 1 second, format `batchTime` with milliseconds. Otherwise,
Expand All @@ -150,19 +147,19 @@ private[spark] object UIUtils extends Logging {
batchInterval: Long,
showYYYYMMSS: Boolean = true,
timezone: TimeZone = null): String = {
val oldTimezones =
(batchTimeFormat.get.getTimeZone, batchTimeFormatWithMilliseconds.get.getTimeZone)
val oldTimezones = (batchTimeFormat.getZone, batchTimeFormatWithMilliseconds.getZone)
if (timezone != null) {
batchTimeFormat.get.setTimeZone(timezone)
batchTimeFormatWithMilliseconds.get.setTimeZone(timezone)
val zoneId = timezone.toZoneId
batchTimeFormat.withZone(zoneId)
Copy link
Member

@srowen srowen Jan 8, 2024

Choose a reason for hiding this comment

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

This looks like a regression - see #44619

batchTimeFormatWithMilliseconds.withZone(zoneId)
}
try {
val formattedBatchTime =
if (batchInterval < 1000) {
batchTimeFormatWithMilliseconds.get.format(batchTime)
batchTimeFormatWithMilliseconds.format(Instant.ofEpochMilli(batchTime))
} else {
// If batchInterval >= 1 second, don't show milliseconds
batchTimeFormat.get.format(batchTime)
batchTimeFormat.format(Instant.ofEpochMilli(batchTime))
}
if (showYYYYMMSS) {
formattedBatchTime
Expand All @@ -171,8 +168,8 @@ private[spark] object UIUtils extends Logging {
}
} finally {
if (timezone != null) {
batchTimeFormat.get.setTimeZone(oldTimezones._1)
batchTimeFormatWithMilliseconds.get.setTimeZone(oldTimezones._2)
batchTimeFormat.withZone(oldTimezones._1)
batchTimeFormatWithMilliseconds.withZone(oldTimezones._2)
}
}
}
Expand Down
18 changes: 8 additions & 10 deletions sql/core/src/main/scala/org/apache/spark/sql/streaming/ui/UIUtils.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,10 @@

package org.apache.spark.sql.streaming.ui

import java.text.SimpleDateFormat
import java.time.ZonedDateTime
import java.time.format.DateTimeFormatter

import org.apache.spark.sql.catalyst.util.DateTimeUtils.getTimeZone
import org.apache.spark.sql.catalyst.util.DateTimeUtils.getZoneId

private[ui] object UIUtils {

Expand Down Expand Up @@ -62,15 +63,12 @@ private[ui] object UIUtils {
}
}

private val progressTimestampFormat = new ThreadLocal[SimpleDateFormat]() {
override def initialValue(): SimpleDateFormat = {
val format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'") // ISO8601
format.setTimeZone(getTimeZone("UTC"))
format
}
}
private val progressTimestampFormat = DateTimeFormatter
.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'") // ISO8601
.withZone(getZoneId("UTC"))

def parseProgressTimestamp(timestamp: String): Long = {
progressTimestampFormat.get.parse(timestamp).getTime
val zonedDateTime = ZonedDateTime.parse(timestamp, progressTimestampFormat)
zonedDateTime.toInstant.toEpochMilli
}
}