Skip to content

Commit d58ef69

Browse files
dreab8dreab8
committed
HHH-9287 - Fix Pooled optimizer identifiers clash with INSERT rows calling sequence directly
1 parent fff9a16 commit d58ef69

File tree

6 files changed

+179
-27
lines changed

6 files changed

+179
-27
lines changed

‎hibernate-core/src/main/java/org/hibernate/id/enhanced/PooledOptimizer.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,12 +86,12 @@ public synchronized Serializable generate(AccessCallback callback) {
8686
}
8787
else {
8888
generationState.hiValue = generationState.value;
89-
generationState.value = generationState.hiValue.copy().subtract( incrementSize );
89+
generationState.value = generationState.hiValue.copy().subtract( incrementSize - 1 );
9090
}
9191
}
92-
else if ( ! generationState.hiValue.gt( generationState.value ) ) {
92+
else if ( generationState.value.gt( generationState.hiValue ) ) {
9393
generationState.hiValue = callback.getNextValue();
94-
generationState.value = generationState.hiValue.copy().subtract( incrementSize );
94+
generationState.value = generationState.hiValue.copy().subtract( incrementSize - 1 );
9595
}
9696

9797
return generationState.value.makeValueThenIncrement();

‎hibernate-core/src/test/java/org/hibernate/id/enhanced/OptimizerUnitTest.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -85,15 +85,15 @@ public void testBasicPooledOptimizerUsage() {
8585
// test historic sequence behavior, where the initial values start at 1...
8686
SourceMock sequence = new SourceMock( 1, 10 );
8787
Optimizer optimizer = buildPooledOptimizer( -1, 10 );
88-
for ( int i = 1; i < 11; i++ ) {
88+
for ( int i = 1; i <= 11; i++ ) {
8989
next = ( Long ) optimizer.generate( sequence );
9090
assertEquals( i, next.intValue() );
9191
}
9292
assertEquals( 2, sequence.getTimesCalled() ); // twice to initialize state
9393
assertEquals( 11, sequence.getCurrentValue() );
9494
// force a "clock over"
9595
next = ( Long ) optimizer.generate( sequence );
96-
assertEquals( 11, next.intValue() );
96+
assertEquals( 12, next.intValue() );
9797
assertEquals( 3, sequence.getTimesCalled() );
9898
assertEquals( 21, sequence.getCurrentValue() );
9999
}
@@ -110,23 +110,23 @@ public void testSubsequentPooledOptimizerUsage() {
110110
assertEquals( 1001, sequence.getCurrentValue() );
111111

112112
Long next = (Long) optimizer.generate( sequence );
113-
assertEquals( 1001, next.intValue() );
113+
assertEquals( 1001 +1 , next.intValue() );
114114
assertEquals( (5+1), sequence.getTimesCalled() );
115115
assertEquals( (1001+3), sequence.getCurrentValue() );
116116

117117
next = (Long) optimizer.generate( sequence );
118-
assertEquals( (1001+1), next.intValue() );
118+
assertEquals( (1001+2), next.intValue() );
119119
assertEquals( (5+1), sequence.getTimesCalled() );
120120
assertEquals( (1001+3), sequence.getCurrentValue() );
121121

122122
next = (Long) optimizer.generate( sequence );
123-
assertEquals( (1001+2), next.intValue() );
123+
assertEquals( (1001+3), next.intValue() );
124124
assertEquals( (5+1), sequence.getTimesCalled() );
125125
assertEquals( (1001+3), sequence.getCurrentValue() );
126126

127127
// force a "clock over"
128128
next = (Long) optimizer.generate( sequence );
129-
assertEquals( (1001+3), next.intValue() );
129+
assertEquals( (1001+4), next.intValue() );
130130
assertEquals( (5+2), sequence.getTimesCalled() );
131131
assertEquals( (1001+6), sequence.getCurrentValue() );
132132
}
@@ -211,7 +211,7 @@ public void testRecoveredPooledOptimizerUsage() {
211211
// app ends, and starts back up (we should "lose" only 2 and 3 as id values)
212212
final Optimizer optimizer2 = buildPooledOptimizer( 1, 3 );
213213
next = ( Long ) optimizer2.generate( sequence );
214-
assertEquals( 4, next.intValue() );
214+
assertEquals( 5, next.intValue() );
215215
assertEquals( 3, sequence.getTimesCalled() );
216216
assertEquals( 7, sequence.getCurrentValue() );
217217
}

‎hibernate-core/src/test/java/org/hibernate/test/id/PooledHiLoSequenceIdentifierTest.java

Lines changed: 152 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,152 @@
1+
/*
2+
* Hibernate, Relational Persistence for Idiomatic Java
3+
*
4+
* Copyright (c) {DATE}, Red Hat Inc. or third-party contributors as
5+
* indicated by the @author tags or express copyright attribution
6+
* statements applied by the authors. All third-party contributions are
7+
* distributed under license by Red Hat Inc.
8+
*
9+
* This copyrighted material is made available to anyone wishing to use, modify,
10+
* copy, or redistribute it subject to the terms and conditions of the GNU
11+
* Lesser General Public License, as published by the Free Software Foundation.
12+
*
13+
* This program is distributed in the hope that it will be useful,
14+
* but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
15+
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
16+
* for more details.
17+
*
18+
* You should have received a copy of the GNU Lesser General Public License
19+
* along with this distribution; if not, write to:
20+
* Free Software Foundation, Inc.
21+
* 51 Franklin Street, Fifth Floor
22+
* Boston, MA 02110-1301 USA
23+
*/
24+
package org.hibernate.test.id;
25+
26+
import javax.persistence.Entity;
27+
import javax.persistence.GeneratedValue;
28+
import javax.persistence.GenerationType;
29+
import javax.persistence.Id;
30+
import java.sql.Connection;
31+
import java.sql.SQLException;
32+
import java.sql.Statement;
33+
import java.util.List;
34+
import java.util.Properties;
35+
36+
import org.jboss.logging.Logger;
37+
38+
import org.hibernate.Session;
39+
import org.hibernate.Transaction;
40+
import org.hibernate.annotations.GenericGenerator;
41+
import org.hibernate.cfg.Configuration;
42+
import org.hibernate.jdbc.Work;
43+
44+
import org.junit.Test;
45+
46+
import org.hibernate.testing.TestForIssue;
47+
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
48+
49+
import static org.junit.Assert.assertEquals;
50+
51+
/**
52+
* @author Andrea Boriero
53+
*/
54+
@TestForIssue(jiraKey = "HHH-9287")
55+
public class PooledHiLoSequenceIdentifierTest extends BaseCoreFunctionalTestCase {
56+
private static final Logger log = Logger.getLogger( PooledHiLoSequenceIdentifierTest.class );
57+
58+
@Test
59+
public void testSequenceIdentifierGenerator() {
60+
Session s = null;
61+
Transaction tx = null;
62+
try {
63+
s = openSession();
64+
tx = s.beginTransaction();
65+
66+
for ( int i = 0; i < 5; i++ ) {
67+
s.persist( new SequenceIdentifier() );
68+
}
69+
s.flush();
70+
71+
assertEquals( 5, countInsertedRows( s ) );
72+
73+
insertNewRow( s );
74+
insertNewRow( s );
75+
76+
assertEquals( 7, countInsertedRows( s ) );
77+
78+
List<Number> ids = s.createSQLQuery( "SELECT id FROM sequenceIdentifier" ).list();
79+
for ( Number id : ids ) {
80+
log.debug( "Found id: " + id );
81+
}
82+
83+
for ( int i = 0; i < 3; i++ ) {
84+
s.persist( new SequenceIdentifier() );
85+
}
86+
s.flush();
87+
88+
assertEquals( 10, countInsertedRows( s ) );
89+
}
90+
finally {
91+
if ( tx != null ) {
92+
tx.rollback();
93+
}
94+
95+
s.close();
96+
}
97+
}
98+
99+
private int countInsertedRows(Session s) {
100+
return ((Number) s.createSQLQuery( "SELECT COUNT(*) FROM sequenceIdentifier" )
101+
.uniqueResult()).intValue();
102+
}
103+
104+
@Override
105+
protected Class[] getAnnotatedClasses() {
106+
return new Class[] {SequenceIdentifier.class};
107+
}
108+
109+
@Override
110+
protected void configure(Configuration configuration) {
111+
Properties properties = configuration.getProperties();
112+
properties.put( "hibernate.id.new_generator_mappings", "true" );
113+
}
114+
115+
@Entity(name = "sequenceIdentifier")
116+
public static class SequenceIdentifier {
117+
118+
@Id
119+
@GenericGenerator(name = "sampleGenerator", strategy = "enhanced-sequence",
120+
parameters = {
121+
@org.hibernate.annotations.Parameter(name = "optimizer", value = "pooled"),
122+
@org.hibernate.annotations.Parameter(name = "initial_value", value = "1"),
123+
@org.hibernate.annotations.Parameter(name = "increment_size", value = "2")
124+
}
125+
)
126+
@GeneratedValue(strategy = GenerationType.TABLE, generator = "sampleGenerator")
127+
private Long id;
128+
}
129+
130+
private void insertNewRow(Session session) {
131+
session.doWork(
132+
new Work() {
133+
@Override
134+
public void execute(Connection connection) throws SQLException {
135+
Statement statement = null;
136+
try {
137+
statement = connection.createStatement();
138+
statement.executeUpdate(
139+
"INSERT INTO sequenceIdentifier VALUES (NEXT VALUE FOR hibernate_sequence)"
140+
);
141+
}
142+
finally {
143+
if ( statement != null ) {
144+
statement.close();
145+
}
146+
}
147+
}
148+
}
149+
);
150+
}
151+
}
152+

‎hibernate-core/src/test/java/org/hibernate/test/idgen/enhanced/forcedtable/PooledForcedTableSequenceTest.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@ public void testNormalBoundary() {
4646
PooledOptimizer optimizer = (PooledOptimizer) generator.getOptimizer();
4747

4848
int increment = optimizer.getIncrementSize();
49-
Entity[] entities = new Entity[ increment + 1 ];
49+
Entity[] entities = new Entity[ increment + 2 ];
5050
Session s = openSession();
5151
s.beginTransaction();
52-
for ( int i = 0; i < increment; i++ ) {
52+
for ( int i = 0; i <= increment; i++ ) {
5353
entities[i] = new Entity( "" + ( i + 1 ) );
5454
s.save( entities[i] );
5555
long expectedId = i + 1;
@@ -61,14 +61,14 @@ public void testNormalBoundary() {
6161
assertEquals( increment + 1, ( (BasicHolder) optimizer.getLastSourceValue() ).getActualLongValue() );
6262
}
6363
// now force a "clock over"
64-
entities[ increment ] = new Entity( "" + increment );
65-
s.save( entities[ increment ] );
66-
long expectedId = optimizer.getIncrementSize() + 1;
67-
assertEquals( expectedId, entities[ optimizer.getIncrementSize() ].getId().longValue() );
64+
entities[increment + 1] = new Entity( "" + increment );
65+
s.save( entities[increment + 1] );
66+
long expectedId = optimizer.getIncrementSize() + 2;
67+
assertEquals( expectedId, entities[ increment + 1 ].getId().longValue() );
6868
// initialization (2) + clock over
6969
assertEquals( 3, generator.getDatabaseStructure().getTimesAccessed() );
7070
assertEquals( ( increment * 2 ) + 1, ( (BasicHolder) optimizer.getLastSourceValue() ).getActualLongValue() );
71-
assertEquals( increment + 1, ( (BasicHolder) optimizer.getLastValue() ).getActualLongValue() );
71+
assertEquals( increment + 2, ( (BasicHolder) optimizer.getLastValue() ).getActualLongValue() );
7272
s.getTransaction().commit();
7373

7474
s.beginTransaction();

‎hibernate-core/src/test/java/org/hibernate/test/idgen/enhanced/sequence/PooledSequenceTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ public void testNormalBoundary() {
3636
PooledOptimizer optimizer = (PooledOptimizer) generator.getOptimizer();
3737

3838
int increment = optimizer.getIncrementSize();
39-
Entity[] entities = new Entity[ increment + 1 ];
39+
Entity[] entities = new Entity[ increment + 2 ];
4040
Session s = openSession();
4141
s.beginTransaction();
42-
for ( int i = 0; i < increment; i++ ) {
42+
for ( int i = 0; i <= increment; i++ ) {
4343
entities[i] = new Entity( "" + ( i + 1 ) );
4444
s.save( entities[i] );
4545
assertEquals( 2, generator.getDatabaseStructure().getTimesAccessed() ); // initialization calls seq twice
@@ -48,11 +48,11 @@ public void testNormalBoundary() {
4848
assertEquals( increment + 1, ( (BasicHolder) optimizer.getLastSourceValue() ).getActualLongValue() );
4949
}
5050
// now force a "clock over"
51-
entities[ increment ] = new Entity( "" + increment );
52-
s.save( entities[ increment ] );
51+
entities[ increment + 1 ] = new Entity( "" + increment );
52+
s.save( entities[ increment + 1 ] );
5353
assertEquals( 3, generator.getDatabaseStructure().getTimesAccessed() ); // initialization (2) + clock over
5454
assertEquals( ( increment * 2 ) + 1, ( (BasicHolder) optimizer.getLastSourceValue() ).getActualLongValue() ); // initialization (2) + clock over
55-
assertEquals( increment + 1, ( (BasicHolder) optimizer.getLastValue() ).getActualLongValue() );
55+
assertEquals( increment + 2, ( (BasicHolder) optimizer.getLastValue() ).getActualLongValue() );
5656
s.getTransaction().commit();
5757

5858
s.beginTransaction();

‎hibernate-core/src/test/java/org/hibernate/test/idgen/enhanced/table/PooledTableTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ public void testNormalBoundary() {
3636
PooledOptimizer optimizer = (PooledOptimizer) generator.getOptimizer();
3737

3838
int increment = optimizer.getIncrementSize();
39-
Entity[] entities = new Entity[ increment + 1 ];
39+
Entity[] entities = new Entity[ increment + 2 ];
4040
Session s = openSession();
4141
s.beginTransaction();
42-
for ( int i = 0; i < increment; i++ ) {
42+
for ( int i = 0; i <= increment; i++ ) {
4343
entities[i] = new Entity( "" + ( i + 1 ) );
4444
s.save( entities[i] );
4545
assertEquals( 2, generator.getTableAccessCount() ); // initialization calls seq twice
@@ -48,11 +48,11 @@ public void testNormalBoundary() {
4848
assertEquals( increment + 1, ( (BasicHolder) optimizer.getLastSourceValue() ).getActualLongValue() );
4949
}
5050
// now force a "clock over"
51-
entities[ increment ] = new Entity( "" + increment );
52-
s.save( entities[ increment ] );
51+
entities[ increment + 1 ] = new Entity( "" + increment );
52+
s.save( entities[ increment + 1 ] );
5353
assertEquals( 3, generator.getTableAccessCount() ); // initialization (2) + clock over
5454
assertEquals( ( increment * 2 ) + 1, ( (BasicHolder) optimizer.getLastSourceValue() ).getActualLongValue() ); // initialization (2) + clock over
55-
assertEquals( increment + 1, ( (BasicHolder) optimizer.getLastValue() ).getActualLongValue() );
55+
assertEquals( increment + 2, ( (BasicHolder) optimizer.getLastValue() ).getActualLongValue() );
5656
s.getTransaction().commit();
5757

5858
s.beginTransaction();

0 commit comments

Comments
 (0)