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

refactoring

Browse Source
pull/3438/head
Nikita Koksharov 4 years ago
parent 22a0d28715
commit de64949aff
4 changed files with 35 additions and 70 deletions
Show Stats Download Patch File Download Diff File

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

@ -26,10 +26,12 @@ import org.redisson.client.ChannelName;
import org.redisson.client.RedisPubSubListener; import org.redisson.client.RedisPubSubListener;
import org.redisson.client.RedisTimeoutException; import org.redisson.client.RedisTimeoutException;
import org.redisson.client.codec.Codec; import org.redisson.client.codec.Codec;
import org.redisson.client.protocol.pubsub.PubSubType;
import org.redisson.command.CommandAsyncExecutor; import org.redisson.command.CommandAsyncExecutor;
import org.redisson.config.MasterSlaveServersConfig; import org.redisson.config.MasterSlaveServersConfig;
import org.redisson.misc.RPromise; import org.redisson.misc.RPromise;
import org.redisson.misc.RedissonPromise; import org.redisson.misc.RedissonPromise;
import org.redisson.misc.TransferListener;
import org.redisson.pubsub.AsyncSemaphore; import org.redisson.pubsub.AsyncSemaphore;
import org.redisson.pubsub.PubSubConnectionEntry; import org.redisson.pubsub.PubSubConnectionEntry;
import org.redisson.pubsub.PublishSubscribeService; import org.redisson.pubsub.PublishSubscribeService;
@ -125,7 +127,8 @@ public class RedissonPatternTopic implements RPatternTopic {
entry.removeListener(channelName, listenerId); entry.removeListener(channelName, listenerId);
if (!entry.hasListeners(channelName)) { if (!entry.hasListeners(channelName)) {
subscribeService.punsubscribe(channelName, semaphore); subscribeService.unsubscribe(PubSubType.PUNSUBSCRIBE, channelName, semaphore)
.onComplete(new TransferListener<>(result));
} else { } else {
semaphore.release(); semaphore.release();
result.trySuccess(null); result.trySuccess(null);
@ -136,21 +139,7 @@ public class RedissonPatternTopic implements RPatternTopic {
@Override @Override
public void removeListener(int listenerId) { public void removeListener(int listenerId) {
AsyncSemaphore semaphore = subscribeService.getSemaphore(channelName); removeListenerAsync(listenerId).syncUninterruptibly();
acquire(semaphore);
PubSubConnectionEntry entry = subscribeService.getPubSubEntry(channelName);
if (entry == null) {
semaphore.release();
return;
}
entry.removeListener(channelName, listenerId);
if (!entry.hasListeners(channelName)) {
subscribeService.punsubscribe(channelName, semaphore);
} else {
semaphore.release();
}
} }
@Override @Override
@ -165,7 +154,7 @@ public class RedissonPatternTopic implements RPatternTopic {
} }
if (entry.hasListeners(channelName)) { if (entry.hasListeners(channelName)) {
subscribeService.punsubscribe(channelName, semaphore); subscribeService.unsubscribe(PubSubType.PUNSUBSCRIBE, channelName, semaphore).syncUninterruptibly();
} else { } else {
semaphore.release(); semaphore.release();
} }
@ -184,7 +173,7 @@ public class RedissonPatternTopic implements RPatternTopic {
entry.removeListener(channelName, listener); entry.removeListener(channelName, listener);
if (!entry.hasListeners(channelName)) { if (!entry.hasListeners(channelName)) {
subscribeService.punsubscribe(channelName, semaphore); subscribeService.unsubscribe(PubSubType.PUNSUBSCRIBE, channelName, semaphore).syncUninterruptibly();
} else { } else {
semaphore.release(); semaphore.release();
} }

9
redisson/src/main/java/org/redisson/RedissonTopic.java
Unescape Escape View File

@ -26,6 +26,7 @@ import org.redisson.client.codec.Codec;
import org.redisson.client.codec.LongCodec; import org.redisson.client.codec.LongCodec;
import org.redisson.client.codec.StringCodec; import org.redisson.client.codec.StringCodec;
import org.redisson.client.protocol.RedisCommands; import org.redisson.client.protocol.RedisCommands;
import org.redisson.client.protocol.pubsub.PubSubType;
import org.redisson.command.CommandAsyncExecutor; import org.redisson.command.CommandAsyncExecutor;
import org.redisson.config.MasterSlaveServersConfig; import org.redisson.config.MasterSlaveServersConfig;
import org.redisson.misc.RPromise; import org.redisson.misc.RPromise;
@ -145,7 +146,7 @@ public class RedissonTopic implements RTopic {
} }
if (entry.hasListeners(channelName)) { if (entry.hasListeners(channelName)) {
subscribeService.unsubscribe(channelName, semaphore).syncUninterruptibly(); subscribeService.unsubscribe(PubSubType.UNSUBSCRIBE, channelName, semaphore).syncUninterruptibly();
} else { } else {
semaphore.release(); semaphore.release();
} }
@ -189,7 +190,7 @@ public class RedissonTopic implements RTopic {
entry.removeListener(channelName, listener); entry.removeListener(channelName, listener);
if (!entry.hasListeners(channelName)) { if (!entry.hasListeners(channelName)) {
subscribeService.unsubscribe(channelName, semaphore) subscribeService.unsubscribe(PubSubType.UNSUBSCRIBE, channelName, semaphore)
.onComplete(new TransferListener<Void>(promise)); .onComplete(new TransferListener<Void>(promise));
} else { } else {
semaphore.release(); semaphore.release();
@ -219,7 +220,7 @@ public class RedissonTopic implements RTopic {
entry.removeListener(channelName, id); entry.removeListener(channelName, id);
} }
if (!entry.hasListeners(channelName)) { if (!entry.hasListeners(channelName)) {
subscribeService.unsubscribe(channelName, semaphore) subscribeService.unsubscribe(PubSubType.UNSUBSCRIBE, channelName, semaphore)
.onComplete(new TransferListener<Void>(promise)); .onComplete(new TransferListener<Void>(promise));
} else { } else {
semaphore.release(); semaphore.release();
@ -245,7 +246,7 @@ public class RedissonTopic implements RTopic {
entry.removeListener(channelName, id); entry.removeListener(channelName, id);
} }
if (!entry.hasListeners(channelName)) { if (!entry.hasListeners(channelName)) {
subscribeService.unsubscribe(channelName, semaphore).syncUninterruptibly(); subscribeService.unsubscribe(PubSubType.UNSUBSCRIBE, channelName, semaphore).syncUninterruptibly();
} else { } else {
semaphore.release(); semaphore.release();
} }

2
redisson/src/main/java/org/redisson/pubsub/PublishSubscribe.java
Unescape Escape View File

@ -53,7 +53,7 @@ abstract class PublishSubscribe<E extends PubSubEntry<E>> {
if (!removed) { if (!removed) {
throw new IllegalStateException(); throw new IllegalStateException();
} }
service.unsubscribe(new ChannelName(channelName), semaphore); service.unsubscribe(PubSubType.UNSUBSCRIBE, new ChannelName(channelName), semaphore);
} else { } else {
semaphore.release(); semaphore.release();
} }

59
redisson/src/main/java/org/redisson/pubsub/PublishSubscribeService.java
Unescape Escape View File

@ -237,7 +237,7 @@ public class PublishSubscribeService {
connEntry.removeListener(channelName, listener); connEntry.removeListener(channelName, listener);
} }
if (!connEntry.hasListeners(channelName)) { if (!connEntry.hasListeners(channelName)) {
unsubscribe(channelName, lock); unsubscribe(type, channelName, lock);
} else { } else {
lock.release(); lock.release();
} }
@ -332,7 +332,7 @@ public class PublishSubscribeService {
}); });
} }
public RFuture<Void> unsubscribe(ChannelName channelName, AsyncSemaphore lock) { public RFuture<Void> unsubscribe(PubSubType topicType, ChannelName channelName, AsyncSemaphore lock) {
PubSubConnectionEntry entry = name2PubSubConnection.remove(channelName); PubSubConnectionEntry entry = name2PubSubConnection.remove(channelName);
if (entry == null || connectionManager.isShuttingDown()) { if (entry == null || connectionManager.isShuttingDown()) {
lock.release(); lock.release();
@ -340,12 +340,12 @@ public class PublishSubscribeService {
} }
AtomicBoolean executed = new AtomicBoolean(); AtomicBoolean executed = new AtomicBoolean();
RedissonPromise<Void> result = new RedissonPromise<Void>(); RedissonPromise<Void> result = new RedissonPromise<>();
ChannelFuture future = entry.unsubscribe(channelName, new BaseRedisPubSubListener() { BaseRedisPubSubListener listener = new BaseRedisPubSubListener() {
@Override @Override
public boolean onStatus(PubSubType type, CharSequence channel) { public boolean onStatus(PubSubType type, CharSequence channel) {
if (type == PubSubType.UNSUBSCRIBE && channel.equals(channelName)) { if (type == topicType && channel.equals(channelName)) {
executed.set(true); executed.set(true);
if (entry.release() == 1) { if (entry.release() == 1) {
@ -359,25 +359,26 @@ public class PublishSubscribeService {
return false; return false;
} }
}); };
future.addListener(new ChannelFutureListener() { ChannelFuture future;
@Override if (topicType == PubSubType.UNSUBSCRIBE) {
public void operationComplete(ChannelFuture future) throws Exception { future = entry.unsubscribe(channelName, listener);
if (!future.isSuccess()) { } else {
future = entry.punsubscribe(channelName, listener);
}
future.addListener((ChannelFutureListener) f -> {
if (!f.isSuccess()) {
return; return;
} }
connectionManager.newTimeout(new TimerTask() { connectionManager.newTimeout(timeout -> {
@Override
public void run(Timeout timeout) throws Exception {
if (executed.get()) { if (executed.get()) {
return; return;
} }
entry.getConnection().onMessage(new PubSubStatusMessage(PubSubType.UNSUBSCRIBE, channelName)); entry.getConnection().onMessage(new PubSubStatusMessage(topicType, channelName));
}
}, config.getTimeout(), TimeUnit.MILLISECONDS); }, config.getTimeout(), TimeUnit.MILLISECONDS);
}
}); });
return result; return result;
@ -468,32 +469,6 @@ public class PublishSubscribeService {
return result; return result;
} }
public void punsubscribe(ChannelName channelName, AsyncSemaphore lock) {
PubSubConnectionEntry entry = name2PubSubConnection.remove(channelName);
if (entry == null || connectionManager.isShuttingDown()) {
lock.release();
return;
}
entry.punsubscribe(channelName, new BaseRedisPubSubListener() {
@Override
public boolean onStatus(PubSubType type, CharSequence channel) {
if (type == PubSubType.PUNSUBSCRIBE && channel.equals(channelName)) {
if (entry.release() == 1) {
addFreeConnectionEntry(channelName, entry);
}
lock.release();
return true;
}
return false;
}
});
}
private void addFreeConnectionEntry(ChannelName channelName, PubSubConnectionEntry entry) { private void addFreeConnectionEntry(ChannelName channelName, PubSubConnectionEntry entry) {
int slot = connectionManager.calcSlot(channelName.getName()); int slot = connectionManager.calcSlot(channelName.getName());
MasterSlaveEntry me = connectionManager.getEntry(slot); MasterSlaveEntry me = connectionManager.getEntry(slot);

Write Preview
Loading…
Cancel
Save