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 <[email protected]> Co-authored-by: Tadgh <[email protected]> Co-authored-by: James Agnew <[email protected]>
hapifhir · Oct 16, 2024 · 3acc95d · 3acc95d
1 parent 7581920
commit 3acc95d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/...cs/src/main/resources/ca/uhn/hapi/fhir/changelog/7_6_0/6341-expand-translation-cache.yaml b/...cs/src/main/resources/ca/uhn/hapi/fhir/changelog/7_6_0/6341-expand-translation-cache.yaml
@@ -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."
diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/util/MemoryCacheService.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/util/MemoryCacheService.java
@@ -68,7 +68,7 @@ private void populateCaches() {
 				case CONCEPT_TRANSLATION_REVERSE:
 					timeoutSeconds =
 							SECONDS.convert(myStorageSettings.getTranslationCachesExpireAfterWriteInMinutes(), MINUTES);
-					maximumSize = 10000;
+					maximumSize = 500000;
 					break;
 				case PID_TO_FORCED_ID:
 				case FORCED_ID_TO_PID:
@@ -200,6 +200,12 @@ public enum CacheEnum {
 		 * Value type: {@literal Optional<String>}
 		 */
 		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),
 		MATCH_URL(String.class),
 		CONCEPT_TRANSLATION_REVERSE(TranslationQuery.class),