Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

HHH-17834 lock(e, OPTIMISTIC_FORCE_INCREMENT) with TABLE_PER_SUBCLASS #8266

Merged
merged 2 commits into from
May 6, 2024
Merged

HHH-17834 lock(e, OPTIMISTIC_FORCE_INCREMENT) with TABLE_PER_SUBCLASS #8266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
66ca60c
HHH-17834 Add test for issue
mbladel Apr 3, 2024
124c92e
HHH-17834 Force version increment for the correct inheritance table
mbladel Apr 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
55 changes: 2 additions & 53 deletions hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2065,45 +2065,9 @@ protected GeneratedValuesProcessor createGeneratedValuesProcessor(

@Override
public Object forceVersionIncrement(Object id, Object currentVersion, SharedSessionContractImplementor session) {
if ( superMappingType != null ) {
return superMappingType.getEntityPersister().forceVersionIncrement( id, currentVersion, session );
}

assert getMappedTableDetails().getTableName().equals( getVersionedTableName() );
final Object nextVersion = calculateNextVersion( id, currentVersion, session );

updateCoordinator.forceVersionIncrement( id, currentVersion, nextVersion, session );

// // todo : cache this sql...
// String versionIncrementString = generateVersionIncrementUpdateString();
// PreparedStatement st;
// try {
// st = session
// .getJdbcCoordinator()
// .getStatementPreparer()
// .prepareStatement( versionIncrementString, false );
// try {
// getVersionType().nullSafeSet( st, nextVersion, 1, session );
// getIdentifierType().nullSafeSet( st, id, 2, session );
// getVersionType().nullSafeSet( st, currentVersion, 2 + getIdentifierColumnSpan(), session );
// int rows = session.getJdbcCoordinator().getResultSetReturn().executeUpdate( st );
// if ( rows != 1 ) {
// throw new StaleObjectStateException( getEntityName(), id );
// }
// }
// finally {
// session.getJdbcCoordinator().getLogicalConnection().getResourceRegistry().release( st );
// session.getJdbcCoordinator().afterStatementExecution();
// }
// }
// catch (SQLException sqle) {
// throw session.getJdbcServices().getSqlExceptionHelper().convert(
// sqle,
// "could not retrieve version: " +
// MessageHelper.infoString( this, id, getFactory() ),
// getVersionSelectString()
// );
// }

return nextVersion;
}

Expand All @@ -2113,12 +2077,8 @@ public Object forceVersionIncrement(
Object currentVersion,
boolean batching,
SharedSessionContractImplementor session) throws HibernateException {
if ( superMappingType != null ) {
return superMappingType.getEntityPersister().forceVersionIncrement( id, currentVersion, session );
}

assert getMappedTableDetails().getTableName().equals( getVersionedTableName() );
final Object nextVersion = calculateNextVersion( id, currentVersion, session );

updateCoordinator.forceVersionIncrement( id, currentVersion, nextVersion, batching, session );
return nextVersion;
}
Expand Down Expand Up @@ -2155,17 +2115,6 @@ private Object calculateNextVersion(Object id, Object currentVersion, SharedSess
return nextVersion;
}

// private String generateVersionIncrementUpdateString() {
// final Update update = new Update( getFactory().getJdbcServices().getDialect() ).setTableName( getTableName( 0 ) );
// if ( getFactory().getSessionFactoryOptions().isCommentsEnabled() ) {
// update.setComment( "forced version increment" );
// }
// update.addColumn( getVersionColumnName() );
// update.addPrimaryKeyColumns( rootTableKeyColumnNames );
// update.setVersionColumnName( getVersionColumnName() );
// return update.toStatementString();
// }

/**
* Retrieve the version number
*/
Expand Down
21 changes: 21 additions & 0 deletions ...nate-core/src/main/java/org/hibernate/persister/entity/JoinedSubclassEntityPersister.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import org.hibernate.cache.spi.access.EntityDataAccess;
import org.hibernate.cache.spi.access.NaturalIdDataAccess;
import org.hibernate.dialect.Dialect;
import org.hibernate.engine.spi.SharedSessionContractImplementor;
import org.hibernate.internal.DynamicFilterAliasGenerator;
import org.hibernate.internal.FilterAliasGenerator;
import org.hibernate.internal.util.collections.ArrayHelper;
Expand Down Expand Up @@ -1082,6 +1083,26 @@ public int determineTableNumberForColumn(String columnName) {
);
}

