Skip to content

Eliminate lambda indirection overhead in DynamoDB Enhanced Client #6591

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

Open
RanVaknin wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Eliminate lambda indirection overhead in DynamoDB Enhanced Client #6591

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
e8a6e51
Performance fix: Eliminate lambda allocation in DynamoDB Enhanced Client
RanVaknin Nov 24, 2025
f94ce23
Add coverage for nulls and error propagation
RanVaknin Nov 24, 2025
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
47 changes: 27 additions & 20 deletions .../software/amazon/awssdk/enhanced/dynamodb/internal/mapper/ResolvedImmutableAttribute.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,33 +27,40 @@
import software.amazon.awssdk.services.dynamodb.model.AttributeValue;

@SdkInternalApi
public final class ResolvedImmutableAttribute<T, B> {
public final class ResolvedImmutableAttribute<T, B, R> {
Copy link
Contributor

@alextwoods alextwoods Feb 2, 2026

Choose a reason for hiding this comment

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

Three type parameters starts to feel like a lot to keep track of with just single letter type names. We should at least documment in comments what these are.

private final String attributeName;
private final Function<T, AttributeValue> getAttributeMethod;
private final BiConsumer<B, AttributeValue> updateBuilderMethod;
private final StaticTableMetadata tableMetadata;
private final AttributeConverter attributeConverter;
private final Function<T, R> getter;
private final AttributeType<R> attributeType;


private ResolvedImmutableAttribute(String attributeName,
Function<T, AttributeValue> getAttributeMethod,
BiConsumer<B, AttributeValue> updateBuilderMethod,
StaticTableMetadata tableMetadata,
AttributeConverter attributeConverter) {
AttributeConverter attributeConverter,

Check warning on line 42 in services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/mapper/ResolvedImmutableAttribute.java

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Provide the parametrized type for this generic. 


See more on https://sonarcloud.io/project/issues?id=aws_aws-sdk-java-v2&issues=AZrB4W2zDvggpPC86Qzf&open=AZrB4W2zDvggpPC86Qzf&pullRequest=6591
Function<T, R> getter,
AttributeType<R> attributeType) {
this.attributeName = attributeName;
this.getAttributeMethod = getAttributeMethod;
this.updateBuilderMethod = updateBuilderMethod;
this.tableMetadata = tableMetadata;
this.attributeConverter = attributeConverter;
this.getter = getter;
this.attributeType = attributeType;
}

AttributeValue getAttributeValue(T item) {
Copy link
Contributor

@alextwoods alextwoods Feb 2, 2026

Choose a reason for hiding this comment

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

Should this be private?

R value = getter.apply(item);
return value == null ? nullAttributeValue()
: attributeType.objectToAttributeValue(value);
}

public static <T, B, R> ResolvedImmutableAttribute<T, B> create(ImmutableAttribute<T, B, R> immutableAttribute,
public static <T, B, R> ResolvedImmutableAttribute<T, B, R> create(ImmutableAttribute<T, B, R> immutableAttribute,
AttributeConverter<R> attributeConverter) {

AttributeType<R> attributeType = StaticAttributeType.create(attributeConverter);
Function<T, AttributeValue> getAttributeValueWithTransform = item -> {
R value = immutableAttribute.getter().apply(item);
return value == null ? nullAttributeValue() : attributeType.objectToAttributeValue(value);
};
Function<T, R> getter = immutableAttribute.getter();

// When setting a value on the java object, do not explicitly set nulls as this can cause an NPE to be thrown
// if the target attribute type is a primitive.
Expand All @@ -78,35 +85,35 @@
tag.modifyMetadata(immutableAttribute.name(), attributeType.attributeValueType()).accept(tableMetadataBuilder);
});
return new ResolvedImmutableAttribute<>(immutableAttribute.name(),
getAttributeValueWithTransform,
updateBuilderWithTransform,
tableMetadataBuilder.build(),
attributeConverter);
attributeConverter,
getter,
attributeType);
}

public <T1, B1> ResolvedImmutableAttribute<T1, B1> transform(
public <T1, B1> ResolvedImmutableAttribute<T1, B1, R> transform(
Function<T1, T> transformItem,
Function<B1, B> transformBuilder) {

return new ResolvedImmutableAttribute<>(
attributeName,
(item, value) -> updateBuilderMethod.accept(transformBuilder.apply(item), value),
tableMetadata,
attributeConverter,
item -> {
T otherItem = transformItem.apply(item);

// If the containing object is null don't attempt to read attributes from it
return otherItem == null ?
nullAttributeValue() : getAttributeMethod.apply(otherItem);
return otherItem == null ? null : getter.apply(otherItem);
},
(item, value) -> updateBuilderMethod.accept(transformBuilder.apply(item), value),
tableMetadata, attributeConverter);
attributeType);
}

public String attributeName() {
return attributeName;
}

