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

Avoid wasted memory on empty maps and sets #29742

Closed
wants to merge 8 commits into from
Closed

Avoid wasted memory on empty maps and sets #29742

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f41d348
Do not waste memory on empty hash maps in annotations
Dec 26, 2022
0608bec
Do not waste memory on empty hash maps in InjectionMetadata
Dec 26, 2022
94f415d
Merge branch 'spring-projects:main' into optimizeAnnotationMemoryFoot…
Dunemaster Jan 5, 2023
21aeaa0
Hash set initial size should be elements number * 4/3 to avoid hash r…
Jan 5, 2023
b344e49
Merge branch 'spring-projects:main' into optimizeAnnotationMemoryFoot…
Dunemaster Jan 7, 2023
f3cd3ed
Replaced Set.of() and Map.of with Collections.emptyXXX
Jan 9, 2023
139ca63
fix code style
Dunemaster Jan 10, 2023
adb01e5
Merge branch 'spring-projects:main' into optimizeAnnotationMemoryFoot…
Dunemaster Jan 10, 2023
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
19 changes: 12 additions & 7 deletions ...g-beans/src/main/java/org/springframework/beans/factory/annotation/InjectionMetadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,15 +107,20 @@ protected boolean needsRefresh(Class<?> clazz) {
}

public void checkConfigMembers(RootBeanDefinition beanDefinition) {
Set<InjectedElement> checkedElements = new LinkedHashSet<>(this.injectedElements.size());
for (InjectedElement element : this.injectedElements) {
Member member = element.getMember();
if (!beanDefinition.isExternallyManagedConfigMember(member)) {
beanDefinition.registerExternallyManagedConfigMember(member);
checkedElements.add(element);
if (this.injectedElements.isEmpty()) {
this.checkedElements = Collections.emptySet();
}
else {
Set<InjectedElement> checkedElements = new LinkedHashSet<>(this.injectedElements.size()*4/3 + 1);
for (InjectedElement element : this.injectedElements) {
Member member = element.getMember();
if (!beanDefinition.isExternallyManagedConfigMember(member)) {
beanDefinition.registerExternallyManagedConfigMember(member);
checkedElements.add(element);
}
sbrannen marked this conversation as resolved.
Show resolved Hide resolved
}
this.checkedElements = checkedElements;
}
this.checkedElements = checkedElements;
}

public void inject(Object target, @Nullable String beanName, @Nullable PropertyValues pvs) throws Throwable {
Expand Down
5 changes: 4 additions & 1 deletion .../main/java/org/springframework/core/type/classreading/MergedAnnotationReadingVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import java.lang.annotation.Annotation;
import java.lang.reflect.Array;
import java.util.ArrayList;
import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
Expand Down Expand Up @@ -92,8 +93,10 @@ public AnnotationVisitor visitArray(String name) {

@Override
public void visitEnd() {
Map<String, Object> compactedAttributes
= this.attributes.size() == 0 ? Collections.emptyMap() : this.attributes;
MergedAnnotation<A> annotation = MergedAnnotation.of(
this.classLoader, this.source, this.annotationType, this.attributes);
this.classLoader, this.source, this.annotationType, compactedAttributes);
this.consumer.accept(annotation);
}

Expand Down