Micro-opt: collections with expected size (#7006)

projectnessie · Jun 7, 2023 · aa93eb8 · aa93eb8
1 parent edf4f2c
commit aa93eb8
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 14 deletions.
diff --git a/...alize/src/main/java/org/projectnessie/versioned/storage/serialize/ProtoSerialization.java b/...alize/src/main/java/org/projectnessie/versioned/storage/serialize/ProtoSerialization.java
@@ -118,7 +118,7 @@ public static void deserializeObjIds(List<ByteString> bytes, Consumer<ObjId> rec
   }
 
   public static List<ObjId> deserializeObjIds(List<ByteString> predecessorsList) {
-    List<ObjId> result = new ArrayList<>();
+    List<ObjId> result = new ArrayList<>(predecessorsList.size());
     deserializeObjIds(predecessorsList, result::add);
     return result;
   }

diff --git a/...ommon/src/main/java/org/projectnessie/versioned/storage/common/logic/CommitLogicImpl.java b/...ommon/src/main/java/org/projectnessie/versioned/storage/common/logic/CommitLogicImpl.java
@@ -17,6 +17,7 @@
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkState;
+import static com.google.common.collect.Maps.newHashMapWithExpectedSize;
 import static com.google.common.collect.Sets.newHashSetWithExpectedSize;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.util.Collections.emptyIterator;
@@ -59,7 +60,6 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.EnumSet;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
@@ -596,7 +596,7 @@ public CommitObj buildCommitObj(
     // Results in a bulk-(pre)fetch of the requested index stripes
     fullIndex.loadIfNecessary(keys);
 
-    Map<UUID, CommitOp> removes = new HashMap<>();
+    Map<UUID, CommitOp> removes = newHashMapWithExpectedSize(createCommit.removes().size());
     for (Remove remove : createCommit.removes()) {
       StoreKey key = remove.key();
       UUID contentId = remove.contentId();

diff --git a/...tore/src/main/java/org/projectnessie/versioned/storage/versionstore/BaseCommitHelper.java b/...tore/src/main/java/org/projectnessie/versioned/storage/versionstore/BaseCommitHelper.java
@@ -17,6 +17,7 @@
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkState;
+import static com.google.common.collect.Maps.newHashMapWithExpectedSize;
 import static java.lang.String.format;
 import static java.util.Collections.emptyList;
 import static java.util.Objects.requireNonNull;
@@ -714,7 +715,7 @@ void validateMergeTransplantCommit(
       commitValidation.addOperations(commitOperation(identifiedKey, OperationType.DELETE));
     }
 
-    Map<ContentKey, UUID> seenContentIds = new HashMap<>();
+    Map<ContentKey, UUID> seenContentIds = newHashMapWithExpectedSize(createCommit.adds().size());
     for (CreateCommit.Add add : createCommit.adds()) {
       ContentKey key = storeKeyToKey(add.key());
       if (key == null) {

diff --git a/...rage/store/src/main/java/org/projectnessie/versioned/storage/versionstore/CommitImpl.java b/...rage/store/src/main/java/org/projectnessie/versioned/storage/versionstore/CommitImpl.java
@@ -153,7 +153,7 @@ CommitResult<Commit> commit(
           RetryException,
           ObjTooLargeException {
     CreateCommit.Builder commit = newCommitBuilder().parentCommitId(headId());
-    List<Obj> objectsToStore = new ArrayList<>(operations.size());
+    List<Obj> objectsToStore = new ArrayList<>(operations.size() + 1);
 
     CommitRetryState commitRetryState =
         retryState.map(x -> (CommitRetryState) x).orElseGet(CommitRetryState::new);
@@ -212,13 +212,15 @@ void commitAddOperations(
       CommitRetryState commitRetryState,
       ImmutableCommitValidation.Builder commitValidation)
       throws ObjNotFoundException, ReferenceConflictException {
-    Set<ContentKey> allKeys = new HashSet<>();
+    int num = operations.size();
+    Set<ContentKey> allKeys = newHashSetWithExpectedSize(num);
 
     Set<StoreKey> storeKeysForHead =
         expectedIndex() != headIndex() ? newHashSetWithExpectedSize(operations.size()) : null;
 
-    List<StoreKey> storeKeys = new ArrayList<>();
-    for (Operation operation : operations) {
+    List<StoreKey> storeKeys = new ArrayList<>(num);
+    for (int i = 0; i < num; i++) {
+      Operation operation = operations.get(i);
       ContentKey key = operation.getKey();
       checkArgument(allKeys.add(key), "Duplicate key in commit operations: %s", key);
       StoreKey storeKey = keyToStoreKey(key);

diff --git a/.../store/src/main/java/org/projectnessie/versioned/storage/versionstore/ContentMapping.java b/.../store/src/main/java/org/projectnessie/versioned/storage/versionstore/ContentMapping.java
@@ -16,6 +16,7 @@
 package org.projectnessie.versioned.storage.versionstore;
 
 import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.collect.Maps.newHashMapWithExpectedSize;
 import static java.util.Objects.requireNonNull;
 import static org.projectnessie.versioned.storage.common.logic.Logics.indexesLogic;
 import static org.projectnessie.versioned.storage.common.objtypes.ContentValueObj.contentValue;
@@ -25,7 +26,6 @@
 import static org.projectnessie.versioned.storage.versionstore.TypeMapping.toCommitMeta;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import javax.annotation.Nonnull;
@@ -71,9 +71,9 @@ public Content fetchContent(@Nonnull @jakarta.annotation.Nonnull ObjId objId)
   public Map<ContentKey, Content> fetchContents(
       @Nonnull @jakarta.annotation.Nonnull Map<ObjId, ContentKey> idsToKeys)
       throws ObjNotFoundException {
-    Map<ContentKey, Content> r = new HashMap<>();
     ObjId[] ids = idsToKeys.keySet().toArray(new ObjId[0]);
     Obj[] objs = persist.fetchObjs(ids);
+    Map<ContentKey, Content> r = newHashMapWithExpectedSize(ids.length);
     for (int i = 0; i < ids.length; i++) {
       Obj obj = objs[i];
       if (obj instanceof ContentValueObj) {

diff --git a/.../store/src/main/java/org/projectnessie/versioned/storage/versionstore/MergeBehaviors.java b/.../store/src/main/java/org/projectnessie/versioned/storage/versionstore/MergeBehaviors.java
@@ -16,6 +16,7 @@
 package org.projectnessie.versioned.storage.versionstore;
 
 import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.collect.Sets.newHashSetWithExpectedSize;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -31,8 +32,9 @@ final class MergeBehaviors {
 
   MergeBehaviors(MergeTransplantOpBase mergeTransplantOpBase) {
     this.mergeTransplantOpBase = mergeTransplantOpBase;
-    this.remainingKeys = new HashSet<>(mergeTransplantOpBase.mergeKeyBehaviors().keySet());
-    this.keysUsedForCommit = new HashSet<>();
+    Set<ContentKey> allKeys = mergeTransplantOpBase.mergeKeyBehaviors().keySet();
+    this.remainingKeys = new HashSet<>(allKeys);
+    this.keysUsedForCommit = newHashSetWithExpectedSize(allKeys.size());
     validate();
   }
 

diff --git a/...tore/src/main/java/org/projectnessie/versioned/storage/versionstore/VersionStoreImpl.java b/...tore/src/main/java/org/projectnessie/versioned/storage/versionstore/VersionStoreImpl.java
@@ -16,6 +16,7 @@
 package org.projectnessie.versioned.storage.versionstore;
 
 import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.collect.Maps.newHashMapWithExpectedSize;
 import static java.util.Collections.emptyList;
 import static java.util.Collections.emptyMap;
 import static java.util.Collections.singleton;
@@ -59,7 +60,6 @@
 import static org.projectnessie.versioned.store.DefaultStoreWorker.contentTypeForPayload;
 
 import java.util.Collection;
-import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -718,7 +718,7 @@ public Map<ContentKey, ContentResult> getValues(Ref ref, Collection<ContentKey>
       index.loadIfNecessary(
           keys.stream().map(TypeMapping::keyToStoreKey).collect(Collectors.toSet()));
 
-      Map<ObjId, ContentKey> idsToKeys = new HashMap<>();
+      Map<ObjId, ContentKey> idsToKeys = newHashMapWithExpectedSize(keys.size());
       for (ContentKey key : keys) {
         StoreKey storeKey = keyToStoreKey(key);
         StoreIndexElement<CommitOp> indexElement = index.get(storeKey);