Skip to content
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

Jump to bottom

[SPARK-50443][SS] Fixing Maven build errors introduced by Guava cache in RocksDBStateStoreProvider #48996

Closed
wants to merge 1 commit into from
+23 −10
Closed

[SPARK-50443][SS] Fixing Maven build errors introduced by Guava cache in RocksDBStateStoreProvider #48996

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 15 additions & 1 deletion core/src/main/scala/org/apache/spark/util/NonFateSharingCache.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

package org.apache.spark.util

import java.util.concurrent.Callable
import java.util.concurrent.{Callable, TimeUnit}

import com.google.common.cache.{Cache, CacheBuilder, CacheLoader, LoadingCache}

Expand Down Expand Up @@ -68,6 +68,20 @@ private[spark] object NonFateSharingCache {
override def load(k: K): V = loadingFunc.apply(k)
}))
}

def apply[K, V](
maximumSize: Long,
expireAfterAccessTime: Long,
expireAfterAccessTimeUnit: TimeUnit): NonFateSharingCache[K, V] = {
val builder = CacheBuilder.newBuilder().asInstanceOf[CacheBuilder[K, V]]
if (maximumSize > 0L) {
builder.maximumSize(maximumSize)
}
if(expireAfterAccessTime > 0) {
builder.expireAfterAccess(expireAfterAccessTime, expireAfterAccessTimeUnit)
}
new NonFateSharingCache(builder.build[K, V]())
}
}

private[spark] class NonFateSharingCache[K, V](protected val cache: Cache[K, V]) {
Expand Down
17 changes: 8 additions & 9 deletions ...main/scala/org/apache/spark/sql/execution/streaming/state/RocksDBStateStoreProvider.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ import java.util.concurrent.{ConcurrentHashMap, TimeUnit}

import scala.util.control.NonFatal

import com.google.common.cache.CacheBuilder
import org.apache.hadoop.conf.Configuration
import org.apache.hadoop.fs.Path

Expand Down Expand Up @@ -613,15 +612,15 @@ object RocksDBStateStoreProvider {
val VIRTUAL_COL_FAMILY_PREFIX_BYTES = 2

private val MAX_AVRO_ENCODERS_IN_CACHE = 1000
// Add the cache at companion object level so it persists across provider instances
private val avroEncoderMap: NonFateSharingCache[String, AvroEncoder] = {
val guavaCache = CacheBuilder.newBuilder()
.maximumSize(MAX_AVRO_ENCODERS_IN_CACHE) // Adjust size based on your needs
.expireAfterAccess(1, TimeUnit.HOURS) // Optional: Add expiration if needed
.build[String, AvroEncoder]()
private val AVRO_ENCODER_LIFETIME_HOURS = 1L

new NonFateSharingCache(guavaCache)
ericm-db marked this conversation as resolved.
Show resolved Hide resolved
}
// Add the cache at companion object level so it persists across provider instances
private val avroEncoderMap: NonFateSharingCache[String, AvroEncoder] =
NonFateSharingCache(
maximumSize = MAX_AVRO_ENCODERS_IN_CACHE,
expireAfterAccessTime = AVRO_ENCODER_LIFETIME_HOURS,
expireAfterAccessTimeUnit = TimeUnit.HOURS
)

def getAvroEnc(
stateStoreEncoding: String,
Expand Down