diff --git a/src/main/java/com/zaxxer/hikari/metrics/MetricsTracker.java b/src/main/java/com/zaxxer/hikari/metrics/MetricsTracker.java index fcbf549c..ac52e84b 100644 --- a/src/main/java/com/zaxxer/hikari/metrics/MetricsTracker.java +++ b/src/main/java/com/zaxxer/hikari/metrics/MetricsTracker.java @@ -27,11 +27,11 @@ public class MetricsTracker implements AutoCloseable { } - public void recordConnectionAcquireNanos(final long elapsedAcquireNano) + public void recordConnectionAcquiredNanos(final long elapsedAcquiredNanos) { } - public void recordConnectionUsageMillis(final long elapsedLastBorrowed) + public void recordConnectionUsageMillis(final long elapsedBorrowedMillis) { } diff --git a/src/main/java/com/zaxxer/hikari/metrics/dropwizard/CodaHaleMetricsTracker.java b/src/main/java/com/zaxxer/hikari/metrics/dropwizard/CodaHaleMetricsTracker.java index f54dd543..2c5be6ef 100644 --- a/src/main/java/com/zaxxer/hikari/metrics/dropwizard/CodaHaleMetricsTracker.java +++ b/src/main/java/com/zaxxer/hikari/metrics/dropwizard/CodaHaleMetricsTracker.java @@ -86,16 +86,16 @@ public final class CodaHaleMetricsTracker extends MetricsTracker /** {@inheritDoc} */ @Override - public void recordConnectionAcquireNanos(final long elapsedAcquireNanos) + public void recordConnectionAcquiredNanos(final long elapsedAcquiredNanos) { - connectionObtainTimer.update(elapsedAcquireNanos, TimeUnit.NANOSECONDS); + connectionObtainTimer.update(elapsedAcquiredNanos, TimeUnit.NANOSECONDS); } /** {@inheritDoc} */ @Override - public void recordConnectionUsageMillis(final long elapsedBorrowedMilli) + public void recordConnectionUsageMillis(final long elapsedBorrowedMillis) { - connectionUsage.update(elapsedBorrowedMilli); + connectionUsage.update(elapsedBorrowedMillis); } public Timer getConnectionAcquisitionTimer() diff --git a/src/main/java/com/zaxxer/hikari/pool/HikariPool.java b/src/main/java/com/zaxxer/hikari/pool/HikariPool.java index f7a1edda..0f47b7a1 100644 --- a/src/main/java/com/zaxxer/hikari/pool/HikariPool.java +++ b/src/main/java/com/zaxxer/hikari/pool/HikariPool.java @@ -314,13 +314,6 @@ public class HikariPool extends PoolBase implements HikariPoolMXBean, IBagStateL } } - /** {@inheritDoc} */ - @Override - public String toString() - { - return poolName; - } - // *********************************************************************** // IBagStateListener callback // *********************************************************************** diff --git a/src/main/java/com/zaxxer/hikari/pool/PoolBase.java b/src/main/java/com/zaxxer/hikari/pool/PoolBase.java index 2168f9f9..8ddf569b 100644 --- a/src/main/java/com/zaxxer/hikari/pool/PoolBase.java +++ b/src/main/java/com/zaxxer/hikari/pool/PoolBase.java @@ -79,7 +79,9 @@ abstract class PoolBase initializeDataSource(); } - String getPoolName() + /** {@inheritDoc} */ + @Override + public String toString() { return poolName; } @@ -130,7 +132,7 @@ abstract class PoolBase statement.execute(config.getConnectionTestQuery()); } - if (isIsolateInternalQueries && !isAutoCommit) { + if (isIsolateInternalQueries && !isReadOnly && !isAutoCommit) { connection.rollback(); } @@ -461,11 +463,13 @@ abstract class PoolBase statement.execute(sql); - if (isCommit) { - connection.commit(); - } - else if (isRollback) { - connection.rollback(); + if (!isReadOnly) { + if (isCommit) { + connection.commit(); + } + else if (isRollback) { + connection.rollback(); + } } } } @@ -566,7 +570,7 @@ abstract class PoolBase void recordConnectionUsage(final PoolEntry poolEntry) { - tracker.recordConnectionUsageMillis(poolEntry.getElapsedLastBorrowed()); + tracker.recordConnectionUsageMillis(poolEntry.getMillisSinceBorrowed()); } /** @@ -577,7 +581,7 @@ abstract class PoolBase { final long now = ClockSource.INSTANCE.currentTime(); poolEntry.lastBorrowed = now; - tracker.recordConnectionAcquireNanos(ClockSource.INSTANCE.elapsedNanos(startTime, now)); + tracker.recordConnectionAcquiredNanos(ClockSource.INSTANCE.elapsedNanos(startTime, now)); } } diff --git a/src/main/java/com/zaxxer/hikari/pool/PoolEntry.java b/src/main/java/com/zaxxer/hikari/pool/PoolEntry.java index 917643e9..7ddb63a8 100644 --- a/src/main/java/com/zaxxer/hikari/pool/PoolEntry.java +++ b/src/main/java/com/zaxxer/hikari/pool/PoolEntry.java @@ -88,7 +88,7 @@ final class PoolEntry implements IConcurrentBagEntry String getPoolName() { - return poolBase.getPoolName(); + return poolBase.toString(); } Connection getConnection() @@ -112,7 +112,7 @@ final class PoolEntry implements IConcurrentBagEntry } /** Returns millis since lastBorrowed */ - long getElapsedLastBorrowed() + long getMillisSinceBorrowed() { return ClockSource.INSTANCE.elapsedMillis(lastBorrowed); }