honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Correctly chunk resource version queries

This commit is contained in:
jamesagnew 2020-12-01 17:20:44 -05:00
parent 015502e98e
commit 18541d4388
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/cache/ResourceVersionSvcDaoImpl.java vendored
View File

@ -23,14 +23,15 @@ package ca.uhn.fhir.jpa.cache;
import ca.uhn.fhir.jpa.api.dao.DaoRegistry;
import ca.uhn.fhir.jpa.api.dao.IFhirResourceDao;
import ca.uhn.fhir.jpa.dao.data.IResourceTableDao;
import ca.uhn.fhir.jpa.model.entity.ResourceTable;
import ca.uhn.fhir.jpa.searchparam.SearchParameterMap;
import ca.uhn.fhir.jpa.util.QueryChunker;
import ca.uhn.fhir.rest.api.server.storage.ResourcePersistentId;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Nonnull;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
@ -40,13 +41,13 @@ import java.util.stream.Collectors;
*/
@Service
public class ResourceVersionSvcDaoImpl implements IResourceVersionSvc {
private static final Logger myLogger = LoggerFactory.getLogger(ResourceVersionMap.class);
@Autowired
DaoRegistry myDaoRegistry;
@Autowired
IResourceTableDao myResourceTableDao;
@Override
@Nonnull
public ResourceVersionMap getVersionMap(String theResourceName, SearchParameterMap theSearchParamMap) {
IFhirResourceDao<?> dao = myDaoRegistry.getResourceDao(theResourceName);
@ -55,6 +56,12 @@ public class ResourceVersionSvcDaoImpl implements IResourceVersionSvc {
.map(ResourcePersistentId::getIdAsLong)
.collect(Collectors.toList());
return ResourceVersionMap.fromResourceTableEntities(myResourceTableDao.findAllById(matchingIds));
List<ResourceTable> allById = new ArrayList<>();
new QueryChunker<Long>().chunk(matchingIds, t -> {
List<ResourceTable> nextBatch = myResourceTableDao.findAllById(t);
allById.addAll(nextBatch);
});
return ResourceVersionMap.fromResourceTableEntities(allById);
}
}