ADBDEV-4980: Refactoring reloadCache methods

arenadata · Feb 28, 2024 · 0614085 · 0614085
1 parent 786ed83
commit 0614085
Showing 1 changed file with 8 additions and 12 deletions.
diff --git a/server/pxf-jdbc/src/main/java/org/greenplum/pxf/plugins/jdbc/utils/ConnectionManager.java b/server/pxf-jdbc/src/main/java/org/greenplum/pxf/plugins/jdbc/utils/ConnectionManager.java
@@ -24,9 +24,7 @@
 import java.sql.DriverManager;
 import java.sql.SQLException;
 import java.sql.SQLTimeoutException;
-import java.util.HashSet;
 import java.util.Properties;
-import java.util.Set;
 import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
@@ -85,24 +83,22 @@ public ConnectionManager(DataSourceFactory factory, Ticker ticker, PxfJdbcProper
     }
 
     public void reloadCache() {
-        Set<PoolDescriptor> poolDescriptorSet = new HashSet<>(dataSources.asMap().keySet());
-        poolDescriptorSet.forEach(this::invalidateCache);
+        log.info("Invalidate cache of all pool descriptors}");
+        dataSources.invalidateAll();
         cleanCache();
     }
 
     public void reloadCacheIf(Predicate<PoolDescriptor> poolDescriptorFilter) {
-        Set<PoolDescriptor> poolDescriptorSet = dataSources.asMap().keySet().stream()
+        dataSources.asMap().keySet().stream()
                 .filter(poolDescriptorFilter)
-                .collect(Collectors.toSet());
-        poolDescriptorSet.forEach(this::invalidateCache);
+                .collect(Collectors.toSet())
+                .forEach(poolDescriptor -> {
+                    log.info("Invalidate cache of the pool descriptor {}", poolDescriptor);
+                    dataSources.invalidate(poolDescriptor);
+                });
         cleanCache();
     }
 
-    private void invalidateCache(PoolDescriptor poolDescriptor) {
-        log.info("Invalidate cache for pool descriptor {}", poolDescriptor);
-        dataSources.invalidate(poolDescriptor);
-    }
-
     /**
      * Explicitly runs cache maintenance operations.
      */