Skip to content

Added cache for computation of partition keys #6719

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

Added cache for computation of partition keys #6719

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e9e1de
Added cache for computation of partition keys
RanVaknin Feb 5, 2026
3ea4dad
Add cache for sort key, wrap in unmodifiable list for thread safety
RanVaknin Feb 7, 2026
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
25 changes: 18 additions & 7 deletions ...ed/src/main/java/software/amazon/awssdk/enhanced/dynamodb/mapper/StaticTableMetadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import software.amazon.awssdk.annotations.NotThreadSafe;
Expand All @@ -47,6 +48,8 @@ public final class StaticTableMetadata implements TableMetadata {
private final Map<String, Object> customMetadata;
private final Map<String, IndexMetadata> indexByNameMap;
private final Map<String, KeyAttributeMetadata> keyAttributes;
private final ConcurrentHashMap<String, List<String>> partitionKeyCache = new ConcurrentHashMap<>();
private final ConcurrentHashMap<String, List<String>> sortKeyCache = new ConcurrentHashMap<>();

private StaticTableMetadata(Builder builder) {
this.customMetadata = Collections.unmodifiableMap(builder.customMetadata);
Expand Down Expand Up @@ -84,6 +87,10 @@ public <T> Optional<T> customMetadataObject(String key, Class<? extends T> objec

@Override
public List<String> indexPartitionKeys(String indexName) {
return partitionKeyCache.computeIfAbsent(indexName, this::computePartitionKeys);
}

private List<String> computePartitionKeys(String indexName) {
IndexMetadata index = getIndex(indexName);

List<KeyAttributeMetadata> partitionKeys = index.partitionKeys();
Expand All @@ -98,21 +105,25 @@ public List<String> indexPartitionKeys(String indexName) {
+ "Index name: " + indexName);
}

return partitionKeys.stream()
return Collections.unmodifiableList(partitionKeys.stream()
.filter(Objects::nonNull)
.map(KeyAttributeMetadata::name)
.collect(Collectors.toList());
.collect(Collectors.toList()));
}

@Override
public List<String> indexSortKeys(String indexName) {
return sortKeyCache.computeIfAbsent(indexName, this::computeSortKeys);
}

private List<String> computeSortKeys(String indexName) {
IndexMetadata index = getIndex(indexName);

List<KeyAttributeMetadata> sortKeys = index.sortKeys();
return sortKeys.stream()
.filter(Objects::nonNull)
.map(KeyAttributeMetadata::name)
.collect(Collectors.toList());
return Collections.unmodifiableList(sortKeys.stream()
.filter(Objects::nonNull)
.map(KeyAttributeMetadata::name)
.collect(Collectors.toList()));
}

@Override
Expand Down