Change representation of Resource data from List<byte[]> to byte[][].

Author: thomaswue

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/Resources.java

@@ -628,8 +628,8 @@ public static InputStream createInputStream(Module module, String resourceName)
         } else if (entry == null) {
             return null;
         }
-        List<byte[]> data = entry.getData();
-        return data.isEmpty() ? null : new ByteArrayInputStream(data.get(0));
+        byte[][] data = entry.getData();
+        return data.length == 0 ? null : new ByteArrayInputStream(data[0]);
     }
 
     private static ResourceStorageEntryBase findResourceForInputStream(Module module, String resourceName) {
@@ -703,8 +703,7 @@ private static void addURLEntries(List<URL> resourcesURLs, ResourceStorageEntry
         if (entry == null) {
             return;
         }
-        int numberOfResources = entry.getData().size();
-        for (int index = 0; index < numberOfResources; index++) {
+        for (int index = 0; index < entry.getData().length; index++) {
             resourcesURLs.add(createURL(module, canonicalResourceName, index));
         }
     }

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/resources/NativeImageResourceFileSystemUtil.java

@@ -40,23 +40,14 @@ public static byte[] getBytes(String resourceName, boolean readOnly) {
         if (entry == null) {
             return new byte[0];
         }
-        byte[] bytes = ((ResourceStorageEntry) entry).getData().get(0);
+        byte[] bytes = ((ResourceStorageEntry) entry).getData()[0];
         if (readOnly) {
             return bytes;
         } else {
             return Arrays.copyOf(bytes, bytes.length);
         }
     }
 
-    public static int getSize(String resourceName) {
-        Object entry = Resources.getAtRuntime(resourceName);
-        if (entry == null) {
-            return 0;
-        } else {
-            return ((ResourceStorageEntry) entry).getData().get(0).length;
-        }
-    }
-
     public static String toRegexPattern(String globPattern) {
         return Target_jdk_nio_zipfs_ZipUtils.toRegexPattern(globPattern);
     }

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/resources/ResourceStorageEntry.java

@@ -25,8 +25,7 @@
 
 package com.oracle.svm.core.jdk.resources;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.Arrays;
 
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
@@ -36,14 +35,16 @@
 
 public final class ResourceStorageEntry extends ResourceStorageEntryBase {
 
+    private static byte[][] EMPTY_DATA = new byte[0][];
+
     private final boolean isDirectory;
     private final boolean fromJar;
-    private List<byte[]> data;
+    private byte[][] data;
 
     public ResourceStorageEntry(boolean isDirectory, boolean fromJar) {
         this.isDirectory = isDirectory;
         this.fromJar = fromJar;
-        this.data = List.of();
+        this.data = EMPTY_DATA;
     }
 
     @Override
@@ -57,18 +58,17 @@ public boolean isFromJar() {
     }
 
     @Override
-    public List<byte[]> getData() {
+    public byte[][] getData() {
         return data;
     }
 
     @Platforms(Platform.HOSTED_ONLY.class)
     @Override
     public void addData(byte[] datum) {
-        List<byte[]> newData = new ArrayList<>(data.size() + 1);
-        newData.addAll(data);
-        newData.add(datum);
+        byte[][] newData = Arrays.copyOf(data, data.length + 1);
+        newData[data.length] = datum;
         /* Always use a compact, immutable data structure in the image heap. */
-        data = List.copyOf(newData);
+        data = newData;
     }
 
     /**
@@ -81,7 +81,7 @@ public void addData(byte[] datum) {
     public void replaceData(byte[]... replacementData) {
         VMError.guarantee(BuildPhaseProvider.isAnalysisFinished(), "Replacing data of a resource entry before analysis finished. Register standard resource instead.");
         VMError.guarantee(!BuildPhaseProvider.isCompilationFinished(), "Trying to replace data of a resource entry after compilation finished.");
-        this.data = List.of(replacementData);
+        this.data = replacementData;
     }
 
     @Override

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/resources/ResourceStorageEntryBase.java

@@ -25,8 +25,6 @@
 
 package com.oracle.svm.core.jdk.resources;
 
-import java.util.List;
-
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 
@@ -41,7 +39,7 @@ public boolean isFromJar() {
         throw VMError.shouldNotReachHere("This should only be called on entries with data.");
     }
 
-    public List<byte[]> getData() {
+    public byte[][] getData() {
         throw VMError.shouldNotReachHere("This should only be called on entries with data.");
     }
 

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/resources/ResourceURLConnection.java

@@ -77,7 +77,7 @@ public void connect() {
         Object entry = Resources.getAtRuntime(module, resourceName, false);
         if (entry != null) {
             ResourceStorageEntry resourceStorageEntry = (ResourceStorageEntry) entry;
-            List<byte[]> bytes = resourceStorageEntry.getData();
+            byte[][] bytes = resourceStorageEntry.getData();
             isDirectory = resourceStorageEntry.isDirectory();
             String urlRef = url.getRef();
             int index = 0;
@@ -88,12 +88,12 @@ public void connect() {
                     throw new IllegalArgumentException("URL anchor '#" + urlRef + "' not allowed in " + JavaNetSubstitutions.RESOURCE_PROTOCOL + " URL");
                 }
             }
-            if (index < bytes.size()) {
-                this.data = bytes.get(index);
+            if (index < bytes.length) {
+                this.data = bytes[index];
             } else {
                 // This will happen only in case that we are creating one URL with the second URL as
                 // a context.
-                this.data = bytes.get(0);
+                this.data = bytes[0];
             }
         } else {
             this.data = null;

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/EmbeddedResourceExporter.java

@@ -120,7 +120,7 @@ public static List<ResourceReportEntry> getResourceReportEntryList(ConcurrentHas
             List<EmbeddedResourceExporter.SourceSizePair> sources = new ArrayList<>();
             for (int i = 0; i < registeredEntrySources.size(); i++) {
                 SourceAndOrigin sourceAndOrigin = registeredEntrySources.get(i);
-                int size = storageEntry.getData().get(i).length;
+                int size = storageEntry.getData()[i].length;
                 sources.add(new SourceSizePair(sourceAndOrigin.source(), sourceAndOrigin.origin(), size));
             }
 

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ProgressReporter.java

@@ -111,7 +111,6 @@
 import jdk.graal.compiler.options.OptionStability;
 import jdk.graal.compiler.options.OptionValues;
 import jdk.graal.compiler.util.json.JsonWriter;
-import org.graalvm.nativeimage.impl.RuntimeResourceSupport;
 
 @SingletonTraits(access = BuildtimeAccessOnly.class, layeredCallbacks = NoLayeredCallbacks.class, layeredInstallationKind = Independent.class)
 public class ProgressReporter {
@@ -513,7 +512,6 @@ private void printAnalysisStatistics(AnalysisUniverse universe, Collection<Strin
             l().a(stubsFormat, numForeignDowncalls, numForeignUpcalls)
                             .doclink("registered for foreign access", "#glossary-foreign-downcall-and-upcall-registrations").println();
         }
-        RuntimeResourceSupport runtimeResourceSupport = ImageSingletons.lookup(RuntimeResourceSupport.class);
         int resourceCount = Resources.currentLayer().resources().size();
         long totalResourceSize = 0;
         for (ConditionalRuntimeValue<ResourceStorageEntryBase> value : Resources.currentLayer().resources().getValues()) {
@@ -526,7 +524,6 @@ private void printAnalysisStatistics(AnalysisUniverse universe, Collection<Strin
         if (resourceCount > 0) {
             l().a("%,9d %s found with %s total size", resourceCount, resourceCount == 1 ? "resource" : "resources", ByteFormattingUtil.bytesToHuman(totalResourceSize)).println();
         }
-        ConditionalRuntimeValue<ResourceStorageEntryBase> value;
         int numLibraries = libraries.size();
         if (numLibraries > 0) {
             TreeSet<String> sortedLibraries = new TreeSet<>(libraries);

web-image/src/com.oracle.svm.webimage/src/com/oracle/svm/webimage/substitute/system/WebImageJavaLangSubstitutions.java

@@ -644,7 +644,7 @@ private InputStream getResourceAsStream(String resourceName) {
             resName = resName.substring(1);
         }
         ResourceStorageEntryBase res = Resources.getAtRuntime(SubstrateUtil.cast(this, Module.class), resName, true);
-        return res == null ? null : new ByteArrayInputStream(res.getData().get(0));
+        return res == null ? null : new ByteArrayInputStream(res.getData()[0]);
     }
 }