Merge branch 'master' into 3.0.0

# Conflicts:
#	redisson/src/main/java/org/redisson/RedissonObject.java
pull/1933/head
Nikita Koksharov 6 years ago
commit ee98f95c76

@ -18,9 +18,7 @@ package org.redisson;
import java.io.IOException;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.AbstractCollection;
import java.util.AbstractMap;
import java.util.AbstractSet;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@ -45,6 +43,7 @@ import org.redisson.cache.CacheKey;
import org.redisson.cache.LFUCacheMap;
import org.redisson.cache.LRUCacheMap;
import org.redisson.cache.LocalCacheListener;
import org.redisson.cache.LocalCacheView;
import org.redisson.cache.LocalCachedMapClear;
import org.redisson.cache.LocalCachedMapInvalidate;
import org.redisson.cache.LocalCachedMapUpdate;
@ -138,6 +137,7 @@ public class RedissonLocalCachedMap<K, V> extends RedissonMap<K, V> implements R
private SyncStrategy syncStrategy;
private LocalCacheListener listener;
private LocalCacheView<K, V> localCacheView;
public RedissonLocalCachedMap(CommandAsyncExecutor commandExecutor, String name, LocalCachedMapOptions<K, V> options, EvictionScheduler evictionScheduler, RedissonClient redisson) {
super(commandExecutor, name, redisson, options);
@ -168,6 +168,7 @@ public class RedissonLocalCachedMap<K, V> extends RedissonMap<K, V> implements R
};
listener.add();
localCacheView = new LocalCacheView(cache, this);
if (options.getSyncStrategy() != SyncStrategy.NONE) {
invalidateEntryOnChange = 1;
@ -1095,183 +1096,22 @@ public class RedissonLocalCachedMap<K, V> extends RedissonMap<K, V> implements R
@Override
public Set<K> cachedKeySet() {
return new LocalKeySet();
}
class LocalKeySet extends AbstractSet<K> {
@Override
public Iterator<K> iterator() {
return new Iterator<K>() {
Iterator<CacheValue> iter = cache.values().iterator();
@Override
public boolean hasNext() {
return iter.hasNext();
}
@Override
public K next() {
return (K) iter.next().getKey();
}
};
}
@Override
public boolean contains(Object o) {
CacheKey cacheKey = toCacheKey(o);
return cache.containsKey(cacheKey);
}
@Override
public boolean remove(Object o) {
CacheKey cacheKey = toCacheKey(o);
return cache.remove(cacheKey) != null;
}
@Override
public int size() {
return cache.size();
}
@Override
public void clear() {
cache.clear();
}
return localCacheView.cachedKeySet();
}
@Override
public Collection<V> cachedValues() {
return new LocalValues();
}
final class LocalValues extends AbstractCollection<V> {
@Override
public Iterator<V> iterator() {
return new Iterator<V>() {
Iterator<CacheValue> iter = cache.values().iterator();
@Override
public boolean hasNext() {
return iter.hasNext();
}
@Override
public V next() {
return (V) iter.next().getValue();
}
};
}
@Override
public boolean contains(Object o) {
CacheValue cacheValue = new CacheValue(null, o);
return cache.containsValue(cacheValue);
}
@Override
public int size() {
return cache.size();
}
@Override
public void clear() {
cache.clear();
}
return localCacheView.cachedValues();
}
@Override
public Set<Entry<K, V>> cachedEntrySet() {
return new LocalEntrySet();
}
final class LocalEntrySet extends AbstractSet<Map.Entry<K,V>> {
@Override
public Iterator<Map.Entry<K,V>> iterator() {
return new Iterator<Map.Entry<K,V>>() {
Iterator<CacheValue> iter = cache.values().iterator();
@Override
public boolean hasNext() {
return iter.hasNext();
}
@Override
public Map.Entry<K,V> next() {
CacheValue e = iter.next();
return new AbstractMap.SimpleEntry<K, V>((K)e.getKey(), (V)e.getValue());
}
};
}
@Override
public boolean contains(Object o) {
if (!(o instanceof Map.Entry))
return false;
Map.Entry<?,?> e = (Map.Entry<?,?>) o;
CacheKey cacheKey = toCacheKey(e.getKey());
CacheValue entry = cache.get(cacheKey);
return entry != null && entry.getValue().equals(e.getValue());
}
@Override
public boolean remove(Object o) {
if (o instanceof Map.Entry) {
Map.Entry<?,?> e = (Map.Entry<?,?>) o;
CacheKey cacheKey = toCacheKey(e.getKey());
return cache.remove(cacheKey, new CacheValue(e.getKey(), e.getValue()));
}
return false;
}
@Override
public int size() {
return cache.size();
}
@Override
public void clear() {
cache.clear();
}
return localCacheView.cachedEntrySet();
}
@Override
public Map<K, V> getCachedMap() {
return new LocalMap();
return localCacheView.getCachedMap();
}
final class LocalMap extends AbstractMap<K,V> {
@Override
public V get(Object key) {
CacheKey cacheKey = toCacheKey(key);
CacheValue e = cache.get(cacheKey);
if (e != null) {
return (V) e.getValue();
}
return null;
}
@Override
public boolean containsKey(Object key) {
CacheKey cacheKey = toCacheKey(key);
return cache.containsKey(cacheKey);
}
@Override
public boolean containsValue(Object value) {
CacheValue cacheValue = new CacheValue(null, value);
return cache.containsValue(cacheValue);
}
@Override
public Set<Entry<K, V>> entrySet() {
return RedissonLocalCachedMap.this.cachedEntrySet();
}
}
}

