HHH-13256 - Fix the fieldsPreUpdateNeeded property index allocation in AbstractEntityPersister#update

hibernate-core/src/main/java/org/hibernate/internal/util/collections/ArrayHelper.java

@@ -421,6 +421,12 @@ public final class ArrayHelper {
 		return destination;
 	}
 
+	public static int[] trim(int[] from, int length) {
+		int[] trimmed = new int[length];
+		System.arraycopy( from, 0, trimmed, 0, length );
+		return trimmed;
+	}
+
 	@AllowSysOut
 	public static void main(String... args) {
 		int[] batchSizes = ArrayHelper.getBatchSizes( 32 );

hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java

@@ -3546,6 +3546,7 @@ public abstract class AbstractEntityPersister
 			int valueGenerationStrategiesSize = valueGenerationStrategies.length;
 			if ( valueGenerationStrategiesSize != 0 ) {
 				int[] fieldsPreUpdateNeeded = new int[valueGenerationStrategiesSize];
+				int count = 0;
 				for ( int i = 0; i < valueGenerationStrategiesSize; i++ ) {
 					if ( valueGenerationStrategies[i] != null && valueGenerationStrategies[i].getGenerationTiming()
 							.includesUpdate() ) {
@@ -3554,7 +3555,7 @@ public abstract class AbstractEntityPersister
 								object
 						);
 						setPropertyValue( object, i, fields[i] );
-						fieldsPreUpdateNeeded[i] = i;
+						fieldsPreUpdateNeeded[count++] = i;
 					}
 				}
 //				if ( fieldsPreUpdateNeeded.length != 0 ) {
@@ -3567,7 +3568,7 @@ public abstract class AbstractEntityPersister
 //					// no dirty fields and no dirty collections so no update needed ???
 //				}
 				if ( fieldsPreUpdateNeeded.length != 0 && dirtyFields != null ) {
-					dirtyFields = ArrayHelper.join( fieldsPreUpdateNeeded, dirtyFields );
+					dirtyFields = ArrayHelper.join( dirtyFields, ArrayHelper.trim( fieldsPreUpdateNeeded, count ) );
 				}
 			}
 		}

hibernate-core/src/main/java/org/hibernate/type/TypeHelper.java

@@ -8,6 +8,7 @@ package org.hibernate.type;
 
 import org.hibernate.bytecode.enhance.spi.LazyPropertyInitializer;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
+import org.hibernate.internal.util.collections.ArrayHelper;
 import org.hibernate.property.access.internal.PropertyAccessStrategyBackRefImpl;
 import org.hibernate.tuple.NonIdentifierAttribute;
 
@@ -325,9 +326,7 @@ public class TypeHelper {
 			return null;
 		}
 		else {
-			int[] trimmed = new int[count];
+			return ArrayHelper.trim(results, count);
-			System.arraycopy( results, 0, trimmed, 0, count );
-			return trimmed;
 		}
 	}
 

hibernate-core/src/test/java/org/hibernate/test/annotations/InMemoryCreationTimestampNullableColumnTest.java

@@ -25,57 +25,56 @@ import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
 /**
  * @author Vlad Mihalcea
  */
