[WIP] Implement refactoring changes

benchmarks/src/jmh/java/software/amazon/jdbc/benchmarks/PluginBenchmarks.java

@@ -62,6 +62,8 @@
 import software.amazon.jdbc.dialect.Dialect;
 import software.amazon.jdbc.hostavailability.SimpleHostAvailabilityStrategy;
 import software.amazon.jdbc.targetdriverdialect.TargetDriverDialect;
+import software.amazon.jdbc.util.storage.StorageService;
+import software.amazon.jdbc.util.storage.StorageServiceImpl;
 import software.amazon.jdbc.util.telemetry.GaugeCallable;
 import software.amazon.jdbc.util.telemetry.TelemetryContext;
 import software.amazon.jdbc.util.telemetry.TelemetryCounter;
@@ -85,6 +87,7 @@ public class PluginBenchmarks {
       "jdbc:aws-wrapper:postgresql://instance-0.XYZ.us-east-2.rds.amazonaws.com";
   private static final String TEST_HOST = "instance-0";
   private static final int TEST_PORT = 5432;
+  private static final StorageService storageService = new StorageServiceImpl();
   private final HostSpec writerHostSpec = new HostSpecBuilder(new SimpleHostAvailabilityStrategy())
       .host(TEST_HOST).port(TEST_PORT).build();
 
@@ -164,7 +167,8 @@ public ConnectionWrapper initAndReleaseWithExecutionTimePlugin() throws SQLExcep
         mockTelemetryFactory,
         mockPluginService,
         mockHostListProviderService,
-        mockPluginManagerService)) {
+        mockPluginManagerService,
+        storageService)) {
       wrapper.releaseResources();
       return wrapper;
     }
@@ -179,7 +183,8 @@ public ConnectionWrapper initAndReleaseWithAuroraHostListPlugin() throws SQLExce
         mockTelemetryFactory,
         mockPluginService,
         mockHostListProviderService,
-        mockPluginManagerService)) {
+        mockPluginManagerService,
+        storageService)) {
       wrapper.releaseResources();
       return wrapper;
     }
@@ -194,7 +199,8 @@ public ConnectionWrapper initAndReleaseWithExecutionTimeAndAuroraHostListPlugins
         mockTelemetryFactory,
         mockPluginService,
         mockHostListProviderService,
-        mockPluginManagerService)) {
+        mockPluginManagerService,
+        storageService)) {
       wrapper.releaseResources();
       return wrapper;
     }
@@ -209,7 +215,8 @@ public ConnectionWrapper initAndReleaseWithReadWriteSplittingPlugin() throws SQL
         mockTelemetryFactory,
         mockPluginService,
         mockHostListProviderService,
-        mockPluginManagerService)) {
+        mockPluginManagerService,
+        storageService)) {
       wrapper.releaseResources();
       return wrapper;
     }
@@ -225,7 +232,8 @@ public ConnectionWrapper initAndReleaseWithAuroraHostListAndReadWriteSplittingPl
         mockTelemetryFactory,
         mockPluginService,
         mockHostListProviderService,
-        mockPluginManagerService)) {
+        mockPluginManagerService,
+        storageService)) {
       wrapper.releaseResources();
       return wrapper;
     }
@@ -243,7 +251,8 @@ public ConnectionWrapper initAndReleaseWithReadWriteSplittingPlugin_internalConn
         mockTelemetryFactory,
         mockPluginService,
         mockHostListProviderService,
-        mockPluginManagerService)) {
+        mockPluginManagerService,
+        storageService)) {
       wrapper.releaseResources();
       ConnectionProviderManager.releaseResources();
       Driver.resetCustomConnectionProvider();
@@ -264,7 +273,8 @@ public ConnectionWrapper initAndReleaseWithAuroraHostListAndReadWriteSplittingPl
         mockTelemetryFactory,
         mockPluginService,
         mockHostListProviderService,
-        mockPluginManagerService)) {
+        mockPluginManagerService,
+        storageService)) {
       wrapper.releaseResources();
       ConnectionProviderManager.releaseResources();
       Driver.resetCustomConnectionProvider();
@@ -281,7 +291,8 @@ public Statement executeStatementBaseline() throws SQLException {
         mockTelemetryFactory,
         mockPluginService,
         mockHostListProviderService,
-        mockPluginManagerService);
+        mockPluginManagerService,
+        storageService);
          Statement statement = wrapper.createStatement()) {
       return statement;
     }
