Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Profiling changes #1007

Merged
merged 21 commits into from
Dec 5, 2022
Merged

Profiling changes #1007

merged 21 commits into from
Dec 5, 2022

Conversation

vmueller-vg
Copy link
Contributor

@vmueller-vg vmueller-vg commented Nov 28, 2022 •
edited
Loading

Changes

  • add caches for ehr.concept, ehr.territory, ehr.language
  • remove unnecessary DB queries
  • use caffeine cache instead of ehcache as ehcache has unnecessary blocking

Related issue

Additional information and checks

  • Pull request linked in changelog

HolgerReiseVSys and others added 20 commits November 23, 2022 12:38
@HolgerReiseVSys @vmueller-vg
CDR-550 cache ehr.concept
258e15b 
# Conflicts:
#	application/src/main/resources/ehcache.xml
#	service/src/main/java/org/ehrbase/cache/CacheOptions.java
#	service/src/main/java/org/ehrbase/dao/access/interfaces/I_CompositionAccess.java
#	service/src/main/java/org/ehrbase/dao/access/interfaces/I_ContributionAccess.java
#	service/src/main/java/org/ehrbase/dao/access/interfaces/I_EhrAccess.java
#	service/src/main/java/org/ehrbase/dao/access/jooq/AuditDetailsAccess.java
#	service/src/main/java/org/ehrbase/dao/access/jooq/CompositionAccess.java
#	service/src/main/java/org/ehrbase/dao/access/jooq/ContributionAccess.java
#	service/src/main/java/org/ehrbase/dao/access/jooq/EhrAccess.java
#	service/src/main/java/org/ehrbase/ehr/knowledge/I_KnowledgeCache.java
#	service/src/main/java/org/ehrbase/service/KnowledgeCacheService.java
@HolgerReiseVSys @vmueller-vg
CDR-550 cache ehr.territory, ehr.language
bb5a2dc 
# Conflicts:
#	application/src/main/resources/ehcache.xml
#	service/src/main/java/org/ehrbase/aql/containment/TemplateIdAqlTuple.java
#	service/src/main/java/org/ehrbase/service/KnowledgeCacheService.java
@HolgerReiseVSys @vmueller-vg
CDR-550 fetch ehrStatus only if response data is requested
07412c0
@vmueller-vg
CDR-550 Fix cache definitions
d5352a2
@vmueller-vg
CDR-550 Remove unnecessary DB queries
902ca80
@HolgerReiseVSys @vmueller-vg
CDR-550 optimized retrieve + create composition
144ddad 
# Conflicts:
#	rest-openehr/src/main/java/org/ehrbase/rest/openehr/OpenehrCompositionController.java
#	service/src/main/java/org/ehrbase/dao/access/jooq/CompositionAccess.java
#	service/src/main/java/org/ehrbase/service/CompositionServiceImp.java
@HolgerReiseVSys @vmueller-vg
CDR-550 fixed CompositionAccess::getLastVersionNumber + test
897af51
@vmueller-vg
CDR-550 Cache user ids
ede9d08 
# Conflicts:
#	service/src/main/java/org/ehrbase/service/BaseServiceImp.java
@vmueller-vg
CDR-550 Don't open transactions on calls to cached methods
f296e58 
# Conflicts:
#	service/src/main/java/org/ehrbase/service/KnowledgeCacheService.java
@vmueller-vg
CDR-550 Cleanup caches, Fix fieldCache key
f469c4a
@HolgerReiseVSys @vmueller-vg
CDR-550 Switch traceId from UUID to Long
4a53cc6
@HolgerReiseVSys @vmueller-vg
CDR-550 optimized OpenehrEhrController::retrieveEhrById
7f2fd7c 
# Conflicts:
#	rest-openehr/src/main/java/org/ehrbase/rest/openehr/OpenehrEhrController.java
#	service/src/main/java/org/ehrbase/service/EhrServiceImp.java
@HolgerReiseVSys @vmueller-vg
CDR-550 set tomcat spare threads to 200
64bf0e3
@vmueller-vg
CDR-550 Use Caffeine cache
b6ffbed 
# Conflicts:
#	application/src/main/java/org/ehrbase/application/config/cache/CacheConfiguration.java
#	application/src/main/resources/application.yml
#	application/src/main/resources/ehcache.xml
@vmueller-vg
CDR-550 Fix circular dependency
4aa02c8
@vmueller-vg
CDR-550 Fix plugin bean injection of user service
f8809fb
@vmueller-vg
CDR-550 Fix 500 status code on missing EHR
c3ca778
@vmueller-vg
CDR-550 Fix 500 on get versioned ehr status with not existing id
281ae3e
@vmueller-vg
Merge branch 'develop' into profiling-changes
bd9cf0f 
# Conflicts:
#	service/src/main/java/org/ehrbase/service/KnowledgeCacheService.java
@vmueller-vg
Update changelog
b2f9769
@vmueller-vg vmueller-vg marked this pull request as ready for review November 28, 2022 10:24
@stefanspiska stefanspiska self-requested a review December 5, 2022 09:10
@sonarcloud
Copy link

sonarcloud bot commented Dec 5, 2022

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 2 Code Smells

80.7% 80.7% Coverage
0.0% 0.0% Duplication

@stefanspiska stefanspiska merged commit 32717c6 into develop Dec 5, 2022
@stefanspiska stefanspiska deleted the profiling-changes branch December 5, 2022 10:13
@vidi42 vidi42 mentioned this pull request Dec 15, 2022
Closed
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@stefanspiska stefanspiska stefanspiska approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@vmueller-vg @stefanspiska @HolgerReiseVSys