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

[FORWARD-PORT] Fix HD leak for EP that run on Map keys (#17271) #17276

Merged
merged 1 commit into from
Jul 29, 2020
Merged

[FORWARD-PORT] Fix HD leak for EP that run on Map keys (#17271) #17276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 9 additions & 0 deletions .../main/java/com/hazelcast/client/impl/protocol/task/AbstractMultiPartitionMessageTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@
import com.hazelcast.internal.util.collection.PartitionIdSet;
import com.hazelcast.spi.impl.operationservice.OperationFactory;
import com.hazelcast.spi.impl.operationservice.impl.OperationServiceImpl;
import com.hazelcast.map.impl.MapService;
import com.hazelcast.map.impl.MapServiceContext;
import com.hazelcast.map.impl.operation.MapOperationProvider;

import java.util.Map;
import java.util.concurrent.CompletableFuture;
Expand All @@ -43,6 +46,12 @@ protected CompletableFuture<Map<Integer, Object>> processInternal() {

public abstract PartitionIdSet getPartitions();

protected final MapOperationProvider getMapOperationProvider(String mapName) {
MapService mapService = getService(MapService.SERVICE_NAME);
MapServiceContext mapServiceContext = mapService.getMapServiceContext();
return mapServiceContext.getMapOperationProvider(mapName);
}

protected abstract OperationFactory createOperationFactory();

protected abstract Object reduce(Map<Integer, Object> map);
Expand Down
11 changes: 5 additions & 6 deletions ...rc/main/java/com/hazelcast/client/impl/protocol/task/map/MapExecuteOnKeysMessageTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
import com.hazelcast.map.EntryProcessor;
import com.hazelcast.map.impl.MapEntries;
import com.hazelcast.map.impl.MapService;
import com.hazelcast.map.impl.operation.MultipleEntryOperationFactory;
import com.hazelcast.internal.nio.Connection;
import com.hazelcast.internal.serialization.Data;
import com.hazelcast.map.impl.operation.MapOperationProvider;
import com.hazelcast.security.permission.ActionConstants;
import com.hazelcast.security.permission.MapPermission;
import com.hazelcast.spi.impl.operationservice.OperationFactory;
Expand All @@ -38,8 +38,6 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;

public class MapExecuteOnKeysMessageTask
extends AbstractMultiPartitionMessageTask<MapExecuteOnKeysCodec.RequestParameters> {

Expand All @@ -49,9 +47,10 @@ public MapExecuteOnKeysMessageTask(ClientMessage clientMessage, Node node, Conne

@Override
protected OperationFactory createOperationFactory() {
EntryProcessor entryProcessor = serializationService.toObject(parameters.entryProcessor);
Set<Data> keys = new HashSet<Data>(parameters.keys);
return new MultipleEntryOperationFactory(parameters.name, keys, entryProcessor);
EntryProcessor processor = serializationService.toObject(parameters.entryProcessor);
MapOperationProvider operationProvider = getMapOperationProvider(parameters.name);
return operationProvider.createMultipleEntryOperationFactory(parameters.name,
new HashSet<Data>(parameters.keys), processor);
}

@Override
Expand Down