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

Fixed - ClassCastException during RBatchReactive and RBatchRx execution in exectionMode = REDIS_WRITE_ATOMIC or REDIS_READ_ATOMIC. #1661

Browse Source
pull/2009/head
Nikita Koksharov 6 years ago
parent c0729ae51a
commit bd74e07fdb
6 changed files with 42 additions and 44 deletions
Show Stats Download Patch File Download Diff File

2
redisson/src/main/java/org/redisson/command/CommandBatchService.java
Unescape Escape View File

@ -188,7 +188,7 @@ public class CommandBatchService extends CommandAsyncService {
AsyncSemaphore semaphore = new AsyncSemaphore(0);
@Override
protected <R> RPromise<R> createPromise() {
public <R> RPromise<R> createPromise() {
if (isRedisBasedQueue()) {
return new BatchPromise<R>(executed);
}

37
redisson/src/main/java/org/redisson/reactive/CommandReactiveBatchService.java
Unescape Escape View File

@ -15,11 +15,8 @@
*/
package org.redisson.reactive;
import java.util.Queue;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.function.Supplier;
import org.reactivestreams.Publisher;
import org.redisson.api.BatchOptions;
import org.redisson.api.BatchResult;
import org.redisson.api.RFuture;
@ -32,7 +29,6 @@ import org.redisson.connection.ConnectionManager;
import org.redisson.connection.NodeSource;
import org.redisson.misc.RPromise;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
/**
@ -43,22 +39,35 @@ import reactor.core.publisher.Mono;
public class CommandReactiveBatchService extends CommandReactiveService {
private final CommandBatchService batchService;
private final Queue<Publisher<?>> publishers = new ConcurrentLinkedQueue<Publisher<?>>();
public CommandReactiveBatchService(ConnectionManager connectionManager) {
public CommandReactiveBatchService(ConnectionManager connectionManager, BatchOptions options) {
super(connectionManager);
batchService = new CommandBatchService(connectionManager);
batchService = new CommandBatchService(connectionManager, options);
}
@Override
public <R> Mono<R> reactive(Supplier<RFuture<R>> supplier) {
Mono<R> publisher = super.reactive(supplier);
publishers.add(publisher);
return publisher;
Mono<R> mono = super.reactive(new Supplier<RFuture<R>>() {
volatile RFuture<R> future;
@Override
public RFuture<R> get() {
if (future == null) {
synchronized (this) {
if (future == null) {
future = supplier.get();
}
}
}
return future;
}
});
mono.subscribe();
return mono;
}
public <R> Publisher<R> superReactive(Supplier<RFuture<R>> supplier) {
return super.reactive(supplier);
@Override
protected <R> RPromise<R> createPromise() {
return batchService.createPromise();
}
@Override
@ -68,10 +77,6 @@ public class CommandReactiveBatchService extends CommandReactiveService {
}
public RFuture<BatchResult<?>> executeAsync(BatchOptions options) {
for (Publisher<?> publisher : publishers) {
Flux.from(publisher).subscribe();
}
return batchService.executeAsync(options);
}

11
redisson/src/main/java/org/redisson/reactive/RedissonBatchReactive.java
Unescape Escape View File

@ -16,7 +16,6 @@
package org.redisson.reactive;
import java.util.concurrent.TimeUnit;
import java.util.function.Supplier;
import org.redisson.RedissonAtomicDouble;
import org.redisson.RedissonAtomicLong;
@ -51,7 +50,6 @@ import org.redisson.api.RBlockingDequeReactive;
import org.redisson.api.RBlockingQueueReactive;
import org.redisson.api.RBucketReactive;
import org.redisson.api.RDequeReactive;
import org.redisson.api.RFuture;
import org.redisson.api.RGeoReactive;
import org.redisson.api.RHyperLogLogReactive;
import org.redisson.api.RKeysReactive;
@ -91,7 +89,7 @@ public class RedissonBatchReactive implements RBatchReactive {
public RedissonBatchReactive(EvictionScheduler evictionScheduler, ConnectionManager connectionManager, CommandReactiveService commandExecutor, BatchOptions options) {
this.evictionScheduler = evictionScheduler;
this.executorService = new CommandReactiveBatchService(connectionManager);
this.executorService = new CommandReactiveBatchService(connectionManager, options);
this.commandExecutor = commandExecutor;
this.options = options;
}
@ -287,12 +285,7 @@ public class RedissonBatchReactive implements RBatchReactive {
@Override
public Mono<BatchResult<?>> execute() {
return commandExecutor.reactive(new Supplier<RFuture<BatchResult<?>>>() {
@Override
public RFuture<BatchResult<?>> get() {
return executorService.executeAsync(options);
}
});
return commandExecutor.reactive(() -> executorService.executeAsync(options));
}
public RBatchReactive atomic() {

20
redisson/src/main/java/org/redisson/rx/CommandRxBatchService.java
Unescape Escape View File

@ -15,9 +15,7 @@
*/
package org.redisson.rx;
import java.util.Queue;
import java.util.concurrent.Callable;
import java.util.concurrent.ConcurrentLinkedQueue;
import org.redisson.api.BatchOptions;
import org.redisson.api.BatchResult;
@ -41,17 +39,16 @@ import io.reactivex.Flowable;
public class CommandRxBatchService extends CommandRxService {
private final CommandBatchService batchService;
private final Queue<Flowable<?>> publishers = new ConcurrentLinkedQueue<>();
public CommandRxBatchService(ConnectionManager connectionManager) {
public CommandRxBatchService(ConnectionManager connectionManager, BatchOptions options) {
super(connectionManager);
batchService = new CommandBatchService(connectionManager);
batchService = new CommandBatchService(connectionManager, options);
}
@Override
public <R> Flowable<R> flowable(Callable<RFuture<R>> supplier) {
Flowable<R> flowable = super.flowable(new Callable<RFuture<R>>() {
RFuture<R> future;
volatile RFuture<R> future;
@Override
public RFuture<R> call() throws Exception {
if (future == null) {
@ -64,10 +61,15 @@ public class CommandRxBatchService extends CommandRxService {
return future;
}
});
publishers.add(flowable);
flowable.subscribe();
return flowable;
}
@Override
protected <R> RPromise<R> createPromise() {
return batchService.createPromise();
}
@Override
public <V, R> void async(boolean readOnlyMode, NodeSource nodeSource,
Codec codec, RedisCommand<V> command, Object[] params, RPromise<R> mainPromise, int attempt, boolean ignoreRedirect) {
@ -75,10 +77,6 @@ public class CommandRxBatchService extends CommandRxService {
}
public RFuture<BatchResult<?>> executeAsync(BatchOptions options) {
for (Flowable<?> element : publishers) {
element.subscribe();
}
return batchService.executeAsync(options);
}

2
redisson/src/main/java/org/redisson/rx/RedissonBatchRx.java
Unescape Escape View File

@ -92,7 +92,7 @@ public class RedissonBatchRx implements RBatchRx {
public RedissonBatchRx(EvictionScheduler evictionScheduler, ConnectionManager connectionManager, CommandRxExecutor commandExecutor, BatchOptions options) {
this.evictionScheduler = evictionScheduler;
this.executorService = new CommandRxBatchService(connectionManager);
this.executorService = new CommandRxBatchService(connectionManager, options);
this.commandExecutor = commandExecutor;
this.options = options;
}

14
redisson/src/test/java/org/redisson/rx/RedissonBatchRxTest.java
Unescape Escape View File

@ -53,7 +53,7 @@ public class RedissonBatchRxTest extends BaseRxTest {
public static Iterable<Object[]> data() {
return Arrays.asList(new Object[][] {
{BatchOptions.defaults().executionMode(ExecutionMode.IN_MEMORY)},
// {BatchOptions.defaults().executionMode(ExecutionMode.REDIS_WRITE_ATOMIC)}
{BatchOptions.defaults().executionMode(ExecutionMode.REDIS_WRITE_ATOMIC)}
});
}
@ -131,7 +131,7 @@ public class RedissonBatchRxTest extends BaseRxTest {
}
}
// @Test
@Test
public void testConnectionLeakAfterError() throws InterruptedException {
Config config = BaseTest.createConfig();
config.useSingleServer()
@ -143,7 +143,7 @@ public class RedissonBatchRxTest extends BaseRxTest {
BatchOptions batchOptions = BatchOptions.defaults().executionMode(ExecutionMode.REDIS_WRITE_ATOMIC);
RBatchRx batch = redisson.createBatch(batchOptions);
for (int i = 0; i < 3000; i++) {
for (int i = 0; i < 300000; i++) {
batch.getBucket("test").set(123);
}
@ -227,7 +227,7 @@ public class RedissonBatchRxTest extends BaseRxTest {
}
@Test
public void testWriteTimeout() {
public void testWriteTimeout() throws InterruptedException {
Config config = BaseTest.createConfig();
config.useSingleServer().setTimeout(3000);
RedissonRxClient redisson = Redisson.createRx(config);
@ -236,9 +236,11 @@ public class RedissonBatchRxTest extends BaseRxTest {
RMapCacheRx<String, String> map = batch.getMapCache("test");
int total = 200000;
for (int i = 0; i < total; i++) {
Maybe<String> f = map.put("" + i, "" + i, 5, TimeUnit.MINUTES);
map.put("" + i, "" + i, 5, TimeUnit.MINUTES);
if (batchOptions.getExecutionMode() == ExecutionMode.REDIS_WRITE_ATOMIC) {
f.blockingGet();
if (i % 100 == 0) {
Thread.sleep(5);
}
}
}

Write Preview
Loading…
Cancel
Save