github-forks
/
HikariCP
mirror of https://github.com/brettwooldridge/HikariCP.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix logic error and update tests to accomodate new fill behavior.

Browse Source
pull/192/head
Brett Wooldridge 10 years ago
parent dc7cb59dc7
commit 82474b9024
6 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File

2
hikaricp-java6/src/main/java/com/zaxxer/hikari/pool/HikariPool.java
Unescape Escape View File

@ -509,7 +509,7 @@ public final class HikariPool implements HikariPoolMBean, IBagStateListener
*/
private void fillPool()
{
if (configuration.getMinimumIdle() == 0) {
if (configuration.getMinimumIdle() > 0) {
if (configuration.isInitializationFailFast() && !addConnection()) {
throw new RuntimeException("Fail-fast during pool initialization", lastConnectionFailure.getAndSet(null));
}

16
hikaricp-java6/src/test/java/com/zaxxer/hikari/ExceptionTest.java
Unescape Escape View File

@ -42,8 +42,8 @@ public class ExceptionTest
Connection connection = ds.getConnection();
Assert.assertNotNull(connection);
Assert.assertSame("Totals connections not as expected", 1, TestElf.getPool(ds).getTotalConnections());
Assert.assertSame("Idle connections not as expected", 0, TestElf.getPool(ds).getIdleConnections());
Assert.assertSame("Totals (2) connections not as expected", 1, TestElf.getPool(ds).getTotalConnections());
Assert.assertSame("Idle (2) connections not as expected", 0, TestElf.getPool(ds).getIdleConnections());
PreparedStatement statement = connection.prepareStatement("SELECT some, thing FROM somewhere WHERE something=?");
Assert.assertNotNull(statement);
@ -63,8 +63,8 @@ public class ExceptionTest
connection.close();
Assert.assertSame("Totals connections not as expected", 0, TestElf.getPool(ds).getTotalConnections());
Assert.assertSame("Idle connections not as expected", 0, TestElf.getPool(ds).getIdleConnections());
Assert.assertSame("Totals (3) connections not as expected", 0, TestElf.getPool(ds).getTotalConnections());
Assert.assertSame("Idle (3) connections not as expected", 0, TestElf.getPool(ds).getIdleConnections());
}
@Test
@ -96,8 +96,8 @@ public class ExceptionTest
Connection connection = ds.getConnection();
Assert.assertNotNull(connection);
Assert.assertSame("Totals connections not as expected", 1, TestElf.getPool(ds).getTotalConnections());
Assert.assertSame("Idle connections not as expected", 0, TestElf.getPool(ds).getIdleConnections());
Assert.assertSame("Totals (2) connections not as expected", 1, TestElf.getPool(ds).getTotalConnections());
Assert.assertSame("Idle (2) connections not as expected", 0, TestElf.getPool(ds).getIdleConnections());
connection.close();
@ -111,8 +111,8 @@ public class ExceptionTest
Assert.assertSame("Connection is closed", e.getMessage());
}
Assert.assertSame("Totals connections not as expected", 1, TestElf.getPool(ds).getTotalConnections());
Assert.assertSame("Idle connections not as expected", 1, TestElf.getPool(ds).getIdleConnections());
Assert.assertSame("Totals (3) connections not as expected", 1, TestElf.getPool(ds).getTotalConnections());
Assert.assertSame("Idle (3) connections not as expected", 1, TestElf.getPool(ds).getIdleConnections());
}
}

8
hikaricp-java6/src/test/java/com/zaxxer/hikari/ShutdownTest.java
Unescape Escape View File

@ -81,7 +81,7 @@ public class ShutdownTest
threads[i].start();
}
PoolUtilities.quietlySleep(1200);
PoolUtilities.quietlySleep(1200L);
Assert.assertTrue("Totals connection count not as expected, ", pool.getTotalConnections() > 0);
@ -109,7 +109,7 @@ public class ShutdownTest
HikariDataSource ds = new HikariDataSource(config);
HikariPool pool = TestElf.getPool(ds);
PoolUtilities.quietlySleep(1200);
PoolUtilities.quietlySleep(1200L);
Assert.assertTrue("Totals connection count not as expected, ", pool.getTotalConnections() > 0);
@ -135,6 +135,8 @@ public class ShutdownTest
HikariDataSource ds = new HikariDataSource(config);
HikariPool pool = TestElf.getPool(ds);
PoolUtilities.quietlySleep(500L);
Assert.assertTrue("Totals connection count not as expected, ", pool.getTotalConnections() == 5);
ds.close();
@ -158,7 +160,7 @@ public class ShutdownTest
HikariDataSource ds = new HikariDataSource(config);
PoolUtilities.quietlySleep(500);
PoolUtilities.quietlySleep(500L);
ds.close();

