Merge branch 'master' into feature/close-async-2

Author: rbygrave

ebean-datasource-api/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-datasource-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>9.5</version>
+    <version>9.6</version>
   </parent>
 
   <artifactId>ebean-datasource-api</artifactId>

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

@@ -140,9 +140,12 @@ public DataSourceConfig copy() {
       copy.customProperties = new LinkedHashMap<>(customProperties);
     }
     if (clientInfo != null) {
-      copy.clientInfo = new Properties(clientInfo);
+      copy.clientInfo = new Properties();
+      copy.clientInfo.putAll(clientInfo);
+    }
+    if (initSql != null) {
+      copy.initSql = new ArrayList<>(initSql);
     }
-    copy.initSql = initSql;
     copy.alert = alert;
     copy.listener = listener;
     copy.enforceCleanClose = enforceCleanClose;
@@ -193,10 +196,23 @@ public DataSourceConfig setDefaults(DataSourceBuilder builder) {
     }
     if (customProperties == null) {
       var otherCustomProps = other.getCustomProperties();
-      if (otherCustomProps != null) {
+      if (otherCustomProps != null && !otherCustomProps.isEmpty()) {
         customProperties = new LinkedHashMap<>(otherCustomProps);
       }
     }
+    if (clientInfo == null) {
+      var otherClientInfo = other.getClientInfo();
+      if (otherClientInfo != null && !otherClientInfo.isEmpty()) {
+        clientInfo = new Properties();
+        clientInfo.putAll(otherClientInfo);
+      }
+    }
+    if (initSql == null) {
+      var otherInitSql = other.getInitSql();
+      if (otherInitSql != null && !otherInitSql.isEmpty()) {
+        initSql = new ArrayList<>(otherInitSql);
+      }
+    }
     return this;
   }
 