@@ -297,7 +308,8 @@ public ResultSet executeStatementWithExecutionTimePlugin() throws SQLException {
             mockTelemetryFactory,
             mockPluginService,
             mockHostListProviderService,
-            mockPluginManagerService);
+            mockPluginManagerService,
+            storageService);
         Statement statement = wrapper.createStatement();
         ResultSet resultSet = statement.executeQuery("some sql")) {
       return resultSet;
@@ -314,7 +326,8 @@ public ResultSet executeStatementWithTelemetryDisabled() throws SQLException {
             mockTelemetryFactory,
             mockPluginService,
             mockHostListProviderService,
-            mockPluginManagerService);
+            mockPluginManagerService,
+            storageService);
         Statement statement = wrapper.createStatement();
         ResultSet resultSet = statement.executeQuery("some sql")) {
       return resultSet;
@@ -331,7 +344,8 @@ public ResultSet executeStatementWithTelemetry() throws SQLException {
             mockTelemetryFactory,
             mockPluginService,
             mockHostListProviderService,
-            mockPluginManagerService);
+            mockPluginManagerService,
+            storageService);
         Statement statement = wrapper.createStatement();
         ResultSet resultSet = statement.executeQuery("some sql")) {
       return resultSet;

benchmarks/src/jmh/java/software/amazon/jdbc/benchmarks/testplugin/TestConnectionWrapper.java

@@ -23,6 +23,7 @@
 import software.amazon.jdbc.HostListProviderService;
 import software.amazon.jdbc.PluginManagerService;
 import software.amazon.jdbc.PluginService;
+import software.amazon.jdbc.util.storage.StorageService;
 import software.amazon.jdbc.util.telemetry.TelemetryFactory;
 import software.amazon.jdbc.wrapper.ConnectionWrapper;
 
@@ -35,9 +36,10 @@ public TestConnectionWrapper(@NonNull Properties props,
       @NonNull final TelemetryFactory telemetryFactory,
       @NonNull PluginService pluginService,
       @NonNull HostListProviderService hostListProviderService,
-      @NonNull PluginManagerService pluginManagerService)
+      @NonNull PluginManagerService pluginManagerService,
+      @NonNull StorageService storageService)
       throws SQLException {
     super(props, url, connectionPluginManager, telemetryFactory, pluginService, hostListProviderService,
-        pluginManagerService);
+        pluginManagerService, storageService);
   }
 }

wrapper/src/main/java/software/amazon/jdbc/Driver.java

@@ -25,6 +25,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Properties;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Function;
 import java.util.logging.ConsoleHandler;
@@ -64,6 +65,10 @@
 import software.amazon.jdbc.util.PropertyUtils;
 import software.amazon.jdbc.util.RdsUtils;
 import software.amazon.jdbc.util.StringUtils;
+import software.amazon.jdbc.util.storage.ItemCategory;
+import software.amazon.jdbc.util.storage.StorageService;
+import software.amazon.jdbc.util.storage.StorageServiceImpl;
+import software.amazon.jdbc.util.storage.Topology;
 import software.amazon.jdbc.util.telemetry.DefaultTelemetryFactory;
 import software.amazon.jdbc.util.telemetry.TelemetryContext;
 import software.amazon.jdbc.util.telemetry.TelemetryFactory;
