Fixed - RGeo.pos throws ClassCastException #1837

redisson/src/main/java/org/redisson/RedissonGeo.java

@@ -55,6 +55,10 @@ public class RedissonGeo<V> extends RedissonScoredSortedSet<V> implements RGeo<V
 
     private static final MultiDecoder<Map<Object, Object>> postitionDecoder = new ListMultiDecoder(new CodecDecoder(), new GeoPositionDecoder(), new ObjectListReplayDecoder(ListMultiDecoder.RESET), new GeoMapReplayDecoder());
     private static final MultiDecoder<Map<Object, Object>> distanceDecoder = new ListMultiDecoder(new GeoDistanceDecoder(), new GeoMapReplayDecoder());
+    private static final RedisCommand<Map<Object, Object>> GEORADIUS_RO_DISTANCE = new RedisCommand<Map<Object, Object>>("GEORADIUS_RO", distanceDecoder);
+    private static final RedisCommand<Map<Object, Object>> GEORADIUS_RO_POS = new RedisCommand<Map<Object, Object>>("GEORADIUS_RO", postitionDecoder);
+    private static final RedisCommand<Map<Object, Object>> GEORADIUSBYMEMBER_RO_DISTANCE = new RedisCommand<Map<Object, Object>>("GEORADIUSBYMEMBER_RO", distanceDecoder);
+    private static final RedisCommand<Map<Object, Object>> GEORADIUSBYMEMBER_RO_POS = new RedisCommand<Map<Object, Object>>("GEORADIUSBYMEMBER_RO", postitionDecoder);
     
     public RedissonGeo(CommandAsyncExecutor connectionManager, String name, RedissonClient redisson) {
         super(connectionManager, name, redisson);
@@ -134,7 +138,9 @@ public class RedissonGeo<V> extends RedissonScoredSortedSet<V> implements RGeo<V
             params.add(encode(member));
         }
         
-        MultiDecoder<Map<Object, Object>> decoder = new ListMultiDecoder(new GeoPositionDecoder(), new ObjectListReplayDecoder(ListMultiDecoder.RESET), new GeoPositionMapDecoder((List<Object>)Arrays.asList(members)));
+        MultiDecoder<Map<Object, Object>> decoder = new ListMultiDecoder(0, new GeoPositionDecoder(), 
+//                new ObjectListReplayDecoder(ListMultiDecoder.RESET), 
+                new GeoPositionMapDecoder((List<Object>)Arrays.asList(members)));
         RedisCommand<Map<Object, Object>> command = new RedisCommand<Map<Object, Object>>("GEOPOS", decoder);
         return commandExecutor.readAsync(getName(), StringCodec.INSTANCE, command, params.toArray());
     }
