Moving getOrCreateFormatter to the DateTimeFormatterHelper trait

Author: MaxGekk

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/util/DateFormatter.scala

@@ -36,7 +36,7 @@ class Iso8601DateFormatter(
     locale: Locale) extends DateFormatter with DateTimeFormatterHelper {
 
   @transient
-  private lazy val formatter = DateTimeFormatterHelper.getFormatter(pattern, locale)
+  private lazy val formatter = getOrCreateFormatter(pattern, locale)
   private val UTC = ZoneId.of("UTC")
 
   private def toInstant(s: String): Instant = {

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/util/DateTimeFormatterHelper.scala

@@ -22,11 +22,12 @@ import java.time.chrono.IsoChronology
 import java.time.format.{DateTimeFormatter, DateTimeFormatterBuilder, ResolverStyle}
 import java.time.temporal.{ChronoField, TemporalAccessor, TemporalQueries}
 import java.util.Locale
-import java.util.concurrent.{Callable, TimeUnit}
 
 import com.google.common.cache.CacheBuilder
 import com.google.common.util.concurrent.{ExecutionError, UncheckedExecutionException}
 
+import org.apache.spark.sql.catalyst.util.DateTimeFormatterHelper._
+
 trait DateTimeFormatterHelper {
   protected def toInstantWithZoneId(temporalAccessor: TemporalAccessor, zoneId: ZoneId): Instant = {
     val localTime = if (temporalAccessor.query(TemporalQueries.localTime) == null) {
@@ -39,15 +40,30 @@ trait DateTimeFormatterHelper {
     val zonedDateTime = ZonedDateTime.of(localDateTime, zoneId)
     Instant.from(zonedDateTime)
   }
+
+  def getOrCreateFormatter(pattern: String, locale: Locale): DateTimeFormatter = {
+    try {
+      val key = (pattern, locale)
+      var formatter = cache.getIfPresent(key)
+      if (formatter == null) {
+        formatter = buildFormatter(pattern, locale)
+        cache.put(key, formatter)
+      }
+      formatter
+    } catch {
+      // Cache.get() may wrap the original exception.
+      case e @ (_: UncheckedExecutionException | _: ExecutionError) =>
+        throw e.getCause
+    }
+  }
 }
 
-object DateTimeFormatterHelper {
-  private val cache = CacheBuilder.newBuilder()
+private object DateTimeFormatterHelper {
+  val cache = CacheBuilder.newBuilder()
     .maximumSize(128)
     .build[(String, Locale), DateTimeFormatter]()
 
-
-  private def buildFormatter(pattern: String, locale: Locale): DateTimeFormatter = {
+  def buildFormatter(pattern: String, locale: Locale): DateTimeFormatter = {
     new DateTimeFormatterBuilder()
       .parseCaseInsensitive()
       .appendPattern(pattern)
@@ -60,20 +76,4 @@ object DateTimeFormatterHelper {
       .withChronology(IsoChronology.INSTANCE)
       .withResolverStyle(ResolverStyle.STRICT)
   }
-
-  def getFormatter(pattern: String, locale: Locale): DateTimeFormatter = {
-    try {
-      val key = (pattern, locale)
-      var formatter = cache.getIfPresent(key)
-      if (formatter == null) {
-        formatter = buildFormatter(pattern, locale)
-        cache.put(key, formatter)
-      }
-      formatter
-    } catch {
-      // Cache.get() may wrap the original exception.
-      case e @ (_: UncheckedExecutionException | _: ExecutionError) =>
-        throw e.getCause
-    }
-  }
 }

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/util/TimestampFormatter.scala

@@ -51,7 +51,7 @@ class Iso8601TimestampFormatter(
     timeZone: TimeZone,
     locale: Locale) extends TimestampFormatter with DateTimeFormatterHelper {
   @transient
-  private lazy val formatter = DateTimeFormatterHelper.getFormatter(pattern, locale)
+  private lazy val formatter = getOrCreateFormatter(pattern, locale)
 
   private def toInstant(s: String): Instant = {
     val temporalAccessor = formatter.parse(s)