@@ -77,6 +82,8 @@ public class Driver implements java.sql.Driver {
   private static final Logger LOGGER = Logger.getLogger("software.amazon.jdbc.Driver");
   private static @Nullable Driver registeredDriver;
 
+  private static final StorageService storageService = new StorageServiceImpl();
+
   private static final AtomicReference<ResetSessionStateOnCloseCallable> resetSessionStateOnCloseCallable =
       new AtomicReference<>(null);
   private static final AtomicReference<TransferSessionStateOnSwitchCallable> transferSessionStateOnSwitchCallable =
@@ -113,6 +120,15 @@ public static void register() throws SQLException {
     final Driver driver = new Driver();
     DriverManager.registerDriver(driver);
     registeredDriver = driver;
+
+    storageService.registerItemCategoryIfAbsent(
+        ItemCategory.TOPOLOGY,
+        Topology.class,
+        false,
+        TimeUnit.MINUTES.toNanos(10),
+        TimeUnit.MINUTES.toNanos(5),
+        null,
+        null);
   }
 
   public static void deregister() throws SQLException {
@@ -388,6 +404,7 @@ public static void resetConnectionInitFunc() {
   }
 
   public static void clearCaches() {
+    storageService.clearAll();
     RdsUtils.clearCache();
     RdsHostListProvider.clearAll();
     PluginServiceImpl.clearCache();

wrapper/src/main/java/software/amazon/jdbc/PluginServiceImpl.java

@@ -54,6 +54,7 @@
 import software.amazon.jdbc.util.CacheMap;
 import software.amazon.jdbc.util.Messages;
 import software.amazon.jdbc.util.Utils;
+import software.amazon.jdbc.util.storage.StorageService;
 import software.amazon.jdbc.util.telemetry.TelemetryFactory;
 
 public class PluginServiceImpl implements PluginService, CanReleaseResources,
@@ -64,6 +65,7 @@ public class PluginServiceImpl implements PluginService, CanReleaseResources,
 
   protected static final CacheMap<String, HostAvailability> hostAvailabilityExpiringCache = new CacheMap<>();
   protected final ConnectionPluginManager pluginManager;
+  protected final StorageService storageService;
   private final Properties props;
   private final String originalUrl;
   private final String driverProtocol;
@@ -91,7 +93,8 @@ public PluginServiceImpl(
       @NonNull final Properties props,
       @NonNull final String originalUrl,
       @NonNull final String targetDriverProtocol,
-      @NonNull final TargetDriverDialect targetDriverDialect)
+      @NonNull final TargetDriverDialect targetDriverDialect,
+      @NonNull final StorageService storageService)
       throws SQLException {
 
     this(pluginManager,
@@ -101,6 +104,7 @@ public PluginServiceImpl(
         targetDriverProtocol,
         null,
         targetDriverDialect,
+        storageService,
         null,
         null);
   }
@@ -111,6 +115,7 @@ public PluginServiceImpl(
       @NonNull final String originalUrl,
       @NonNull final String targetDriverProtocol,
       @NonNull final TargetDriverDialect targetDriverDialect,
+      @NonNull final StorageService storageService,
       @Nullable final ConfigurationProfile configurationProfile) throws SQLException {
     this(pluginManager,
         new ExceptionManager(),
@@ -119,6 +124,7 @@ public PluginServiceImpl(
         targetDriverProtocol,
         null,
         targetDriverDialect,
+        storageService,
         configurationProfile,
         null);
   }
@@ -131,6 +137,7 @@ public PluginServiceImpl(
       @NonNull final String targetDriverProtocol,
       @Nullable final DialectProvider dialectProvider,
       @NonNull final TargetDriverDialect targetDriverDialect,
+      @NonNull final StorageService storageService,
       @Nullable final ConfigurationProfile configurationProfile,
       @Nullable final SessionStateService sessionStateService) throws SQLException {
     this.pluginManager = pluginManager;
@@ -141,6 +148,7 @@ public PluginServiceImpl(
     this.exceptionManager = exceptionManager;
     this.dialectProvider = dialectProvider != null ? dialectProvider : new DialectManager(this);
     this.targetDriverDialect = targetDriverDialect;
+    this.storageService = storageService;
     this.connectionProviderManager = new ConnectionProviderManager(
         this.pluginManager.getDefaultConnProvider(),
         this.pluginManager.getEffectiveConnProvider());
@@ -705,7 +713,8 @@ public void updateDialect(final @NonNull Connection connection) throws SQLExcept
     }
 
     final HostListProviderSupplier supplier = this.dialect.getHostListProvider();
-    this.setHostListProvider(supplier.getProvider(props, this.originalUrl, this, this));
+    this.setHostListProvider(supplier.getProvider(
+        this.props, this.originalUrl, this, this, this.storageService));
   }
 
   @Override

wrapper/src/main/java/software/amazon/jdbc/dialect/AuroraMysqlDialect.java

@@ -81,7 +81,7 @@ public boolean isDialect(final Connection connection) {
 
   @Override
   public HostListProviderSupplier getHostListProvider() {
-    return (properties, initialUrl, hostListProviderService, pluginService) -> {
+    return (properties, initialUrl, hostListProviderService, pluginService, storageService) -> {
 
       final FailoverConnectionPlugin failover2Plugin = pluginService.getPlugin(FailoverConnectionPlugin.class);
 
@@ -90,6 +90,7 @@ public HostListProviderSupplier getHostListProvider() {
             properties,
             initialUrl,
             hostListProviderService,
+            storageService,
             TOPOLOGY_QUERY,
             NODE_ID_QUERY,
             IS_READER_QUERY,
@@ -100,6 +101,7 @@ public HostListProviderSupplier getHostListProvider() {
           properties,
           initialUrl,
           hostListProviderService,
+          storageService,
           TOPOLOGY_QUERY,
           NODE_ID_QUERY,
           IS_READER_QUERY);

wrapper/src/main/java/software/amazon/jdbc/dialect/AuroraPgDialect.java

@@ -127,7 +127,7 @@ public boolean isDialect(final Connection connection) {
 
   @Override
   public HostListProviderSupplier getHostListProvider() {
-    return (properties, initialUrl, hostListProviderService, pluginService) -> {
+    return (properties, initialUrl, hostListProviderService, pluginService, storageService) -> {
 
       final FailoverConnectionPlugin failover2Plugin = pluginService.getPlugin(FailoverConnectionPlugin.class);
 
@@ -136,6 +136,7 @@ public HostListProviderSupplier getHostListProvider() {
             properties,
             initialUrl,
             hostListProviderService,
+            storageService,
             TOPOLOGY_QUERY,
             NODE_ID_QUERY,
             IS_READER_QUERY,
@@ -146,6 +147,7 @@ public HostListProviderSupplier getHostListProvider() {
           properties,
           initialUrl,
           hostListProviderService,
+          storageService,
           TOPOLOGY_QUERY,
           NODE_ID_QUERY,
           IS_READER_QUERY);

wrapper/src/main/java/software/amazon/jdbc/dialect/HostListProviderSupplier.java

@@ -21,12 +21,14 @@
 import software.amazon.jdbc.HostListProvider;
 import software.amazon.jdbc.HostListProviderService;
 import software.amazon.jdbc.PluginService;
+import software.amazon.jdbc.util.storage.StorageService;
 
 @FunctionalInterface
 public interface HostListProviderSupplier {
   @NonNull HostListProvider getProvider(
       final @NonNull Properties properties,
       final String initialUrl,
       final @NonNull HostListProviderService hostListProviderService,
-      final @NonNull PluginService pluginService);
+      final @NonNull PluginService pluginService,
+      final @NonNull StorageService storageService);
 }

wrapper/src/main/java/software/amazon/jdbc/dialect/MariaDbDialect.java

@@ -104,7 +104,7 @@ public List<String> getDialectUpdateCandidates() {
   }
 
   public HostListProviderSupplier getHostListProvider() {
-    return (properties, initialUrl, hostListProviderService, pluginService) ->
+    return (properties, initialUrl, hostListProviderService, pluginService, storageService) ->
         new ConnectionStringHostListProvider(properties, initialUrl, hostListProviderService);
   }
 

wrapper/src/main/java/software/amazon/jdbc/dialect/MysqlDialect.java

@@ -108,7 +108,7 @@ public List<String> getDialectUpdateCandidates() {
   }
 
   public HostListProviderSupplier getHostListProvider() {
-    return (properties, initialUrl, hostListProviderService, pluginService) ->
+    return (properties, initialUrl, hostListProviderService, pluginService, storageService) ->
         new ConnectionStringHostListProvider(properties, initialUrl, hostListProviderService);
   }
 

wrapper/src/main/java/software/amazon/jdbc/dialect/PgDialect.java

@@ -106,7 +106,7 @@ public List<String> getDialectUpdateCandidates() {
 
   @Override
   public HostListProviderSupplier getHostListProvider() {
-    return (properties, initialUrl, hostListProviderService, pluginService) ->
+    return (properties, initialUrl, hostListProviderService, pluginService, storageService) ->
         new ConnectionStringHostListProvider(properties, initialUrl, hostListProviderService);
   }
 

wrapper/src/main/java/software/amazon/jdbc/dialect/RdsMultiAzDbClusterMysqlDialect.java

@@ -96,7 +96,7 @@ public boolean isDialect(final Connection connection) {
 
   @Override
   public HostListProviderSupplier getHostListProvider() {
-    return (properties, initialUrl, hostListProviderService, pluginService) -> {
+    return (properties, initialUrl, hostListProviderService, pluginService, storageService) -> {
 
       final FailoverConnectionPlugin failover2Plugin = pluginService.getPlugin(FailoverConnectionPlugin.class);
 
@@ -105,6 +105,7 @@ public HostListProviderSupplier getHostListProvider() {
             properties,
             initialUrl,
             hostListProviderService,
+            storageService,
             TOPOLOGY_QUERY,
             NODE_ID_QUERY,
             IS_READER_QUERY,
@@ -117,6 +118,7 @@ public HostListProviderSupplier getHostListProvider() {
             properties,
             initialUrl,
             hostListProviderService,
+            storageService,
             TOPOLOGY_QUERY,
             NODE_ID_QUERY,
             IS_READER_QUERY,