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

7.5.0 snapshot midcycle branch mergeback (#6371) 

* 6323 resource creation deadlock (#6324)

* make map reads concurrent

* change log

* CUstom version number for guaranteed build determinism

* licenses

* Expand translation cache (#6341)

* Expand translation cache

* Add changelog

* Correction to #6341 (#6342)

---------

Co-authored-by: JasonRoberts-smile <85363818+JasonRoberts-smile@users.noreply.github.com>
Co-authored-by: Tadgh <garygrantgraham@gmail.com>
Co-authored-by: James Agnew <jamesagnew@gmail.com>
This commit is contained in:
David Raeside 2024-10-16 12:37:56 -04:00 committed by GitHub
parent 7581920a15
commit 3acc95d45b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/7_6_0/6341-expand-translation-cache.yaml Normal file
View File

@ -0,0 +1,6 @@
---
type: change
issue: 6341
title: "The CachingValidationSupport cache for concept translations will
now keep up to 500000 translations instead of the previous 5000.
This will be made configurable in a future release."

8
hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/util/MemoryCacheService.java
View File

@ -68,7 +68,7 @@ public class MemoryCacheService {
case CONCEPT_TRANSLATION_REVERSE: case CONCEPT_TRANSLATION_REVERSE:
timeoutSeconds = timeoutSeconds =
SECONDS.convert(myStorageSettings.getTranslationCachesExpireAfterWriteInMinutes(), MINUTES); SECONDS.convert(myStorageSettings.getTranslationCachesExpireAfterWriteInMinutes(), MINUTES);
maximumSize = 10000; maximumSize = 500000;
break; break;
case PID_TO_FORCED_ID: case PID_TO_FORCED_ID:
case FORCED_ID_TO_PID: case FORCED_ID_TO_PID:
@ -200,6 +200,12 @@ public class MemoryCacheService {
* Value type: {@literal Optional<String>} * Value type: {@literal Optional<String>}
*/ */
PID_TO_FORCED_ID(Long.class), PID_TO_FORCED_ID(Long.class),
/**
* TODO: JA this is duplicate with the CachingValidationSupport cache.
* A better solution would be to drop this cache for this item, and to
* create a new CachingValidationSupport implementation which uses
* the MemoryCacheService for all of its caches.
*/
CONCEPT_TRANSLATION(TranslationQuery.class), CONCEPT_TRANSLATION(TranslationQuery.class),
MATCH_URL(String.class), MATCH_URL(String.class),
CONCEPT_TRANSLATION_REVERSE(TranslationQuery.class), CONCEPT_TRANSLATION_REVERSE(TranslationQuery.class),