From be22877c1a6b8041a95a59b4acd364d8e4765d2e Mon Sep 17 00:00:00 2001
From: Eric Marnadi <eric.marnadi@databricks.com>
Date: Wed, 27 Nov 2024 15:07:10 -0800
Subject: [PATCH] Fixing maven build for Guava dep

---
 sql/core/pom.xml                                            | 6 ++++++
 .../streaming/state/RocksDBStateStoreProvider.scala         | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/sql/core/pom.xml b/sql/core/pom.xml
index 47c9ca0ea7a1f..c10680d05bb1f 100644
--- a/sql/core/pom.xml
+++ b/sql/core/pom.xml
@@ -39,6 +39,11 @@
       <groupId>org.rocksdb</groupId>
       <artifactId>rocksdbjni</artifactId>
     </dependency>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>com.univocity</groupId>
       <artifactId>univocity-parsers</artifactId>
@@ -278,6 +283,7 @@
           <artifactSet>
             <includes>
               <include>org.spark-project.spark:unused</include>
+              <include>com.google.guava:guava</include>
             </includes>
           </artifactSet>
           <relocations>
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/state/RocksDBStateStoreProvider.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/state/RocksDBStateStoreProvider.scala
index e5a4175aeec1a..b1fb9b97a34a9 100644
--- a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/state/RocksDBStateStoreProvider.scala
+++ b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/state/RocksDBStateStoreProvider.scala
@@ -620,7 +620,7 @@ object RocksDBStateStoreProvider {
       .expireAfterAccess(1, TimeUnit.HOURS)  // Optional: Add expiration if needed
       .build[String, AvroEncoder]()
 
-    new NonFateSharingCache(guavaCache)
+    NonFateSharingCache(guavaCache)
   }
 
   def getAvroEnc(