Wip

Tim-Brooks · Dec 11, 2024 · 19deaac · 19deaac
1 parent 369a372
commit 19deaac
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/...n/blob-cache/src/main/java/org/elasticsearch/blobcache/shared/SharedBlobCacheService.java b/...n/blob-cache/src/main/java/org/elasticsearch/blobcache/shared/SharedBlobCacheService.java
@@ -626,17 +626,18 @@ public void maybeFetchRegions(
                 ActionListener.releaseAfter(listener, () -> regionsToFetch.forEach(AbstractRefCounted::decRef))
             )
         ) {
-            final List<Tuple<CacheFileRegion<KeyType>, RegionGaps>> gaps = new ArrayList<>();
+            final List<Tuple<CacheFileRegion<KeyType>, RegionGaps>> gaps = new ArrayList<>(regionsToFetch.size());
             for (CacheFileRegion<KeyType> toFetch : regionsToFetch) {
-                ByteRange regionRange = ByteRange.of(0, computeCacheFileRegionSize(blobLength, toFetch.regionKey.region));
+                int region = toFetch.regionKey.region();
+                ByteRange regionRange = ByteRange.of(0, computeCacheFileRegionSize(blobLength, region));
                 if (regionRange.isEmpty() == false) {
                     List<SparseFileTracker.Gap> regionGaps = toFetch.tracker.waitForRange(
                         regionRange,
                         regionRange,
                         regionsListener.acquire()
                     );
                     if (regionGaps.isEmpty() == false) {
-                        gaps.add(new Tuple<>(toFetch, new RegionGaps(toFetch.regionKey.region(), regionGaps)));
+                        gaps.add(new Tuple<>(toFetch, new RegionGaps((long) region * regionSize, regionGaps)));
                     }
                 }
             }
@@ -1070,7 +1071,7 @@ void populate(
                         return;
                     }
                     final SourceInputStreamFactory streamFactory = writer.sharedInputStreamFactory(
-                        new RegionGaps(regionKey.region(), gaps)
+                        new RegionGaps((long) regionKey.region() * blobCacheService.getRegionSize(), gaps)
                     );
                     logger.trace(
                         () -> Strings.format(
@@ -1149,7 +1150,7 @@ void populateAndRead(
 
                     if (gaps.isEmpty() == false) {
                         final SourceInputStreamFactory streamFactory = writer.sharedInputStreamFactory(
-                            new RegionGaps(regionKey.region(), gaps)
+                            new RegionGaps((long) regionKey.region() * blobCacheService.getRegionSize(), gaps)
                         );
                         logger.trace(
                             () -> Strings.format(
@@ -1248,7 +1249,7 @@ protected void alreadyClosed() {
         }
     }
 
-    public record RegionGaps(int region, List<SparseFileTracker.Gap> gaps) {}
+    public record RegionGaps(long regionOffset, List<SparseFileTracker.Gap> gaps) {}
 
     public class CacheFile {
 

diff --git a/...b-cache/src/test/java/org/elasticsearch/blobcache/shared/SharedBlobCacheServiceTests.java b/...b-cache/src/test/java/org/elasticsearch/blobcache/shared/SharedBlobCacheServiceTests.java
@@ -14,7 +14,6 @@
 import org.elasticsearch.blobcache.BlobCacheMetrics;
 import org.elasticsearch.blobcache.BlobCacheUtils;
 import org.elasticsearch.blobcache.common.ByteRange;
-import org.elasticsearch.blobcache.common.SparseFileTracker;
 import org.elasticsearch.blobcache.shared.SharedBlobCacheService.RangeMissingHandler;
 import org.elasticsearch.blobcache.shared.SharedBlobCacheService.SourceInputStreamFactory;
 import org.elasticsearch.cluster.node.DiscoveryNodeRole;