From 2fe0290a0893f70775e6595bd8292adb09b8d6a6 Mon Sep 17 00:00:00 2001 From: Nikita Date: Mon, 14 Sep 2015 21:14:31 +0300 Subject: [PATCH] first and last methods added. #143 --- .../org/redisson/RedissonScoredSortedSet.java | 16 ++++++++ .../client/protocol/RedisCommands.java | 2 + .../ObjectFirstResultReplayDecoder.java | 41 +++++++++++++++++++ .../org/redisson/core/RScoredSortedSet.java | 4 ++ .../redisson/core/RScoredSortedSetAsync.java | 4 ++ .../redisson/RedissonScoredSortedSetTest.java | 13 ++++++ 6 files changed, 80 insertions(+) create mode 100644 src/main/java/org/redisson/client/protocol/decoder/ObjectFirstResultReplayDecoder.java diff --git a/src/main/java/org/redisson/RedissonScoredSortedSet.java b/src/main/java/org/redisson/RedissonScoredSortedSet.java index 904b5b48c..37dce78d9 100644 --- a/src/main/java/org/redisson/RedissonScoredSortedSet.java +++ b/src/main/java/org/redisson/RedissonScoredSortedSet.java @@ -49,6 +49,22 @@ public class RedissonScoredSortedSet extends RedissonExpirable implements RSc return get(addAsync(score, object)); } + public V first() { + return get(firstAsync()); + } + + public Future firstAsync() { + return commandExecutor.readAsync(getName(), codec, RedisCommands.ZRANGE_SINGLE, getName(), 0, 0); + } + + public V last() { + return get(lastAsync()); + } + + public Future lastAsync() { + return commandExecutor.readAsync(getName(), codec, RedisCommands.ZRANGE_SINGLE, getName(), -1, -1); + } + @Override public Future addAsync(double score, V object) { return commandExecutor.writeAsync(getName(), codec, RedisCommands.ZADD, getName(), BigDecimal.valueOf(score).toPlainString(), object); diff --git a/src/main/java/org/redisson/client/protocol/RedisCommands.java b/src/main/java/org/redisson/client/protocol/RedisCommands.java index b937264ca..ce3100456 100644 --- a/src/main/java/org/redisson/client/protocol/RedisCommands.java +++ b/src/main/java/org/redisson/client/protocol/RedisCommands.java @@ -34,6 +34,7 @@ import org.redisson.client.protocol.decoder.ListScanResultReplayDecoder; import org.redisson.client.protocol.decoder.MapScanResult; import org.redisson.client.protocol.decoder.MapScanResultReplayDecoder; import org.redisson.client.protocol.decoder.NestedMultiDecoder; +import org.redisson.client.protocol.decoder.ObjectFirstResultReplayDecoder; import org.redisson.client.protocol.decoder.ObjectListReplayDecoder; import org.redisson.client.protocol.decoder.ObjectMapReplayDecoder; import org.redisson.client.protocol.decoder.ObjectSetReplayDecoder; @@ -55,6 +56,7 @@ public interface RedisCommands { RedisCommand ZSCORE_CONTAINS = new RedisCommand("ZSCORE", new BooleanNotNullReplayConvertor(), 2); RedisStrictCommand ZSCORE = new RedisStrictCommand("ZSCORE", new DoubleReplayConvertor()); RedisCommand ZRANK = new RedisCommand("ZRANK", new IntegerReplayConvertor(), 2); + RedisCommand ZRANGE_SINGLE = new RedisCommand("ZRANGE", new ObjectFirstResultReplayDecoder()); RedisCommand> ZRANGE = new RedisCommand>("ZRANGE", new ObjectListReplayDecoder()); RedisStrictCommand ZREMRANGEBYRANK = new RedisStrictCommand("ZREMRANGEBYRANK", new IntegerReplayConvertor()); RedisStrictCommand ZREMRANGEBYSCORE = new RedisStrictCommand("ZREMRANGEBYSCORE", new IntegerReplayConvertor()); diff --git a/src/main/java/org/redisson/client/protocol/decoder/ObjectFirstResultReplayDecoder.java b/src/main/java/org/redisson/client/protocol/decoder/ObjectFirstResultReplayDecoder.java new file mode 100644 index 000000000..a022ff52c --- /dev/null +++ b/src/main/java/org/redisson/client/protocol/decoder/ObjectFirstResultReplayDecoder.java @@ -0,0 +1,41 @@ +/** + * Copyright 2014 Nikita Koksharov, Nickolay Borbit + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.redisson.client.protocol.decoder; + +import java.util.List; + +import org.redisson.client.handler.State; + +import io.netty.buffer.ByteBuf; + +public class ObjectFirstResultReplayDecoder implements MultiDecoder { + + @Override + public Object decode(ByteBuf buf, State state) { + throw new UnsupportedOperationException(); + } + + @Override + public T decode(List parts, State state) { + return (T) parts.get(0); + } + + @Override + public boolean isApplicable(int paramNum, State state) { + return false; + } + +} diff --git a/src/main/java/org/redisson/core/RScoredSortedSet.java b/src/main/java/org/redisson/core/RScoredSortedSet.java index a3796b7c7..3f51debde 100644 --- a/src/main/java/org/redisson/core/RScoredSortedSet.java +++ b/src/main/java/org/redisson/core/RScoredSortedSet.java @@ -21,6 +21,10 @@ import org.redisson.client.protocol.ScoredEntry; public interface RScoredSortedSet extends RScoredSortedSetAsync, Iterable, RExpirable { + V first(); + + V last(); + int removeRangeByScore(double startScore, boolean startScoreInclusive, double endScore, boolean endScoreInclusive); int removeRangeByRank(int startIndex, int endIndex); diff --git a/src/main/java/org/redisson/core/RScoredSortedSetAsync.java b/src/main/java/org/redisson/core/RScoredSortedSetAsync.java index ba9776188..067dc1dd3 100644 --- a/src/main/java/org/redisson/core/RScoredSortedSetAsync.java +++ b/src/main/java/org/redisson/core/RScoredSortedSetAsync.java @@ -23,6 +23,10 @@ import io.netty.util.concurrent.Future; public interface RScoredSortedSetAsync extends RExpirableAsync { + Future firstAsync(); + + Future lastAsync(); + Future removeRangeByRankAsync(int startIndex, int endIndex); Future rankAsync(V o); diff --git a/src/test/java/org/redisson/RedissonScoredSortedSetTest.java b/src/test/java/org/redisson/RedissonScoredSortedSetTest.java index 9f0f90f6d..9ee92e651 100644 --- a/src/test/java/org/redisson/RedissonScoredSortedSetTest.java +++ b/src/test/java/org/redisson/RedissonScoredSortedSetTest.java @@ -21,6 +21,19 @@ import io.netty.util.concurrent.Future; public class RedissonScoredSortedSetTest extends BaseTest { + @Test + public void testFirstLast() { + RScoredSortedSet set = redisson.getScoredSortedSet("simple"); + set.add(0.1, "a"); + set.add(0.2, "b"); + set.add(0.3, "c"); + set.add(0.4, "d"); + + Assert.assertEquals("a", set.first()); + Assert.assertEquals("d", set.last()); + } + + @Test public void testRemoveRangeByScore() { RScoredSortedSet set = redisson.getScoredSortedSet("simple");