Remove extra flush events to increase performance #43363
+21
−19
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
48b6395 to
5eabd3e
Compare
Closes keycloak#43362 Signed-off-by: Alexander Schwartz <alexander.schwartz@ibm.com>
5eabd3e to
49dbbc5
Compare
|
@shawkins - may I ask you to review this PR, or should I ask a different team? Thanks! |
shawkins
approved these changes
Oct 10, 2025
| action.setPriority(model.getPriority()); | ||
| realm.getRequiredActionProviders().add(action); | ||
| em.persist(action); | ||
| em.flush(); |
There was a problem hiding this comment.
This seems fine. In general there are a lot of flushes in RealmAdapter that seem ad hoc beyond the pattern of persist / flush / detach.
Comment on lines
+1323
to
+1343
| Set<ClientScopeClientMappingEntity> clientScopeEntities = clientScopes.stream() | ||
| .filter(clientScope -> !existingClientScopes.containsKey(clientScope.getName())) | ||
| .filter(clientScope -> { | ||
| if (clientScope.getProtocol() == null) { | ||
| // set default protocol if not set. Otherwise, we will get a NullPointer | ||
| clientScope.setProtocol(OIDCLoginProtocol.LOGIN_PROTOCOL); | ||
| } | ||
| return acceptedClientProtocols.contains(clientScope.getProtocol()); | ||
| }) | ||
| .map(clientScope -> { | ||
| ClientScopeClientMappingEntity entity = new ClientScopeClientMappingEntity(); | ||
| entity.setClientScopeId(clientScope.getId()); | ||
| entity.setClientId(client.getId()); | ||
| entity.setDefaultScope(defaultScope); | ||
| em.persist(entity); | ||
| return entity; | ||
| }).collect(Collectors.toSet()); | ||
| if (!clientScopeEntities.isEmpty()) { | ||
| em.flush(); | ||
| clientScopeEntities.forEach(entity -> em.detach(entity)); | ||
| } |
There was a problem hiding this comment.
In situations where you have less direct control over the transitive calls, the pattern using the EntityManagers logic looks like:
Suggested change
| Set<ClientScopeClientMappingEntity> clientScopeEntities = clientScopes.stream() | |
| .filter(clientScope -> !existingClientScopes.containsKey(clientScope.getName())) | |
| .filter(clientScope -> { | |
| if (clientScope.getProtocol() == null) { | |
| // set default protocol if not set. Otherwise, we will get a NullPointer | |
| clientScope.setProtocol(OIDCLoginProtocol.LOGIN_PROTOCOL); | |
| } | |
| return acceptedClientProtocols.contains(clientScope.getProtocol()); | |
| }) | |
| .map(clientScope -> { | |
| ClientScopeClientMappingEntity entity = new ClientScopeClientMappingEntity(); | |
| entity.setClientScopeId(clientScope.getId()); | |
| entity.setClientId(client.getId()); | |
| entity.setDefaultScope(defaultScope); | |
| em.persist(entity); | |
| return entity; | |
| }).collect(Collectors.toSet()); | |
| if (!clientScopeEntities.isEmpty()) { | |
| em.flush(); | |
| clientScopeEntities.forEach(entity -> em.detach(entity)); | |
| } | |
| EntityManagers.runInBatch(session, () -> { | |
| clientScopes.stream() | |
| .filter(clientScope -> !existingClientScopes.containsKey(clientScope.getName())) | |
| .filter(clientScope -> { | |
| if (clientScope.getProtocol() == null) { | |
| // set default protocol if not set. Otherwise, we will get a NullPointer | |
| clientScope.setProtocol(OIDCLoginProtocol.LOGIN_PROTOCOL); | |
| } | |
| return acceptedClientProtocols.contains(clientScope.getProtocol()); | |
| }) | |
| .forEach(clientScope -> { | |
| ClientScopeClientMappingEntity entity = new ClientScopeClientMappingEntity(); | |
| entity.setClientScopeId(clientScope.getId()); | |
| entity.setClientId(client.getId()); | |
| entity.setDefaultScope(defaultScope); | |
| em.persist(entity); | |
| }); | |
| }, true); |
However that will generally result in 2 flushes though, rather than the single flush that is done here.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #43362