@Override
public Object forceVersionIncrement(Object id, Object currentVersion, SharedSessionContractImplementor session) {
if ( getSuperMappingType() != null ) {
return getSuperMappingType().getEntityPersister().forceVersionIncrement( id, currentVersion, session );
}
return super.forceVersionIncrement( id, currentVersion, session );
}

@Override
public Object forceVersionIncrement(
Object id,
Object currentVersion,
boolean batching,
SharedSessionContractImplementor session) throws HibernateException {
if ( getSuperMappingType() != null ) {
return getSuperMappingType().getEntityPersister().forceVersionIncrement( id, currentVersion, session );
}
return super.forceVersionIncrement( id, currentVersion, batching, session );
}

@Override
protected EntityVersionMapping generateVersionMapping(
Supplier<?> templateInstanceCreator,
Expand Down
127 changes: 127 additions & 0 deletions .../orm/test/mapping/inheritance/version/TablePerClassAbstractRootTypeVersionUpdateTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,127 @@
/*
* 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.orm.test.mapping.inheritance.version;

import org.hibernate.testing.orm.junit.DomainModel;
import org.hibernate.testing.orm.junit.Jira;
import org.hibernate.testing.orm.junit.SessionFactory;
import org.hibernate.testing.orm.junit.SessionFactoryScope;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;

import jakarta.persistence.Entity;
import jakarta.persistence.Id;
import jakarta.persistence.Inheritance;
import jakarta.persistence.InheritanceType;
import jakarta.persistence.LockModeType;
import jakarta.persistence.Version;

import static org.assertj.core.api.Assertions.assertThat;

/**
* @author Marco Belladelli
*/
@DomainModel( annotatedClasses = {
TablePerClassAbstractRootTypeVersionUpdateTest.Animal.class,
TablePerClassAbstractRootTypeVersionUpdateTest.Dog.class,
TablePerClassAbstractRootTypeVersionUpdateTest.Shepherd.class,
} )
@SessionFactory
@Jira( "https://hibernate.atlassian.net/browse/HHH-17834" )
public class TablePerClassAbstractRootTypeVersionUpdateTest {
@Test
public void testOptimisticIncrement(SessionFactoryScope scope) {
scope.inTransaction( session -> {
final Dog dog = session.find( Dog.class, 1L, LockModeType.OPTIMISTIC_FORCE_INCREMENT );
assertThat( dog.getVersion() ).isEqualTo( 0L );

dog.setName( "updated_1" );
session.flush();
assertThat( dog.getVersion() ).isEqualTo( 1L );
} );
scope.inSession( session -> assertThat( session.find( Dog.class, 1L ).getVersion() ).isEqualTo( 2L ) );
}

@Test
public void testPessimisticIncrement(SessionFactoryScope scope) {
scope.inSession( session -> assertThat( session.find( Dog.class, 2L ).getVersion() ).isEqualTo( 0L ) );
scope.inTransaction( session -> {
final Shepherd dog = session.find( Shepherd.class, 2L, LockModeType.PESSIMISTIC_FORCE_INCREMENT );
assertThat( dog.getVersion() ).isEqualTo( 1L );

dog.setName( "updated_2" );
session.flush();
assertThat( dog.getVersion() ).isEqualTo( 2L );
} );
}

@BeforeAll
public void setUp(SessionFactoryScope scope) {
scope.inTransaction( session -> {
session.persist( new Dog( 1L, "dog_1" ) );
session.persist( new Shepherd( 2L, "dog_2" ) );
} );
}

@AfterAll
public void tearDown(SessionFactoryScope scope) {
scope.inTransaction( session -> session.createMutationQuery( "delete from Animal" ).executeUpdate() );
}

@Entity( name = "Animal" )
@Inheritance( strategy = InheritanceType.TABLE_PER_CLASS )
abstract static class Animal {
@Id
private Long id;

private String name;

@Version
private Long version;

public Animal() {
}

public Animal(Long id, String name) {
this.id = id;
this.name = name;
}

public String getName() {
return name;
}

public void setName(String name) {
this.name = name;
}

public Long getVersion() {
return version;
}
}

@Entity( name = "Dog" )
static class Dog extends Animal {
public Dog() {
}

public Dog(Long id, String name) {
super( id, name );
}
}

@Entity( name = "Shepherd" )
static class Shepherd extends Dog {
public Shepherd() {
}

public Shepherd(Long id, String name) {
super( id, name );
}
}
}