@ -18,7 +18,6 @@ package org.redisson;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Spliterator;

@ -0,0 +1,236 @@
/**
* Copyright 2018 Nikita Koksharov
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.redisson.cache;
import java.util.AbstractCollection;
import java.util.AbstractMap;
import java.util.AbstractSet;
import java.util.Collection;
import java.util.Iterator;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import org.redisson.RedissonLocalCachedMap.CacheValue;
import org.redisson.RedissonObject;
import io.netty.buffer.ByteBuf;
/**
*
* @author Nikita Koksharov
*
* @param <K> key type
* @param <V> value type
*/
public class LocalCacheView<K, V> {
private final RedissonObject object;
private final Cache<CacheKey, CacheValue> cache;
public LocalCacheView(Cache<CacheKey, CacheValue> cache, RedissonObject object) {
this.cache = cache;
this.object = object;
}
public Set<K> cachedKeySet() {
return new LocalKeySet();
}
class LocalKeySet extends AbstractSet<K> {
@Override
public Iterator<K> iterator() {
return new Iterator<K>() {
Iterator<CacheValue> iter = cache.values().iterator();
@Override
public boolean hasNext() {
return iter.hasNext();
}
@Override
public K next() {
return (K) iter.next().getKey();
}
};
}
@Override
public boolean contains(Object o) {
CacheKey cacheKey = toCacheKey(o);
return cache.containsKey(cacheKey);
}
@Override
public boolean remove(Object o) {
CacheKey cacheKey = toCacheKey(o);
return cache.remove(cacheKey) != null;
}
@Override
public int size() {
return cache.size();
}
@Override
public void clear() {
cache.clear();
}
}
public Collection<V> cachedValues() {
return new LocalValues();
}
final class LocalValues extends AbstractCollection<V> {
@Override
public Iterator<V> iterator() {
return new Iterator<V>() {
Iterator<CacheValue> iter = cache.values().iterator();
@Override
public boolean hasNext() {
return iter.hasNext();
}
@Override
public V next() {
return (V) iter.next().getValue();
}
};
}
@Override
public boolean contains(Object o) {
CacheValue cacheValue = new CacheValue(null, o);
return cache.containsValue(cacheValue);
}
@Override
public int size() {
return cache.size();
}
@Override
public void clear() {
cache.clear();
}
}
public Set<Entry<K, V>> cachedEntrySet() {
return new LocalEntrySet();
}
final class LocalEntrySet extends AbstractSet<Map.Entry<K,V>> {
@Override
public Iterator<Map.Entry<K,V>> iterator() {
return new Iterator<Map.Entry<K,V>>() {
Iterator<CacheValue> iter = cache.values().iterator();
@Override
public boolean hasNext() {
return iter.hasNext();
}
@Override
public Map.Entry<K,V> next() {
CacheValue e = iter.next();
return new AbstractMap.SimpleEntry<K, V>((K)e.getKey(), (V)e.getValue());
}
};
}
@Override
public boolean contains(Object o) {
if (!(o instanceof Map.Entry))
return false;
Map.Entry<?,?> e = (Map.Entry<?,?>) o;
CacheKey cacheKey = toCacheKey(e.getKey());
CacheValue entry = cache.get(cacheKey);
return entry != null && entry.getValue().equals(e.getValue());
}
@Override
public boolean remove(Object o) {
if (o instanceof Map.Entry) {
Map.Entry<?,?> e = (Map.Entry<?,?>) o;
CacheKey cacheKey = toCacheKey(e.getKey());
return cache.remove(cacheKey, new CacheValue(e.getKey(), e.getValue()));
}
return false;
}
@Override
public int size() {
return cache.size();
}
@Override
public void clear() {
cache.clear();
}
}
public Map<K, V> getCachedMap() {
return new LocalMap();
}
final class LocalMap extends AbstractMap<K,V> {
@Override
public V get(Object key) {
CacheKey cacheKey = toCacheKey(key);
CacheValue e = cache.get(cacheKey);
if (e != null) {
return (V) e.getValue();
}
return null;
}
@Override
public boolean containsKey(Object key) {
CacheKey cacheKey = toCacheKey(key);
return cache.containsKey(cacheKey);
}
@Override
public boolean containsValue(Object value) {
CacheValue cacheValue = new CacheValue(null, value);
return cache.containsValue(cacheValue);
}
@Override
public Set<Entry<K, V>> entrySet() {
return cachedEntrySet();
}
}
public CacheKey toCacheKey(Object key) {
ByteBuf encoded = object.encodeMapKey(key);
try {
return toCacheKey(encoded);
} finally {
encoded.release();
}
}
}
Loading…
Cancel
Save