ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Revert "cache service: move database updating to happen during download"

Browse Source 
This reverts commit 018843f3a34f343c32c59db259aae317193f9fc8.
This commit is contained in:
Adam
2018-01-19 14:13:02 -05:00
parent 1eeab55b01
commit 8eb37bb3db
4 changed files with 44 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cache-client/src/main/java/net/runelite/cache/client/CacheClient.java vendored
View File

@@ -264,11 +264,6 @@ public class CacheClient implements AutoCloseable
logger.info("Index {} has {} archives", i, indexData.getArchives().length);
if (watcher != null)
{
watcher.indexComplete(index);
}
for (ArchiveData ad : indexData.getArchives())
{
Archive existing = index.getArchive(ad.getId());

4
cache-client/src/main/java/net/runelite/cache/client/DownloadWatcher.java vendored
View File

@@ -25,11 +25,9 @@
package net.runelite.cache.client;
import net.runelite.cache.fs.Archive;
import net.runelite.cache.fs.Index;
@FunctionalInterface
public interface DownloadWatcher
{
void indexComplete(Index index);
void downloadComplete(Archive archive, byte[] data);
}

38
http-service/src/main/java/net/runelite/http/service/cache/CacheStorage.java vendored
View File

@@ -34,13 +34,14 @@ import net.runelite.cache.fs.Store;
import net.runelite.cache.index.FileData;
import net.runelite.http.service.cache.beans.ArchiveEntry;
import net.runelite.http.service.cache.beans.CacheEntry;
import net.runelite.http.service.cache.beans.FileEntry;
import net.runelite.http.service.cache.beans.IndexEntry;
import org.sql2o.Connection;
import org.sql2o.ResultSetIterable;
public class CacheStorage implements Storage
{
private final CacheEntry cacheEntry;
private CacheEntry cacheEntry;
private final CacheDAO cacheDao;
private final Connection con;
@@ -51,6 +52,16 @@ public class CacheStorage implements Storage
this.con = con;
}
public CacheEntry getCacheEntry()
{
return cacheEntry;
}
public void setCacheEntry(CacheEntry cacheEntry)
{
this.cacheEntry = cacheEntry;
}
@Override
public void init(Store store) throws IOException
{
@@ -91,7 +102,30 @@ public class CacheStorage implements Storage
@Override
public void save(Store store) throws IOException
{
throw new UnsupportedOperationException();
for (Index index : store.getIndexes())
{
IndexEntry entry = cacheDao.findOrCreateIndex(con, cacheEntry, index.getId(), index.getCrc(), index.getRevision());
// this assumes nothing is associated to the cache yet
cacheDao.associateIndexToCache(con, cacheEntry, entry);
for (Archive archive : index.getArchives())
{
ArchiveEntry archiveEntry = cacheDao.findArchive(con, entry, archive.getArchiveId(),
archive.getNameHash(), archive.getCrc(), archive.getRevision());
if (archiveEntry == null)
{
byte[] hash = archive.getHash();
archiveEntry = cacheDao.createArchive(con, entry, archive.getArchiveId(),
archive.getNameHash(), archive.getCrc(), archive.getRevision(), hash);
for (FileData file : archive.getFileData())
{
cacheDao.associateFileToArchive(con, archiveEntry, file.getId(), file.getNameHash());
}
}
cacheDao.associateArchiveToIndex(con, archiveEntry, entry);
}
}
}
@Override

52
http-service/src/main/java/net/runelite/http/service/cache/CacheUpdater.java vendored
View File

@@ -29,21 +29,15 @@ import io.minio.errors.InvalidEndpointException;
import io.minio.errors.InvalidPortException;
import java.io.IOException;
import java.time.Instant;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import net.runelite.cache.client.CacheClient;
import net.runelite.cache.client.DownloadWatcher;
import net.runelite.cache.client.IndexInfo;
import net.runelite.cache.fs.Archive;
import net.runelite.cache.fs.Index;
import net.runelite.cache.fs.Store;
import net.runelite.cache.index.FileData;
import net.runelite.http.api.RuneLiteAPI;
import net.runelite.http.service.cache.beans.ArchiveEntry;
import net.runelite.http.service.cache.beans.CacheEntry;
import net.runelite.http.service.cache.beans.IndexEntry;
import net.runelite.protocol.api.login.HandshakeResponseType;
@@ -101,45 +95,8 @@ public class CacheUpdater
ExecutorService executor = Executors.newSingleThreadExecutor();
CacheEntry newCache = created ? cache : cacheDao.createCache(con, rsVersion, Instant.now());
CacheClient client = new CacheClient(store, rsVersion, new DownloadWatcher()
{
private final Map<Index, IndexEntry> indexEntryMap = new HashMap<>();
@Override
public void indexComplete(Index index)
{
IndexEntry entry = cacheDao.findOrCreateIndex(con, newCache, index.getId(), index.getCrc(), index.getRevision());
// this assumes nothing is associated to the cache yet
cacheDao.associateIndexToCache(con, newCache, entry);
indexEntryMap.put(index, entry);
}
@Override
public void downloadComplete(Archive archive, byte[] data)
{
executor.submit(new CacheUploader(minioClient, minioBucket, archive, data));
IndexEntry entry = indexEntryMap.get(archive.getIndex());
ArchiveEntry archiveEntry = cacheDao.findArchive(con, entry, archive.getArchiveId(),
archive.getNameHash(), archive.getCrc(), archive.getRevision());
if (archiveEntry == null)
{
byte[] hash = archive.getHash();
archiveEntry = cacheDao.createArchive(con, entry, archive.getArchiveId(),
archive.getNameHash(), archive.getCrc(), archive.getRevision(), hash);
for (FileData file : archive.getFileData())
{
cacheDao.associateFileToArchive(con, archiveEntry, file.getId(), file.getNameHash());
}
}
cacheDao.associateArchiveToIndex(con, archiveEntry, entry);
archive.setFileData(null); // don't need this anymore
}
});
CacheClient client = new CacheClient(store, rsVersion,
(Archive archive, byte[] data) -> executor.submit(new CacheUploader(minioClient, minioBucket, archive, data)));
client.connect();
HandshakeResponseType result = client.handshake().join();
@@ -160,6 +117,11 @@ public class CacheUpdater
client.download();
CacheEntry newCache = created ? cache : cacheDao.createCache(con, rsVersion, Instant.now());
storage.setCacheEntry(newCache);
store.save();
// ensure objects are added to the store before they become
// visible in the database
executor.shutdown();