@@ -189,8 +195,7 @@ public class RedissonGeo<V> extends RedissonScoredSortedSet<V> implements RGeo<V
     
     @Override
     public RFuture<Map<V, Double>> radiusWithDistanceAsync(double longitude, double latitude, double radius, GeoUnit geoUnit) {
-        RedisCommand<Map<Object, Object>> command = new RedisCommand<Map<Object, Object>>("GEORADIUS_RO", distanceDecoder);
-        return commandExecutor.readAsync(getName(), codec, command, getName(), convert(longitude), convert(latitude), 
+        return commandExecutor.readAsync(getName(), codec, GEORADIUS_RO_DISTANCE, getName(), convert(longitude), convert(latitude), 
                 radius, geoUnit, "WITHDIST");
     }
     
@@ -201,8 +206,7 @@ public class RedissonGeo<V> extends RedissonScoredSortedSet<V> implements RGeo<V
     
     @Override
     public RFuture<Map<V, Double>> radiusWithDistanceAsync(double longitude, double latitude, double radius, GeoUnit geoUnit, int count) {
-        RedisCommand<Map<Object, Object>> command = new RedisCommand<Map<Object, Object>>("GEORADIUS_RO", distanceDecoder);
-        return commandExecutor.readAsync(getName(), codec, command, getName(), convert(longitude), convert(latitude), 
+        return commandExecutor.readAsync(getName(), codec, GEORADIUS_RO_DISTANCE, getName(), convert(longitude), convert(latitude), 
                 radius, geoUnit, "WITHDIST", "COUNT", count);
     }
 
@@ -213,8 +217,7 @@ public class RedissonGeo<V> extends RedissonScoredSortedSet<V> implements RGeo<V
     
     @Override
     public RFuture<Map<V, Double>> radiusWithDistanceAsync(double longitude, double latitude, double radius, GeoUnit geoUnit, GeoOrder geoOrder) {
-        RedisCommand<Map<Object, Object>> command = new RedisCommand<Map<Object, Object>>("GEORADIUS_RO", distanceDecoder);
-        return commandExecutor.readAsync(getName(), codec, command, getName(), convert(longitude), convert(latitude), 
+        return commandExecutor.readAsync(getName(), codec, GEORADIUS_RO_DISTANCE, getName(), convert(longitude), convert(latitude), 
                 radius, geoUnit, "WITHDIST", geoOrder);
     }
     
@@ -225,8 +228,7 @@ public class RedissonGeo<V> extends RedissonScoredSortedSet<V> implements RGeo<V
 
     @Override
     public RFuture<Map<V, Double>> radiusWithDistanceAsync(double longitude, double latitude, double radius, GeoUnit geoUnit, GeoOrder geoOrder, int count) {
-        RedisCommand<Map<Object, Object>> command = new RedisCommand<Map<Object, Object>>("GEORADIUS_RO", distanceDecoder);
-        return commandExecutor.readAsync(getName(), codec, command, getName(), convert(longitude), convert(latitude), 
+        return commandExecutor.readAsync(getName(), codec, GEORADIUS_RO_DISTANCE, getName(), convert(longitude), convert(latitude), 
                 radius, geoUnit, "WITHDIST", "COUNT", count, geoOrder);
     }
 
@@ -237,8 +239,7 @@ public class RedissonGeo<V> extends RedissonScoredSortedSet<V> implements RGeo<V
     
     @Override
     public RFuture<Map<V, GeoPosition>> radiusWithPositionAsync(double longitude, double latitude, double radius, GeoUnit geoUnit) {
-        RedisCommand<Map<Object, Object>> command = new RedisCommand<Map<Object, Object>>("GEORADIUS_RO", postitionDecoder);
-        return commandExecutor.readAsync(getName(), codec, command, getName(), convert(longitude), convert(latitude), radius, geoUnit, "WITHCOORD");
+        return commandExecutor.readAsync(getName(), codec, GEORADIUS_RO_POS, getName(), convert(longitude), convert(latitude), radius, geoUnit, "WITHCOORD");
     }
     
     @Override
@@ -248,8 +249,7 @@ public class RedissonGeo<V> extends RedissonScoredSortedSet<V> implements RGeo<V
     
     @Override
     public RFuture<Map<V, GeoPosition>> radiusWithPositionAsync(double longitude, double latitude, double radius, GeoUnit geoUnit, int count) {
-        RedisCommand<Map<Object, Object>> command = new RedisCommand<Map<Object, Object>>("GEORADIUS_RO", postitionDecoder);
-        return commandExecutor.readAsync(getName(), codec, command, getName(), convert(longitude), convert(latitude), 
+        return commandExecutor.readAsync(getName(), codec, GEORADIUS_RO_POS, getName(), convert(longitude), convert(latitude), 
                 radius, geoUnit, "WITHCOORD", "COUNT", count);
     }
     
@@ -260,8 +260,7 @@ public class RedissonGeo<V> extends RedissonScoredSortedSet<V> implements RGeo<V
     
     @Override
     public RFuture<Map<V, GeoPosition>> radiusWithPositionAsync(double longitude, double latitude, double radius, GeoUnit geoUnit, GeoOrder geoOrder) {
-        RedisCommand<Map<Object, Object>> command = new RedisCommand<Map<Object, Object>>("GEORADIUS_RO", postitionDecoder);
-        return commandExecutor.readAsync(getName(), codec, command, getName(), convert(longitude), convert(latitude), 
+        return commandExecutor.readAsync(getName(), codec, GEORADIUS_RO_POS, getName(), convert(longitude), convert(latitude), 
                 radius, geoUnit, "WITHCOORD", geoOrder);
     }
 
@@ -272,8 +271,7 @@ public class RedissonGeo<V> extends RedissonScoredSortedSet<V> implements RGeo<V
     
     @Override
     public RFuture<Map<V, GeoPosition>> radiusWithPositionAsync(double longitude, double latitude, double radius, GeoUnit geoUnit, GeoOrder geoOrder, int count) {
-        RedisCommand<Map<Object, Object>> command = new RedisCommand<Map<Object, Object>>("GEORADIUS_RO", postitionDecoder);
-        return commandExecutor.readAsync(getName(), codec, command, getName(), convert(longitude), convert(latitude), 
+        return commandExecutor.readAsync(getName(), codec, GEORADIUS_RO_POS, getName(), convert(longitude), convert(latitude), 
                 radius, geoUnit, "WITHCOORD", "COUNT", count, geoOrder);
     }
 
@@ -324,8 +322,7 @@ public class RedissonGeo<V> extends RedissonScoredSortedSet<V> implements RGeo<V
     
     @Override
     public RFuture<Map<V, Double>> radiusWithDistanceAsync(V member, double radius, GeoUnit geoUnit) {
-        RedisCommand command = new RedisCommand("GEORADIUSBYMEMBER_RO", distanceDecoder);
-        return commandExecutor.readAsync(getName(), codec, command, getName(), encode(member), radius, geoUnit, "WITHDIST");
+        return commandExecutor.readAsync(getName(), codec, GEORADIUSBYMEMBER_RO_DISTANCE, getName(), encode(member), radius, geoUnit, "WITHDIST");
     }
 
     @Override
@@ -335,8 +332,7 @@ public class RedissonGeo<V> extends RedissonScoredSortedSet<V> implements RGeo<V
     
     @Override
     public RFuture<Map<V, Double>> radiusWithDistanceAsync(V member, double radius, GeoUnit geoUnit, int count) {
-        RedisCommand command = new RedisCommand("GEORADIUSBYMEMBER_RO", distanceDecoder);
-        return commandExecutor.readAsync(getName(), codec, command, getName(), encode(member), radius, geoUnit, "WITHDIST", "COUNT", count);
+        return commandExecutor.readAsync(getName(), codec, GEORADIUSBYMEMBER_RO_DISTANCE, getName(), encode(member), radius, geoUnit, "WITHDIST", "COUNT", count);
     }
 
     @Override
@@ -346,8 +342,7 @@ public class RedissonGeo<V> extends RedissonScoredSortedSet<V> implements RGeo<V
     
     @Override
     public RFuture<Map<V, Double>> radiusWithDistanceAsync(V member, double radius, GeoUnit geoUnit, GeoOrder geoOrder) {
-        RedisCommand command = new RedisCommand("GEORADIUSBYMEMBER_RO", distanceDecoder);
-        return commandExecutor.readAsync(getName(), codec, command, getName(), encode(member), radius, geoUnit, "WITHDIST", geoOrder);
+        return commandExecutor.readAsync(getName(), codec, GEORADIUSBYMEMBER_RO_DISTANCE, getName(), encode(member), radius, geoUnit, "WITHDIST", geoOrder);
     }
     
     @Override
@@ -357,8 +352,7 @@ public class RedissonGeo<V> extends RedissonScoredSortedSet<V> implements RGeo<V
     
     @Override
     public RFuture<Map<V, Double>> radiusWithDistanceAsync(V member, double radius, GeoUnit geoUnit, GeoOrder geoOrder, int count) {
-        RedisCommand command = new RedisCommand("GEORADIUSBYMEMBER_RO", distanceDecoder);
-        return commandExecutor.readAsync(getName(), codec, command, getName(), encode(member), radius, geoUnit, "WITHDIST", "COUNT", count, geoOrder);
+        return commandExecutor.readAsync(getName(), codec, GEORADIUSBYMEMBER_RO_DISTANCE, getName(), encode(member), radius, geoUnit, "WITHDIST", "COUNT", count, geoOrder);
     }
     
     @Override
@@ -368,8 +362,7 @@ public class RedissonGeo<V> extends RedissonScoredSortedSet<V> implements RGeo<V
     
     @Override
     public RFuture<Map<V, GeoPosition>> radiusWithPositionAsync(V member, double radius, GeoUnit geoUnit) {
-        RedisCommand<Map<Object, Object>> command = new RedisCommand<Map<Object, Object>>("GEORADIUSBYMEMBER_RO", postitionDecoder);
-        return commandExecutor.readAsync(getName(), codec, command, getName(), encode(member), radius, geoUnit, "WITHCOORD");
+        return commandExecutor.readAsync(getName(), codec, GEORADIUSBYMEMBER_RO_POS, getName(), encode(member), radius, geoUnit, "WITHCOORD");
     }
     
     @Override
@@ -379,8 +372,7 @@ public class RedissonGeo<V> extends RedissonScoredSortedSet<V> implements RGeo<V
     
     @Override
     public RFuture<Map<V, GeoPosition>> radiusWithPositionAsync(V member, double radius, GeoUnit geoUnit, int count) {
-        RedisCommand<Map<Object, Object>> command = new RedisCommand<Map<Object, Object>>("GEORADIUSBYMEMBER_RO", postitionDecoder);
-        return commandExecutor.readAsync(getName(), codec, command, getName(), encode(member), radius, geoUnit, "WITHCOORD", "COUNT", count);
+        return commandExecutor.readAsync(getName(), codec, GEORADIUSBYMEMBER_RO_POS, getName(), encode(member), radius, geoUnit, "WITHCOORD", "COUNT", count);
     }
 
     @Override
@@ -390,8 +382,7 @@ public class RedissonGeo<V> extends RedissonScoredSortedSet<V> implements RGeo<V
     
     @Override
     public RFuture<Map<V, GeoPosition>> radiusWithPositionAsync(V member, double radius, GeoUnit geoUnit, GeoOrder geoOrder) {
-        RedisCommand<Map<Object, Object>> command = new RedisCommand<Map<Object, Object>>("GEORADIUSBYMEMBER_RO", postitionDecoder);
-        return commandExecutor.readAsync(getName(), codec, command, getName(), encode(member), radius, geoUnit, "WITHCOORD", geoOrder);
+        return commandExecutor.readAsync(getName(), codec, GEORADIUSBYMEMBER_RO_POS, getName(), encode(member), radius, geoUnit, "WITHCOORD", geoOrder);
     }
     
     @Override
@@ -401,8 +392,7 @@ public class RedissonGeo<V> extends RedissonScoredSortedSet<V> implements RGeo<V
     
     @Override
     public RFuture<Map<V, GeoPosition>> radiusWithPositionAsync(V member, double radius, GeoUnit geoUnit, GeoOrder geoOrder, int count) {
-        RedisCommand<Map<Object, Object>> command = new RedisCommand<Map<Object, Object>>("GEORADIUSBYMEMBER_RO", postitionDecoder);
-        return commandExecutor.readAsync(getName(), codec, command, getName(), encode(member), radius, geoUnit, "WITHCOORD", "COUNT", count, geoOrder);
+        return commandExecutor.readAsync(getName(), codec, GEORADIUSBYMEMBER_RO_POS, getName(), encode(member), radius, geoUnit, "WITHCOORD", "COUNT", count, geoOrder);
     }
 
 	@Override

redisson/src/main/java/org/redisson/client/handler/CommandDecoder.java

@@ -340,8 +340,12 @@ public class CommandDecoder extends ReplayingDecoder<State> {
                 state().addLevel(lastLevel);
             }
             
+            state().incLevel();
+            
             decodeList(in, data, parts, ctx, size, respParts, skipConvertor);
             
+            state().decLevel();
+            
             if (state().isMakeCheckpoint()) {
                 if (lastLevel == state().getLastLevel() && lastLevel.isFull()) {
                     state().removeLastLevel();

redisson/src/main/java/org/redisson/client/handler/State.java

@@ -54,6 +54,14 @@ public class State {
         return levels.get(level);
     }
     
+    public void incLevel() {
+        level++;
+    }
+    
+    public void decLevel() {
+        level--;
+    }
+    
     public void addLevel(StateLevel stateLevel) {
         if (levels == null) {
             levels = new ArrayList<StateLevel>(2);

redisson/src/main/java/org/redisson/client/protocol/decoder/ListMultiDecoder.java

@@ -115,12 +115,23 @@ public class ListMultiDecoder<T> implements MultiDecoder<Object> {
     public ListMultiDecoder(MultiDecoder<?> ... decoders) {
         this.decoders = decoders;
     }
+    
+    private Integer fixedIndex;
+    
+    public ListMultiDecoder(Integer fixedIndex, MultiDecoder<?> ... decoders) {
+        this.fixedIndex = fixedIndex;
+        this.decoders = decoders;
+    }
 
     @Override
     public Decoder<Object> getDecoder(int paramNum, State state) {
         if (paramNum == 0) {
             NestedDecoderState s = getDecoder(state);
-            s.incIndex();
+            if (fixedIndex != null) {
+                s.setIndex(fixedIndex);
+            } else {
+                s.incIndex();
+            }
             s.resetPartsIndex();
         }
 
@@ -152,7 +163,11 @@ public class ListMultiDecoder<T> implements MultiDecoder<Object> {
         int index = s.getIndex();
         index += s.incPartsIndex();
         
-        if (index == -1) {
+        if (fixedIndex != null && parts.isEmpty()) {
+            s.resetPartsIndex();
+        }
+        
+        if (index == -1 || (fixedIndex != null && state.getLevel() == 0)) {
             return decoders[decoders.length-1].decode(parts, state);
         }
         

redisson/src/test/java/org/redisson/RedissonGeoTest.java

@@ -74,8 +74,46 @@ public class RedissonGeoTest extends BaseTest {
         
         assertThat(geo.hash("Palermo", "Catania")).isEmpty();
     }
+    
+    @Test
+    public void testPos4() {
+        RGeo<String> geo = redisson.getGeo("test");
+        geo.add(new GeoEntry(13.361389, 38.115556, "Palermo"), new GeoEntry(15.087269, 37.502669, "Catania"));
+        
+        Map<String, GeoPosition> expected = new LinkedHashMap<String, GeoPosition>();
+        expected.put("Palermo", new GeoPosition(13.361389338970184, 38.115556395496299));
+        expected.put("Catania", new GeoPosition(15.087267458438873, 37.50266842333162));
+        assertThat(geo.pos("Palermo", "Catania")).isEqualTo(expected);
+    }
 
+    @Test
+    public void testPos1() {
+        RGeo<String> geo = redisson.getGeo("test");
+        geo.add(0.123,0.893,"hi");
+        Map<String, GeoPosition> res = geo.pos("hi");
+        assertThat(res.get("hi").getLatitude()).isNotNull();
+        assertThat(res.get("hi").getLongitude()).isNotNull();
+    }
     
+    @Test
+    public void testPos3() {
+        RGeo<String> geo = redisson.getGeo("test");
+        geo.add(0.123,0.893,"hi");
+        Map<String, GeoPosition> res = geo.pos("hi", "123f", "sdfdsf");
+        assertThat(res.get("hi").getLatitude()).isNotNull();
+        assertThat(res.get("hi").getLongitude()).isNotNull();
+    }
+
+    @Test
+    public void testPos2() {
+        RGeo<String> geo = redisson.getGeo("test");
+        geo.add(new GeoEntry(13.361389, 38.115556, "Palermo"));
+        
+        Map<String, GeoPosition> expected = new LinkedHashMap<String, GeoPosition>();
+        expected.put("Palermo", new GeoPosition(13.361389338970184, 38.115556395496299));
+        assertThat(geo.pos("test2", "Palermo", "test3", "Catania", "test1")).isEqualTo(expected);
+    }
+
     @Test
     public void testPos() {
         RGeo<String> geo = redisson.getGeo("test");