public Function<T, AttributeValue> attributeGetterMethod() {
return getAttributeMethod;
return this::getAttributeValue;
}

public BiConsumer<B, AttributeValue> updateItemMethod() {
Expand Down
2 changes: 1 addition & 1 deletion ...ced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/mapper/ImmutableAttribute.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ public Builder<T, B, R> toBuilder() {
}


ResolvedImmutableAttribute<T, B> resolve(AttributeConverterProvider attributeConverterProvider) {
ResolvedImmutableAttribute<T, B, R> resolve(AttributeConverterProvider attributeConverterProvider) {
return ResolvedImmutableAttribute.create(this,
converterFrom(attributeConverterProvider));
}
Expand Down
24 changes: 12 additions & 12 deletions ...main/java/software/amazon/awssdk/enhanced/dynamodb/mapper/StaticImmutableTableSchema.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,10 @@
@SdkPublicApi
@ThreadSafe
public final class StaticImmutableTableSchema<T, B> implements TableSchema<T> {
private final List<ResolvedImmutableAttribute<T, B>> attributeMappers;
private final List<ResolvedImmutableAttribute<T, B, ?>> attributeMappers;
private final Supplier<B> newBuilderSupplier;
private final Function<B, T> buildItemFunction;
private final Map<String, ResolvedImmutableAttribute<T, B>> indexedMappers;
private final Map<String, ResolvedImmutableAttribute<T, B, ?>> indexedMappers;
private final StaticTableMetadata tableMetadata;
private final EnhancedType<T> itemType;
private final AttributeConverterProvider attributeConverterProvider;
Expand Down Expand Up @@ -203,12 +203,12 @@ private StaticImmutableTableSchema(Builder<T, B> builder) {
ConverterProviderResolver.resolveProviders(builder.attributeConverterProviders);

// Resolve declared attributes and find converters for them
Stream<ResolvedImmutableAttribute<T, B>> attributesStream = builder.attributes == null ?
Stream<ResolvedImmutableAttribute<T, B, ?>> attributesStream = builder.attributes == null ?
Stream.empty() : builder.attributes.stream().map(a -> a.resolve(this.attributeConverterProvider));

// Merge resolved declared attributes
List<ResolvedImmutableAttribute<T, B>> mutableAttributeMappers = new ArrayList<>();
Map<String, ResolvedImmutableAttribute<T, B>> mutableIndexedMappers = new HashMap<>();
List<ResolvedImmutableAttribute<T, B, ?>> mutableAttributeMappers = new ArrayList<>();
Map<String, ResolvedImmutableAttribute<T, B, ?>> mutableIndexedMappers = new HashMap<>();
Set<String> mutableAttributeNames = new LinkedHashSet<>();
Stream.concat(attributesStream, builder.additionalAttributes.stream()).forEach(
resolvedAttribute -> {
Expand Down Expand Up @@ -300,7 +300,7 @@ public static <T, B> Builder<T, B> builder(EnhancedType<T> itemType, EnhancedTyp
public static final class Builder<T, B> {
private final EnhancedType<T> itemType;
private final EnhancedType<B> builderType;
private final List<ResolvedImmutableAttribute<T, B>> additionalAttributes = new ArrayList<>();
private final List<ResolvedImmutableAttribute<T, B, ?>> additionalAttributes = new ArrayList<>();
private final List<FlattenedMapper<T, B, ?>> flattenedObjectMappers = new ArrayList<>();

private FlattenedMapperForMaps<T, B> flattenedMapMapper;
Expand Down Expand Up @@ -447,7 +447,7 @@ public <T1> Builder<T, B> flatten(String mapName, Function<T, Map<String, String
* table schema.
*/
public Builder<T, B> extend(StaticImmutableTableSchema<? super T, ? super B> superTableSchema) {
Stream<ResolvedImmutableAttribute<T, B>> attributeStream =
Stream<ResolvedImmutableAttribute<T, B, ?>> attributeStream =
upcastingTransformForAttributes(superTableSchema.attributeMappers);
attributeStream.forEach(this.additionalAttributes::add);
return this;
Expand Down Expand Up @@ -508,8 +508,8 @@ public StaticImmutableTableSchema<T, B> build() {
return new StaticImmutableTableSchema<>(this);
}

private static <T extends T1, T1, B extends B1, B1> Stream<ResolvedImmutableAttribute<T, B>>
upcastingTransformForAttributes(Collection<ResolvedImmutableAttribute<T1, B1>> superAttributes) {
private static <T extends T1, T1, B extends B1, B1> Stream<ResolvedImmutableAttribute<T, B, ?>>
upcastingTransformForAttributes(Collection<ResolvedImmutableAttribute<T1, B1, ?>> superAttributes) {

return superAttributes.stream().map(attribute -> attribute.transform(x -> x, x -> x));
}
Expand Down Expand Up @@ -538,7 +538,7 @@ public T mapToItem(Map<String, AttributeValue> attributeMap, boolean preserveEmp
AttributeValue value = entry.getValue();

if (!isNullAttributeValue(value)) {
ResolvedImmutableAttribute<T, B> attributeMapper = indexedMappers.get(key);
ResolvedImmutableAttribute<T, B, ?> attributeMapper = indexedMappers.get(key);

if (attributeMapper != null) {
if (builder == null) {
Expand Down Expand Up @@ -647,7 +647,7 @@ public Map<String, AttributeValue> itemToMap(T item, Collection<String> attribut

@Override
public AttributeValue attributeValue(T item, String key) {
ResolvedImmutableAttribute<T, B> attributeMapper = indexedMappers.get(key);
ResolvedImmutableAttribute<T, B, ?> attributeMapper = indexedMappers.get(key);

if (attributeMapper == null) {
FlattenedMapper<T, B, ?> flattenedMapper = flattenedObjectMappers.get(key);
Expand Down Expand Up @@ -700,7 +700,7 @@ private B constructNewBuilder() {

@Override
public AttributeConverter<T> converterForAttribute(Object key) {
ResolvedImmutableAttribute<T, B> resolvedImmutableAttribute = indexedMappers.get(key);
ResolvedImmutableAttribute<T, B, ?> resolvedImmutableAttribute = indexedMappers.get(key);
if (resolvedImmutableAttribute != null) {
return resolvedImmutableAttribute.attributeConverter();
}
Expand Down
42 changes: 41 additions & 1 deletion ...src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/ImmutableAttributeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import org.mockito.junit.MockitoJUnitRunner;
import software.amazon.awssdk.enhanced.dynamodb.AttributeConverter;
import software.amazon.awssdk.enhanced.dynamodb.AttributeConverterProvider;
import software.amazon.awssdk.enhanced.dynamodb.AttributeValueType;

Check warning on line 32 in services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/ImmutableAttributeTest.java

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Remove this unused import 'software.amazon.awssdk.enhanced.dynamodb.AttributeValueType'. 


See more on https://sonarcloud.io/project/issues?id=aws_aws-sdk-java-v2&issues=AZrB4W7gDvggpPC86Qzy&open=AZrB4W7gDvggpPC86Qzy&pullRequest=6591
import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
import software.amazon.awssdk.enhanced.dynamodb.internal.mapper.ResolvedImmutableAttribute;
import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
Expand Down Expand Up @@ -219,7 +220,7 @@
.attributeConverter(attributeConverter)
.build();

ResolvedImmutableAttribute<SimpleItem, SimpleItem> resolvedAttribute =
ResolvedImmutableAttribute<SimpleItem, SimpleItem, String> resolvedAttribute =
staticAttribute.resolve(AttributeConverterProvider.defaultProvider());

Function<SimpleItem, AttributeValue> attributeValueFunction = resolvedAttribute.attributeGetterMethod();
Expand All @@ -229,4 +230,43 @@

assertThat(resultAttributeValue.s()).isEqualTo("test-string-custom");
}

@Test
public void getAttributeValue_getterThrowsRuntimeException_propagatesException() {
ImmutableAttribute<SimpleItem, SimpleItem, String> staticAttribute =
ImmutableAttribute.builder(SimpleItem.class, SimpleItem.class, String.class)
.name("test-attribute")
.getter(item -> { throw new RuntimeException("getter failed"); })
.setter(SimpleItem::setAString)
.build();

ResolvedImmutableAttribute<SimpleItem, SimpleItem, String> resolvedAttribute =
staticAttribute.resolve(AttributeConverterProvider.defaultProvider());

Function<SimpleItem, AttributeValue> attributeValueFunction = resolvedAttribute.attributeGetterMethod();
SimpleItem item = new SimpleItem("test");

assertThatThrownBy(() -> attributeValueFunction.apply(item))
.isInstanceOf(RuntimeException.class)
.hasMessage("getter failed");
}

@Test
public void getAttributeValue_nullFromGetter_returnsNullAttributeValue() {
ImmutableAttribute<SimpleItem, SimpleItem, String> staticAttribute =
ImmutableAttribute.builder(SimpleItem.class, SimpleItem.class, String.class)
.name("test-attribute")
.getter(item -> null)
.setter(SimpleItem::setAString)
.build();

ResolvedImmutableAttribute<SimpleItem, SimpleItem, String> resolvedAttribute =
staticAttribute.resolve(AttributeConverterProvider.defaultProvider());

Function<SimpleItem, AttributeValue> attributeValueFunction = resolvedAttribute.attributeGetterMethod();
SimpleItem item = new SimpleItem("test");
AttributeValue result = attributeValueFunction.apply(item);

assertThat(result.nul()).isTrue();
}
}
Loading