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

RLexSortedSetReactive refactoring

Browse Source
pull/970/head
Nikita 8 years ago
parent c10de37eda
commit 06c11a2592
3 changed files with 115 additions and 76 deletions
Show Stats Download Patch File Download Diff File

30
redisson/src/main/java/org/redisson/api/RLexSortedSetReactive.java
Unescape Escape View File

@ -19,34 +19,32 @@ import java.util.Collection;
import org.reactivestreams.Publisher; import org.reactivestreams.Publisher;
public interface RLexSortedSetReactive extends RCollectionReactive<String> { public interface RLexSortedSetReactive extends RScoredSortedSetReactive<String>, RCollectionReactive<String> {
Publisher<Integer> removeRangeByLex(String fromElement, boolean fromInclusive, String toElement, boolean toInclusive); Publisher<Integer> removeRange(String fromElement, boolean fromInclusive, String toElement, boolean toInclusive);
Publisher<Integer> removeRangeTailByLex(String fromElement, boolean fromInclusive); Publisher<Integer> removeRangeTail(String fromElement, boolean fromInclusive);
Publisher<Integer> removeRangeHeadByLex(String toElement, boolean toInclusive); Publisher<Integer> removeRangeHead(String toElement, boolean toInclusive);
Publisher<Integer> lexCountTail(String fromElement, boolean fromInclusive); Publisher<Integer> countTail(String fromElement, boolean fromInclusive);
Publisher<Integer> lexCountHead(String toElement, boolean toInclusive); Publisher<Integer> countHead(String toElement, boolean toInclusive);
Publisher<Collection<String>> lexRangeTail(String fromElement, boolean fromInclusive); Publisher<Collection<String>> rangeTail(String fromElement, boolean fromInclusive);
Publisher<Collection<String>> lexRangeHead(String toElement, boolean toInclusive); Publisher<Collection<String>> rangeHead(String toElement, boolean toInclusive);
Publisher<Collection<String>> lexRange(String fromElement, boolean fromInclusive, String toElement, boolean toInclusive); Publisher<Collection<String>> range(String fromElement, boolean fromInclusive, String toElement, boolean toInclusive);
Publisher<Collection<String>> lexRangeTail(String fromElement, boolean fromInclusive, int offset, int count); Publisher<Collection<String>> rangeTail(String fromElement, boolean fromInclusive, int offset, int count);
Publisher<Collection<String>> lexRangeHead(String toElement, boolean toInclusive, int offset, int count); Publisher<Collection<String>> rangeHead(String toElement, boolean toInclusive, int offset, int count);
Publisher<Collection<String>> lexRange(String fromElement, boolean fromInclusive, String toElement, boolean toInclusive, int offset, int count); Publisher<Collection<String>> range(String fromElement, boolean fromInclusive, String toElement, boolean toInclusive, int offset, int count);
Publisher<Integer> lexCount(String fromElement, boolean fromInclusive, String toElement, boolean toInclusive); Publisher<Integer> count(String fromElement, boolean fromInclusive, String toElement, boolean toInclusive);
Publisher<Integer> rank(String o); Publisher<Collection<String>> range(int startIndex, int endIndex);
Publisher<Collection<String>> valueRange(int startIndex, int endIndex);
} }

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

