honeymoose/hapi-fhir
1
0
Fork 0
mirror of https://github.com/hapifhir/hapi-fhir.git synced 2025-02-18 10:55:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixing

Browse Source
This commit is contained in:
leif stawnyczy 2023-08-15 10:56:47 -04:00
parent ab8b1ca277
commit a1d9b4c7f0
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -655,6 +655,8 @@ public class SearchBuilder implements ISearchBuilder<JpaPid> {
if (myParams.getEverythingMode() != null) {
HashSet<Long> targetPids = new HashSet<>();
if (myParams.get(IAnyResource.SP_RES_ID) != null) {
// will add an initial search executor for
// _id params
extractTargetPidsFromIdParams(targetPids, theSearchQueryExecutors);
} else {
// For Everything queries, we make the query root by the ResourceLink table, since this query
@ -676,8 +678,7 @@ public class SearchBuilder implements ISearchBuilder<JpaPid> {
List<Long> output = jdbcTemplate.query(sql, args, new SingleColumnRowMapper<>(Long.class));
// we add the search to the list of search executors as the first
// search executor/resultsiterator
// we add a search executor to fetch unlinked patients first
theSearchQueryExecutors.add(new ListWrappingSearchQueryExecutor(output));
}

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

@ -122,9 +122,11 @@ public class SearchTask implements Callable<Void> {
private boolean myAdditionalPrefetchThresholdsRemaining;
private List<JpaPid> myPreviouslyAddedResourcePids;
private Integer myMaxResultsToFetch;
/**
* Constructor
*/
@SuppressWarnings({"unchecked", "rawtypes"})
public SearchTask(
SearchTaskParameters theCreationParams,
HapiTransactionService theManagedTxManager,
@ -198,6 +200,7 @@ public class SearchTask implements Callable<Void> {
myCountSavedTotal = myPreviouslyAddedResourcePids.size();
}
@SuppressWarnings("rawtypes")
private ISearchBuilder newSearchBuilder() {
Class<? extends IBaseResource> resourceTypeClass =
myContext.getResourceDefinition(myResourceType).getImplementingClass();
@ -281,6 +284,7 @@ public class SearchTask implements Callable<Void> {
.execute(() -> doSaveSearch());
}
@SuppressWarnings("rawtypes")
private void saveUnsynced(final IResultIterator theResultIter) {
myTxService
.withRequest(myRequest)
@ -296,7 +300,7 @@ public class SearchTask implements Callable<Void> {
// Interceptor call: STORAGE_PREACCESS_RESOURCES
// This can be used to remove results from the search result details before
// the user has a chance to know that they were in the results
if (mySearchRuntimeDetails.getRequestDetails() != null && unsyncedPids.isEmpty() == false) {
if (mySearchRuntimeDetails.getRequestDetails() != null && !unsyncedPids.isEmpty()) {
JpaPreResourceAccessDetails accessDetails =
new JpaPreResourceAccessDetails(unsyncedPids, () -> newSearchBuilder());
HookParams params = new HookParams()
@ -332,7 +336,7 @@ public class SearchTask implements Callable<Void> {
mySyncedPids.addAll(unsyncedPids);
unsyncedPids.clear();
if (theResultIter.hasNext() == false) {
if (!theResultIter.hasNext()) {
int skippedCount = theResultIter.getSkippedCount();
ourLog.trace(
"MaxToFetch[{}] SkippedCount[{}] CountSavedThisPass[{}] CountSavedThisTotal[{}] AdditionalPrefetchRemaining[{}]",
@ -382,6 +386,7 @@ public class SearchTask implements Callable<Void> {
ourLog.trace("saveUnsynced() - post-commit");
}
@SuppressWarnings("rawtypes")
private boolean isFinished(final IResultIterator theResultIter) {
int skippedCount = theResultIter.getSkippedCount();
int nonSkippedCount = theResultIter.getNonSkippedCount();
@ -408,7 +413,7 @@ public class SearchTask implements Callable<Void> {
}
public boolean isNotAborted() {
return myAbortRequested == false;
return !myAbortRequested;
}
public void markComplete() {
@ -542,6 +547,7 @@ public class SearchTask implements Callable<Void> {
* This method actually creates the database query to perform the
* search, and starts it.
*/
@SuppressWarnings({"rawtypes", "unchecked"})
private void doSearch() {
/*
* If the user has explicitly requested a _count, perform a
@ -693,6 +699,7 @@ public class SearchTask implements Callable<Void> {
*/
private void doCountOnlyQuery(boolean theParamWantOnlyCount) {
ourLog.trace("Performing count");
@SuppressWarnings("rawtypes")
ISearchBuilder sb = newSearchBuilder();
/*