issue 3758 rewrite calculateVersionSizes to fix problem with duplicat…

…ed keys
epam · Nov 5, 2024 · ac556c1 · ac556c1
1 parent f125a8e
commit ac556c1
Showing 1 changed file with 20 additions and 22 deletions.
diff --git a/...om/epam/pipeline/elasticsearchagent/service/impl/converter/storage/StorageFileMapper.java b/...om/epam/pipeline/elasticsearchagent/service/impl/converter/storage/StorageFileMapper.java
@@ -27,13 +27,11 @@
 import com.epam.pipeline.entity.search.SearchDocumentType;
 import com.epam.pipeline.entity.search.StorageFileSearchMask;
 import com.epam.pipeline.utils.FileContentUtils;
-import com.epam.pipeline.utils.StreamUtils;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.ListUtils;
 import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.collections4.SetUtils;
 import org.apache.commons.lang3.tuple.ImmutablePair;
-import org.apache.commons.lang3.tuple.Pair;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentFactory;
 import org.slf4j.Logger;
@@ -42,13 +40,7 @@
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
+import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -131,21 +123,27 @@ public XContentBuilder fileToDocument(final DataStorageFile dataStorageFile,
 
     private Map<String, ImmutablePair<Long, Integer>> calculateVersionSizes(
             final Map<String, AbstractDataStorageItem> versions) {
-        return StreamUtils.grouped(
-                versions.values().stream().map(v -> (DataStorageFile) v),
-                Comparator.comparing(v -> MapUtils.emptyIfNull(v.getLabels())
-                        .getOrDefault(ESConstants.STORAGE_CLASS_LABEL, STANDARD_TIER)
-                )
-        ).map(tierVersions -> {
-            final String storageClass = tierVersions.stream().findFirst()
-                    .map(v -> MapUtils.emptyIfNull(v.getLabels()).get(ESConstants.STORAGE_CLASS_LABEL))
-                    .orElse(STANDARD_TIER);
-            final long totalSize = tierVersions.stream()
-                    .collect(Collectors.summarizingLong(DataStorageFile::getSize)).getSum();
-            return ImmutablePair.of(storageClass, ImmutablePair.of(totalSize, tierVersions.size()));
-        }).collect(Collectors.toMap(Pair::getKey, Pair::getValue));
+        final HashMap<String, ImmutablePair<Long, Integer>> result = new HashMap<>();
+        for (final AbstractDataStorageItem v : versions.values()) {
+            final DataStorageFile version = (DataStorageFile) v;
+            final String storageClass = Optional.ofNullable(
+                    MapUtils.emptyIfNull(version.getLabels()).get(ESConstants.STORAGE_CLASS_LABEL)
+            ).orElse(STANDARD_TIER);
+            result.compute(
+                storageClass,
+                (tier, tierSize) -> {
+                    if (tierSize == null) {
+                        return ImmutablePair.of(version.getSize(), 1);
+                    } else {
+                        return ImmutablePair.of(tierSize.getLeft() + version.getSize(), tierSize.getRight() + 1);
+                    }
+                }
+            );
+        }
+        return result;
     }
 
+
     // This method construct mount path assuming that default mount point is /cloud-data/,
     // if f.e. CP_STORAGE_MOUNT_ROOT_DIR is defined in launch.env.properties or somewhere else,
     // this method will return wrong results