@ -103,6 +103,7 @@ public interface RedisCommands {
RedisCommand<Boolean> ZADD_NX_BOOL = new RedisCommand<Boolean>("ZADD", new BooleanAmountReplayConvertor(), 4); RedisCommand<Boolean> ZADD_NX_BOOL = new RedisCommand<Boolean>("ZADD", new BooleanAmountReplayConvertor(), 4);
RedisCommand<Boolean> ZADD_BOOL_RAW = new RedisCommand<Boolean>("ZADD", new BooleanAmountReplayConvertor()); RedisCommand<Boolean> ZADD_BOOL_RAW = new RedisCommand<Boolean>("ZADD", new BooleanAmountReplayConvertor());
RedisCommand<Boolean> ZADD_RAW = new RedisCommand<Boolean>("ZADD"); RedisCommand<Boolean> ZADD_RAW = new RedisCommand<Boolean>("ZADD");
RedisStrictCommand<Integer> ZADD_INT = new RedisStrictCommand<Integer>("ZADD", new IntegerReplayConvertor());
RedisCommand<Long> ZADD = new RedisCommand<Long>("ZADD"); RedisCommand<Long> ZADD = new RedisCommand<Long>("ZADD");
RedisCommand<Boolean> ZREM = new RedisCommand<Boolean>("ZREM", new BooleanAmountReplayConvertor(), 2, ValueType.OBJECTS); RedisCommand<Boolean> ZREM = new RedisCommand<Boolean>("ZREM", new BooleanAmountReplayConvertor(), 2, ValueType.OBJECTS);
RedisStrictCommand<Integer> ZCARD_INT = new RedisStrictCommand<Integer>("ZCARD", new IntegerReplayConvertor()); RedisStrictCommand<Integer> ZCARD_INT = new RedisStrictCommand<Integer>("ZCARD", new IntegerReplayConvertor());

160
redisson/src/main/java/org/redisson/reactive/RedissonLexSortedSetReactive.java
Unescape Escape View File

@ -20,11 +20,16 @@ import java.util.Collection;
import java.util.List; import java.util.List;
import org.reactivestreams.Publisher; import org.reactivestreams.Publisher;
import org.redisson.RedissonLexSortedSet;
import org.redisson.api.RFuture;
import org.redisson.api.RLexSortedSetAsync;
import org.redisson.api.RLexSortedSetReactive; import org.redisson.api.RLexSortedSetReactive;
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.command.CommandReactiveExecutor; import org.redisson.command.CommandReactiveExecutor;
import reactor.fn.Supplier;
/** /**
* *
* @author Nikita Koksharov * @author Nikita Koksharov
@ -32,8 +37,11 @@ import org.redisson.command.CommandReactiveExecutor;
*/ */
public class RedissonLexSortedSetReactive extends RedissonScoredSortedSetReactive<String> implements RLexSortedSetReactive { public class RedissonLexSortedSetReactive extends RedissonScoredSortedSetReactive<String> implements RLexSortedSetReactive {
private final RLexSortedSetAsync instance;
public RedissonLexSortedSetReactive(CommandReactiveExecutor commandExecutor, String name) { public RedissonLexSortedSetReactive(CommandReactiveExecutor commandExecutor, String name) {
super(StringCodec.INSTANCE, commandExecutor, name); super(StringCodec.INSTANCE, commandExecutor, name);
instance = new RedissonLexSortedSet(commandExecutor, name, null);
} }
@Override @Override
@ -42,101 +50,128 @@ public class RedissonLexSortedSetReactive extends RedissonScoredSortedSetReactiv
} }
@Override @Override
public Publisher<Integer> removeRangeHeadByLex(String toElement, boolean toInclusive) { public Publisher<Integer> removeRangeHead(final String toElement, final boolean toInclusive) {
String toValue = value(toElement, toInclusive); return reactive(new Supplier<RFuture<Integer>>() {
return commandExecutor.writeReactive(getName(), StringCodec.INSTANCE, RedisCommands.ZREMRANGEBYLEX, getName(), "-", toValue); @Override
public RFuture<Integer> get() {
return instance.removeRangeHeadAsync(toElement, toInclusive);
}
});
} }
@Override @Override
public Publisher<Integer> removeRangeTailByLex(String fromElement, boolean fromInclusive) { public Publisher<Integer> removeRangeTail(final String fromElement, final boolean fromInclusive) {
String fromValue = value(fromElement, fromInclusive); return reactive(new Supplier<RFuture<Integer>>() {
return commandExecutor.writeReactive(getName(), StringCodec.INSTANCE, RedisCommands.ZREMRANGEBYLEX, getName(), fromValue, "+"); @Override
public RFuture<Integer> get() {
return instance.removeRangeTailAsync(fromElement, fromInclusive);
}
});
} }
@Override @Override
public Publisher<Integer> removeRangeByLex(String fromElement, boolean fromInclusive, String toElement, boolean toInclusive) { public Publisher<Integer> removeRange(final String fromElement, final boolean fromInclusive, final String toElement, final boolean toInclusive) {
String fromValue = value(fromElement, fromInclusive); return reactive(new Supplier<RFuture<Integer>>() {
String toValue = value(toElement, toInclusive); @Override
public RFuture<Integer> get() {
return commandExecutor.writeReactive(getName(), StringCodec.INSTANCE, RedisCommands.ZREMRANGEBYLEX, getName(), fromValue, toValue); return instance.removeRangeAsync(fromElement, fromInclusive, toElement, toInclusive);
}
});
} }
@Override @Override
public Publisher<Collection<String>> lexRangeHead(String toElement, boolean toInclusive) { public Publisher<Collection<String>> rangeHead(final String toElement, final boolean toInclusive) {
String toValue = value(toElement, toInclusive); return reactive(new Supplier<RFuture<Collection<String>>>() {
return commandExecutor.readReactive(getName(), StringCodec.INSTANCE, RedisCommands.ZRANGEBYLEX, getName(), "-", toValue); @Override
public RFuture<Collection<String>> get() {
return instance.rangeHeadAsync(toElement, toInclusive);
}
});
} }
@Override @Override
public Publisher<Collection<String>> lexRangeTail(String fromElement, boolean fromInclusive) { public Publisher<Collection<String>> rangeTail(final String fromElement, final boolean fromInclusive) {
String fromValue = value(fromElement, fromInclusive); return reactive(new Supplier<RFuture<Collection<String>>>() {
return commandExecutor.readReactive(getName(), StringCodec.INSTANCE, RedisCommands.ZRANGEBYLEX, getName(), fromValue, "+"); @Override
public RFuture<Collection<String>> get() {
return instance.rangeTailAsync(fromElement, fromInclusive);
}
});
} }
@Override @Override
public Publisher<Collection<String>> lexRange(String fromElement, boolean fromInclusive, String toElement, boolean toInclusive) { public Publisher<Collection<String>> range(final String fromElement, final boolean fromInclusive, final String toElement, final boolean toInclusive) {
String fromValue = value(fromElement, fromInclusive); return reactive(new Supplier<RFuture<Collection<String>>>() {
String toValue = value(toElement, toInclusive); @Override
public RFuture<Collection<String>> get() {
return commandExecutor.readReactive(getName(), StringCodec.INSTANCE, RedisCommands.ZRANGEBYLEX, getName(), fromValue, toValue); return instance.rangeAsync(fromElement, fromInclusive, toElement, toInclusive);
}
});
} }
@Override @Override
public Publisher<Collection<String>> lexRangeHead(String toElement, boolean toInclusive, int offset, int count) { public Publisher<Collection<String>> rangeHead(final String toElement, final boolean toInclusive, final int offset, final int count) {
String toValue = value(toElement, toInclusive); return reactive(new Supplier<RFuture<Collection<String>>>() {
return commandExecutor.readReactive(getName(), StringCodec.INSTANCE, RedisCommands.ZRANGEBYLEX, getName(), "-", toValue, "LIMIT", offset, count); @Override
public RFuture<Collection<String>> get() {
return instance.rangeHeadAsync(toElement, toInclusive, offset, count);
}
});
} }
@Override @Override
public Publisher<Collection<String>> lexRangeTail(String fromElement, boolean fromInclusive, int offset, int count) { public Publisher<Collection<String>> rangeTail(final String fromElement, final boolean fromInclusive, final int offset, final int count) {
String fromValue = value(fromElement, fromInclusive); return reactive(new Supplier<RFuture<Collection<String>>>() {
return commandExecutor.readReactive(getName(), StringCodec.INSTANCE, RedisCommands.ZRANGEBYLEX, getName(), fromValue, "+", "LIMIT", offset, count); @Override
public RFuture<Collection<String>> get() {
return instance.rangeTailAsync(fromElement, fromInclusive, offset, count);
}
});
} }
@Override @Override
public Publisher<Collection<String>> lexRange(String fromElement, boolean fromInclusive, String toElement, boolean toInclusive, int offset, int count) { public Publisher<Collection<String>> range(final String fromElement, final boolean fromInclusive, final String toElement, final boolean toInclusive, final int offset, final int count) {
String fromValue = value(fromElement, fromInclusive); return reactive(new Supplier<RFuture<Collection<String>>>() {
String toValue = value(toElement, toInclusive); @Override
public RFuture<Collection<String>> get() {
return commandExecutor.readReactive(getName(), StringCodec.INSTANCE, RedisCommands.ZRANGEBYLEX, getName(), fromValue, toValue, "LIMIT", offset, count); return instance.rangeAsync(fromElement, fromInclusive, toElement, toInclusive, offset, count);
}
});
} }
@Override @Override
public Publisher<Integer> lexCountTail(String fromElement, boolean fromInclusive) { public Publisher<Integer> countTail(final String fromElement, final boolean fromInclusive) {
String fromValue = value(fromElement, fromInclusive); return reactive(new Supplier<RFuture<Integer>>() {
@Override
return commandExecutor.readReactive(getName(), StringCodec.INSTANCE, RedisCommands.ZLEXCOUNT, getName(), fromValue, "+"); public RFuture<Integer> get() {
return instance.countTailAsync(fromElement, fromInclusive);
}
});
} }
@Override @Override
public Publisher<Integer> lexCountHead(String toElement, boolean toInclusive) { public Publisher<Integer> countHead(final String toElement, final boolean toInclusive) {
String toValue = value(toElement, toInclusive); return reactive(new Supplier<RFuture<Integer>>() {
@Override
return commandExecutor.readReactive(getName(), StringCodec.INSTANCE, RedisCommands.ZLEXCOUNT, getName(), "-", toValue); public RFuture<Integer> get() {
return instance.countHeadAsync(toElement, toInclusive);
}
});
} }
@Override @Override
public Publisher<Integer> lexCount(String fromElement, boolean fromInclusive, String toElement, boolean toInclusive) { public Publisher<Integer> count(final String fromElement, final boolean fromInclusive, final String toElement, final boolean toInclusive) {
String fromValue = value(fromElement, fromInclusive); return reactive(new Supplier<RFuture<Integer>>() {
String toValue = value(toElement, toInclusive); @Override
public RFuture<Integer> get() {
return commandExecutor.readReactive(getName(), StringCodec.INSTANCE, RedisCommands.ZLEXCOUNT, getName(), fromValue, toValue); return instance.countAsync(fromElement, fromInclusive, toElement, toInclusive);
} }
});
private String value(String fromElement, boolean fromInclusive) {
String fromValue = fromElement.toString();
if (fromInclusive) {
fromValue = "[" + fromValue;
} else {
fromValue = "(" + fromValue;
}
return fromValue;
} }
@Override @Override
public Publisher<Integer> add(String e) { public Publisher<Integer> add(final String e) {
return commandExecutor.writeReactive(getName(), StringCodec.INSTANCE, RedisCommands.ZADD_RAW, getName(), 0, e); return commandExecutor.writeReactive(getName(), StringCodec.INSTANCE, RedisCommands.ZADD_INT, getName(), 0, e);
} }
@Override @Override
@ -146,7 +181,12 @@ public class RedissonLexSortedSetReactive extends RedissonScoredSortedSetReactiv
params.add(0); params.add(0);
params.add(param); params.add(param);
} }
return commandExecutor.writeReactive(getName(), StringCodec.INSTANCE, RedisCommands.ZADD_RAW, getName(), params.toArray()); return commandExecutor.writeReactive(getName(), StringCodec.INSTANCE, RedisCommands.ZADD_INT, getName(), params.toArray());
}
@Override
public Publisher<Collection<String>> range(int startIndex, int endIndex) {
return valueRange(startIndex, endIndex);
} }
} }

Write Preview
Loading…
Cancel
Save