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

cleanup

This commit is contained in:
leif stawnyczy 2023-08-11 14:24:56 -04:00
parent 9843e0eb0f
commit cc30b6a32d
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/SearchBuilder.java
View File

@ -188,6 +188,7 @@ public class SearchBuilder implements ISearchBuilder<JpaPid> {
* when invoking an $everything operation
*/
private List<JpaPid> myAlsoIncludePids;
private CriteriaBuilder myCriteriaBuilder;
private SearchParameterMap myParams;
private String mySearchUuid;
@ -1944,6 +1945,7 @@ public class SearchBuilder implements ISearchBuilder<JpaPid> {
* and fetches data from the db.
*/
private ISearchQueryExecutor myResultsIterator;
private boolean myFetchIncludesForEverythingOperation;
/**
* The count of resources found in the cached search
@ -1954,6 +1956,7 @@ public class SearchBuilder implements ISearchBuilder<JpaPid> {
* (ie, not cached in previous searches)
*/
private int myNonSkipCount = 0;
private List<ISearchQueryExecutor> myQueryList = new ArrayList<>();
private QueryIterator(SearchRuntimeDetails theSearchRuntimeDetails, RequestDetails theRequest) {
@ -2010,11 +2013,8 @@ public class SearchBuilder implements ISearchBuilder<JpaPid> {
for (JpaPid next : myAlsoIncludePids) {
if (next != null)
if (myPidSet.add(next)) {
// mySkipCount++;
myNext = next;
break;
} else {
// myNonSkipCount++;
}
}

7
hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/tasks/SearchTask.java
View File

@ -60,6 +60,7 @@ import org.hl7.fhir.instance.model.api.IBaseResource;
import org.springframework.transaction.annotation.Isolation;
import org.springframework.transaction.annotation.Propagation;
import javax.annotation.Nonnull;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Iterator;
@ -68,7 +69,6 @@ import java.util.concurrent.Callable;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.function.Consumer;
import javax.annotation.Nonnull;
import static ca.uhn.fhir.jpa.util.SearchParameterMapCalculator.isWantCount;
import static ca.uhn.fhir.jpa.util.SearchParameterMapCalculator.isWantOnlyCount;
@ -408,11 +408,6 @@ public class SearchTask implements Callable<Void> {
}
}
private boolean hasMoreToFetch(IResultIterator theResultIter) {
return myAdditionalPrefetchThresholdsRemaining
&& !isFinished(theResultIter);
}
public boolean isNotAborted() {
return myAbortRequested == false;
}