Fix invalidation race in CachingHiveMetastore

lib/trino-plugin-toolkit/pom.xml

@@ -146,6 +146,13 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.gaul</groupId>
+            <artifactId>modernizer-maven-annotations</artifactId>
+            <version>2.1.0</version>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>

lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/cache/EvictableCache.java

@@ -36,10 +36,10 @@
 import static java.util.Objects.requireNonNull;
 
 /**
- * A Cache implementation similar to ones produced by {@code com.google.common.cache.CacheBuilder},
- * but one that does not exhibits <a href="https://github.com/google/guava/issues/1881">Guava issue #1881</a>, i.e.
- * a {@link #getIfPresent(Object)} after {@link #invalidate(Object)} is guaranteed to return {@code null} and
- * {@link #get(Object, Callable)} after {@link #invalidate(Object)} is guaranteed to load a fresh value.
+ * A {@link Cache} implementation similar to ones produced by {@link CacheBuilder#build()}, but one that does not exhibit
+ * <a href="https://github.com/google/guava/issues/1881">Guava issue #1881</a>: a cache inspection with
+ * {@link #getIfPresent(Object)} or {@link #get(Object, Callable)} is guaranteed to return fresh state after
+ * {@link #invalidate(Object)}, {@link #invalidateAll(Iterable)} or {@link #invalidateAll()} were called.
  */
 public class EvictableCache<K, V>
         extends AbstractCache<K, V>