-@TestForIssue( jiraKey = "HHH-11096" )
+@TestForIssue(jiraKey = "HHH-11096")
 public class InMemoryCreationTimestampNullableColumnTest extends BaseEntityManagerFunctionalTestCase {
 
-    @Override
+	@Override
-    protected Class<?>[] getAnnotatedClasses() {
+	protected Class<?>[] getAnnotatedClasses() {
-        return new Class<?>[]{
+		return new Class<?>[] {
-                Person.class
+				Person.class
-        };
+		};
-    }
+	}
 
-    @Entity(name = "Person")
+	@Entity(name = "Person")
-    public class Person {
+	public static class Person {
 
-        @Id
+		@Id
-        @GeneratedValue
+		@GeneratedValue
-        private Long id;
+		private Long id;
 
-        @NaturalId
+		@NaturalId
-        private String name;
+		private String name;
 
-        @Column(nullable = false)
+		@Column(nullable = false)
-        @CreationTimestamp
+		@CreationTimestamp
-        private Date creationDate;
+		private Date creationDate;
 
-        public String getName() {
+		public String getName() {
-            return name;
+			return name;
-        }
+		}
 
-        public void setName(String name) {
+		public void setName(String name) {
-            this.name = name;
+			this.name = name;
-        }
+		}
 
-        public Date getCreationDate() {
+		public Date getCreationDate() {
-            return creationDate;
+			return creationDate;
-        }
+		}
 
-        public void setCreationDate(Date creationDate) {
+		public void setCreationDate(Date creationDate) {
-            this.creationDate = creationDate;
+			this.creationDate = creationDate;
-        }
+		}
+	}
 
-    }
+	@Test
+	public void generatesCurrentTimestamp() {
+		doInJPA( this::entityManagerFactory, entityManager -> {
+			Person person = new Person();
+			person.setName( "John Doe" );
+			entityManager.persist( person );
 
-    @Test
+			entityManager.flush();
-    public void generatesCurrentTimestamp() {
+			Assert.assertNotNull( person.getCreationDate() );
-        doInJPA(this::entityManagerFactory, entityManager -> {
+		} );
-            Person person = new Person();
+	}
-            person.setName("John Doe");
-            entityManager.persist(person);
-
-            entityManager.flush();
-            Assert.assertNotNull(person.getCreationDate());
-        });
-    }
 }

hibernate-core/src/test/java/org/hibernate/test/annotations/InMemoryUpdateTimestampTest.java

@@ -0,0 +1,109 @@
+/*
+ * 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.test.annotations;
+
+import java.util.Date;
+import java.util.concurrent.atomic.AtomicReference;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+import org.hibernate.annotations.NaturalId;
+import org.hibernate.annotations.UpdateTimestamp;
+import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase;
+
+import org.hibernate.testing.TestForIssue;
+import org.junit.Assert;
+import org.junit.Test;
+
+import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * @author Vlad Mihalcea
+ */
+@TestForIssue(jiraKey = "HHH-13256")
+public class InMemoryUpdateTimestampTest extends BaseEntityManagerFunctionalTestCase {
+
+	@Override
+	protected Class<?>[] getAnnotatedClasses() {
+		return new Class<?>[] {
+				Person.class
+		};
+	}
+
+	@Test
+	public void test() {
+		doInJPA( this::entityManagerFactory, entityManager -> {
+			Person person = new Person();
+			person.setId( 1L );
+			person.setFirstName( "Jon" );
+			person.setLastName( "Doe" );
+			entityManager.persist( person );
+
+			entityManager.flush();
+			Assert.assertNotNull( person.getUpdatedOn() );
+		} );
+
+		AtomicReference<Date> beforeTimestamp = new AtomicReference<>();
+
+		sleep( 1 );
+
+		Person _person = doInJPA( this::entityManagerFactory, entityManager -> {
+			Person person = entityManager.find( Person.class, 1L );
+			beforeTimestamp.set( person.getUpdatedOn() );
+			person.setLastName( "Doe Jr." );
+
+			return person;
+		} );
+
+		assertTrue( _person.getUpdatedOn().after( beforeTimestamp.get() ) );
+	}
+
+	@Entity(name = "Person")
+	public static class Person {
+
+		@Id
+		private Long id;
+
+		private String firstName;
+
+		private String lastName;
+
+		@Column(nullable = false)
+		@UpdateTimestamp
+		private Date updatedOn;
+
+		public Long getId() {
+			return id;
+		}
+
+		public void setId(Long id) {
+			this.id = id;
+		}
+
+		public String getFirstName() {
+			return firstName;
+		}
+
+		public void setFirstName(String firstName) {
+			this.firstName = firstName;
+		}
+
+		public String getLastName() {
+			return lastName;
+		}
+
+		public void setLastName(String lastName) {
+			this.lastName = lastName;
+		}
+
+		public Date getUpdatedOn() {
+			return updatedOn;
+		}
+	}
+}