2
hikaricp/src/main/java/com/zaxxer/hikari/pool/HikariPool.java
Unescape Escape View File

@ -488,7 +488,7 @@ public final class HikariPool implements HikariPoolMBean, IBagStateListener
*/
private void fillPool()
{
if (configuration.getMinimumIdle() == 0) {
if (configuration.getMinimumIdle() > 0) {
if (configuration.isInitializationFailFast() && !addConnection()) {
throw new RuntimeException("Fail-fast during pool initialization", lastConnectionFailure.getAndSet(null));
}

16
hikaricp/src/test/java/com/zaxxer/hikari/ExceptionTest.java
Unescape Escape View File

@ -42,8 +42,8 @@ public class ExceptionTest
Connection connection = ds.getConnection();
Assert.assertNotNull(connection);
Assert.assertSame("Totals connections not as expected", 1, TestElf.getPool(ds).getTotalConnections());
Assert.assertSame("Idle connections not as expected", 0, TestElf.getPool(ds).getIdleConnections());
Assert.assertSame("Totals (2) connections not as expected", 1, TestElf.getPool(ds).getTotalConnections());
Assert.assertSame("Idle (2) connections not as expected", 0, TestElf.getPool(ds).getIdleConnections());
PreparedStatement statement = connection.prepareStatement("SELECT some, thing FROM somewhere WHERE something=?");
Assert.assertNotNull(statement);
@ -63,8 +63,8 @@ public class ExceptionTest
connection.close();
Assert.assertSame("Totals connections not as expected", 0, TestElf.getPool(ds).getTotalConnections());
Assert.assertSame("Idle connections not as expected", 0, TestElf.getPool(ds).getIdleConnections());
Assert.assertSame("Totals (3) connections not as expected", 0, TestElf.getPool(ds).getTotalConnections());
Assert.assertSame("Idle (3) connections not as expected", 0, TestElf.getPool(ds).getIdleConnections());
}
@Test
@ -96,8 +96,8 @@ public class ExceptionTest
Connection connection = ds.getConnection();
Assert.assertNotNull(connection);
Assert.assertSame("Totals connections not as expected", 1, TestElf.getPool(ds).getTotalConnections());
Assert.assertSame("Idle connections not as expected", 0, TestElf.getPool(ds).getIdleConnections());
Assert.assertSame("Totals (2) connections not as expected", 1, TestElf.getPool(ds).getTotalConnections());
Assert.assertSame("Idle (2) connections not as expected", 0, TestElf.getPool(ds).getIdleConnections());
connection.close();
@ -111,8 +111,8 @@ public class ExceptionTest
Assert.assertSame("Connection is closed", e.getMessage());
}
Assert.assertSame("Totals connections not as expected", 1, TestElf.getPool(ds).getTotalConnections());
Assert.assertSame("Idle connections not as expected", 1, TestElf.getPool(ds).getIdleConnections());
Assert.assertSame("Totals (3) connections not as expected", 1, TestElf.getPool(ds).getTotalConnections());
Assert.assertSame("Idle (3) connections not as expected", 1, TestElf.getPool(ds).getIdleConnections());
}
}

8
hikaricp/src/test/java/com/zaxxer/hikari/ShutdownTest.java
Unescape Escape View File

@ -81,7 +81,7 @@ public class ShutdownTest
threads[i].start();
}
PoolUtilities.quietlySleep(1200);
PoolUtilities.quietlySleep(1200L);
Assert.assertTrue("Totals connection count not as expected, ", pool.getTotalConnections() > 0);
@ -109,7 +109,7 @@ public class ShutdownTest
HikariDataSource ds = new HikariDataSource(config);
HikariPool pool = TestElf.getPool(ds);
PoolUtilities.quietlySleep(1200);
PoolUtilities.quietlySleep(1200L);
Assert.assertTrue("Totals connection count not as expected, ", pool.getTotalConnections() > 0);
@ -135,6 +135,8 @@ public class ShutdownTest
HikariDataSource ds = new HikariDataSource(config);
HikariPool pool = TestElf.getPool(ds);
PoolUtilities.quietlySleep(500L);
Assert.assertTrue("Totals connection count not as expected, ", pool.getTotalConnections() == 5);
ds.close();
@ -158,7 +160,7 @@ public class ShutdownTest
HikariDataSource ds = new HikariDataSource(config);
PoolUtilities.quietlySleep(500);
PoolUtilities.quietlySleep(500L);
ds.close();

Write Preview
Loading…
Cancel
Save