Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
HHH-10104 - Fix HHH-10104 Using JPA 2.1 schema generation together wi…
…th hbm2ddl runs into deadlock with MySQL
- Loading branch information
Showing
2 changed files
with
175 additions
and
60 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
141 changes: 141 additions & 0 deletions
141
...-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/PooledConnections.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Original file line | Diff line number | Diff line change |
---|---|---|---|
@@ -0,0 +1,141 @@ | |||
/* | |||
* Hibernate, Relational Persistence for Idiomatic Java | |||
* | |||
* License: GNU Lesser General Public License (LGPL), version 2.1 or later. | |||
* See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>. | |||
*/ | |||
package org.hibernate.engine.jdbc.connections.internal; | |||
|
|||
import java.sql.Connection; | |||
import java.sql.SQLException; | |||
import java.util.concurrent.ConcurrentLinkedQueue; | |||
|
|||
import org.hibernate.internal.CoreLogging; | |||
import org.hibernate.internal.CoreMessageLogger; | |||
|
|||
/** | |||
* @author Andrea Boriero | |||
*/ | |||
public class PooledConnections { | |||
|
|||
private ConcurrentLinkedQueue<Connection> connections = new ConcurrentLinkedQueue<Connection>(); | |||
|
|||
private static final CoreMessageLogger log = CoreLogging.messageLogger( DriverManagerConnectionProviderImpl.class ); | |||
|
|||
private final ConnectionCreator connectionCreator; | |||
private final boolean autoCommit; | |||
private final int minSize; | |||
private final int maxSize; | |||
|
|||
private boolean primed; | |||
|
|||
private PooledConnections( | |||
Builder builder) { | |||
log.debugf( "Initializing Connection pool with %s Connections", builder.initialSize ); | |||
connectionCreator = builder.connectionCreator; | |||
autoCommit = builder.autoCommit; | |||
maxSize = builder.maxSize; | |||
minSize = builder.minSize; | |||
log.hibernateConnectionPoolSize( maxSize, minSize ); | |||
addConnections( builder.initialSize ); | |||
} | |||
|
|||
public void validate() { | |||
final int size = size(); | |||
|
|||
if ( !primed && size >= minSize ) { | |||
// IMPL NOTE : the purpose of primed is to allow the pool to lazily reach its | |||
// defined min-size. | |||
log.debug( "Connection pool now considered primed; min-size will be maintained" ); | |||
primed = true; | |||
} | |||
|
|||
if ( size < minSize && primed ) { | |||
int numberToBeAdded = minSize - size; | |||
log.debugf( "Adding %s Connections to the pool", numberToBeAdded ); | |||
addConnections( numberToBeAdded ); | |||
} | |||
else if ( size > maxSize ) { | |||
int numberToBeRemoved = size - maxSize; | |||
log.debugf( "Removing %s Connections from the pool", numberToBeRemoved ); | |||
removeConnections( numberToBeRemoved ); | |||
} | |||
} | |||
|
|||
public void add(Connection conn) throws SQLException { | |||
conn.setAutoCommit( true ); | |||
conn.clearWarnings(); | |||
connections.offer( conn ); | |||
} | |||
|
|||
public Connection poll() throws SQLException { | |||
Connection conn = connections.poll(); | |||
if ( conn == null ) { | |||
return null; | |||
} | |||
conn.setAutoCommit( autoCommit ); | |||
return conn; | |||
} | |||
|
|||
public void close() throws SQLException { | |||
for ( Connection connection : connections ) { | |||
connection.close(); | |||
} | |||
} | |||
|
|||
public int size() { | |||
return connections.size(); | |||
} | |||
|
|||
protected void removeConnections(int numberToBeRemoved) { | |||
for ( int i = 0; i < numberToBeRemoved; i++ ) { | |||
Connection connection = connections.poll(); | |||
try { | |||
if ( connection != null ) { | |||
connection.close(); | |||
} | |||
} | |||
catch (SQLException e) { | |||
log.unableToCloseConnection( e ); | |||
} | |||
} | |||
} | |||
|
|||
protected void addConnections(int numberOfConnections) { | |||
for ( int i = 0; i < numberOfConnections; i++ ) { | |||
connections.add( connectionCreator.createConnection() ); | |||
} | |||
} | |||
|
|||
public static class Builder { | |||
private final ConnectionCreator connectionCreator; | |||
private boolean autoCommit; | |||
private int initialSize = 1; | |||
private int minSize = 1; | |||
private int maxSize = 20; | |||
|
|||
public Builder(ConnectionCreator connectionCreator, boolean autoCommit) { | |||
this.connectionCreator = connectionCreator; | |||
this.autoCommit = autoCommit; | |||
} | |||
|
|||
public Builder initialSize(int initialSize) { | |||
this.initialSize = initialSize; | |||
return this; | |||
} | |||
|
|||
public Builder minSize(int minSize) { | |||
this.minSize = minSize; | |||
return this; | |||
} | |||
|
|||
public Builder maxSize(int maxSize) { | |||
this.maxSize = maxSize; | |||
return this; | |||
} | |||
|
|||
public PooledConnections build() { | |||
return new PooledConnections( this ); | |||
} | |||
} | |||
} |