github-forks
/
redisson
mirror of https://github.com/redisson/redisson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

refactoring write-behind persist mode #927

Browse Source
pull/968/head
Nikita 8 years ago
parent 01cefc5641
commit 4c80f29b2a
7 changed files with 80 additions and 30 deletions
Show Stats Download Patch File Download Diff File

25
redisson/src/main/java/org/redisson/MapWriteBehindListener.java
Unescape Escape View File

@ -16,8 +16,7 @@
package org.redisson;
import java.util.Queue;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import org.redisson.command.CommandAsyncExecutor;
import org.slf4j.Logger;
@ -36,16 +35,19 @@ public class MapWriteBehindListener<R> implements FutureListener<R> {
private static final Logger log = LoggerFactory.getLogger(MapWriteBehindListener.class);
private static final AtomicBoolean sent = new AtomicBoolean();
private static final Queue<Runnable> operations = new ConcurrentLinkedQueue<Runnable>();
private final AtomicInteger writeBehindCurrentThreads;
private final Queue<Runnable> writeBehindTasks;
private final int threadsAmount;
private final MapWriterTask<R> task;
private final CommandAsyncExecutor commandExecutor;
public MapWriteBehindListener(CommandAsyncExecutor commandExecutor, MapWriterTask<R> task) {
public MapWriteBehindListener(CommandAsyncExecutor commandExecutor, MapWriterTask<R> task, AtomicInteger writeBehindCurrentThreads, Queue<Runnable> writeBehindTasks, int threadsAmount) {
super();
this.threadsAmount = threadsAmount;
this.commandExecutor = commandExecutor;
this.task = task;
this.writeBehindCurrentThreads = writeBehindCurrentThreads;
this.writeBehindTasks = writeBehindTasks;
}
@Override
@ -66,16 +68,16 @@ public class MapWriteBehindListener<R> implements FutureListener<R> {
private void enqueueRunnable(Runnable runnable) {
if (runnable != null) {
operations.add(runnable);
writeBehindTasks.add(runnable);
}
if (sent.compareAndSet(false, true)) {
if (writeBehindCurrentThreads.incrementAndGet() <= threadsAmount) {
commandExecutor.getConnectionManager().getExecutor().execute(new Runnable() {
@Override
public void run() {
try {
while (true) {
Runnable runnable = operations.poll();
Runnable runnable = writeBehindTasks.poll();
if (runnable != null) {
runnable.run();
} else {
@ -83,13 +85,14 @@ public class MapWriteBehindListener<R> implements FutureListener<R> {
}
}
} finally {
sent.set(false);
if (!operations.isEmpty()) {
if (writeBehindCurrentThreads.decrementAndGet() == 0 && !writeBehindTasks.isEmpty()) {
enqueueRunnable(null);
}
}
}
});
} else {
writeBehindCurrentThreads.decrementAndGet();
}
}

18
redisson/src/main/java/org/redisson/RedissonMap.java
Unescape Escape View File

@ -28,7 +28,9 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Queue;
import java.util.Set;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.atomic.AtomicInteger;
import org.redisson.api.MapOptions;
@ -71,6 +73,8 @@ import io.netty.util.concurrent.FutureListener;
*/
public class RedissonMap<K, V> extends RedissonExpirable implements RMap<K, V> {
final AtomicInteger writeBehindCurrentThreads = new AtomicInteger();
final Queue<Runnable> writeBehindTasks;
final RedissonClient redisson;
final MapOptions<K, V> options;
@ -78,12 +82,22 @@ public class RedissonMap<K, V> extends RedissonExpirable implements RMap<K, V> {
super(commandExecutor, name);
this.redisson = redisson;
this.options = options;
if (options != null && options.getWriteMode() == WriteMode.WRITE_BEHIND) {
writeBehindTasks = new ConcurrentLinkedQueue<Runnable>();
} else {
writeBehindTasks = null;
}
}
public RedissonMap(Codec codec, CommandAsyncExecutor commandExecutor, String name, RedissonClient redisson, MapOptions<K, V> options) {
super(codec, commandExecutor, name);
this.redisson = redisson;
this.options = options;
if (options != null && options.getWriteMode() == WriteMode.WRITE_BEHIND) {
writeBehindTasks = new ConcurrentLinkedQueue<Runnable>();
} else {
writeBehindTasks = null;
}
}
@Override
@ -274,7 +288,7 @@ public class RedissonMap<K, V> extends RedissonExpirable implements RMap<K, V> {
protected <M> RFuture<M> mapWriterFuture(RFuture<M> future, MapWriterTask<M> listener) {
if (options != null && options.getWriteMode() == WriteMode.WRITE_BEHIND) {
future.addListener(new MapWriteBehindListener<M>(commandExecutor, listener));
future.addListener(new MapWriteBehindListener<M>(commandExecutor, listener, writeBehindCurrentThreads, writeBehindTasks, options.getWriteBehindThreads()));
return future;
}
@ -876,7 +890,7 @@ public class RedissonMap<K, V> extends RedissonExpirable implements RMap<K, V> {
options.getWriter().deleteAll(deletedKeys);
}
};
future.addListener(new MapWriteBehindListener<List<Long>>(commandExecutor, listener));
future.addListener(new MapWriteBehindListener<List<Long>>(commandExecutor, listener, writeBehindCurrentThreads, writeBehindTasks, options.getWriteBehindThreads()));
} else {
commandExecutor.getConnectionManager().getExecutor().execute(new Runnable() {
@Override

18
redisson/src/main/java/org/redisson/api/LocalCachedMapOptions.java
Unescape Escape View File

@ -266,15 +266,23 @@ public class LocalCachedMapOptions<K, V> extends MapOptions<K, V> {
}
@Override
public LocalCachedMapOptions<K, V> writer(MapWriter<K, V> writer, org.redisson.api.MapOptions.WriteMode writeMode) {
super.writer(writer, writeMode);
return this;
public LocalCachedMapOptions<K, V> writer(MapWriter<K, V> writer) {
return (LocalCachedMapOptions<K, V>) super.writer(writer);
}
@Override
public LocalCachedMapOptions<K, V> writeBehindThreads(int writeBehindThreads) {
return (LocalCachedMapOptions<K, V>) super.writeBehindThreads(writeBehindThreads);
}
@Override
public LocalCachedMapOptions<K, V> writeMode(org.redisson.api.MapOptions.WriteMode writeMode) {
return (LocalCachedMapOptions<K, V>) super.writeMode(writeMode);
}
@Override
public LocalCachedMapOptions<K, V> loader(MapLoader<K, V> loader) {
super.loader(loader);
return this;
return (LocalCachedMapOptions<K, V>) super.loader(loader);
}
}

40
redisson/src/main/java/org/redisson/api/MapOptions.java
Unescape Escape View File

@ -47,7 +47,8 @@ public class MapOptions<K, V> {
private MapLoader<K, V> loader;
private MapWriter<K, V> writer;
private WriteMode writeMode;
private WriteMode writeMode = WriteMode.WRITE_THROUGH;
private int writeBehindThreads = 1;
protected MapOptions() {
}
@ -75,26 +76,53 @@ public class MapOptions<K, V> {
}
/**
* Sets map writer object used for write-through operations.
* Sets {@link MapWriter} object.
*
* @param writer object
* @param writeMode for writer
* @return MapOptions instance
*/
public MapOptions<K, V> writer(MapWriter<K, V> writer, WriteMode writeMode) {
public MapOptions<K, V> writer(MapWriter<K, V> writer) {
this.writer = writer;
this.writeMode = writeMode;
return this;
}
public MapWriter<K, V> getWriter() {
return writer;
}
/**
* Sets threads amount used in write behind mode.
* <p>
* Default is <code>1</code>
*
* @param writeBehindThreads - threads amount
* @return MapOptions instance
*/
public MapOptions<K, V> writeBehindThreads(int writeBehindThreads) {
this.writeBehindThreads = writeBehindThreads;
return this;
}
public int getWriteBehindThreads() {
return writeBehindThreads;
}
/**
* Sets write mode.
* <p>
* Default is <code>{@link WriteMode#WRITE_THROUGH}</code>
*
* @param writeMode - write mode
* @return MapOptions instance
*/
public MapOptions<K, V> writeMode(WriteMode writeMode) {
this.writeMode = writeMode;
return this;
}
public WriteMode getWriteMode() {
return writeMode;
}
/**
* Sets map reader object used for write-through operations.
* Sets {@link MapLoader} object.
*
* @param loader object
* @return MapOptions instance

3
redisson/src/test/java/org/redisson/RedissonLocalCachedMapTest.java
Unescape Escape View File

@ -18,7 +18,6 @@ import org.redisson.RedissonMapTest.SimpleValue;
import org.redisson.api.LocalCachedMapOptions;
import org.redisson.api.LocalCachedMapOptions.EvictionPolicy;
import org.redisson.api.LocalCachedMapOptions.InvalidationPolicy;
import org.redisson.api.MapOptions.WriteMode;
import org.redisson.api.RLocalCachedMap;
import org.redisson.api.RMap;
import org.redisson.cache.Cache;
@ -51,7 +50,7 @@ public class RedissonLocalCachedMapTest extends BaseMapTest {
@Override
protected <K, V> RMap<K, V> getWriterTestMap(String name, Map<K, V> map) {
LocalCachedMapOptions<K, V> options = LocalCachedMapOptions.<K, V>defaults().writer(createMapWriter(map), WriteMode.WRITE_THROUGH);
LocalCachedMapOptions<K, V> options = LocalCachedMapOptions.<K, V>defaults().writer(createMapWriter(map));
return redisson.getLocalCachedMap("test", options);
}

3
redisson/src/test/java/org/redisson/RedissonMapCacheTest.java
Unescape Escape View File

@ -19,7 +19,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
import org.junit.Assert;
import org.junit.Test;
import org.redisson.api.MapOptions;
import org.redisson.api.MapOptions.WriteMode;
import org.redisson.api.RFuture;
import org.redisson.api.RMap;
import org.redisson.api.RMapCache;
@ -141,7 +140,7 @@ public class RedissonMapCacheTest extends BaseMapTest {
@Override
protected <K, V> RMap<K, V> getWriterTestMap(String name, Map<K, V> map) {
MapOptions<K, V> options = MapOptions.<K, V>defaults().writer(createMapWriter(map), WriteMode.WRITE_THROUGH);
MapOptions<K, V> options = MapOptions.<K, V>defaults().writer(createMapWriter(map));
return redisson.getMapCache("test", options);
}

3
redisson/src/test/java/org/redisson/RedissonMapTest.java
Unescape Escape View File

@ -19,7 +19,6 @@ import org.junit.Assert;
import org.junit.Assume;
import org.junit.Test;
import org.redisson.api.MapOptions;
import org.redisson.api.MapOptions.WriteMode;
import org.redisson.api.RFuture;
import org.redisson.api.RMap;
import org.redisson.api.RedissonClient;
@ -139,7 +138,7 @@ public class RedissonMapTest extends BaseMapTest {
@Override
protected <K, V> RMap<K, V> getWriterTestMap(String name, Map<K, V> map) {
MapOptions<K, V> options = MapOptions.<K, V>defaults().writer(createMapWriter(map), WriteMode.WRITE_THROUGH);
MapOptions<K, V> options = MapOptions.<K, V>defaults().writer(createMapWriter(map));
return redisson.getMap("test", options);
}

Write Preview
Loading…
Cancel
Save