Merge pull request #428 from nitincchauhan/dev

renamed method/var names, moved toString() to PoolBase, checking for

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)
    {
    }
 

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()

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
    // ***********************************************************************

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));
       }
    }
 

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);
    }