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

Merge branch 'mrniko/master'

Browse Source
pull/282/head
Rui Gu 10 years ago
parent 11f53363a2 fbef4ee89a
commit 61ecf7f1f3
9 changed files with 208 additions and 136 deletions
Show Stats Download Patch File Download Diff File

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

@ -15,6 +15,8 @@
*/
package org.redisson.client;
import java.util.Collections;
import java.util.Map;
import java.util.Queue;
import java.util.concurrent.ConcurrentLinkedQueue;
@ -30,10 +32,13 @@ import org.redisson.client.protocol.pubsub.PubSubPatternMessageDecoder;
import org.redisson.client.protocol.pubsub.PubSubStatusMessage;
import io.netty.channel.Channel;
import io.netty.util.internal.PlatformDependent;
public class RedisPubSubConnection extends RedisConnection {
final Queue<RedisPubSubListener<Object>> listeners = new ConcurrentLinkedQueue<RedisPubSubListener<Object>>();
final Map<String, Codec> channels = PlatformDependent.newConcurrentHashMap();
final Map<String, Codec> patternChannels = PlatformDependent.newConcurrentHashMap();
public RedisPubSubConnection(RedisClient redisClient, Channel channel) {
super(redisClient, channel);
@ -71,22 +76,42 @@ public class RedisPubSubConnection extends RedisConnection {
public void subscribe(Codec codec, String ... channel) {
async(new PubSubMessageDecoder(codec.getValueDecoder()), RedisCommands.SUBSCRIBE, channel);
for (String ch : channel) {
channels.put(ch, codec);
}
}
public void psubscribe(Codec codec, String ... channel) {
async(new PubSubPatternMessageDecoder(codec.getValueDecoder()), RedisCommands.PSUBSCRIBE, channel);
for (String ch : channel) {
patternChannels.put(ch, codec);
}
}
public void unsubscribe(String ... channel) {
async((MultiDecoder)null, RedisCommands.UNSUBSCRIBE, channel);
for (String ch : channel) {
channels.remove(ch);
}
}
public void punsubscribe(String ... channel) {
async((MultiDecoder)null, RedisCommands.PUNSUBSCRIBE, channel);
for (String ch : channel) {
patternChannels.remove(ch);
}
}
private <T, R> void async(MultiDecoder<Object> messageDecoder, RedisCommand<T> command, Object ... params) {
channel.writeAndFlush(new CommandData<T, R>(null, messageDecoder, null, command, params));
}
public Map<String, Codec> getChannels() {
return Collections.unmodifiableMap(channels);
}
public Map<String, Codec> getPatternChannels() {
return Collections.unmodifiableMap(patternChannels);
}
}

8
src/main/java/org/redisson/client/codec/LongCodec.java
Unescape Escape View File

@ -25,14 +25,16 @@ public class LongCodec extends StringCodec {
public static final LongCodec INSTANCE = new LongCodec();
@Override
public Decoder<Object> getValueDecoder() {
return new Decoder<Object>() {
public final Decoder<Object> decoder = new Decoder<Object>() {
@Override
public Object decode(ByteBuf buf, State state) {
return Long.valueOf(buf.toString(CharsetUtil.UTF_8));
}
};
@Override
public Decoder<Object> getValueDecoder() {
return decoder;
}
}

20
src/main/java/org/redisson/client/codec/StringCodec.java
Unescape Escape View File

@ -28,24 +28,28 @@ public class StringCodec implements Codec {
public static final StringCodec INSTANCE = new StringCodec();
private final Encoder encoder = new Encoder() {
@Override
public Decoder<Object> getValueDecoder() {
return new Decoder<Object>() {
public byte[] encode(Object in) throws IOException {
return in.toString().getBytes("UTF-8");
}
};
private final Decoder<Object> decoder = new Decoder<Object>() {
@Override
public Object decode(ByteBuf buf, State state) {
return buf.toString(CharsetUtil.UTF_8);
}
};
@Override
public Decoder<Object> getValueDecoder() {
return decoder;
}
@Override
public Encoder getValueEncoder() {
return new Encoder() {
@Override
public byte[] encode(Object in) throws IOException {
return in.toString().getBytes("UTF-8");
}
};
return encoder;
}
@Override

59
src/main/java/org/redisson/client/handler/ConnectionWatchdog.java
Unescape Escape View File

@ -15,14 +15,18 @@
*/
package org.redisson.client.handler;
import java.util.Map.Entry;
import java.util.concurrent.TimeUnit;
import org.redisson.client.RedisConnection;
import org.redisson.client.RedisException;
import org.redisson.client.RedisPubSubConnection;
import org.redisson.client.codec.Codec;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import io.netty.bootstrap.Bootstrap;
import io.netty.channel.Channel;
import io.netty.channel.ChannelFuture;
import io.netty.channel.ChannelFutureListener;
import io.netty.channel.ChannelHandlerContext;
@ -63,12 +67,12 @@ public class ConnectionWatchdog extends ChannelInboundHandlerAdapter {
group.schedule(new Runnable() {
@Override
public void run() {
doReConnect(group, connection, 1);
tryReconnect(group, connection, 1);
}
}, 100, TimeUnit.MILLISECONDS);
}
private void doReConnect(final EventLoopGroup group, final RedisConnection connection, final int attempts) {
private void tryReconnect(final EventLoopGroup group, final RedisConnection connection, final int attempts) {
if (connection.isClosed()) {
return;
}
@ -86,20 +90,7 @@ public class ConnectionWatchdog extends ChannelInboundHandlerAdapter {
try {
if (future.isSuccess()) {
log.debug("{} connected to {}", connection, connection.getRedisClient().getAddr());
if (connection.getReconnectListener() != null) {
bootstrap.group().execute(new Runnable() {
@Override
public void run() {
// new connection used only to init channel
RedisConnection rc = new RedisConnection(connection.getRedisClient(), future.channel());
connection.getReconnectListener().onReconnect(rc);
connection.updateChannel(future.channel());
}
});
} else {
connection.updateChannel(future.channel());
}
reconnect(connection, future.channel());
return;
}
} catch (RedisException e) {
@ -110,12 +101,46 @@ public class ConnectionWatchdog extends ChannelInboundHandlerAdapter {
group.schedule(new Runnable() {
@Override
public void run() {
doReConnect(group, connection, Math.min(BACKOFF_CAP, attempts + 1));
tryReconnect(group, connection, Math.min(BACKOFF_CAP, attempts + 1));
}
}, timeout, TimeUnit.MILLISECONDS);
}
});
}
private void reconnect(final RedisConnection connection, final Channel channel) {
if (connection.getReconnectListener() != null) {
bootstrap.group().execute(new Runnable() {
@Override
public void run() {
// new connection used only for channel init
RedisConnection rc = new RedisConnection(connection.getRedisClient(), channel);
connection.getReconnectListener().onReconnect(rc);
connection.updateChannel(channel);
resubscribe(connection);
}
});
} else {
connection.updateChannel(channel);
resubscribe(connection);
}
}
private void resubscribe(RedisConnection connection) {
if (connection instanceof RedisPubSubConnection) {
RedisPubSubConnection conn = (RedisPubSubConnection) connection;
for (Entry<String, Codec> entry : conn.getChannels().entrySet()) {
conn.subscribe(entry.getValue(), entry.getKey());
}
for (Entry<String, Codec> entry : conn.getPatternChannels().entrySet()) {
conn.psubscribe(entry.getValue(), entry.getKey());
}
}
}
@Override

32
src/main/java/org/redisson/codec/JsonJacksonCodec.java
Unescape Escape View File

@ -44,7 +44,21 @@ import io.netty.buffer.ByteBufInputStream;
*/
public class JsonJacksonCodec implements Codec {
private ObjectMapper mapObjectMapper = new ObjectMapper();
private final ObjectMapper mapObjectMapper = new ObjectMapper();
private final Encoder encoder = new Encoder() {
@Override
public byte[] encode(Object in) throws IOException {
return mapObjectMapper.writeValueAsBytes(in);
}
};
private final Decoder<Object> decoder = new Decoder<Object>() {
@Override
public Object decode(ByteBuf buf, State state) throws IOException {
return mapObjectMapper.readValue(new ByteBufInputStream(buf), Object.class);
}
};
public JsonJacksonCodec() {
init(mapObjectMapper);
@ -94,24 +108,12 @@ public class JsonJacksonCodec implements Codec {
@Override
public Decoder<Object> getMapValueDecoder() {
return new Decoder<Object>() {
@Override
public Object decode(ByteBuf buf, State state) throws IOException {
return mapObjectMapper.readValue(new ByteBufInputStream(buf), Object.class);
}
};
return decoder;
}
@Override
public Encoder getMapValueEncoder() {
return new Encoder() {
@Override
public byte[] encode(Object in) throws IOException {
return mapObjectMapper.writeValueAsBytes(in);
}
};
return encoder;
}
@Override

85
src/main/java/org/redisson/codec/KryoCodec.java
Unescape Escape View File

@ -93,43 +93,7 @@ public class KryoCodec implements Codec {
private final KryoPool kryoPool;
public KryoCodec() {
this(new KryoPoolImpl(Collections.<Class<?>>emptyList()));
}
public KryoCodec(List<Class<?>> classes) {
this(new KryoPoolImpl(classes));
}
public KryoCodec(KryoPool kryoPool) {
this.kryoPool = kryoPool;
}
@Override
public Decoder<Object> getMapValueDecoder() {
return getValueDecoder();
}
@Override
public Encoder getMapValueEncoder() {
return getValueEncoder();
}
@Override
public Decoder<Object> getMapKeyDecoder() {
return getValueDecoder();
}
@Override
public Encoder getMapKeyEncoder() {
return getValueEncoder();
}
@Override
public Decoder<Object> getValueDecoder() {
return new Decoder<Object>() {
private final Decoder<Object> decoder = new Decoder<Object>() {
@Override
public Object decode(ByteBuf buf, State state) throws IOException {
Kryo kryo = null;
@ -148,11 +112,8 @@ public class KryoCodec implements Codec {
}
}
};
}
@Override
public Encoder getValueEncoder() {
return new Encoder() {
private final Encoder encoder = new Encoder() {
@Override
public byte[] encode(Object in) throws IOException {
@ -176,6 +137,48 @@ public class KryoCodec implements Codec {
}
}
};
public KryoCodec() {
this(new KryoPoolImpl(Collections.<Class<?>>emptyList()));
}
public KryoCodec(List<Class<?>> classes) {
this(new KryoPoolImpl(classes));
}
public KryoCodec(KryoPool kryoPool) {
this.kryoPool = kryoPool;
}
@Override
public Decoder<Object> getMapValueDecoder() {
return getValueDecoder();
}
@Override
public Encoder getMapValueEncoder() {
return getValueEncoder();
}
@Override
public Decoder<Object> getMapKeyDecoder() {
return getValueDecoder();
}
@Override
public Encoder getMapKeyEncoder() {
return getValueEncoder();
}
@Override
public Decoder<Object> getValueDecoder() {
return decoder;
}
@Override
public Encoder getValueEncoder() {
return encoder;
}
}

52
src/main/java/org/redisson/codec/SerializationCodec.java
Unescape Escape View File

@ -35,6 +35,32 @@ import io.netty.buffer.ByteBufInputStream;
*/
public class SerializationCodec implements Codec {
private final Decoder<Object> decoder = new Decoder<Object>() {
@Override
public Object decode(ByteBuf buf, State state) throws IOException {
try {
ObjectInputStream inputStream = new ObjectInputStream(new ByteBufInputStream(buf));
return inputStream.readObject();
} catch (IOException e) {
throw e;
} catch (Exception e) {
throw new IOException(e);
}
}
};
private final Encoder encoder = new Encoder() {
@Override
public byte[] encode(Object in) throws IOException {
ByteArrayOutputStream result = new ByteArrayOutputStream();
ObjectOutputStream outputStream = new ObjectOutputStream(result);
outputStream.writeObject(in);
outputStream.close();
return result.toByteArray();
}
};
@Override
public Decoder<Object> getMapValueDecoder() {
return getValueDecoder();
@ -57,34 +83,12 @@ public class SerializationCodec implements Codec {
@Override
public Decoder<Object> getValueDecoder() {
return new Decoder<Object>() {
@Override
public Object decode(ByteBuf buf, State state) throws IOException {
try {
ObjectInputStream inputStream = new ObjectInputStream(new ByteBufInputStream(buf));
return inputStream.readObject();
} catch (IOException e) {
throw e;
} catch (Exception e) {
throw new IOException(e);
}
}
};
return decoder;
}
@Override
public Encoder getValueEncoder() {
return new Encoder() {
@Override
public byte[] encode(Object in) throws IOException {
ByteArrayOutputStream result = new ByteArrayOutputStream();
ObjectOutputStream outputStream = new ObjectOutputStream(result);
outputStream.writeObject(in);
outputStream.close();
return result.toByteArray();
}
};
return encoder;
}
}

19
src/main/java/org/redisson/connection/MasterSlaveConnectionManager.java
Unescape Escape View File

@ -374,7 +374,8 @@ public class MasterSlaveConnectionManager implements ConnectionManager {
return null;
}
return entry.unsubscribe(channelName, new BaseRedisPubSubListener() {
Codec entryCodec = entry.getConnection().getChannels().get(channelName);
entry.unsubscribe(channelName, new BaseRedisPubSubListener() {
@Override
public boolean onStatus(PubSubType type, String channel) {
@ -390,6 +391,7 @@ public class MasterSlaveConnectionManager implements ConnectionManager {
}
});
return entryCodec;
}
@Override
@ -399,7 +401,8 @@ public class MasterSlaveConnectionManager implements ConnectionManager {
return null;
}
return entry.punsubscribe(channelName, new BaseRedisPubSubListener() {
Codec entryCodec = entry.getConnection().getPatternChannels().get(channelName);
entry.punsubscribe(channelName, new BaseRedisPubSubListener() {
@Override
public boolean onStatus(PubSubType type, String channel) {
@ -415,6 +418,7 @@ public class MasterSlaveConnectionManager implements ConnectionManager {
}
});
return entryCodec;
}
protected MasterSlaveEntry getEntry(int slot) {
@ -438,6 +442,16 @@ public class MasterSlaveConnectionManager implements ConnectionManager {
entry.close();
Collection<RedisPubSubListener> listeners = entry.getListeners(channelName);
if (entry.getConnection().getPatternChannels().get(channelName) != null) {
Codec subscribeCodec = punsubscribe(channelName);
if (!listeners.isEmpty()) {
PubSubConnectionEntry newEntry = psubscribe(channelName, subscribeCodec);
for (RedisPubSubListener redisPubSubListener : listeners) {
newEntry.addListener(channelName, redisPubSubListener);
}
log.debug("resubscribed listeners for '{}' channel-pattern", channelName);
}
} else {
Codec subscribeCodec = unsubscribe(channelName);
if (!listeners.isEmpty()) {
PubSubConnectionEntry newEntry = subscribe(channelName, subscribeCodec);
@ -450,6 +464,7 @@ public class MasterSlaveConnectionManager implements ConnectionManager {
}
}
}
}
protected void changeMaster(int endSlot, String host, int port) {
getEntry(endSlot).changeMaster(host, port);

12
src/main/java/org/redisson/connection/PubSubConnectionEntry.java
Unescape Escape View File

@ -18,7 +18,6 @@ package org.redisson.connection;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.Map;
import java.util.Queue;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentLinkedQueue;
@ -33,8 +32,6 @@ import org.redisson.client.protocol.pubsub.PubSubType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import io.netty.util.internal.PlatformDependent;
public class PubSubConnectionEntry {
public enum Status {ACTIVE, INACTIVE}
@ -46,7 +43,6 @@ public class PubSubConnectionEntry {
private final RedisPubSubConnection conn;
private final int subscriptionsPerConnection;
private final Map<String, Codec> channel2Codec = PlatformDependent.newConcurrentHashMap();
private final ConcurrentMap<String, Queue<RedisPubSubListener>> channelListeners = new ConcurrentHashMap<String, Queue<RedisPubSubListener>>();
public PubSubConnectionEntry(RedisPubSubConnection conn, int subscriptionsPerConnection) {
@ -127,12 +123,10 @@ public class PubSubConnectionEntry {
}
public void subscribe(Codec codec, String channelName) {
channel2Codec.put(channelName, codec);
conn.subscribe(codec, channelName);
}
public void psubscribe(Codec codec, String pattern) {
channel2Codec.put(pattern, codec);
conn.psubscribe(codec, pattern);
}
@ -141,7 +135,7 @@ public class PubSubConnectionEntry {
conn.subscribe(codec, channel);
}
public Codec unsubscribe(final String channel, RedisPubSubListener listener) {
public void unsubscribe(final String channel, RedisPubSubListener listener) {
conn.addOneShotListener(new BaseRedisPubSubListener<Object>() {
@Override
public boolean onStatus(PubSubType type, String ch) {
@ -155,7 +149,6 @@ public class PubSubConnectionEntry {
});
conn.addOneShotListener(listener);
conn.unsubscribe(channel);
return channel2Codec.remove(channel);
}
private void removeListeners(String channel) {
@ -171,7 +164,7 @@ public class PubSubConnectionEntry {
subscribedChannelsAmount.release();
}
public Codec punsubscribe(final String channel, RedisPubSubListener listener) {
public void punsubscribe(final String channel, RedisPubSubListener listener) {
conn.addOneShotListener(new BaseRedisPubSubListener<Object>() {
@Override
public boolean onStatus(PubSubType type, String ch) {
@ -184,7 +177,6 @@ public class PubSubConnectionEntry {
});
conn.addOneShotListener(listener);
conn.punsubscribe(channel);
return channel2Codec.remove(channel);
}

Write Preview
Loading…
Cancel
Save