cache: fix archive ids being written out of order

Adam- · Nov 6, 2024 · db5bdc2 · db5bdc2
1 parent 95d4208
commit db5bdc2
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 7 deletions.
diff --git a/cache/src/main/java/net/runelite/cache/fs/Index.java b/cache/src/main/java/net/runelite/cache/fs/Index.java
@@ -25,6 +25,7 @@
 package net.runelite.cache.fs;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 import net.runelite.cache.index.ArchiveData;
@@ -147,26 +148,60 @@ public void setCompression(int compression)
 
 	public List<Archive> getArchives()
 	{
-		return archives;
+		return Collections.unmodifiableList(archives);
 	}
 
 	public Archive addArchive(int id)
 	{
+		int idx = findArchiveIndex(id);
+		if (idx >= 0)
+		{
+			throw new IllegalArgumentException("archive " + id + " already exists");
+		}
+
+		idx = -idx - 1;
 		Archive archive = new Archive(this, id);
-		this.archives.add(archive);
+		this.archives.add(idx, archive);
 		return archive;
 	}
 
 	public Archive getArchive(int id)
 	{
-		for (Archive a : archives)
+		int idx = findArchiveIndex(id);
+		if (idx < 0)
 		{
-			if (a.getArchiveId() == id)
+			return null;
+		}
+
+		return archives.get(idx);
+	}
+
+	private int findArchiveIndex(int id)
+	{
+		int low = 0;
+		int high = archives.size() - 1;
+
+		while (low <= high)
+		{
+			int mid = (low + high) >>> 1;
+
+			Archive a = archives.get(mid);
+			int cmp = Integer.compare(a.getArchiveId(), id);
+			if (cmp < 0)
 			{
-				return a;
+				low = mid + 1;
+			}
+			else if (cmp > 0)
+			{
+				high = mid - 1;
+			}
+			else
+			{
+				return mid;
 			}
 		}
-		return null;
+
+		return -(low + 1);
 	}
 
 	public boolean removeArchive(Archive archive)

diff --git a/cache/src/main/java/net/runelite/cache/fs/flat/FlatStorage.java b/cache/src/main/java/net/runelite/cache/fs/flat/FlatStorage.java
@@ -219,7 +219,6 @@ public void save(Store store) throws IOException
 				br.printf("crc=%d\n", idx.getCrc());
 				br.printf("named=%b\n", idx.isNamed());
 
-				idx.getArchives().sort(Comparator.comparingInt(Archive::getArchiveId));
 				for (Archive archive : idx.getArchives())
 				{
 					br.printf("id=%d\n", archive.getArchiveId());

diff --git a/cache/src/main/java/net/runelite/cache/index/IndexData.java b/cache/src/main/java/net/runelite/cache/index/IndexData.java
@@ -162,6 +162,7 @@ public byte[] writeIndexData()
 			if (i != 0)
 			{
 				ArchiveData prev = this.archives[i - 1];
+				assert a.id > prev.id : "archive ids out of order";
 				archive -= prev.getId();
 			}
 
@@ -224,6 +225,7 @@ public byte[] writeIndexData()
 				if (j != 0)
 				{
 					FileData prev = a.getFiles()[j - 1];
+					assert file.id > prev.id : "file ids out of order";
 					offset -= prev.getId();
 				}
 

diff --git a/cache/src/test/java/net/runelite/cache/fs/StoreTest.java b/cache/src/test/java/net/runelite/cache/fs/StoreTest.java
@@ -121,20 +121,23 @@ public void testMultipleArchives() throws IOException
 			{
 				FileData[] fileData = archive.getFileData();
 				FileData file = fileData[i] = new FileData();
+				file.setId(i);
 				file.setNameHash(random.nextInt(Integer.MAX_VALUE));
 			}
 
 			for (int i = 0; i < NUMBER_OF_FILES; ++i)
 			{
 				FileData[] fileData = archive2.getFileData();
 				FileData file = fileData[i] = new FileData();
+				file.setId(i);
 				file.setNameHash(random.nextInt(Integer.MAX_VALUE));
 			}
 
 			for (int i = 0; i < NUMBER_OF_FILES; ++i)
 			{
 				FileData[] fileData = archive3.getFileData();
 				FileData file = fileData[i] = new FileData();
+				file.setId(i);
 				file.setNameHash(random.nextInt(Integer.MAX_VALUE));
 			}