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

Work on perf

This commit is contained in:
James 2017-04-09 19:13:55 -04:00
parent fa435fb8b2
commit bf0f1421b3
3 changed files with 123 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/SearchBuilder.java
View File

@ -1186,9 +1186,13 @@ public class SearchBuilder {
return query;
}
private void createSort(CriteriaBuilder theBuilder, Root<ResourceTable> theFrom, SortSpec theSort, List<Order> theOrders, List<Predicate> thePredicates) {
/**
* @return Returns {@literal true} if any search parameter sorts were found, or false if
* no sorts were found, or only non-search parameters ones (e.g. _id, _lastUpdated)
*/
private boolean createSort(CriteriaBuilder theBuilder, Root<ResourceTable> theFrom, SortSpec theSort, List<Order> theOrders, List<Predicate> thePredicates) {
if (theSort == null || isBlank(theSort.getParamName())) {
return;
return false;
}
if (BaseResource.SP_RES_ID.equals(theSort.getParamName())) {
@ -1201,8 +1205,7 @@ public class SearchBuilder {
theOrders.add(theBuilder.desc(theFrom.get("myId")));
}
createSort(theBuilder, theFrom, theSort.getChain(), theOrders, thePredicates);
return;
return createSort(theBuilder, theFrom, theSort.getChain(), theOrders, thePredicates);
}
if (Constants.PARAM_LASTUPDATED.equals(theSort.getParamName())) {
@ -1212,8 +1215,7 @@ public class SearchBuilder {
theOrders.add(theBuilder.desc(theFrom.get("myUpdated")));
}
createSort(theBuilder, theFrom, theSort.getChain(), theOrders, thePredicates);
return;
return createSort(theBuilder, theFrom, theSort.getChain(), theOrders, thePredicates);
}
RuntimeResourceDefinition resourceDef = myContext.getResourceDefinition(myResourceName);
@ -1276,6 +1278,8 @@ public class SearchBuilder {
}
createSort(theBuilder, theFrom, theSort.getChain(), theOrders, thePredicates);
return true;
}
private String determineSystemIfMissing(String theParamName, String code, String system) {
@ -1577,9 +1581,10 @@ public class SearchBuilder {
query.setMaxResults(theToIndex - theFromIndex);
List<Long> pids = new ArrayList<Long>();
Set<Long> pidSet = new HashSet<Long>();
for (Long next : query.getResultList()) {
if (next != null) {
if (next != null && pidSet.add(next)) {
pids.add(next);
}
}

16
hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/BaseResourceIndexedSearchParam.java
View File

@ -30,6 +30,8 @@ import javax.persistence.MappedSuperclass;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
import org.hibernate.annotations.ColumnDefault;
import org.hibernate.annotations.Columns;
import org.hibernate.search.annotations.ContainedIn;
import org.hibernate.search.annotations.Field;
@ -40,6 +42,12 @@ public abstract class BaseResourceIndexedSearchParam implements Serializable {
private static final long serialVersionUID = 1L;
@Field()
@Column(name = "SP_MISSING", nullable = true)
@ColumnDefault("false")
@Temporal(TemporalType.TIMESTAMP)
private boolean myMissing;
@Field
@Column(name = "SP_NAME", length = MAX_SP_NAME, nullable = false)
private String myParamName;
@ -83,6 +91,14 @@ public abstract class BaseResourceIndexedSearchParam implements Serializable {
return myUpdated;
}
public boolean isMissing() {
return myMissing;
}
public void setMissing(boolean theMissing) {
myMissing = theMissing;
}
public void setParamName(String theName) {
myParamName = theName;
}

105
hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3SearchNoFtTest.java
View File

@ -2863,7 +2863,99 @@ public class FhirResourceDaoDstu3SearchNoFtTest extends BaseJpaDstu3Test {
}
@Test
public void testSortOnPopulatedField() throws Exception {
public void testSortOnId() throws Exception {
// Numeric ID
Patient p01 = new Patient();
p01.setActive(true);
p01.setGender(AdministrativeGender.MALE);
p01.addName().setFamily("B").addGiven("A");
String id1 = myPatientDao.create(p01).getId().toUnqualifiedVersionless().getValue();
// Numeric ID
Patient p02 = new Patient();
p02.setActive(true);
p02.setGender(AdministrativeGender.MALE);
p02.addName().setFamily("B").addGiven("B");
p02.addName().setFamily("Z").addGiven("Z");
String id2 = myPatientDao.create(p02).getId().toUnqualifiedVersionless().getValue();
// Forced ID
Patient pAB = new Patient();
pAB.setId("AB");
pAB.setActive(true);
pAB.setGender(AdministrativeGender.MALE);
pAB.addName().setFamily("A").addGiven("B");
myPatientDao.update(pAB);
// Forced ID
Patient pAA = new Patient();
pAA.setId("AA");
pAA.setActive(true);
pAA.setGender(AdministrativeGender.MALE);
pAA.addName().setFamily("A").addGiven("A");
myPatientDao.update(pAA);
SearchParameterMap map;
List<String> ids;
map = new SearchParameterMap();
map.setSort(new SortSpec("_id", SortOrderEnum.ASC));
ids = toUnqualifiedVersionlessIdValues(myPatientDao.search(map));
assertThat(ids, contains("Patient/AA", "Patient/AB", id1, id2));
}
@Test
public void testSortOnLastUpdated() throws Exception {
// Numeric ID
Patient p01 = new Patient();
p01.setActive(true);
p01.setGender(AdministrativeGender.MALE);
p01.addName().setFamily("B").addGiven("A");
String id1 = myPatientDao.create(p01).getId().toUnqualifiedVersionless().getValue();
Thread.sleep(10);
// Numeric ID
Patient p02 = new Patient();
p02.setActive(true);
p02.setGender(AdministrativeGender.MALE);
p02.addName().setFamily("B").addGiven("B");
p02.addName().setFamily("Z").addGiven("Z");
String id2 = myPatientDao.create(p02).getId().toUnqualifiedVersionless().getValue();
Thread.sleep(10);
// Forced ID
Patient pAB = new Patient();
pAB.setId("AB");
pAB.setActive(true);
pAB.setGender(AdministrativeGender.MALE);
pAB.addName().setFamily("A").addGiven("B");
myPatientDao.update(pAB);
Thread.sleep(10);
// Forced ID
Patient pAA = new Patient();
pAA.setId("AA");
pAA.setActive(true);
pAA.setGender(AdministrativeGender.MALE);
pAA.addName().setFamily("A").addGiven("A");
myPatientDao.update(pAA);
SearchParameterMap map;
List<String> ids;
map = new SearchParameterMap();
map.setSort(new SortSpec("_lastUpdated", SortOrderEnum.ASC));
ids = toUnqualifiedVersionlessIdValues(myPatientDao.search(map));
assertThat(ids, contains(id1, id2, "Patient/AB", "Patient/AA"));
}
@Test
public void testSortOnSearchParameterWhereAllResourcesHaveAValue() throws Exception {
Patient pBA = new Patient();
pBA.setId("BA");
pBA.setActive(true);
@ -2915,7 +3007,7 @@ public class FhirResourceDaoDstu3SearchNoFtTest extends BaseJpaDstu3Test {
}
@Test
public void testSort() throws Exception {
public void testSortOnSparselyPopulatedSearchParameter() throws Exception {
Patient pBA = new Patient();
pBA.setId("BA");
pBA.setActive(true);
@ -2947,6 +3039,7 @@ public class FhirResourceDaoDstu3SearchNoFtTest extends BaseJpaDstu3Test {
Patient pCA = new Patient();
pCA.setId("CA");
pCA.setActive(false);
pCA.getAddressFirstRep().addLine("A");
pCA.addName().setFamily("C").addGiven("A");
pCA.addName().setFamily("Z").addGiven("A");
myPatientDao.update(pCA);
@ -2954,13 +3047,6 @@ public class FhirResourceDaoDstu3SearchNoFtTest extends BaseJpaDstu3Test {
SearchParameterMap map;
List<String> ids;
// Sort across all resources
map = new SearchParameterMap();
map.setSort(new SortSpec("family", SortOrderEnum.ASC).setChain(new SortSpec("given", SortOrderEnum.ASC)));
ids = toUnqualifiedVersionlessIdValues(myPatientDao.search(map));
assertThat(ids, contains("Patient/AA", "Patient/AB", "Patient/BA", "Patient/BB", "Patient/CA"));
// A sort on a field that isn't populated in all cases
map = new SearchParameterMap();
map.setSort(new SortSpec("gender"));
ids = toUnqualifiedVersionlessIdValues(myPatientDao.search(map));
@ -2973,7 +3059,6 @@ public class FhirResourceDaoDstu3SearchNoFtTest extends BaseJpaDstu3Test {
ourLog.info("IDS: {}", ids);
assertThat(ids, contains("Patient/AA", "Patient/AB", "Patient/BA", "Patient/BB", "Patient/CA"));
// Sort
map = new SearchParameterMap();
map.add(Patient.SP_ACTIVE, new TokenParam(null, "true"));
map.setSort(new SortSpec("family", SortOrderEnum.ASC).setChain(new SortSpec("given", SortOrderEnum.ASC)));