Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
* dev: (77 commits)
  Unwrap DataSource test.
  Discourage users from turning on metrics until they do something useful.
  Add idle fill test.
  Reduce the number of filler threads ... 8 threads is too many on a hyper threaded 4-core CPU.
  Start implementing [optional] metrics for HikariCP.
  Additional connection tests.
  Add provided dependency on coda hale metrics.
  Merged #48 fix connectionTest validation
  Change defaults.
  Default minIdle the same as maxPoolSize.
  Split out stateless utility functions to reduce the weight of the HikariPool class (increases readability).
  Rename idleConnectionBag to connectionBag.
  Change connectionTimeout minimum to 250ms.
  Fix timing edge case in test.
  Check validation error
  Improve warnings for invalid configuration
  Use the DriverManager to create connections.
  Update changes.log.
  Update changes.log.
  Remove deprecated calls from tests, fix test conditions for new background fill behavior.
  ...
  • Loading branch information
brettwooldridge committed Mar 26, 2014
2 parents 9b599f9 + b699cbf commit 5c1592c
Show file tree
Hide file tree
Showing 40 changed files with 2,216 additions and 510 deletions.
35 changes: 35 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
@@ -1,5 +1,40 @@
HikariCP Changes

Changes between 1.3.3 and 1.3.4

*) Added new property isolateInternalQueries used to control whether
internal pool queries such as connection alive tests are isolated
in their own transaction.

*) Added properties for DriverManager (driverClassName) and JDBC URL-based
(jdbcUrl) configuration. 1999 called and wants its JDBC driver back.

*) Added new username and password properties to allow default authentication
for connections.

*) Added support for the getConnection(username, password) method signature
to HikariDataSource.

*) Added new property readOnly to control the default read-only status
of connections in the pool.

*) Deprecated acquireIncrement property.

*) Deprecated acquireRetries property.

*) Deprecated acquireRetryDelay property.

*) Deprecated minimumPoolSize property.

*) Added new property minimumIdle used to control the minimum number of
idle connections the pool should try to maintain on a running basis.

*) Added evictConnection(Connection) method to HikariDataSource to allow
special cases where users wish to forcibly eject a connection from
the pool. To use used cautiously, read the JavaDoc before using.

*) Various bug fixes and minor enhancements.

Changes between 1.3.2 and 1.3.3

*) Removed shared state contention that was causing excessive CPU cache-line
Expand Down
10 changes: 8 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,12 @@
<version>4.3.0.Final</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.codahale.metrics</groupId>
<artifactId>metrics-core</artifactId>
<version>3.0.2</version>
<scope>provided</scope>
</dependency>

<!-- OSGi test -->
<dependency>
Expand Down Expand Up @@ -148,7 +154,7 @@
<Bundle-Name>HikariCP</Bundle-Name>
<Export-Package>com.zaxxer.hikari</Export-Package>
<Import-Package>
com.sun.tools.attach,javassist.*,
javassist.*,
javax.management,
javax.sql,
javax.sql.rowset,
Expand Down Expand Up @@ -199,7 +205,7 @@
<version>2.9.1</version>
<configuration>
<show>public</show>
<excludePackageNames>com.zaxxer.hikari.*</excludePackageNames>
<!-- excludePackageNames>com.zaxxer.hikari.*</excludePackageNames -->
<attach>true</attach>
<maxmemory>1024m</maxmemory>
</configuration>
Expand Down
Loading

0 comments on commit 5c1592c

Please sign in to comment.