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

Check map's nullity inside functor #17527

Merged
merged 1 commit into from Sep 11, 2020
Merged

Check map's nullity inside functor #17527

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
21 changes: 10 additions & 11 deletions hazelcast/src/main/java/com/hazelcast/query/impl/BaseIndexStore.java
View file
Open in desktop
Expand Up @@ -18,6 +18,7 @@

import com.hazelcast.internal.serialization.Data;
import com.hazelcast.internal.util.Clock;
import com.hazelcast.internal.util.MapUtil;
import com.hazelcast.map.impl.record.Record;

import java.util.AbstractSet;
Expand Down Expand Up @@ -163,26 +164,24 @@ private class PassThroughFunctor implements CopyFunctor<Data, QueryableEntry> {

@Override
public Map<Data, QueryableEntry> invoke(Map<Data, QueryableEntry> map) {
if (isExpirable()) {
return new ExpirationAwareHashMapDelegate(map);
if (MapUtil.isNullOrEmpty(map)) {
return map;
}
return map;
}

return isExpirable() ? new ExpirationAwareHashMapDelegate(map) : map;
}
}

private class CopyInputFunctor implements CopyFunctor<Data, QueryableEntry> {

@Override
public Map<Data, QueryableEntry> invoke(Map<Data, QueryableEntry> map) {
if (map != null && !map.isEmpty()) {
HashMap<Data, QueryableEntry> newMap = new HashMap<>(map);
if (isExpirable()) {
return new ExpirationAwareHashMapDelegate(newMap);
}
return newMap;
if (MapUtil.isNullOrEmpty(map)) {
return map;
}
return map;

Map<Data, QueryableEntry> newMap = new HashMap<>(map);
return isExpirable() ? new ExpirationAwareHashMapDelegate(newMap) : newMap;
}

}
Expand Down