Bug fix for propagation of pstmtCacheSize and cstmtCacheSize from main to readOnly Datasource

Currently this propagation doesn't happen and when we reduce the pstmtCacheSize size on a main datasource this isn't propagated to the readonly one.

This was picked up with a CI build failure with oracle, when the default pstmtCacheSize bumped to 300, this has meant it hits a too-many-cursors error with the CI Oracle build for ebean.

Author: rob-bygrave

ebean-datasource-api/src/main/java/io/ebean/datasource/DataSourceConfig.java

@@ -74,8 +74,8 @@ public class DataSourceConfig implements DataSourceBuilder.Settings {
   private int maxInactiveTimeSecs = 300;
   private int maxAgeMinutes = 0;
   private int trimPoolFreqSecs = 59;
-  private int pstmtCacheSize = 300;
-  private int cstmtCacheSize = 20;
+  private int pstmtCacheSize = UNSET; // defaults to 300
+  private int cstmtCacheSize = UNSET; // defaults to 20
   private int waitTimeoutMillis = 1000;
   private String poolListener;
   private boolean offline;
@@ -198,6 +198,12 @@ public DataSourceConfig setDefaults(DataSourceBuilder builder) {
     if (maxConnections == UNSET) {
       maxConnections = other.getMaxConnections();
     }
+    if (pstmtCacheSize == UNSET) {
+      pstmtCacheSize = other.getPstmtCacheSize();
+    }
+    if (cstmtCacheSize == UNSET) {
+      cstmtCacheSize = other.getCstmtCacheSize();
+    }
     if (!shutdownOnJvmExit && other.isShutdownOnJvmExit()) {
       shutdownOnJvmExit = true;
     }
@@ -576,7 +582,7 @@ public DataSourceConfig setLeakTimeMinutes(int leakTimeMinutes) {
 
   @Override
   public int getPstmtCacheSize() {
-    return pstmtCacheSize;
+    return pstmtCacheSize == UNSET ? 300 : pstmtCacheSize;
   }
 
   @Override
@@ -587,7 +593,7 @@ public DataSourceConfig setPstmtCacheSize(int pstmtCacheSize) {
 
   @Override
   public int getCstmtCacheSize() {
-    return cstmtCacheSize;
+    return cstmtCacheSize == UNSET ? 20 : cstmtCacheSize;
   }
 
   @Override

ebean-datasource-api/src/test/java/io/ebean/datasource/DataSourceConfigTest.java

@@ -198,6 +198,43 @@ void setDefaults_when_explicit() {
     assertThat(readOnly.getMaxConnections()).isEqualTo(32);
   }
 
+  @Test
+  void setDefaults_inheritsStatementCacheSizes_whenNotExplicit() {
+    DataSourceConfig main = create();
+    main.setPstmtCacheSize(50);
+    main.setCstmtCacheSize(11);
+
+    DataSourceConfig readOnly = new DataSourceConfig();
+    readOnly.setDefaults(main);
+
+    assertThat(readOnly.getPstmtCacheSize()).isEqualTo(50);
+    assertThat(readOnly.getCstmtCacheSize()).isEqualTo(11);
+  }
+
+  @Test
+  void setDefaults_keepsExplicitStatementCacheSizes() {
+    DataSourceConfig main = create();
+    main.setPstmtCacheSize(50);
+    main.setCstmtCacheSize(11);
+
+    DataSourceConfig readOnly = new DataSourceConfig();
+    readOnly.setPstmtCacheSize(70);
+    readOnly.setCstmtCacheSize(9);
+    readOnly.setDefaults(main);
+
+    assertThat(readOnly.getPstmtCacheSize()).isEqualTo(70);
+    assertThat(readOnly.getCstmtCacheSize()).isEqualTo(9);
+  }
+
+  @Test
+  void setDefaults_inheritsStatementCacheSizes_whenMainAlsoDefault() {
+    DataSourceConfig readOnly = new DataSourceConfig();
+    readOnly.setDefaults(create());
+
+    assertThat(readOnly.getPstmtCacheSize()).isEqualTo(300);
+    assertThat(readOnly.getCstmtCacheSize()).isEqualTo(20);
+  }
+
   @Test
   void setDefaults_when_explicitSameAsNormalDefaults() {
     DataSourceConfig readOnly = new DataSourceConfig();