@@ -808,49 +824,58 @@ private void loadSettings(ConfigPropertiesHelper properties) {
 
     String isoLevel = properties.get("isolationLevel", _isolationLevel(isolationLevel));
     this.isolationLevel = _isolationLevel(isoLevel);
-    this.initSql = parseSql(properties.get("initSql", null));
+    String sql = properties.get("initSql", null);
+    if (sql != null && !sql.isEmpty()) {
+      if (this.initSql == null) {
+        this.initSql = new ArrayList<>();
+      }
+      parseSql(sql, this.initSql);
+    }
     this.failOnStart = properties.getBoolean("failOnStart", failOnStart);
 
     String customProperties = properties.get("customProperties", null);
     if (customProperties != null && !customProperties.isEmpty()) {
-      this.customProperties = parseCustom(customProperties);
+      if (this.customProperties == null) {
+        this.customProperties = new LinkedHashMap<>();
+      }
+      parseCustom(customProperties, this.customProperties);
     }
     String infoProperties = properties.get("clientInfo", null);
     if (infoProperties != null && !infoProperties.isEmpty()) {
-      Map<String, String> pairs = parseCustom(infoProperties);
-      if (!pairs.isEmpty()) {
+      if (this.clientInfo == null) {
         this.clientInfo = new Properties();
-        for (Map.Entry<String, String> entry : pairs.entrySet()) {
-          this.clientInfo.setProperty(entry.getKey(), entry.getValue());
-        }
       }
+      parseCustom(infoProperties, this.clientInfo);
     }
   }
 
-  private List<String> parseSql(String sql) {
-    List<String> ret = new ArrayList<>();
+  void parseSql(String sql, List<String> target) {
     if (sql != null) {
-      String[] queries = sql.split(";");
+      String splitter = ";";
+      if (sql.toLowerCase().startsWith("delimiter $$")) {
+        sql = sql.substring("delimiter $$".length());
+        splitter = "\\$\\$";
+      }
+      String[] queries = sql.split(splitter);
       for (String query : queries) {
         query = query.trim();
         if (!query.isEmpty()) {
-          ret.add(query);
+          target.add(query);
         }
       }
     }
-    return ret;
   }
 
-  Map<String, String> parseCustom(String customProperties) {
-    Map<String, String> propertyMap = new LinkedHashMap<>();
+  @SuppressWarnings("unchecked")
+    // we use raw map type here, so that we can also accept Properties as target
+  void parseCustom(String customProperties, Map target) {
     String[] pairs = customProperties.split(";");
     for (String pair : pairs) {
       String[] split = pair.split("=");
       if (split.length == 2) {
-        propertyMap.put(split[0], split[1]);
+        target.put(split[0], split[1]);
       }
     }
-    return propertyMap;
   }
 
   @Override

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

@@ -84,6 +84,9 @@ static DataSourceBuilder builder() {
   /**
    * Shutdown the pool.
    * <p>
+   * This will close all the free connections, and then go into a wait loop,
+   * waiting for the busy connections to be freed.
+   * <p>
    * This is functionally the same as {@link #offline()} but generally we expect to only
    * shut down the pool once whereas we can expect to make many calls to offline() and
    * online().

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

@@ -31,12 +31,14 @@ public interface PoolStatus {
   int waiting();
 
   /**
-   * Return the busy connection high water mark.
+   * Return the busy connection highwater mark.
    */
   int highWaterMark();
 
   /**
    * Return the number of times threads had to wait for connections.
+   * <p>
+   * This occurs when the pool is full and threads are waiting for a connection.
    */
   int waitCount();
 
@@ -45,6 +47,18 @@ public interface PoolStatus {
    */
   int hitCount();
 
+  /**
+   * Return the total time acquiring a connection from the pool.
+   */
+  long totalAcquireMicros();
+
+  /**
+   * Return the total time waiting in micros for a free connection when the pool has hit maxConnections.
+   * <p>
+   * When the pool is full and threads are waiting for a connection, this is the total time spent waiting.
+   */
+  long totalWaitMicros();
+
   /**
    * Return the max acquire time in micros.
    */

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

@@ -3,7 +3,10 @@
 import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 
@@ -37,12 +40,50 @@ public void addProperty() {
   public void parseCustom() {
 
     DataSourceConfig config = new DataSourceConfig();
-    Map<String, String> map = config.parseCustom("a=1;b=2;c=3");
+    Map<String, String> map = new HashMap<>();
+    config.parseCustom("a=1;b=2;c=3", map);
 
     assertThat(map).hasSize(3);
     assertThat(map.get("a")).isEqualTo("1");
     assertThat(map.get("b")).isEqualTo("2");
     assertThat(map.get("c")).isEqualTo("3");
+
+    config.parseCustom("a=4;b=5;d=6", map);
+    assertThat(map).hasSize(4);
+    assertThat(map.get("a")).isEqualTo("4");
+    assertThat(map.get("b")).isEqualTo("5");
+    assertThat(map.get("c")).isEqualTo("3");
+    assertThat(map.get("d")).isEqualTo("6");
+  }
+
+  @Test
+  public void parseSql() {
+
+    DataSourceConfig config = new DataSourceConfig();
+    List<String> list = new ArrayList<>();
+    config.parseSql("SET NAMES utf8mb4;SET collation_connection = 'utf8mb4_bin';SET wait_timeout = 28800", list);
+    assertThat(list).containsExactly("SET NAMES utf8mb4", "SET collation_connection = 'utf8mb4_bin'", "SET wait_timeout = 28800");
+
+    config.parseSql("delimiter $$CREATE PROCEDURE test1\n" +
+      "BEGIN\n" +
+      "DECLARE xy INT DEFAULT FALSE;\n" +
+      "END$$CREATE PROCEDURE test2\n" +
+      "BEGIN\n" +
+      "DECLARE ab INT DEFAULT FALSE;\n" +
+      "END$$", list);
+    assertThat(list).containsExactly(
+      "SET NAMES utf8mb4",
+      "SET collation_connection = 'utf8mb4_bin'",
+      "SET wait_timeout = 28800",
+      "CREATE PROCEDURE test1\n" +
+        "BEGIN\n" +
+        "DECLARE xy INT DEFAULT FALSE;\n" +
+        "END",
+      "CREATE PROCEDURE test2\n" +
+        "BEGIN\n" +
+        "DECLARE ab INT DEFAULT FALSE;\n" +
+        "END");
+
   }
 
   @Test
@@ -79,9 +120,9 @@ public void copy() {
     source.setSchema("sch");
     source.catalog("cat");
 
-    Map<String,String> customSource = new LinkedHashMap<>();
-    customSource.put("a","a");
-    customSource.put("b","b");
+    Map<String, String> customSource = new LinkedHashMap<>();
+    customSource.put("a", "a");
+    customSource.put("b", "b");
     source.setCustomProperties(customSource);
 
 
@@ -95,8 +136,8 @@ public void copy() {
     assertEquals(42, copy.getMinConnections());
     assertEquals(45, copy.getMaxConnections());
 
-    customSource.put("a","modifiedA");
-    customSource.put("c","newC");
+    customSource.put("a", "modifiedA");
+    customSource.put("c", "newC");
 
     assertEquals("a", copy.getCustomProperties().get("a"));
     assertEquals("b", copy.getCustomProperties().get("b"));
@@ -121,13 +162,30 @@ public void defaults() {
   }
 
   @Test
-  public void defaults_someOverride() {
+  void setDefaults_expect_connectionsDefault() {
+    DataSourceConfig readOnly = new DataSourceConfig();
+    readOnly.setDefaults(create());
+    assertThat(readOnly.getMinConnections()).isEqualTo(1);
+    assertThat(readOnly.getMaxConnections()).isEqualTo(20);
+  }
 
+  @Test
+  void setDefaults_when_explicit() {
+    DataSourceConfig readOnly = new DataSourceConfig();
+    readOnly.setMinConnections(21);
+    readOnly.setMaxConnections(22);
+    readOnly.setDefaults(create());
+    assertThat(readOnly.getMinConnections()).isEqualTo(21);
+    assertThat(readOnly.getMaxConnections()).isEqualTo(22);
+  }
+
+  @Test
+  public void defaults_someOverride() {
     DataSourceConfig readOnly = new DataSourceConfig();
-    readOnly.setMinConnections(3);
     readOnly.setUsername("foo2");
     readOnly.setUrl("jdbc:postgresql://127.0.0.2:5432/unit");
     readOnly.validateOnHeartbeat(false);
+    readOnly.setMinConnections(3);
 
     DataSourceBuilder configBuilder = create();
     DataSourceConfig readOnly2 = readOnly.setDefaults(configBuilder);

ebean-datasource/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.ebean</groupId>
     <artifactId>ebean-datasource-parent</artifactId>
-    <version>9.5</version>
+    <version>9.6</version>
   </parent>
 
   <artifactId>ebean-datasource</artifactId>
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-datasource-api</artifactId>
-      <version>9.5</version>
+      <version>9.6</version>
     </dependency>
 
     <dependency>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test-containers</artifactId>
-      <version>7.6</version>
+      <version>7.8</version>
       <scope>test</scope>
     </dependency>
 

ebean-datasource/src/main/java/io/ebean/datasource/pool/BusyConnectionBuffer.java

@@ -119,7 +119,7 @@ private void closeBusyConnection(PooledConnection pc) {
    */
   String busyConnectionInformation(boolean toLogger) {
     if (toLogger) {
-      Log.info("Dumping [{0}] busy connections: (Use datasource.xxx.capturestacktrace=true  ... to get stackTraces)", size());
+      Log.info("Dumping [{0}] busy connections: (Use datasource.xxx.captureStackTrace=true  ... to get stackTraces)", size());
     }
     StringBuilder sb = new StringBuilder();
     for (PooledConnection pc : slots) {