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

migrate threading code

Browse Source
This commit is contained in:
justin.mckelvy 2023-05-26 13:55:47 -06:00
parent 63359c3a9e
commit 47c32fd61c
4 changed files with 1 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/config/BaseClinicalReasoningConfig.java
View File

@ -295,7 +295,7 @@ public abstract class BaseClinicalReasoningConfig {
public ExecutorService cqlExecutor() {
CqlThreadFactory factory = new CqlThreadFactory();
ExecutorService executor = Executors.
newFixedThreadPool(CrProperties.MeasureProperties.DEFAULT_THREADS_BATCH_SIZE
newFixedThreadPool(Runtime.getRuntime().availableProcessors()
, factory);
executor = new DelegatingSecurityContextExecutorService(executor);

8
hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/config/CrProperties.java
View File

@ -65,18 +65,10 @@ public class CrProperties {
private MeasureReportConfiguration myMeasureReportConfiguration;
private MeasureEvaluationOptions myMeasureEvaluationOptions;
public static final int DEFAULT_THREADS_FOR_MEASURE_EVAL = 4;
public static final int DEFAULT_THREADS_BATCH_SIZE = 250;
public static final boolean DEFAULT_THREADS_ENABLED_FOR_MEASURE_EVAL = true;
public MeasureProperties() {
myMeasureEvaluationOptions = MeasureEvaluationOptions.defaultOptions();
myMeasureEvaluationOptions.setNumThreads(DEFAULT_THREADS_FOR_MEASURE_EVAL);
myMeasureEvaluationOptions.setThreadedBatchSize(DEFAULT_THREADS_BATCH_SIZE);
myMeasureEvaluationOptions.setThreadedEnabled(DEFAULT_THREADS_ENABLED_FOR_MEASURE_EVAL);
};
//care gaps
public boolean getThreadedCareGapsEnabled() {
return myThreadedCareGapsEnabled;

7
hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/dstu3/measure/MeasureService.java
View File

@ -55,7 +55,6 @@ import javax.inject.Named;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ExecutorService;
import static ca.uhn.fhir.cr.constant.MeasureReportConstants.COUNTRY_CODING_SYSTEM_CODE;
import static ca.uhn.fhir.cr.constant.MeasureReportConstants.MEASUREREPORT_MEASURE_SUPPLEMENTALDATA_EXTENSION;
@ -132,10 +131,6 @@ public class MeasureService implements IDaoRegistryUser {
@Autowired
protected DaoRegistry myDaoRegistry;
@Autowired
@Named("cqlExecutor")
private ExecutorService myCqlExecutor;
protected RequestDetails myRequestDetails;
/**
* Get The details (such as tenant) of this request. Usually auto-populated HAPI.
@ -188,8 +183,6 @@ public class MeasureService implements IDaoRegistryUser {
TerminologyProvider terminologyProvider;
myMeasureEvaluationOptions.setMeasureExecutor(myCqlExecutor);
if (theTerminologyEndpoint != null) {
IGenericClient client = Clients.forEndpoint(getFhirContext(), theTerminologyEndpoint);
terminologyProvider = new Dstu3FhirTerminologyProvider(client);

8
hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/r4/measure/MeasureService.java
View File

@ -64,8 +64,6 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.concurrent.Executor;
import java.util.concurrent.ExecutorService;
import static ca.uhn.fhir.cr.constant.MeasureReportConstants.COUNTRY_CODING_SYSTEM_CODE;
import static ca.uhn.fhir.cr.constant.MeasureReportConstants.MEASUREREPORT_MEASURE_SUPPLEMENTALDATA_EXTENSION;
@ -144,10 +142,6 @@ public class MeasureService implements IDaoRegistryUser {
@Autowired
protected DaoRegistry myDaoRegistry;
@Autowired
@Named("cqlExecutor")
private ExecutorService myCqlExecutor;
protected RequestDetails myRequestDetails;
public RequestDetails getRequestDetails() {
@ -201,8 +195,6 @@ public class MeasureService implements IDaoRegistryUser {
TerminologyProvider terminologyProvider;
myMeasureEvaluationOptions.setMeasureExecutor(myCqlExecutor);
if (theTerminologyEndpoint != null) {
IGenericClient client = Clients.forEndpoint(getFhirContext(), theTerminologyEndpoint);
terminologyProvider = new R4FhirTerminologyProvider(client);