misc various test addition

* Datasource now implements ConnectionPoolDataSource

Author: rusher

src/main/java/org/mariadb/jdbc/Configuration.java

@@ -356,7 +356,7 @@ public static Configuration parse(final String url) throws SQLException {
  * @throws SQLException if parsing exception occur
  */
  public static Configuration parse(final String url, Properties prop) throws SQLException {
- if (url != null && url.startsWith("jdbc:mariadb:")) {
+ if (acceptsUrl(url)) {
  return parseInternal(url, (prop == null) ? new Properties() : prop);
  }
  return null;
@@ -487,11 +487,8 @@ private static void mapPropertiesToOption(Builder builder, Properties properties
  }
  }
 
- } catch (IllegalAccessException n) {
- n.printStackTrace();
- } catch (SecurityException s) {
- // only for jws, so never thrown
- throw new IllegalArgumentException("Security too restrictive : " + s.getMessage());
+ } catch (IllegalAccessException | SecurityException s) {
+ throw new IllegalArgumentException("Unexpected error", s);
  }
  builder._nonMappedOptions = nonMappedOptions;
  }

src/main/java/org/mariadb/jdbc/Driver.java

@@ -103,40 +103,37 @@ public boolean acceptsURL(String url) {
  * @throws SQLException if there is a problem getting the property info
  */
  public DriverPropertyInfo[] getPropertyInfo(String url, Properties info) throws SQLException {
- if (url != null && !url.isEmpty()) {
- Configuration conf = Configuration.parse(url, info);
- if (conf == null) {
- return new DriverPropertyInfo[0];
- }
+ Configuration conf = Configuration.parse(url, info);
+ if (conf == null) {
+ return new DriverPropertyInfo[0];
+ }
 
-  Properties propDesc = new Properties();
-  try (InputStream inputStream =
-  Driver.class.getClassLoader().getResourceAsStream("driver.properties")) {
-  propDesc.load(inputStream);
-  } catch (IOException io) {
-  // eat
-  }
+ Properties propDesc = new Properties();
+ try (InputStream inputStream =
+ Driver.class.getClassLoader().getResourceAsStream("driver.properties")) {
+ propDesc.load(inputStream);
+ } catch (IOException io) {
+ // eat
+ }
 
- List<DriverPropertyInfo> props = new ArrayList<>();
- for (Field field : Configuration.Builder.class.getDeclaredFields()) {
- if (!field.getName().startsWith("_")) {
- try {
- Field fieldConf = Configuration.class.getDeclaredField(field.getName());
- fieldConf.setAccessible(true);
- Object obj = fieldConf.get(conf);
- String value = obj == null ? null : obj.toString();
- DriverPropertyInfo propertyInfo = new DriverPropertyInfo(field.getName(), value);
- propertyInfo.description = value == null ? "" : (String) propDesc.get(field.getName());
- propertyInfo.required = false;
- props.add(propertyInfo);
- } catch (IllegalAccessException | NoSuchFieldException e) {
- // eat error
- }
+ List<DriverPropertyInfo> props = new ArrayList<>();
+ for (Field field : Configuration.Builder.class.getDeclaredFields()) {
+ if (!field.getName().startsWith("_")) {
+ try {
+ Field fieldConf = Configuration.class.getDeclaredField(field.getName());
+ fieldConf.setAccessible(true);
+ Object obj = fieldConf.get(conf);
+ String value = obj == null ? null : obj.toString();
+ DriverPropertyInfo propertyInfo = new DriverPropertyInfo(field.getName(), value);
+ propertyInfo.description = value == null ? "" : (String) propDesc.get(field.getName());
+ propertyInfo.required = false;
+ props.add(propertyInfo);
+ } catch (IllegalAccessException | NoSuchFieldException e) {
+ // eat error
  }
  }
- return props.toArray(new DriverPropertyInfo[0]);
  }
- return new DriverPropertyInfo[0];
+ return props.toArray(new DriverPropertyInfo[0]);
  }
 
  /**

src/main/java/org/mariadb/jdbc/MariaDbDataSource.java

@@ -1,12 +1,35 @@
+/*
+ * MariaDB Client for Java
+ *
+ * Copyright (c) 2012-2014 Monty Program Ab.
+ * Copyright (c) 2015-2020 MariaDB Corporation Ab.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License along
+ * with this library; if not, write to Monty Program Ab info@montyprogram.com.
+ *
+ */
+
 package org.mariadb.jdbc;
 
 import java.io.PrintWriter;
 import java.sql.*;
 import java.sql.Connection;
 import java.util.logging.Logger;
+import javax.sql.ConnectionPoolDataSource;
 import javax.sql.DataSource;
+import javax.sql.PooledConnection;
 
-public class MariaDbDataSource implements DataSource {
+public class MariaDbDataSource implements DataSource, ConnectionPoolDataSource {
 
  private final Configuration conf;
 
@@ -158,4 +181,20 @@ public void setLoginTimeout(int seconds) {
  public Logger getParentLogger() {
  return null;
  }
+
+ @Override
+ public PooledConnection getPooledConnection() throws SQLException {
+ return Driver.connect(conf);
+ }
+
+ @Override
+ public PooledConnection getPooledConnection(String username, String password)
+ throws SQLException {
+ try {
+ Configuration conf = this.conf.clone(username, password);
+ return Driver.connect(conf);
+ } catch (CloneNotSupportedException cloneNotSupportedException) {
+ throw new SQLException(cloneNotSupportedException);
+ }
+ }
 }

src/main/java/org/mariadb/jdbc/client/MultiPrimaryClient.java

@@ -55,7 +55,7 @@ public class MultiPrimaryClient implements Client {
  private static final Logger logger = Loggers.getLogger(MultiPrimaryClient.class);
 
  protected static final ConcurrentMap<HostAddress, Long> denyList = new ConcurrentHashMap<>();
- protected static final long DENY_TIMEOUT = 60_000L;
+ protected long deniedListTimeout;
  protected final Configuration conf;
  protected boolean closed = false;
  protected final ReentrantLock lock;
@@ -64,6 +64,8 @@ public class MultiPrimaryClient implements Client {
  public MultiPrimaryClient(Configuration conf, ReentrantLock lock) throws SQLException {
  this.conf = conf;
  this.lock = lock;
+ deniedListTimeout =
+ Long.parseLong(conf.nonMappedOptions().getProperty("deniedListTimeout", "60000"));
  currentClient = connectHost(false, false);
  }
 
@@ -92,12 +94,16 @@ protected Client connectHost(boolean readOnly, boolean failFast) throws SQLExcep
  : new ClientImpl(conf, host.get(), lock, false);
  } catch (SQLNonTransientConnectionException sqle) {
  lastSqle = sqle;
- denyList.putIfAbsent(host.get(), System.currentTimeMillis() + DENY_TIMEOUT);
+ denyList.putIfAbsent(host.get(), System.currentTimeMillis() + deniedListTimeout);
  maxRetries--;
  }
  }
 
- if (failFast) throw lastSqle;
+ if (failFast) {
+ throw (lastSqle != null)
+ ? lastSqle
+ : new SQLNonTransientConnectionException("No host not blacklisted");
+ }
 
  // All server corresponding to type are in deny list
  // return the one with lower denylist timeout
@@ -123,7 +129,7 @@ protected Client connectHost(boolean readOnly, boolean failFast) throws SQLExcep
  lastSqle = sqle;
  host.ifPresent(
  hostAddress ->
- denyList.putIfAbsent(hostAddress, System.currentTimeMillis() + DENY_TIMEOUT));
+ denyList.putIfAbsent(hostAddress, System.currentTimeMillis() + deniedListTimeout));
  maxRetries--;
  if (maxRetries > 0) {
  try {
@@ -141,7 +147,8 @@ protected Client connectHost(boolean readOnly, boolean failFast) throws SQLExcep
 
  protected void reConnect() throws SQLException {
 
- denyList.putIfAbsent(currentClient.getHostAddress(), System.currentTimeMillis() + DENY_TIMEOUT);
+ denyList.putIfAbsent(
+ currentClient.getHostAddress(), System.currentTimeMillis() + deniedListTimeout);
  logger.info("Connection error on {}", currentClient.getHostAddress());
  try {
  Client oldClient = currentClient;

src/main/java/org/mariadb/jdbc/client/MultiPrimaryReplicaClient.java

@@ -48,7 +48,7 @@
  */
 public class MultiPrimaryReplicaClient extends MultiPrimaryClient {
  private static final Logger logger = Loggers.getLogger(MultiPrimaryReplicaClient.class);
- protected static final long NEXT_TRY_TIMEOUT = 30_000L;
+ protected long waitTimeout;
  private Client replicaClient;
  private Client primaryClient;
  private boolean requestReadOnly;
@@ -58,12 +58,13 @@ public class MultiPrimaryReplicaClient extends MultiPrimaryClient {
  public MultiPrimaryReplicaClient(Configuration conf, ReentrantLock lock) throws SQLException {
  super(conf, lock);
  primaryClient = currentClient;
-
+ waitTimeout =
+ Long.parseLong(conf.nonMappedOptions().getProperty("waitReconnectTimeout", "30000"));
  try {
  replicaClient = connectHost(true, false);
  } catch (SQLException e) {
  replicaClient = null;
- nextTryReplica = System.currentTimeMillis() + NEXT_TRY_TIMEOUT;
+ nextTryReplica = System.currentTimeMillis() + waitTimeout;
  }
  }
 
@@ -76,7 +77,7 @@ private void reconnectIfNeeded() {
  primaryClient = connectHost(false, true);
  nextTryPrimary = -1;
  } catch (SQLException e) {
- nextTryPrimary = System.currentTimeMillis() + NEXT_TRY_TIMEOUT;
+ nextTryPrimary = System.currentTimeMillis() + waitTimeout;
  }
  }
 
@@ -90,7 +91,7 @@ private void reconnectIfNeeded() {
  currentClient = replicaClient;
  }
  } catch (SQLException e) {
- nextTryReplica = System.currentTimeMillis() + NEXT_TRY_TIMEOUT;
+ nextTryReplica = System.currentTimeMillis() + waitTimeout;
  }
  }
  }
@@ -107,7 +108,8 @@ private void reconnectIfNeeded() {
  */
  @Override
  protected void reConnect() throws SQLException {
- denyList.putIfAbsent(currentClient.getHostAddress(), System.currentTimeMillis() + DENY_TIMEOUT);
+ denyList.putIfAbsent(
+ currentClient.getHostAddress(), System.currentTimeMillis() + deniedListTimeout);
  logger.info("Connection error on {}", currentClient.getHostAddress());
  try {
  Client oldClient = currentClient;
@@ -132,7 +134,7 @@ protected void reConnect() throws SQLException {
 
  } catch (SQLNonTransientConnectionException e) {
  if (requestReadOnly) {
- nextTryReplica = System.currentTimeMillis() + NEXT_TRY_TIMEOUT;
+ nextTryReplica = System.currentTimeMillis() + waitTimeout;
  if (primaryClient != null) {
  // connector will use primary client until some replica is up
  currentClient = primaryClient;
@@ -270,12 +272,12 @@ public void close() throws SQLException {
  }
  closed = true;
  try {
- primaryClient.close();
+ if (primaryClient != null) primaryClient.close();
  } catch (SQLException e) {
  // eat
  }
  try {
- replicaClient.close();
+ if (replicaClient != null) replicaClient.close();
  } catch (SQLException e) {
  // eat
  }
@@ -299,7 +301,7 @@ public void setReadOnly(boolean readOnly) throws SQLException {
  currentClient = replicaClient;
  syncNewState(primaryClient);
  } catch (SQLException e) {
- nextTryReplica = System.currentTimeMillis() + NEXT_TRY_TIMEOUT;
+ nextTryReplica = System.currentTimeMillis() + waitTimeout;
  }
  }
  }
@@ -314,7 +316,7 @@ public void setReadOnly(boolean readOnly) throws SQLException {
  primaryClient = connectHost(false, false);
  nextTryPrimary = -1;
  } catch (SQLException e) {
- nextTryPrimary = System.currentTimeMillis() + NEXT_TRY_TIMEOUT;
+ nextTryPrimary = System.currentTimeMillis() + waitTimeout;
  throw new SQLNonTransientConnectionException(
  "Driver has failed to reconnect a primary connection", "08000");
  }

src/test/java/org/mariadb/jdbc/Common.java

@@ -30,6 +30,7 @@
 import java.sql.SQLException;
 import java.time.Duration;
 import java.time.Instant;
+import java.util.Locale;
 import java.util.Optional;
 import java.util.Properties;
 import org.junit.jupiter.api.*;
@@ -121,7 +122,9 @@ public Connection createProxyCon(HaMode mode, String opts) throws SQLException {
 
  String url = mDefUrl.replaceAll("//([^/]*)/", "//localhost:" + proxy.getLocalPort() + "/");
  if (mode != HaMode.NONE) {
- url = url.replaceAll("jdbc:mariadb:", "jdbc:mariadb:sequential:");
+ url =
+ url.replaceAll(
+ "jdbc:mariadb:", "jdbc:mariadb:" + mode.name().toLowerCase(Locale.ROOT) + ":");
  }
  if (conf.sslMode() == SslMode.VERIFY_FULL) {
  url = url.replaceAll("sslMode=verify-full", "sslMode=verify-ca");