8000 Use DELETE statement instead of deleting one by one for HotRod store by mhajas · Pull Request #15401 · keycloak/keycloak · GitHub
[go: up one dir, main page]

Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@
import java.util.Map;
import java.util.Objects;
import java.util.Spliterators;
import java.util.concurrent.atomic.AtomicLong;
import java.util.function.Function;
import java.util.stream.Collectors;
import java.util.stream.Stream;
Expand Down Expand Up @@ -185,7 +184,7 @@ public long getCount(QueryParameters<M> queryParameters) {
public long delete(QueryParameters<M> queryParameters) {
IckleQueryMapModelCriteriaBuilder<E, M> iqmcb = queryParameters.getModelCriteriaBuilder()
.flashToModelCriteriaBuilder(createCriteriaBuilder());
String queryString = "SELECT id " + iqmcb.getIckleQuery();
String queryString = "DELETE " + iqmcb.getIckleQuery();

if (!queryParameters.getOrderBy().isEmpty()) {
queryString += " ORDER BY " + queryParameters.getOrderBy().stream().map(HotRodMapStorage::toOrderString)
Expand All @@ -201,17 +200,7 @@ public long delete(QueryParameters<M> queryParameters) {

query.setParameters(iqmcb.getParameters());

AtomicLong result = new AtomicLong();

CloseableIterator<Object[]> iterator = query.iterator();
StreamSupport.stream(Spliterators.spliteratorUnknownSize(iterator, 0), false)
.peek(e -> result.incrementAndGet())
.map(a -> a[0])
.map(String.class::cast)
.forEach(this::delete);
iterator.close();

return result.get();
return query.executeStatement();
}

public IckleQueryMapModelCriteriaBuilder<E, M> createCriteriaBuilder() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
*/
package org.keycloak.testsuite.model;

import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.containsInAnyOrder;
import static org.hamcrest.Matchers.empty;
Expand All @@ -34,6 +35,8 @@
import org.keycloak.models.RealmProvider;
import org.keycloak.models.RoleModel;
import org.keycloak.models.RoleProvider;
import org.keycloak.models.map.client.MapClientProvider;
import org.keycloak.models.map.client.MapClientProviderFactory;

import java.util.LinkedList;
import java.util.List;
Expand Down Expand Up @@ -149,6 +152,23 @@ public void testClientsBasics() {
}
}

@Test
@RequireProvider(value = ClientProvider.class, >
public void testDeleteClientUsingQueryParameters() {
final String CLIENT_ID = "createDeleteClientId";
// Create client
withRealm(realmId, (session, realm) -> session.clients().addClient(realm, CLIENT_ID));

// Check if exists
assertThat(withRealm(realmId, (session, realm) -> session.clients().getClientByClientId(realm, CLIENT_ID)), notNullValue());

// Remove
withRealm(realmId, (session, realm) -> {((MapClientProvider)session.clients()).preRemove(realm); return null;});

// Check is null
assertThat(withRealm(realmId, (session, realm) -> session.clients().getClientByClientId(realm, CLIENT_ID)), nullValue());
}

@Test
public void testScopeMappingRoleRemoval() {
// create two clients, one realm role and one client role and assign both to one of the clients
Expand Down
0