Fixed empty result handling for RGeo.radiusStoreTo methods

redisson · May 8, 2017 · f54c462 · f54c462
1 parent e544b8a
commit f54c462
Show file tree

Hide file tree

Showing 37 changed files with 245 additions and 33 deletions.
diff --git a/redisson/src/main/java/org/redisson/RedissonGeo.java b/redisson/src/main/java/org/redisson/RedissonGeo.java
@@ -407,63 +407,63 @@ public RFuture<Map<V, GeoPosition>> radiusWithPositionAsync(V member, double rad
     }
 
 	@Override
-	public int radiusStoreTo(String destName, double longitude, double latitude, double radius, GeoUnit geoUnit) {
+	public long radiusStoreTo(String destName, double longitude, double latitude, double radius, GeoUnit geoUnit) {
 		return get(radiusStoreToAsync(destName, longitude, latitude, radius, geoUnit));
 	}
 
 	@Override
-	public RFuture<Integer> radiusStoreToAsync(String destName, double longitude, double latitude, double radius, GeoUnit geoUnit) {
+	public RFuture<Long> radiusStoreToAsync(String destName, double longitude, double latitude, double radius, GeoUnit geoUnit) {
-        return commandExecutor.writeAsync(getName(), LongCodec.INSTANCE, RedisCommands.GEORADIUS_STORE_INT, getName(), convert(longitude), convert(latitude), radius, geoUnit, "STORE", destName);
+        return commandExecutor.writeAsync(getName(), LongCodec.INSTANCE, RedisCommands.GEORADIUS_STORE, getName(), convert(longitude), convert(latitude), radius, geoUnit, "STORE", destName);
 	}
 
 	@Override
-	public int radiusStoreTo(String destName, double longitude, double latitude, double radius, GeoUnit geoUnit, int count) {
+	public long radiusStoreTo(String destName, double longitude, double latitude, double radius, GeoUnit geoUnit, int count) {
 		return get(radiusStoreToAsync(destName, longitude, latitude, radius, geoUnit, count));
 	}
 
 	@Override
-	public RFuture<Integer> radiusStoreToAsync(String destName, double longitude, double latitude, double radius, GeoUnit geoUnit, int count) {
+	public RFuture<Long> radiusStoreToAsync(String destName, double longitude, double latitude, double radius, GeoUnit geoUnit, int count) {
-        return commandExecutor.writeAsync(getName(), LongCodec.INSTANCE, RedisCommands.GEORADIUS_STORE_INT, getName(), convert(longitude), convert(latitude), radius, geoUnit, "COUNT", count, "STORE", destName);
+        return commandExecutor.writeAsync(getName(), LongCodec.INSTANCE, RedisCommands.GEORADIUS_STORE, getName(), convert(longitude), convert(latitude), radius, geoUnit, "COUNT", count, "STORE", destName);
 	}
 
 	@Override
-	public int radiusStoreTo(String destName, double longitude, double latitude, double radius, GeoUnit geoUnit, GeoOrder geoOrder, int count) {
+	public long radiusStoreTo(String destName, double longitude, double latitude, double radius, GeoUnit geoUnit, GeoOrder geoOrder, int count) {
 		return get(radiusStoreToAsync(destName, longitude, latitude, radius, geoUnit, geoOrder, count));
 	}
 
 	@Override
-	public RFuture<Integer> radiusStoreToAsync(String destName, double longitude, double latitude, double radius, GeoUnit geoUnit, GeoOrder geoOrder, int count) {
+	public RFuture<Long> radiusStoreToAsync(String destName, double longitude, double latitude, double radius, GeoUnit geoUnit, GeoOrder geoOrder, int count) {
-        return commandExecutor.writeAsync(getName(), LongCodec.INSTANCE, RedisCommands.GEORADIUS_STORE_INT, getName(), convert(longitude), convert(latitude), radius, geoUnit, geoOrder, "COUNT", count, "STORE", destName);
+        return commandExecutor.writeAsync(getName(), LongCodec.INSTANCE, RedisCommands.GEORADIUS_STORE, getName(), convert(longitude), convert(latitude), radius, geoUnit, geoOrder, "COUNT", count, "STORE", destName);
 	}
 
 	@Override
-	public int radiusStoreTo(String destName, V member, double radius, GeoUnit geoUnit) {
+	public long radiusStoreTo(String destName, V member, double radius, GeoUnit geoUnit) {
 		return get(radiusStoreToAsync(destName, member, radius, geoUnit));
 	}
 
 	@Override
-	public RFuture<Integer> radiusStoreToAsync(String destName, V member, double radius, GeoUnit geoUnit) {
+	public RFuture<Long> radiusStoreToAsync(String destName, V member, double radius, GeoUnit geoUnit) {
-        return commandExecutor.writeAsync(getName(), codec, RedisCommands.GEORADIUSBYMEMBER_STORE_INT, getName(), member, radius, geoUnit, "STORE", destName);
+        return commandExecutor.writeAsync(getName(), codec, RedisCommands.GEORADIUSBYMEMBER_STORE, getName(), member, radius, geoUnit, "STORE", destName);
 	}
 
 	@Override
-	public int radiusStoreTo(String destName, V member, double radius, GeoUnit geoUnit, int count) {
+	public long radiusStoreTo(String destName, V member, double radius, GeoUnit geoUnit, int count) {
 		return get(radiusStoreToAsync(destName, member, radius, geoUnit, count));
 	}
 
 	@Override
-	public RFuture<Integer> radiusStoreToAsync(String destName, V member, double radius, GeoUnit geoUnit, int count) {
+	public RFuture<Long> radiusStoreToAsync(String destName, V member, double radius, GeoUnit geoUnit, int count) {
-        return commandExecutor.writeAsync(getName(), codec, RedisCommands.GEORADIUSBYMEMBER_STORE_INT, getName(), member, radius, geoUnit, "COUNT", count, "STORE", destName);
+        return commandExecutor.writeAsync(getName(), codec, RedisCommands.GEORADIUSBYMEMBER_STORE, getName(), member, radius, geoUnit, "COUNT", count, "STORE", destName);
 	}
 
 	@Override
-	public int radiusStoreTo(String destName, V member, double radius, GeoUnit geoUnit, GeoOrder geoOrder, int count) {
+	public long radiusStoreTo(String destName, V member, double radius, GeoUnit geoUnit, GeoOrder geoOrder, int count) {
         return get(radiusStoreToAsync(destName, member, radius, geoUnit, geoOrder, count));
 	}
 
 	@Override
-	public RFuture<Integer> radiusStoreToAsync(String destName, V member, double radius, GeoUnit geoUnit, GeoOrder geoOrder, int count) {
+	public RFuture<Long> radiusStoreToAsync(String destName, V member, double radius, GeoUnit geoUnit, GeoOrder geoOrder, int count) {
-        return commandExecutor.writeAsync(getName(), codec, RedisCommands.GEORADIUSBYMEMBER_STORE_INT, getName(), member, radius, geoUnit, geoOrder, "COUNT", count, "STORE", destName);
+        return commandExecutor.writeAsync(getName(), codec, RedisCommands.GEORADIUSBYMEMBER_STORE, getName(), member, radius, geoUnit, geoOrder, "COUNT", count, "STORE", destName);
 	}
 
 }
diff --git a/redisson/src/main/java/org/redisson/api/RGeo.java b/redisson/src/main/java/org/redisson/api/RGeo.java
@@ -459,7 +459,7 @@ public interface RGeo<V> extends RScoredSortedSet<V>, RGeoAsync<V> {
      * @param geoUnit - geo unit
      * @return length of result
      */
-    int radiusStoreTo(String destName, double longitude, double latitude, double radius, GeoUnit geoUnit);
+    long radiusStoreTo(String destName, double longitude, double latitude, double radius, GeoUnit geoUnit);
 
     /**
      * Finds the members of a sorted set, which are within the 
@@ -476,7 +476,7 @@ public interface RGeo<V> extends RScoredSortedSet<V>, RGeoAsync<V> {
      * @param count - result limit
      * @return length of result
      */
-    int radiusStoreTo(String destName, double longitude, double latitude, double radius, GeoUnit geoUnit, int count);
+    long radiusStoreTo(String destName, double longitude, double latitude, double radius, GeoUnit geoUnit, int count);
 
     /**
      * Finds the members of a sorted set, which are within the 
@@ -495,7 +495,7 @@ public interface RGeo<V> extends RScoredSortedSet<V>, RGeoAsync<V> {
      * @param count - result limit
      * @return length of result
      */
-    int radiusStoreTo(String destName, double longitude, double latitude, double radius, GeoUnit geoUnit, GeoOrder geoOrder, int count);
+    long radiusStoreTo(String destName, double longitude, double latitude, double radius, GeoUnit geoUnit, GeoOrder geoOrder, int count);
 
     /**
      * Finds the members of a sorted set, which are within the 
@@ -510,7 +510,7 @@ public interface RGeo<V> extends RScoredSortedSet<V>, RGeoAsync<V> {
      * @param geoUnit - geo unit
      * @return length of result
      */
-    int radiusStoreTo(String destName, V member, double radius, GeoUnit geoUnit);
+    long radiusStoreTo(String destName, V member, double radius, GeoUnit geoUnit);
 
     /**
      * Finds the members of a sorted set, which are within the 
@@ -526,7 +526,7 @@ public interface RGeo<V> extends RScoredSortedSet<V>, RGeoAsync<V> {
      * @param count - result limit
      * @return length of result
      */
-    int radiusStoreTo(String destName, V member, double radius, GeoUnit geoUnit, int count);
+    long radiusStoreTo(String destName, V member, double radius, GeoUnit geoUnit, int count);
 
     /**
      * Finds the members of a sorted set, which are within the 
@@ -543,6 +543,6 @@ public interface RGeo<V> extends RScoredSortedSet<V>, RGeoAsync<V> {
      * @param count - result limit
      * @return length of result
      */
-    int radiusStoreTo(String destName, V member, double radius, GeoUnit geoUnit, GeoOrder geoOrder, int count);
+    long radiusStoreTo(String destName, V member, double radius, GeoUnit geoUnit, GeoOrder geoOrder, int count);
 
 }
diff --git a/redisson/src/main/java/org/redisson/api/RGeoAsync.java b/redisson/src/main/java/org/redisson/api/RGeoAsync.java
@@ -457,7 +457,7 @@ public interface RGeoAsync<V> extends RScoredSortedSetAsync<V> {
      * @param geoUnit - geo unit
      * @return length of result
      */
-    RFuture<Integer> radiusStoreToAsync(String destName, double longitude, double latitude, double radius, GeoUnit geoUnit);
+    RFuture<Long> radiusStoreToAsync(String destName, double longitude, double latitude, double radius, GeoUnit geoUnit);
 
     /**
      * Finds the members of a sorted set, which are within the 
@@ -474,7 +474,7 @@ public interface RGeoAsync<V> extends RScoredSortedSetAsync<V> {
      * @param count - result limit
      * @return length of result
      */
-    RFuture<Integer> radiusStoreToAsync(String destName, double longitude, double latitude, double radius, GeoUnit geoUnit, int count);
+    RFuture<Long> radiusStoreToAsync(String destName, double longitude, double latitude, double radius, GeoUnit geoUnit, int count);
 
     /**
      * Finds the members of a sorted set, which are within the 
@@ -493,7 +493,7 @@ public interface RGeoAsync<V> extends RScoredSortedSetAsync<V> {
      * @param count - result limit
      * @return length of result
      */
-    RFuture<Integer> radiusStoreToAsync(String destName, double longitude, double latitude, double radius, GeoUnit geoUnit, GeoOrder geoOrder, int count);
+    RFuture<Long> radiusStoreToAsync(String destName, double longitude, double latitude, double radius, GeoUnit geoUnit, GeoOrder geoOrder, int count);
 
     /**
      * Finds the members of a sorted set, which are within the 
@@ -508,7 +508,7 @@ public interface RGeoAsync<V> extends RScoredSortedSetAsync<V> {
      * @param geoUnit - geo unit
      * @return length of result
      */
-    RFuture<Integer> radiusStoreToAsync(String destName, V member, double radius, GeoUnit geoUnit);
+    RFuture<Long> radiusStoreToAsync(String destName, V member, double radius, GeoUnit geoUnit);
 
     /**
      * Finds the members of a sorted set, which are within the 
@@ -524,7 +524,7 @@ public interface RGeoAsync<V> extends RScoredSortedSetAsync<V> {
      * @param count - result limit
      * @return length of result
      */
-    RFuture<Integer> radiusStoreToAsync(String destName, V member, double radius, GeoUnit geoUnit, int count);
+    RFuture<Long> radiusStoreToAsync(String destName, V member, double radius, GeoUnit geoUnit, int count);
 
     /**
      * Finds the members of a sorted set, which are within the 
@@ -541,6 +541,6 @@ public interface RGeoAsync<V> extends RScoredSortedSetAsync<V> {
      * @param count - result limit
      * @return length of result
      */
-    RFuture<Integer> radiusStoreToAsync(String destName, V member, double radius, GeoUnit geoUnit, GeoOrder geoOrder, int count);
+    RFuture<Long> radiusStoreToAsync(String destName, V member, double radius, GeoUnit geoUnit, GeoOrder geoOrder, int count);
 
 }
diff --git a/redisson/src/main/java/org/redisson/client/protocol/RedisCommands.java b/redisson/src/main/java/org/redisson/client/protocol/RedisCommands.java
@@ -45,6 +45,8 @@
 import org.redisson.client.protocol.decoder.ListResultReplayDecoder;
 import org.redisson.client.protocol.decoder.ListScanResult;
 import org.redisson.client.protocol.decoder.ListScanResultReplayDecoder;
+import org.redisson.client.protocol.decoder.Long2MultiDecoder;
+import org.redisson.client.protocol.decoder.LongMultiDecoder;
 import org.redisson.client.protocol.decoder.MapScanResult;
 import org.redisson.client.protocol.decoder.MapScanResultReplayDecoder;
 import org.redisson.client.protocol.decoder.NestedMultiDecoder;
@@ -76,8 +78,8 @@ public interface RedisCommands {
     RedisCommand<Double> GEODIST = new RedisCommand<Double>("GEODIST", new DoubleReplayConvertor(), 2, Arrays.asList(ValueType.OBJECT, ValueType.OBJECT, ValueType.STRING));
     RedisCommand<List<Object>> GEORADIUS = new RedisCommand<List<Object>>("GEORADIUS", new ObjectListReplayDecoder<Object>());
     RedisCommand<List<Object>> GEORADIUSBYMEMBER = new RedisCommand<List<Object>>("GEORADIUSBYMEMBER", new ObjectListReplayDecoder<Object>(), 2);
-    RedisStrictCommand<Integer> GEORADIUS_STORE_INT = new RedisStrictCommand<Integer>("GEORADIUS", new IntegerReplayConvertor());
+    RedisCommand<Object> GEORADIUS_STORE = new RedisCommand<Object>("GEORADIUS", new Long2MultiDecoder());
-    RedisStrictCommand<Integer> GEORADIUSBYMEMBER_STORE_INT = new RedisStrictCommand<Integer>("GEORADIUSBYMEMBER", new IntegerReplayConvertor(), 2);
+    RedisCommand<Object> GEORADIUSBYMEMBER_STORE = new RedisCommand<Object>("GEORADIUSBYMEMBER", new Long2MultiDecoder(), 2);
 
     RedisStrictCommand<Integer> KEYSLOT = new RedisStrictCommand<Integer>("CLUSTER", "KEYSLOT", new IntegerReplayConvertor());
     RedisStrictCommand<RType> TYPE = new RedisStrictCommand<RType>("TYPE", new TypeConvertor());

diff --git a/redisson/src/main/java/org/redisson/client/protocol/decoder/DecoderState.java b/redisson/src/main/java/org/redisson/client/protocol/decoder/DecoderState.java
@@ -15,6 +15,11 @@
  */
 package org.redisson.client.protocol.decoder;
 
+/**
+ * 
+ * @author Nikita Koksharov
+ *
+ */
 public interface DecoderState {
 
     DecoderState copy();

diff --git a/redisson/src/main/java/org/redisson/client/protocol/decoder/GeoDistanceDecoder.java b/redisson/src/main/java/org/redisson/client/protocol/decoder/GeoDistanceDecoder.java
@@ -23,8 +23,12 @@
 import org.redisson.client.handler.State;
 
 import io.netty.buffer.ByteBuf;
-import io.netty.util.CharsetUtil;
 
+/**
+ * 
+ * @author Nikita Koksharov
+ *
+ */
 public class GeoDistanceDecoder implements MultiDecoder<List<Object>> {
 
     private final ThreadLocal<Integer> pos = new ThreadLocal<Integer>();

diff --git a/redisson/src/main/java/org/redisson/client/protocol/decoder/GeoDistanceMapDecoder.java b/redisson/src/main/java/org/redisson/client/protocol/decoder/GeoDistanceMapDecoder.java
@@ -26,6 +26,11 @@
 
 import io.netty.buffer.ByteBuf;
 
+/**
+ * 
+ * @author Nikita Koksharov
+ *
+ */
 public class GeoDistanceMapDecoder implements MultiDecoder<Map<Object, Object>> {
 
     private final ThreadLocal<Integer> pos = new ThreadLocal<Integer>();

diff --git a/redisson/src/main/java/org/redisson/client/protocol/decoder/GeoMapReplayDecoder.java b/redisson/src/main/java/org/redisson/client/protocol/decoder/GeoMapReplayDecoder.java
@@ -23,6 +23,11 @@
 
 import io.netty.buffer.ByteBuf;
 
+/**
+ * 
+ * @author Nikita Koksharov
+ *
+ */
 public class GeoMapReplayDecoder implements MultiDecoder<Map<Object, Object>> {
 
     @Override

diff --git a/redisson/src/main/java/org/redisson/client/protocol/decoder/GeoPositionDecoder.java b/redisson/src/main/java/org/redisson/client/protocol/decoder/GeoPositionDecoder.java
@@ -24,6 +24,11 @@
 
 import io.netty.buffer.ByteBuf;
 
+/**
+ * 
+ * @author Nikita Koksharov
+ *
+ */
 public class GeoPositionDecoder implements MultiDecoder<GeoPosition> {
 
     @Override

diff --git a/redisson/src/main/java/org/redisson/client/protocol/decoder/GeoPositionMapDecoder.java b/redisson/src/main/java/org/redisson/client/protocol/decoder/GeoPositionMapDecoder.java
@@ -25,6 +25,11 @@
 
 import io.netty.buffer.ByteBuf;
 
+/**
+ * 
+ * @author Nikita Koksharov
+ *
+ */
 public class GeoPositionMapDecoder implements MultiDecoder<Map<Object, Object>> {
 
     private final List<Object> args;

diff --git a/redisson/src/main/java/org/redisson/client/protocol/decoder/KeyValueMessage.java b/redisson/src/main/java/org/redisson/client/protocol/decoder/KeyValueMessage.java
@@ -15,6 +15,13 @@
  */
 package org.redisson.client.protocol.decoder;
 
+/**
+ * 
+ * @author Nikita Koksharov
+ *
+ * @param <K> key type
+ * @param <V> value type
+ */
 public class KeyValueMessage<K, V> {
 
     private K key;

diff --git a/redisson/src/main/java/org/redisson/client/protocol/decoder/KeyValueObjectDecoder.java b/redisson/src/main/java/org/redisson/client/protocol/decoder/KeyValueObjectDecoder.java
@@ -22,6 +22,11 @@
 import io.netty.buffer.ByteBuf;
 import io.netty.util.CharsetUtil;
 
+/**
+ * 
+ * @author Nikita Koksharov
+ *
+ */
 public class KeyValueObjectDecoder implements MultiDecoder<Object> {
 
     @Override

diff --git a/redisson/src/main/java/org/redisson/client/protocol/decoder/ListFirstObjectDecoder.java b/redisson/src/main/java/org/redisson/client/protocol/decoder/ListFirstObjectDecoder.java
@@ -21,6 +21,11 @@
 
 import io.netty.buffer.ByteBuf;
 
+/**
+ * 
+ * @author Nikita Koksharov
+ *
+ */
 public class ListFirstObjectDecoder implements MultiDecoder<Object> {
 
     @Override

diff --git a/redisson/src/main/java/org/redisson/client/protocol/decoder/ListIteratorReplayDecoder.java b/redisson/src/main/java/org/redisson/client/protocol/decoder/ListIteratorReplayDecoder.java
@@ -21,6 +21,11 @@
 
 import io.netty.buffer.ByteBuf;
 
+/**
+ * 
+ * @author Nikita Koksharov
+ *
+ */
 public class ListIteratorReplayDecoder implements MultiDecoder<ListIteratorResult<Object>> {
 
     @Override

diff --git a/redisson/src/main/java/org/redisson/client/protocol/decoder/ListIteratorResult.java b/redisson/src/main/java/org/redisson/client/protocol/decoder/ListIteratorResult.java
@@ -15,6 +15,12 @@
  */
 package org.redisson.client.protocol.decoder;
 
+/**
+ * 
+ * @author Nikita Koksharov
+ *
+ * @param <V> value type
+ */
 public class ListIteratorResult<V> {
 
     private final V element;

diff --git a/redisson/src/main/java/org/redisson/client/protocol/decoder/ListMultiDecoder.java b/redisson/src/main/java/org/redisson/client/protocol/decoder/ListMultiDecoder.java
@@ -22,6 +22,12 @@
 
 import io.netty.buffer.ByteBuf;
 
+/**
+ * 
+ * @author Nikita Koksharov
+ *
+ * @param <T> type
+ */
 public class ListMultiDecoder<T> implements MultiDecoder<Object> {
 
     private final MultiDecoder<?>[] decoders;

diff --git a/redisson/src/main/java/org/redisson/client/protocol/decoder/ListResultReplayDecoder.java b/redisson/src/main/java/org/redisson/client/protocol/decoder/ListResultReplayDecoder.java
@@ -24,6 +24,11 @@
 import io.netty.buffer.ByteBuf;
 import io.netty.util.CharsetUtil;
 
+/**
+ * 
+ * @author Nikita Koksharov
+ *
+ */
 public class ListResultReplayDecoder implements MultiDecoder<List<Map<Object, Object>>> {
 
     @Override

diff --git a/redisson/src/main/java/org/redisson/client/protocol/decoder/ListScanResult.java b/redisson/src/main/java/org/redisson/client/protocol/decoder/ListScanResult.java
@@ -20,6 +20,12 @@
 
 import org.redisson.RedisClientResult;
 
+/**
+ * 
+ * @author Nikita Koksharov
+ *
+ * @param <V> value type
+ */
 public class ListScanResult<V> implements RedisClientResult {
 
     private final Long pos;

diff --git a/redisson/src/main/java/org/redisson/client/protocol/decoder/ListScanResultReplayDecoder.java b/redisson/src/main/java/org/redisson/client/protocol/decoder/ListScanResultReplayDecoder.java
@@ -22,6 +22,11 @@
 import io.netty.buffer.ByteBuf;
 import io.netty.util.CharsetUtil;
 
+/**
+ * 
+ * @author Nikita Koksharov
+ *
+ */
 public class ListScanResultReplayDecoder implements MultiDecoder<ListScanResult<Object>> {
 
     @Override