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/1025/head
Nikita 8 years ago
parent da3c5df4b9
commit 98aa72d046
5 changed files with 73 additions and 55 deletions
Show Stats Download Patch File Download Diff File

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

@ -76,13 +76,21 @@ public class RedissonBloomFilter<T> extends RedissonExpirable implements RBloomF
}
return (long) (-n * Math.log(p) / (Math.log(2) * Math.log(2)));
}
private long[] hash(Object object) {
ByteBuf state = encode(object);
try {
long hash1 = LongHashFunction.xx().hashBytes(state.internalNioBuffer(state.readerIndex(), state.readableBytes()));
long hash2 = LongHashFunction.farmUo().hashBytes(state.internalNioBuffer(state.readerIndex(), state.readableBytes()));
return new long[] {hash1, hash2};
} finally {
state.release();
}
}
@Override
public boolean add(T object) {
ByteBuf state = encode(object);
long hash1 = LongHashFunction.xx().hashBytes(state.internalNioBuffer(state.readerIndex(), state.readableBytes()));
long hash2 = LongHashFunction.farmUo().hashBytes(state.internalNioBuffer(state.readerIndex(), state.readableBytes()));
state.release();
long[] hashes = hash(object);
while (true) {
if (size == 0) {
@ -92,7 +100,7 @@ public class RedissonBloomFilter<T> extends RedissonExpirable implements RBloomF
int hashIterations = this.hashIterations;
long size = this.size;
long[] indexes = hash(hash1, hash2, hashIterations, size);
long[] indexes = hash(hashes[0], hashes[1], hashIterations, size);
CommandBatchService executorService = new CommandBatchService(commandExecutor.getConnectionManager());
addConfigCheck(hashIterations, size, executorService);
@ -132,10 +140,7 @@ public class RedissonBloomFilter<T> extends RedissonExpirable implements RBloomF
@Override
public boolean contains(T object) {
ByteBuf state = encode(object);
long hash1 = LongHashFunction.xx().hashBytes(state.internalNioBuffer(state.readerIndex(), state.readableBytes()));
long hash2 = LongHashFunction.farmUo().hashBytes(state.internalNioBuffer(state.readerIndex(), state.readableBytes()));
state.release();
long[] hashes = hash(object);
while (true) {
if (size == 0) {
@ -145,7 +150,7 @@ public class RedissonBloomFilter<T> extends RedissonExpirable implements RBloomF
int hashIterations = this.hashIterations;
long size = this.size;
long[] indexes = hash(hash1, hash2, hashIterations, size);
long[] indexes = hash(hashes[0], hashes[1], hashIterations, size);
CommandBatchService executorService = new CommandBatchService(commandExecutor.getConnectionManager());
addConfigCheck(hashIterations, size, executorService);

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

@ -15,6 +15,7 @@
*/
package org.redisson;
import java.io.IOException;
import java.util.Collections;
import java.util.List;
@ -27,8 +28,15 @@ import org.redisson.client.codec.Codec;
import org.redisson.client.protocol.RedisCommands;
import org.redisson.command.CommandAsyncExecutor;
import org.redisson.connection.PubSubConnectionEntry;
import org.redisson.misc.RPromise;
import org.redisson.misc.RedissonObjectFactory;
import org.redisson.misc.RedissonPromise;
import org.redisson.pubsub.AsyncSemaphore;
import io.netty.buffer.ByteBuf;
import io.netty.util.concurrent.Future;
import io.netty.util.concurrent.FutureListener;
/**
* Distributed topic implementation. Messages are delivered to all message listeners across Redis cluster.
*
@ -42,11 +50,11 @@ public class RedissonTopic<M> implements RTopic<M> {
private final String name;
private final Codec codec;
protected RedissonTopic(CommandAsyncExecutor commandExecutor, String name) {
public RedissonTopic(CommandAsyncExecutor commandExecutor, String name) {
this(commandExecutor.getConnectionManager().getCodec(), commandExecutor, name);
}
protected RedissonTopic(Codec codec, CommandAsyncExecutor commandExecutor, String name) {
public RedissonTopic(Codec codec, CommandAsyncExecutor commandExecutor, String name) {
this.commandExecutor = commandExecutor;
this.name = name;
this.codec = codec;
@ -63,9 +71,24 @@ public class RedissonTopic<M> implements RTopic<M> {
@Override
public RFuture<Long> publishAsync(M message) {
return commandExecutor.writeAsync(name, codec, RedisCommands.PUBLISH, name, message);
return commandExecutor.writeAsync(name, codec, RedisCommands.PUBLISH, name, encode(message));
}
protected ByteBuf encode(Object value) {
if (commandExecutor.isRedissonReferenceSupportEnabled()) {
RedissonReference reference = RedissonObjectFactory.toReference(commandExecutor.getConnectionManager().getCfg(), value);
if (reference != null) {
value = reference;
}
}
try {
return codec.getValueEncoder().encode(value);
} catch (IOException e) {
throw new IllegalArgumentException(e);
}
}
@Override
public int addListener(StatusListener listener) {
return addListener(new PubSubStatusListener<Object>(listener, name));
@ -82,6 +105,23 @@ public class RedissonTopic<M> implements RTopic<M> {
commandExecutor.syncSubscription(future);
return System.identityHashCode(pubSubListener);
}
public RFuture<Integer> addListenerAsync(final RedisPubSubListener<?> pubSubListener) {
RFuture<PubSubConnectionEntry> future = commandExecutor.getConnectionManager().subscribe(codec, name, pubSubListener);
RPromise<Integer> result = new RedissonPromise<Integer>();
future.addListener(new FutureListener<PubSubConnectionEntry>() {
@Override
public void operationComplete(Future<PubSubConnectionEntry> future) throws Exception {
if (!future.isSuccess()) {
result.tryFailure(future.cause());
return;
}
result.trySuccess(System.identityHashCode(pubSubListener));
}
});
return result;
}
@Override
public void removeAllListeners() {

2
redisson/src/main/java/org/redisson/client/protocol/RedisCommands.java
Unescape Escape View File

@ -302,7 +302,7 @@ public interface RedisCommands {
RedisStrictCommand<Boolean> MOVE = new RedisStrictCommand<Boolean>("MOVE", new BooleanReplayConvertor());
RedisStrictCommand<Void> MIGRATE = new RedisStrictCommand<Void>("MIGRATE", new VoidReplayConvertor());
RedisStrictCommand<Long> PUBLISH = new RedisStrictCommand<Long>("PUBLISH", 2);
RedisStrictCommand<Long> PUBLISH = new RedisStrictCommand<Long>("PUBLISH");
RedisCommand<Object> SUBSCRIBE = new RedisCommand<Object>("SUBSCRIBE", new PubSubStatusDecoder());
RedisCommand<Object> UNSUBSCRIBE = new RedisCommand<Object>("UNSUBSCRIBE", new PubSubStatusDecoder());

1
redisson/src/main/java/org/redisson/connection/pool/PubSubConnectionPool.java
Unescape Escape View File

@ -17,7 +17,6 @@ package org.redisson.connection.pool;
import org.redisson.api.RFuture;
import org.redisson.client.RedisPubSubConnection;
import org.redisson.client.protocol.RedisCommand;
import org.redisson.client.protocol.RedisCommands;
import org.redisson.config.MasterSlaveServersConfig;
import org.redisson.connection.ClientConnectionsEntry;

54
redisson/src/main/java/org/redisson/reactive/RedissonTopicReactive.java
Unescape Escape View File

@ -21,20 +21,16 @@ import java.util.List;
import org.reactivestreams.Publisher;
import org.redisson.PubSubMessageListener;
import org.redisson.PubSubStatusListener;
import org.redisson.RedissonTopic;
import org.redisson.api.RFuture;
import org.redisson.api.RTopic;
import org.redisson.api.RTopicReactive;
import org.redisson.api.listener.MessageListener;
import org.redisson.api.listener.StatusListener;
import org.redisson.client.RedisPubSubListener;
import org.redisson.client.codec.Codec;
import org.redisson.client.protocol.RedisCommands;
import org.redisson.command.CommandReactiveExecutor;
import org.redisson.connection.PubSubConnectionEntry;
import org.redisson.misc.RPromise;
import org.redisson.pubsub.AsyncSemaphore;
import io.netty.util.concurrent.Future;
import io.netty.util.concurrent.FutureListener;
import reactor.fn.Supplier;
/**
@ -46,18 +42,18 @@ import reactor.fn.Supplier;
*/
public class RedissonTopicReactive<M> implements RTopicReactive<M> {
private final RTopic<M> topic;
private final CommandReactiveExecutor commandExecutor;
private final String name;
private final Codec codec;
public RedissonTopicReactive(CommandReactiveExecutor commandExecutor, String name) {
this(commandExecutor.getConnectionManager().getCodec(), commandExecutor, name);
}
public RedissonTopicReactive(Codec codec, CommandReactiveExecutor commandExecutor, String name) {
this.topic = new RedissonTopic<M>(codec, commandExecutor, name);
this.commandExecutor = commandExecutor;
this.name = name;
this.codec = codec;
}
@Override
@ -66,8 +62,13 @@ public class RedissonTopicReactive<M> implements RTopicReactive<M> {
}
@Override
public Publisher<Long> publish(M message) {
return commandExecutor.writeReactive(name, codec, RedisCommands.PUBLISH, name, message);
public Publisher<Long> publish(final M message) {
return commandExecutor.reactive(new Supplier<RFuture<Long>>() {
@Override
public RFuture<Long> get() {
return topic.publishAsync(message);
}
});
}
@Override
@ -82,23 +83,10 @@ public class RedissonTopicReactive<M> implements RTopicReactive<M> {
}
private Publisher<Integer> addListener(final RedisPubSubListener<?> pubSubListener) {
return new NettyFuturePublisher<Integer>(new Supplier<RFuture<Integer>>() {
return commandExecutor.reactive(new Supplier<RFuture<Integer>>() {
@Override
public RFuture<Integer> get() {
final RPromise<Integer> promise = commandExecutor.getConnectionManager().newPromise();
RFuture<PubSubConnectionEntry> future = commandExecutor.getConnectionManager().subscribe(codec, name, pubSubListener);
future.addListener(new FutureListener<PubSubConnectionEntry>() {
@Override
public void operationComplete(Future<PubSubConnectionEntry> future) throws Exception {
if (!future.isSuccess()) {
promise.tryFailure(future.cause());
return;
}
promise.trySuccess(System.identityHashCode(pubSubListener));
}
});
return promise;
return ((RedissonTopic<Integer>) topic).addListenerAsync(pubSubListener);
}
});
}
@ -106,21 +94,7 @@ public class RedissonTopicReactive<M> implements RTopicReactive<M> {
@Override
public void removeListener(int listenerId) {
AsyncSemaphore semaphore = commandExecutor.getConnectionManager().getSemaphore(name);
semaphore.acquireUninterruptibly();
PubSubConnectionEntry entry = commandExecutor.getConnectionManager().getPubSubEntry(name);
if (entry == null) {
semaphore.release();
return;
}
entry.removeListener(name, listenerId);
if (!entry.hasListeners(name)) {
commandExecutor.getConnectionManager().unsubscribe(name, semaphore);
} else {
semaphore.release();
}
topic.removeListener(listenerId);
}

Write Preview
Loading…
Cancel
Save