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

Startup time improvement #4

Open
wants to merge 5 commits into
base: 5.6
Choose a base branch
from
Open

Startup time improvement #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
461acf3
prevent duplicate getParameterTypes call
Postremus Feb 25, 2022
3661932
search in already retrieved array of declared method for getter / is …
Postremus Feb 25, 2022
92c6077
Prevent getDeclaredField calls by iterating over all fields
Postremus Feb 26, 2022
ed8519e
Only decapitalize if needed
Postremus Feb 26, 2022
e7f01ff
Prevent substring call if the result would be an empty string
Postremus Feb 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions ...te-core/src/main/java/org/hibernate/bytecode/internal/bytebuddy/BytecodeProviderImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,17 +197,18 @@ public Size apply(
methodVisitor.visitVarInsn( Opcodes.ALOAD, 2 );
methodVisitor.visitLdcInsn( index++ );
methodVisitor.visitInsn( Opcodes.AALOAD );
if ( setter.getParameterTypes()[0].isPrimitive() ) {
Class<?> firstParameterType = setter.getParameterTypes()[0];
if ( firstParameterType.isPrimitive() ) {
PrimitiveUnboxingDelegate.forReferenceType( TypeDescription.Generic.OBJECT )
.assignUnboxedTo(
new TypeDescription.Generic.OfNonGenericType.ForLoadedType( setter.getParameterTypes()[0] ),
new TypeDescription.Generic.OfNonGenericType.ForLoadedType( firstParameterType ),
ReferenceTypeAwareAssigner.INSTANCE,
Assigner.Typing.DYNAMIC
)
.apply( methodVisitor, implementationContext );
}
else {
methodVisitor.visitTypeInsn( Opcodes.CHECKCAST, Type.getInternalName( setter.getParameterTypes()[0] ) );
methodVisitor.visitTypeInsn( Opcodes.CHECKCAST, Type.getInternalName( firstParameterType ) );
}
methodVisitor.visitMethodInsn(
Opcodes.INVOKEVIRTUAL,
Expand Down
90 changes: 50 additions & 40 deletions hibernate-core/src/main/java/org/hibernate/internal/util/ReflectHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,16 +423,14 @@ private static Field locateField(Class clazz, String propertyName) {
return null;
}

try {
Field field = clazz.getDeclaredField( propertyName );
if ( !isStaticField( field ) ) {
return field;
}
Field field = findField(propertyName, clazz.getDeclaredFields());
if (field == null) {
return locateField( clazz.getSuperclass(), propertyName );
}
catch ( NoSuchFieldException nsfe ) {
return locateField( clazz.getSuperclass(), propertyName );
if ( !isStaticField( field ) ) {
return field;
}
return locateField( clazz.getSuperclass(), propertyName );
}

public static boolean isStaticField(Field field) {
Expand Down Expand Up @@ -490,7 +488,8 @@ private static Method getGetterOrNull(Class[] interfaces, String propertyName) {
}

private static Method getGetterOrNull(Class containerClass, String propertyName) {
for ( Method method : containerClass.getDeclaredMethods() ) {
Method[] declaredMethods = containerClass.getDeclaredMethods();
for ( Method method : declaredMethods) {
// if the method has parameters, skip it
if ( method.getParameterCount() != 0 ) {
continue;
Expand All @@ -514,9 +513,8 @@ private static Method getGetterOrNull(Class containerClass, String propertyName)
// try "get"
if ( methodName.startsWith( "get" ) ) {
final String stemName = methodName.substring( 3 );
final String decapitalizedStemName = Introspector.decapitalize( stemName );
if ( stemName.equals( propertyName ) || decapitalizedStemName.equals( propertyName ) ) {
verifyNoIsVariantExists( containerClass, propertyName, method, stemName );
if ( stemName.equals( propertyName ) || Introspector.decapitalize( stemName ).equals( propertyName ) ) {
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good catch!

verifyNoIsVariantExists( containerClass, propertyName, method, stemName, declaredMethods);
return method;
}

Expand All @@ -525,9 +523,8 @@ private static Method getGetterOrNull(Class containerClass, String propertyName)
// if not "get", then try "is"
if ( methodName.startsWith( "is" ) ) {
final String stemName = methodName.substring( 2 );
String decapitalizedStemName = Introspector.decapitalize( stemName );
if ( stemName.equals( propertyName ) || decapitalizedStemName.equals( propertyName ) ) {
verifyNoGetVariantExists( containerClass, propertyName, method, stemName );
if ( stemName.equals( propertyName ) || Introspector.decapitalize( stemName ).equals( propertyName ) ) {
verifyNoGetVariantExists( containerClass, propertyName, method, stemName, declaredMethods);
return method;
}
}
Expand All @@ -536,21 +533,39 @@ private static Method getGetterOrNull(Class containerClass, String propertyName)
return null;
}

private static Method findAnyMatch(String name, Method[] methods) {
for (Method method : methods) {
if (method.getName().equals(name)) {
return method;
}
}
return null;
}

private static Field findField(String name, Field[] methods) {
for (Field field : methods) {
if (field.getName().equals(name)) {
return field;
}
}
return null;
}

private static void verifyNoIsVariantExists(
Class containerClass,
String propertyName,
Method getMethod,
String stemName) {
// verify that the Class does not also define a method with the same stem name with 'is'
try {
final Method isMethod = containerClass.getDeclaredMethod( "is" + stemName );
if ( !Modifier.isStatic( isMethod.getModifiers() ) && isMethod.getAnnotation( Transient.class ) == null ) {
// No such method should throw the caught exception. So if we get here, there was
// such a method.
checkGetAndIsVariants( containerClass, propertyName, getMethod, isMethod );
}
String stemName,
Method[] declaredMethods) {

Method isMethod = findAnyMatch( "is" + stemName, declaredMethods);
if (isMethod == null) {
return;
}
catch (NoSuchMethodException ignore) {

// verify that the Class does not also define a method with the same stem name with 'is'
if ( !Modifier.isStatic( isMethod.getModifiers() ) && isMethod.getAnnotation( Transient.class ) == null ) {
checkGetAndIsVariants( containerClass, propertyName, getMethod, isMethod );
}
}

Expand Down Expand Up @@ -580,17 +595,15 @@ private static void verifyNoGetVariantExists(
Class containerClass,
String propertyName,
Method isMethod,
String stemName) {
// verify that the Class does not also define a method with the same stem name with 'is'
try {
final Method getMethod = containerClass.getDeclaredMethod( "get" + stemName );
// No such method should throw the caught exception. So if we get here, there was
// such a method.
if ( !Modifier.isStatic( getMethod.getModifiers() ) && getMethod.getAnnotation( Transient.class ) == null ) {
checkGetAndIsVariants( containerClass, propertyName, getMethod, isMethod );
}
String stemName,
Method[] declaredMethods) {
Method getMethod = findAnyMatch( "get" + stemName, declaredMethods);
if (getMethod == null) {
return;
}
catch (NoSuchMethodException ignore) {
// verify that the Class does not also define a method with the same stem name with 'get'
if ( !Modifier.isStatic( getMethod.getModifiers() ) && getMethod.getAnnotation( Transient.class ) == null ) {
checkGetAndIsVariants( containerClass, propertyName, getMethod, isMethod );
}
}

Expand Down Expand Up @@ -663,8 +676,7 @@ private static Method setterOrNull(Class theClass, String propertyName, Class pr
final String methodName = method.getName();
if ( method.getParameterCount() == 1 && methodName.startsWith( "set" ) ) {
final String testOldMethod = methodName.substring( 3 );
final String testStdMethod = Introspector.decapitalize( testOldMethod );
if ( testStdMethod.equals( propertyName ) || testOldMethod.equals( propertyName ) ) {
if (testOldMethod.equals( propertyName ) || Introspector.decapitalize( testOldMethod ).equals( propertyName )) {
potentialSetter = method;
if ( propertyType == null || method.getParameterTypes()[0].equals( propertyType ) ) {
break;
Expand Down Expand Up @@ -703,8 +715,7 @@ public static Method findGetterMethodForFieldAccess(Field field, String property
// try "get"
if ( methodName.startsWith( "get" ) ) {
final String stemName = methodName.substring( 3 );
final String decapitalizedStemName = Introspector.decapitalize( stemName );
if ( stemName.equals( propertyName ) || decapitalizedStemName.equals( propertyName ) ) {
if ( stemName.equals( propertyName ) || Introspector.decapitalize( stemName ).equals( propertyName ) ) {
return method;
}

Expand All @@ -713,8 +724,7 @@ public static Method findGetterMethodForFieldAccess(Field field, String property
// if not "get", then try "is"
if ( methodName.startsWith( "is" ) ) {
final String stemName = methodName.substring( 2 );
String decapitalizedStemName = Introspector.decapitalize( stemName );
if ( stemName.equals( propertyName ) || decapitalizedStemName.equals( propertyName ) ) {
if ( stemName.equals( propertyName ) || Introspector.decapitalize( stemName ).equals( propertyName ) ) {
return method;
}
}
Expand Down
5 changes: 4 additions & 1 deletion hibernate-core/src/main/java/org/hibernate/internal/util/StringHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,10 @@ public static String replace(
return template;
}
else {
String beforePlaceholder = template.substring( 0, loc );
String beforePlaceholder = "";
if (loc > 0) {
beforePlaceholder = template.substring(0, loc);
}
String afterPlaceholder = template.substring( loc + placeholder.length() );
return replace(
beforePlaceholder,
Expand Down