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

Merge branch 'master' into 3.0.0

Browse Source
pull/1821/head
Nikita 7 years ago
parent 8af4d37d44 46e8e8846a
commit 24f18ab7c4
5 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File

2
redisson/src/main/java/org/redisson/client/handler/CommandDecoder.java
Unescape Escape View File

@ -228,7 +228,7 @@ public class CommandDecoder extends ReplayingDecoder<State> {
}
try {
decode(in, commandData, null, ctx.channel(), !commandBatch.isAtomic());
decode(in, commandData, null, ctx.channel(), commandBatch.isQueued());
} finally {
if (commandData != null && RedisCommands.EXEC.getName().equals(commandData.getCommand().getName())) {
commandsData.remove();

20
redisson/src/main/java/org/redisson/client/protocol/CommandsData.java
Unescape Escape View File

@ -32,33 +32,39 @@ public class CommandsData implements QueueCommand {
private final RPromise<Void> promise;
private final boolean skipResult;
private final boolean atomic;
private final boolean queued;
public CommandsData(RPromise<Void> promise, List<CommandData<?, ?>> commands) {
this(promise, commands, null);
public CommandsData(RPromise<Void> promise, List<CommandData<?, ?>> commands, boolean queued) {
this(promise, commands, null, false, false, queued);
}
public CommandsData(RPromise<Void> promise, List<CommandData<?, ?>> commands, List<CommandData<?, ?>> attachedCommands) {
this(promise, commands, attachedCommands, false, false);
this(promise, commands, attachedCommands, false, false, true);
}
public CommandsData(RPromise<Void> promise, List<CommandData<?, ?>> commands, boolean skipResult, boolean atomic) {
this(promise, commands, null, skipResult, atomic);
public CommandsData(RPromise<Void> promise, List<CommandData<?, ?>> commands, boolean skipResult, boolean atomic, boolean queued) {
this(promise, commands, null, skipResult, atomic, queued);
}
public CommandsData(RPromise<Void> promise, List<CommandData<?, ?>> commands, List<CommandData<?, ?>> attachedCommands, boolean skipResult, boolean atomic) {
public CommandsData(RPromise<Void> promise, List<CommandData<?, ?>> commands, List<CommandData<?, ?>> attachedCommands,
boolean skipResult, boolean atomic, boolean queued) {
super();
this.promise = promise;
this.commands = commands;
this.skipResult = skipResult;
this.atomic = atomic;
this.attachedCommands = attachedCommands;
this.queued = queued;
}
public RPromise<Void> getPromise() {
return promise;
}
public boolean isQueued() {
return queued;
}
public boolean isAtomic() {
return atomic;
}

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

@ -1051,7 +1051,7 @@ public class CommandAsyncService implements CommandAsyncExecutor {
list.add(new CommandData<Void, Void>(promise, details.getCodec(), RedisCommands.ASKING, new Object[]{}));
list.add(new CommandData<V, R>(details.getAttemptPromise(), details.getCodec(), details.getCommand(), details.getParams()));
RPromise<Void> main = new RedissonPromise<Void>();
ChannelFuture future = connection.send(new CommandsData(main, list));
ChannelFuture future = connection.send(new CommandsData(main, list, false));
details.setWriteFuture(future);
} else {
if (log.isDebugEnabled()) {

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

@ -269,7 +269,7 @@ public class CommandBatchService extends CommandAsyncService {
}
list.add(new CommandData<V, R>(details.getAttemptPromise(), details.getCodec(), details.getCommand(), details.getParams()));
RPromise<Void> main = new RedissonPromise<Void>();
ChannelFuture future = connection.send(new CommandsData(main, list));
ChannelFuture future = connection.send(new CommandsData(main, list, true));
details.setWriteFuture(future);
} else {
if (log.isDebugEnabled()) {
@ -282,7 +282,7 @@ public class CommandBatchService extends CommandAsyncService {
list.add(new CommandData<Void, Void>(new RedissonPromise<Void>(), details.getCodec(), RedisCommands.MULTI, new Object[]{}));
list.add(new CommandData<V, R>(details.getAttemptPromise(), details.getCodec(), details.getCommand(), details.getParams()));
RPromise<Void> main = new RedissonPromise<Void>();
ChannelFuture future = connection.send(new CommandsData(main, list));
ChannelFuture future = connection.send(new CommandsData(main, list, true));
connectionEntry.setFirstCommand(false);
details.setWriteFuture(future);
} else {
@ -733,7 +733,7 @@ public class CommandBatchService extends CommandAsyncService {
@Override
public void operationComplete(Future<RedisConnection> connFuture) throws Exception {
checkConnectionFuture(entry, source, mainPromise, attemptPromise, details, connectionFuture, options.isSkipResult(),
options.getResponseTimeout(), attempts, options.getExecutionMode() != ExecutionMode.IN_MEMORY);
options.getResponseTimeout(), attempts, options.getExecutionMode());
}
});
@ -824,7 +824,7 @@ public class CommandBatchService extends CommandAsyncService {
private void checkConnectionFuture(final Entry entry, final NodeSource source,
final RPromise<Void> mainPromise, final RPromise<Void> attemptPromise, final AsyncDetails details,
RFuture<RedisConnection> connFuture, final boolean noResult, final long responseTimeout, final int attempts, boolean atomic) {
RFuture<RedisConnection> connFuture, final boolean noResult, final long responseTimeout, final int attempts, ExecutionMode executionMode) {
if (connFuture.isCancelled()) {
return;
}
@ -841,6 +841,8 @@ public class CommandBatchService extends CommandAsyncService {
}
final RedisConnection connection = connFuture.getNow();
boolean isAtomic = executionMode != ExecutionMode.IN_MEMORY;
boolean isQueued = executionMode == ExecutionMode.REDIS_READ_ATOMIC || executionMode == ExecutionMode.REDIS_WRITE_ATOMIC;
List<CommandData<?, ?>> list = new LinkedList<CommandData<?, ?>>();
if (source.getRedirect() == Redirect.ASK) {
@ -848,14 +850,14 @@ public class CommandBatchService extends CommandAsyncService {
list.add(new CommandData<Void, Void>(promise, StringCodec.INSTANCE, RedisCommands.ASKING, new Object[] {}));
}
for (BatchCommandData<?, ?> c : entry.getCommands()) {
if (c.getPromise().isSuccess() && !isWaitCommand(c) && !atomic) {
if (c.getPromise().isSuccess() && !isWaitCommand(c) && !isAtomic) {
// skip successful commands
continue;
}
list.add(c);
}
ChannelFuture future = connection.send(new CommandsData(attemptPromise, list, noResult, atomic));
ChannelFuture future = connection.send(new CommandsData(attemptPromise, list, noResult, isAtomic, isQueued));
details.setWriteFuture(future);
details.getWriteFuture().addListener(new ChannelFutureListener() {

4
redisson/src/test/java/org/redisson/RedisClientTest.java
Unescape Escape View File

@ -153,7 +153,7 @@ public class RedisClientTest {
commands.add(cmd4);
RPromise<Void> p = new RedissonPromise<Void>();
conn.send(new CommandsData(p, commands));
conn.send(new CommandsData(p, commands, false));
assertThat(cmd1.getPromise().get()).isEqualTo("PONG");
assertThat(cmd2.getPromise().get()).isEqualTo(1);
@ -188,7 +188,7 @@ public class RedisClientTest {
}
RPromise<Void> p = new RedissonPromise<Void>();
conn.send(new CommandsData(p, commands));
conn.send(new CommandsData(p, commands, false));
for (CommandData<?, ?> commandData : commands) {
commandData.getPromise().get();

Write Preview
Loading…
Cancel
Save