s434730/RandomSec
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix EntityCache so that it actually caches stuff

Browse Source
This commit is contained in:
Antonin Delpeuch 2018-01-10 15:22:51 +00:00
parent 63d488d74f
commit d4cb64cdfd
1 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
extensions/wikidata/src/org/openrefine/wikidata/utils/EntityCache.java
View File

@ -7,6 +7,7 @@ import org.wikidata.wdtk.datamodel.interfaces.EntityDocument;
import org.wikidata.wdtk.datamodel.interfaces.EntityIdValue; import org.wikidata.wdtk.datamodel.interfaces.EntityIdValue;
import org.wikidata.wdtk.wikibaseapi.ApiConnection; import org.wikidata.wdtk.wikibaseapi.ApiConnection;
import org.wikidata.wdtk.wikibaseapi.WikibaseDataFetcher; import org.wikidata.wdtk.wikibaseapi.WikibaseDataFetcher;
import org.wikidata.wdtk.wikibaseapi.apierrors.MediaWikiApiErrorException;
import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheBuilder;
import com.google.common.cache.CacheLoader; import com.google.common.cache.CacheLoader;
@ -15,27 +16,42 @@ import com.google.common.cache.LoadingCache;
public class EntityCache { public class EntityCache {
private static EntityCache _entityCache = new EntityCache(); private static EntityCache _entityCache = new EntityCache();
private LoadingCache<EntityIdValue, EntityDocument> _cache; private LoadingCache<String, EntityDocument> _cache = null;
private WikibaseDataFetcher _fetcher; private WikibaseDataFetcher _fetcher;
private EntityCache() { private EntityCache() {
ApiConnection connection = ApiConnection.getWikidataApiConnection(); ApiConnection connection = ApiConnection.getWikidataApiConnection();
_fetcher = new WikibaseDataFetcher(connection, Datamodel.SITE_WIKIDATA); _fetcher = new WikibaseDataFetcher(connection, Datamodel.SITE_WIKIDATA);
System.out.println("Creating fresh cache");
_cache = CacheBuilder.newBuilder() _cache = CacheBuilder.newBuilder()
.maximumSize(4096) .maximumSize(4096)
.expireAfterWrite(1, TimeUnit.HOURS) .expireAfterWrite(1, TimeUnit.HOURS)
.build( .build(
new CacheLoader<EntityIdValue, EntityDocument>() { new CacheLoader<String, EntityDocument>() {
public EntityDocument load(EntityIdValue entityId) throws Exception { public EntityDocument load(String entityId) throws Exception {
EntityDocument doc = _fetcher.getEntityDocument(entityId.getId()); EntityDocument doc = _fetcher.getEntityDocument(entityId);
return doc; if (doc != null) {
return doc;
} else {
throw new MediaWikiApiErrorException("400", "Unknown entity id \""+entityId+"\"");
}
} }
}); });
} }
public static EntityDocument getEntityDocument(EntityIdValue qid) { public EntityDocument get(EntityIdValue id) {
return _entityCache._cache.apply(qid); return _cache.apply(id.getId());
}
public static EntityCache getEntityCache() {
if (_entityCache == null) {
_entityCache = new EntityCache();
}
return _entityCache;
}
public static EntityDocument getEntityDocument(EntityIdValue id) {
return getEntityCache().get(id);
} }
} }