diff --git a/redisson/src/main/java/org/redisson/RedissonGeo.java b/redisson/src/main/java/org/redisson/RedissonGeo.java index bcf23ff6f..8b8afe814 100644 --- a/redisson/src/main/java/org/redisson/RedissonGeo.java +++ b/redisson/src/main/java/org/redisson/RedissonGeo.java @@ -53,8 +53,8 @@ import org.redisson.connection.decoder.MapGetAllDecoder; */ public class RedissonGeo extends RedissonScoredSortedSet implements RGeo { - private final MultiDecoder> postitionDecoder = new ListMultiDecoder(new CodecDecoder(), new GeoPositionDecoder(), new ObjectListReplayDecoder(ListMultiDecoder.RESET), new GeoMapReplayDecoder()); - private final MultiDecoder> distanceDecoder = new ListMultiDecoder(new GeoDistanceDecoder(), new GeoMapReplayDecoder()); + private static final MultiDecoder> postitionDecoder = new ListMultiDecoder(new CodecDecoder(), new GeoPositionDecoder(), new ObjectListReplayDecoder(ListMultiDecoder.RESET), new GeoMapReplayDecoder()); + private static final MultiDecoder> distanceDecoder = new ListMultiDecoder(new GeoDistanceDecoder(), new GeoMapReplayDecoder()); public RedissonGeo(CommandAsyncExecutor connectionManager, String name, RedissonClient redisson) { super(connectionManager, name, redisson); @@ -146,7 +146,7 @@ public class RedissonGeo extends RedissonScoredSortedSet implements RGeo> radiusAsync(double longitude, double latitude, double radius, GeoUnit geoUnit) { - return commandExecutor.readAsync(getName(), codec, RedisCommands.GEORADIUS, getName(), convert(longitude), convert(latitude), radius, geoUnit); + return commandExecutor.readAsync(getName(), codec, RedisCommands.GEORADIUS_RO, getName(), convert(longitude), convert(latitude), radius, geoUnit); } @Override @@ -156,7 +156,7 @@ public class RedissonGeo extends RedissonScoredSortedSet implements RGeo> radiusAsync(double longitude, double latitude, double radius, GeoUnit geoUnit, int count) { - return commandExecutor.readAsync(getName(), codec, RedisCommands.GEORADIUS, getName(), convert(longitude), convert(latitude), + return commandExecutor.readAsync(getName(), codec, RedisCommands.GEORADIUS_RO, getName(), convert(longitude), convert(latitude), radius, geoUnit, "COUNT", count); } @@ -167,7 +167,7 @@ public class RedissonGeo extends RedissonScoredSortedSet implements RGeo> radiusAsync(double longitude, double latitude, double radius, GeoUnit geoUnit, GeoOrder geoOrder) { - return commandExecutor.readAsync(getName(), codec, RedisCommands.GEORADIUS, getName(), convert(longitude), convert(latitude), + return commandExecutor.readAsync(getName(), codec, RedisCommands.GEORADIUS_RO, getName(), convert(longitude), convert(latitude), radius, geoUnit, geoOrder); } @@ -178,7 +178,7 @@ public class RedissonGeo extends RedissonScoredSortedSet implements RGeo> radiusAsync(double longitude, double latitude, double radius, GeoUnit geoUnit, GeoOrder geoOrder, int count) { - return commandExecutor.readAsync(getName(), codec, RedisCommands.GEORADIUS, getName(), convert(longitude), convert(latitude), + return commandExecutor.readAsync(getName(), codec, RedisCommands.GEORADIUS_RO, getName(), convert(longitude), convert(latitude), radius, geoUnit, "COUNT", count, geoOrder); } @@ -189,7 +189,7 @@ public class RedissonGeo extends RedissonScoredSortedSet implements RGeo> radiusWithDistanceAsync(double longitude, double latitude, double radius, GeoUnit geoUnit) { - RedisCommand> command = new RedisCommand>("GEORADIUS", distanceDecoder); + RedisCommand> command = new RedisCommand>("GEORADIUS_RO", distanceDecoder); return commandExecutor.readAsync(getName(), codec, command, getName(), convert(longitude), convert(latitude), radius, geoUnit, "WITHDIST"); } @@ -201,7 +201,7 @@ public class RedissonGeo extends RedissonScoredSortedSet implements RGeo> radiusWithDistanceAsync(double longitude, double latitude, double radius, GeoUnit geoUnit, int count) { - RedisCommand> command = new RedisCommand>("GEORADIUS", distanceDecoder); + RedisCommand> command = new RedisCommand>("GEORADIUS_RO", distanceDecoder); return commandExecutor.readAsync(getName(), codec, command, getName(), convert(longitude), convert(latitude), radius, geoUnit, "WITHDIST", "COUNT", count); } @@ -213,7 +213,7 @@ public class RedissonGeo extends RedissonScoredSortedSet implements RGeo> radiusWithDistanceAsync(double longitude, double latitude, double radius, GeoUnit geoUnit, GeoOrder geoOrder) { - RedisCommand> command = new RedisCommand>("GEORADIUS", distanceDecoder); + RedisCommand> command = new RedisCommand>("GEORADIUS_RO", distanceDecoder); return commandExecutor.readAsync(getName(), codec, command, getName(), convert(longitude), convert(latitude), radius, geoUnit, "WITHDIST", geoOrder); } @@ -225,7 +225,7 @@ public class RedissonGeo extends RedissonScoredSortedSet implements RGeo> radiusWithDistanceAsync(double longitude, double latitude, double radius, GeoUnit geoUnit, GeoOrder geoOrder, int count) { - RedisCommand> command = new RedisCommand>("GEORADIUS", distanceDecoder); + RedisCommand> command = new RedisCommand>("GEORADIUS_RO", distanceDecoder); return commandExecutor.readAsync(getName(), codec, command, getName(), convert(longitude), convert(latitude), radius, geoUnit, "WITHDIST", "COUNT", count, geoOrder); } @@ -237,7 +237,7 @@ public class RedissonGeo extends RedissonScoredSortedSet implements RGeo> radiusWithPositionAsync(double longitude, double latitude, double radius, GeoUnit geoUnit) { - RedisCommand> command = new RedisCommand>("GEORADIUS", postitionDecoder); + RedisCommand> command = new RedisCommand>("GEORADIUS_RO", postitionDecoder); return commandExecutor.readAsync(getName(), codec, command, getName(), convert(longitude), convert(latitude), radius, geoUnit, "WITHCOORD"); } @@ -248,7 +248,7 @@ public class RedissonGeo extends RedissonScoredSortedSet implements RGeo> radiusWithPositionAsync(double longitude, double latitude, double radius, GeoUnit geoUnit, int count) { - RedisCommand> command = new RedisCommand>("GEORADIUS", postitionDecoder); + RedisCommand> command = new RedisCommand>("GEORADIUS_RO", postitionDecoder); return commandExecutor.readAsync(getName(), codec, command, getName(), convert(longitude), convert(latitude), radius, geoUnit, "WITHCOORD", "COUNT", count); } @@ -260,7 +260,7 @@ public class RedissonGeo extends RedissonScoredSortedSet implements RGeo> radiusWithPositionAsync(double longitude, double latitude, double radius, GeoUnit geoUnit, GeoOrder geoOrder) { - RedisCommand> command = new RedisCommand>("GEORADIUS", postitionDecoder); + RedisCommand> command = new RedisCommand>("GEORADIUS_RO", postitionDecoder); return commandExecutor.readAsync(getName(), codec, command, getName(), convert(longitude), convert(latitude), radius, geoUnit, "WITHCOORD", geoOrder); } @@ -272,7 +272,7 @@ public class RedissonGeo extends RedissonScoredSortedSet implements RGeo> radiusWithPositionAsync(double longitude, double latitude, double radius, GeoUnit geoUnit, GeoOrder geoOrder, int count) { - RedisCommand> command = new RedisCommand>("GEORADIUS", postitionDecoder); + RedisCommand> command = new RedisCommand>("GEORADIUS_RO", postitionDecoder); return commandExecutor.readAsync(getName(), codec, command, getName(), convert(longitude), convert(latitude), radius, geoUnit, "WITHCOORD", "COUNT", count, geoOrder); } @@ -284,7 +284,7 @@ public class RedissonGeo extends RedissonScoredSortedSet implements RGeo> radiusAsync(V member, double radius, GeoUnit geoUnit) { - return commandExecutor.readAsync(getName(), codec, RedisCommands.GEORADIUSBYMEMBER, getName(), encode(member), radius, geoUnit); + return commandExecutor.readAsync(getName(), codec, RedisCommands.GEORADIUSBYMEMBER_RO, getName(), encode(member), radius, geoUnit); } @Override @@ -294,7 +294,7 @@ public class RedissonGeo extends RedissonScoredSortedSet implements RGeo> radiusAsync(V member, double radius, GeoUnit geoUnit, int count) { - return commandExecutor.readAsync(getName(), codec, RedisCommands.GEORADIUSBYMEMBER, getName(), encode(member), radius, geoUnit, "COUNT", count); + return commandExecutor.readAsync(getName(), codec, RedisCommands.GEORADIUSBYMEMBER_RO, getName(), encode(member), radius, geoUnit, "COUNT", count); } @Override @@ -304,7 +304,7 @@ public class RedissonGeo extends RedissonScoredSortedSet implements RGeo> radiusAsync(V member, double radius, GeoUnit geoUnit, GeoOrder geoOrder) { - return commandExecutor.readAsync(getName(), codec, RedisCommands.GEORADIUSBYMEMBER, getName(), encode(member), radius, geoUnit, geoOrder); + return commandExecutor.readAsync(getName(), codec, RedisCommands.GEORADIUSBYMEMBER_RO, getName(), encode(member), radius, geoUnit, geoOrder); } @Override @@ -314,7 +314,7 @@ public class RedissonGeo extends RedissonScoredSortedSet implements RGeo> radiusAsync(V member, double radius, GeoUnit geoUnit, GeoOrder geoOrder, int count) { - return commandExecutor.readAsync(getName(), codec, RedisCommands.GEORADIUSBYMEMBER, getName(), encode(member), radius, geoUnit, "COUNT", count, geoOrder); + return commandExecutor.readAsync(getName(), codec, RedisCommands.GEORADIUSBYMEMBER_RO, getName(), encode(member), radius, geoUnit, "COUNT", count, geoOrder); } @Override @@ -324,7 +324,7 @@ public class RedissonGeo extends RedissonScoredSortedSet implements RGeo> radiusWithDistanceAsync(V member, double radius, GeoUnit geoUnit) { - RedisCommand command = new RedisCommand("GEORADIUSBYMEMBER", distanceDecoder); + RedisCommand command = new RedisCommand("GEORADIUSBYMEMBER_RO", distanceDecoder); return commandExecutor.readAsync(getName(), codec, command, getName(), encode(member), radius, geoUnit, "WITHDIST"); } @@ -335,7 +335,7 @@ public class RedissonGeo extends RedissonScoredSortedSet implements RGeo> radiusWithDistanceAsync(V member, double radius, GeoUnit geoUnit, int count) { - RedisCommand command = new RedisCommand("GEORADIUSBYMEMBER", distanceDecoder); + RedisCommand command = new RedisCommand("GEORADIUSBYMEMBER_RO", distanceDecoder); return commandExecutor.readAsync(getName(), codec, command, getName(), encode(member), radius, geoUnit, "WITHDIST", "COUNT", count); } @@ -346,7 +346,7 @@ public class RedissonGeo extends RedissonScoredSortedSet implements RGeo> radiusWithDistanceAsync(V member, double radius, GeoUnit geoUnit, GeoOrder geoOrder) { - RedisCommand command = new RedisCommand("GEORADIUSBYMEMBER", distanceDecoder); + RedisCommand command = new RedisCommand("GEORADIUSBYMEMBER_RO", distanceDecoder); return commandExecutor.readAsync(getName(), codec, command, getName(), encode(member), radius, geoUnit, "WITHDIST", geoOrder); } @@ -357,7 +357,7 @@ public class RedissonGeo extends RedissonScoredSortedSet implements RGeo> radiusWithDistanceAsync(V member, double radius, GeoUnit geoUnit, GeoOrder geoOrder, int count) { - RedisCommand command = new RedisCommand("GEORADIUSBYMEMBER", distanceDecoder); + RedisCommand command = new RedisCommand("GEORADIUSBYMEMBER_RO", distanceDecoder); return commandExecutor.readAsync(getName(), codec, command, getName(), encode(member), radius, geoUnit, "WITHDIST", "COUNT", count, geoOrder); } @@ -368,7 +368,7 @@ public class RedissonGeo extends RedissonScoredSortedSet implements RGeo> radiusWithPositionAsync(V member, double radius, GeoUnit geoUnit) { - RedisCommand> command = new RedisCommand>("GEORADIUSBYMEMBER", postitionDecoder); + RedisCommand> command = new RedisCommand>("GEORADIUSBYMEMBER_RO", postitionDecoder); return commandExecutor.readAsync(getName(), codec, command, getName(), encode(member), radius, geoUnit, "WITHCOORD"); } @@ -379,7 +379,7 @@ public class RedissonGeo extends RedissonScoredSortedSet implements RGeo> radiusWithPositionAsync(V member, double radius, GeoUnit geoUnit, int count) { - RedisCommand> command = new RedisCommand>("GEORADIUSBYMEMBER", postitionDecoder); + RedisCommand> command = new RedisCommand>("GEORADIUSBYMEMBER_RO", postitionDecoder); return commandExecutor.readAsync(getName(), codec, command, getName(), encode(member), radius, geoUnit, "WITHCOORD", "COUNT", count); } @@ -390,7 +390,7 @@ public class RedissonGeo extends RedissonScoredSortedSet implements RGeo> radiusWithPositionAsync(V member, double radius, GeoUnit geoUnit, GeoOrder geoOrder) { - RedisCommand> command = new RedisCommand>("GEORADIUSBYMEMBER", postitionDecoder); + RedisCommand> command = new RedisCommand>("GEORADIUSBYMEMBER_RO", postitionDecoder); return commandExecutor.readAsync(getName(), codec, command, getName(), encode(member), radius, geoUnit, "WITHCOORD", geoOrder); } @@ -401,7 +401,7 @@ public class RedissonGeo extends RedissonScoredSortedSet implements RGeo> radiusWithPositionAsync(V member, double radius, GeoUnit geoUnit, GeoOrder geoOrder, int count) { - RedisCommand> command = new RedisCommand>("GEORADIUSBYMEMBER", postitionDecoder); + RedisCommand> command = new RedisCommand>("GEORADIUSBYMEMBER_RO", postitionDecoder); return commandExecutor.readAsync(getName(), codec, command, getName(), encode(member), radius, geoUnit, "WITHCOORD", "COUNT", count, geoOrder); } diff --git a/redisson/src/main/java/org/redisson/api/RGeo.java b/redisson/src/main/java/org/redisson/api/RGeo.java index a6f5d0598..ce3ec05c5 100644 --- a/redisson/src/main/java/org/redisson/api/RGeo.java +++ b/redisson/src/main/java/org/redisson/api/RGeo.java @@ -80,6 +80,8 @@ public interface RGeo extends RScoredSortedSet, RGeoAsync { * borders of the area specified with the center location * and the maximum distance from the center (the radius) * in GeoUnit units. + *

+ * Requires Redis 3.2.10 and higher. * * @param longitude - longitude of object * @param latitude - latitude of object @@ -94,6 +96,8 @@ public interface RGeo extends RScoredSortedSet, RGeoAsync { * borders of the area specified with the center location * and the maximum distance from the center (the radius) * in GeoUnit units and limited by count + *

+ * Requires Redis 3.2.10 and higher. * * @param longitude - longitude of object * @param latitude - latitude of object @@ -109,6 +113,8 @@ public interface RGeo extends RScoredSortedSet, RGeoAsync { * borders of the area specified with the center location * and the maximum distance from the center (the radius) * in GeoUnit units with GeoOrder + *

+ * Requires Redis 3.2.10 and higher. * * @param longitude - longitude of object * @param latitude - latitude of object @@ -125,6 +131,8 @@ public interface RGeo extends RScoredSortedSet, RGeoAsync { * and the maximum distance from the center (the radius) * in GeoUnit units with GeoOrder * and limited by count + *

+ * Requires Redis 3.2.10 and higher. * * @param longitude - longitude of object * @param latitude - latitude of object @@ -142,6 +150,8 @@ public interface RGeo extends RScoredSortedSet, RGeoAsync { * borders of the area specified with the center location * and the maximum distance from the center (the radius) * in GeoUnit units. + *

+ * Requires Redis 3.2.10 and higher. * * @param longitude - longitude of object * @param latitude - latitude of object @@ -157,6 +167,8 @@ public interface RGeo extends RScoredSortedSet, RGeoAsync { * borders of the area specified with the center location * and the maximum distance from the center (the radius) * in GeoUnit units and limited by count. + *

+ * Requires Redis 3.2.10 and higher. * * @param longitude - longitude of object * @param latitude - latitude of object @@ -173,6 +185,8 @@ public interface RGeo extends RScoredSortedSet, RGeoAsync { * borders of the area specified with the center location * and the maximum distance from the center (the radius) * in GeoUnit units with GeoOrder + *

+ * Requires Redis 3.2.10 and higher. * * @param longitude - longitude of object * @param latitude - latitude of object @@ -190,6 +204,8 @@ public interface RGeo extends RScoredSortedSet, RGeoAsync { * and the maximum distance from the center (the radius) * in GeoUnit units with GeoOrder * and limited by count + *

+ * Requires Redis 3.2.10 and higher. * * @param longitude - longitude of object * @param latitude - latitude of object @@ -207,6 +223,8 @@ public interface RGeo extends RScoredSortedSet, RGeoAsync { * borders of the area specified with the center location * and the maximum distance from the center (the radius) * in GeoUnit units. + *

+ * Requires Redis 3.2.10 and higher. * * @param longitude - longitude of object * @param latitude - latitude of object @@ -222,6 +240,8 @@ public interface RGeo extends RScoredSortedSet, RGeoAsync { * borders of the area specified with the center location * and the maximum distance from the center (the radius) * in GeoUnit units and limited by count + *

+ * Requires Redis 3.2.10 and higher. * * @param longitude - longitude of object * @param latitude - latitude of object @@ -238,6 +258,8 @@ public interface RGeo extends RScoredSortedSet, RGeoAsync { * borders of the area specified with the center location * and the maximum distance from the center (the radius) * in GeoUnit units with GeoOrder + *

+ * Requires Redis 3.2.10 and higher. * * @param longitude - longitude of object * @param latitude - latitude of object @@ -255,6 +277,8 @@ public interface RGeo extends RScoredSortedSet, RGeoAsync { * and the maximum distance from the center (the radius) * in GeoUnit units with GeoOrder * and limited by count + *

+ * Requires Redis 3.2.10 and higher. * * @param longitude - longitude of object * @param latitude - latitude of object @@ -271,6 +295,8 @@ public interface RGeo extends RScoredSortedSet, RGeoAsync { * borders of the area specified with the defined member location * and the maximum distance from the defined member location (the radius) * in GeoUnit units. + *

+ * Requires Redis 3.2.10 and higher. * * @param member - object * @param radius - radius in geo units @@ -284,6 +310,8 @@ public interface RGeo extends RScoredSortedSet, RGeoAsync { * borders of the area specified with the defined member location * and the maximum distance from the defined member location (the radius) * in GeoUnit units and limited by count + *

+ * Requires Redis 3.2.10 and higher. * * @param member - object * @param radius - radius in geo units @@ -298,6 +326,8 @@ public interface RGeo extends RScoredSortedSet, RGeoAsync { * borders of the area specified with the defined member location * and the maximum distance from the defined member location (the radius) * in GeoUnit units with GeoOrder + *

+ * Requires Redis 3.2.10 and higher. * * @param member - object * @param radius - radius in geo units @@ -313,6 +343,8 @@ public interface RGeo extends RScoredSortedSet, RGeoAsync { * and the maximum distance from the defined member location (the radius) * in GeoUnit units with GeoOrder * and limited by count + *

+ * Requires Redis 3.2.10 and higher. * * @param member - object * @param radius - radius in geo units @@ -329,6 +361,8 @@ public interface RGeo extends RScoredSortedSet, RGeoAsync { * borders of the area specified with the defined member location * and the maximum distance from the defined member location (the radius) * in GeoUnit units. + *

+ * Requires Redis 3.2.10 and higher. * * @param member - object * @param radius - radius in geo units @@ -343,6 +377,8 @@ public interface RGeo extends RScoredSortedSet, RGeoAsync { * borders of the area specified with the defined member location * and the maximum distance from the defined member location (the radius) * in GeoUnit units and limited by count + *

+ * Requires Redis 3.2.10 and higher. * * @param member - object * @param radius - radius in geo units @@ -358,6 +394,8 @@ public interface RGeo extends RScoredSortedSet, RGeoAsync { * borders of the area specified with the defined member location * and the maximum distance from the defined member location (the radius) * in GeoUnit units with GeoOrder + *

+ * Requires Redis 3.2.10 and higher. * * @param member - object * @param radius - radius in geo units @@ -374,6 +412,8 @@ public interface RGeo extends RScoredSortedSet, RGeoAsync { * and the maximum distance from the defined member location (the radius) * in GeoUnit units with GeoOrder * and limited by count + *

+ * Requires Redis 3.2.10 and higher. * * @param member - object * @param radius - radius in geo units @@ -390,6 +430,8 @@ public interface RGeo extends RScoredSortedSet, RGeoAsync { * borders of the area specified with the defined member location * and the maximum distance from the defined member location (the radius) * in GeoUnit units. + *

+ * Requires Redis 3.2.10 and higher. * * @param member - object * @param radius - radius in geo units @@ -404,6 +446,8 @@ public interface RGeo extends RScoredSortedSet, RGeoAsync { * borders of the area specified with the defined member location * and the maximum distance from the defined member location (the radius) * in GeoUnit units and limited by count + *

+ * Requires Redis 3.2.10 and higher. * * @param member - object * @param radius - radius in geo units @@ -419,6 +463,8 @@ public interface RGeo extends RScoredSortedSet, RGeoAsync { * borders of the area specified with the defined member location * and the maximum distance from the defined member location (the radius) * in GeoUnit units with GeoOrder + *

+ * Requires Redis 3.2.10 and higher. * * @param member - object * @param radius - radius in geo units @@ -435,6 +481,8 @@ public interface RGeo extends RScoredSortedSet, RGeoAsync { * and the maximum distance from the defined member location (the radius) * in GeoUnit units with GeoOrder * and limited by count + *

+ * Requires Redis 3.2.10 and higher. * * @param member - object * @param radius - radius in geo units diff --git a/redisson/src/main/java/org/redisson/api/RGeoAsync.java b/redisson/src/main/java/org/redisson/api/RGeoAsync.java index 3cc6f12e2..1c670bcfc 100644 --- a/redisson/src/main/java/org/redisson/api/RGeoAsync.java +++ b/redisson/src/main/java/org/redisson/api/RGeoAsync.java @@ -80,6 +80,8 @@ public interface RGeoAsync extends RScoredSortedSetAsync { * borders of the area specified with the center location * and the maximum distance from the center (the radius) * in GeoUnit units. + *

+ * Requires Redis 3.2.10 and higher. * * @param longitude - longitude of object * @param latitude - latitude of object @@ -94,6 +96,8 @@ public interface RGeoAsync extends RScoredSortedSetAsync { * borders of the area specified with the center location * and the maximum distance from the center (the radius) * in GeoUnit units and limited by count + *

+ * Requires Redis 3.2.10 and higher. * * @param longitude - longitude of object * @param latitude - latitude of object @@ -109,6 +113,8 @@ public interface RGeoAsync extends RScoredSortedSetAsync { * borders of the area specified with the center location * and the maximum distance from the center (the radius) * in GeoUnit units with GeoOrder + *

+ * Requires Redis 3.2.10 and higher. * * @param longitude - longitude of object * @param latitude - latitude of object @@ -125,6 +131,8 @@ public interface RGeoAsync extends RScoredSortedSetAsync { * and the maximum distance from the center (the radius) * in GeoUnit units with GeoOrder * and limited by count + *

+ * Requires Redis 3.2.10 and higher. * * @param longitude - longitude of object * @param latitude - latitude of object @@ -142,6 +150,8 @@ public interface RGeoAsync extends RScoredSortedSetAsync { * borders of the area specified with the center location * and the maximum distance from the center (the radius) * in GeoUnit units. + *

+ * Requires Redis 3.2.10 and higher. * * @param longitude - longitude of object * @param latitude - latitude of object @@ -157,6 +167,8 @@ public interface RGeoAsync extends RScoredSortedSetAsync { * borders of the area specified with the center location * and the maximum distance from the center (the radius) * in GeoUnit units and limited by count. + *

+ * Requires Redis 3.2.10 and higher. * * @param longitude - longitude of object * @param latitude - latitude of object @@ -173,6 +185,8 @@ public interface RGeoAsync extends RScoredSortedSetAsync { * borders of the area specified with the center location * and the maximum distance from the center (the radius) * in GeoUnit units with GeoOrder + *

+ * Requires Redis 3.2.10 and higher. * * @param longitude - longitude of object * @param latitude - latitude of object @@ -190,6 +204,8 @@ public interface RGeoAsync extends RScoredSortedSetAsync { * and the maximum distance from the center (the radius) * in GeoUnit units with GeoOrder * and limited by count + *

+ * Requires Redis 3.2.10 and higher. * * @param longitude - longitude of object * @param latitude - latitude of object @@ -207,6 +223,8 @@ public interface RGeoAsync extends RScoredSortedSetAsync { * borders of the area specified with the center location * and the maximum distance from the center (the radius) * in GeoUnit units. + *

+ * Requires Redis 3.2.10 and higher. * * @param longitude - longitude of object * @param latitude - latitude of object @@ -222,6 +240,8 @@ public interface RGeoAsync extends RScoredSortedSetAsync { * borders of the area specified with the center location * and the maximum distance from the center (the radius) * in GeoUnit units and limited by count + *

+ * Requires Redis 3.2.10 and higher. * * @param longitude - longitude of object * @param latitude - latitude of object @@ -238,6 +258,8 @@ public interface RGeoAsync extends RScoredSortedSetAsync { * borders of the area specified with the center location * and the maximum distance from the center (the radius) * in GeoUnit units with GeoOrder + *

+ * Requires Redis 3.2.10 and higher. * * @param longitude - longitude of object * @param latitude - latitude of object @@ -255,6 +277,8 @@ public interface RGeoAsync extends RScoredSortedSetAsync { * and the maximum distance from the center (the radius) * in GeoUnit units with GeoOrder * and limited by count + *

+ * Requires Redis 3.2.10 and higher. * * @param longitude - longitude of object * @param latitude - latitude of object @@ -271,6 +295,8 @@ public interface RGeoAsync extends RScoredSortedSetAsync { * borders of the area specified with the defined member location * and the maximum distance from the defined member location (the radius) * in GeoUnit units. + *

+ * Requires Redis 3.2.10 and higher. * * @param member - object * @param radius - radius in geo units @@ -284,6 +310,8 @@ public interface RGeoAsync extends RScoredSortedSetAsync { * borders of the area specified with the defined member location * and the maximum distance from the defined member location (the radius) * in GeoUnit units and limited by count + *

+ * Requires Redis 3.2.10 and higher. * * @param member - object * @param radius - radius in geo units @@ -298,6 +326,8 @@ public interface RGeoAsync extends RScoredSortedSetAsync { * borders of the area specified with the defined member location * and the maximum distance from the defined member location (the radius) * in GeoUnit units with GeoOrder + *

+ * Requires Redis 3.2.10 and higher. * * @param member - object * @param radius - radius in geo units @@ -312,6 +342,8 @@ public interface RGeoAsync extends RScoredSortedSetAsync { * borders of the area specified with the defined member location * and the maximum distance from the defined member location (the radius) * in GeoUnit units with GeoOrder + *

+ * Requires Redis 3.2.10 and higher. * * @param member - object * @param radius - radius in geo units @@ -328,6 +360,8 @@ public interface RGeoAsync extends RScoredSortedSetAsync { * borders of the area specified with the defined member location * and the maximum distance from the defined member location (the radius) * in GeoUnit units. + *

+ * Requires Redis 3.2.10 and higher. * * @param member - object * @param radius - radius in geo units @@ -342,6 +376,8 @@ public interface RGeoAsync extends RScoredSortedSetAsync { * borders of the area specified with the defined member location * and the maximum distance from the defined member location (the radius) * in GeoUnit units and limited by count + *

+ * Requires Redis 3.2.10 and higher. * * @param member - object * @param radius - radius in geo units @@ -357,6 +393,8 @@ public interface RGeoAsync extends RScoredSortedSetAsync { * borders of the area specified with the defined member location * and the maximum distance from the defined member location (the radius) * in GeoUnit units with GeoOrder + *

+ * Requires Redis 3.2.10 and higher. * * @param member - object * @param radius - radius in geo units @@ -373,6 +411,8 @@ public interface RGeoAsync extends RScoredSortedSetAsync { * and the maximum distance from the defined member location (the radius) * in GeoUnit units with GeoOrder * and limited by count + *

+ * Requires Redis 3.2.10 and higher. * * @param member - object * @param radius - radius in geo units @@ -389,6 +429,8 @@ public interface RGeoAsync extends RScoredSortedSetAsync { * borders of the area specified with the defined member location * and the maximum distance from the defined member location (the radius) * in GeoUnit units. + *

+ * Requires Redis 3.2.10 and higher. * * @param member - object * @param radius - radius in geo units @@ -403,6 +445,8 @@ public interface RGeoAsync extends RScoredSortedSetAsync { * borders of the area specified with the defined member location * and the maximum distance from the defined member location (the radius) * in GeoUnit units and limited by count + *

+ * Requires Redis 3.2.10 and higher. * * @param member - object * @param radius - radius in geo units @@ -418,6 +462,8 @@ public interface RGeoAsync extends RScoredSortedSetAsync { * borders of the area specified with the defined member location * and the maximum distance from the defined member location (the radius) * in GeoUnit units with GeoOrder + *

+ * Requires Redis 3.2.10 and higher. * * @param member - object * @param radius - radius in geo units @@ -434,6 +480,8 @@ public interface RGeoAsync extends RScoredSortedSetAsync { * and the maximum distance from the defined member location (the radius) * in GeoUnit units with GeoOrder * and limited by count + *

+ * Requires Redis 3.2.10 and higher. * * @param member - object * @param radius - radius in geo units diff --git a/redisson/src/main/java/org/redisson/api/RGeoReactive.java b/redisson/src/main/java/org/redisson/api/RGeoReactive.java index 4aa3b8e54..eff5e5063 100644 --- a/redisson/src/main/java/org/redisson/api/RGeoReactive.java +++ b/redisson/src/main/java/org/redisson/api/RGeoReactive.java @@ -82,6 +82,8 @@ public interface RGeoReactive extends RScoredSortedSetReactive { * borders of the area specified with the center location * and the maximum distance from the center (the radius) * in GeoUnit units. + *

+ * Requires Redis 3.2.10 and higher. * * @param longitude - longitude of object * @param latitude - latitude of object @@ -96,6 +98,8 @@ public interface RGeoReactive extends RScoredSortedSetReactive { * borders of the area specified with the center location * and the maximum distance from the center (the radius) * in GeoUnit units and limited by count + *

+ * Requires Redis 3.2.10 and higher. * * @param longitude - longitude of object * @param latitude - latitude of object @@ -111,6 +115,8 @@ public interface RGeoReactive extends RScoredSortedSetReactive { * borders of the area specified with the center location * and the maximum distance from the center (the radius) * in GeoUnit units with GeoOrder + *

+ * Requires Redis 3.2.10 and higher. * * @param longitude - longitude of object * @param latitude - latitude of object @@ -127,6 +133,8 @@ public interface RGeoReactive extends RScoredSortedSetReactive { * and the maximum distance from the center (the radius) * in GeoUnit units with GeoOrder * and limited by count + *

+ * Requires Redis 3.2.10 and higher. * * @param longitude - longitude of object * @param latitude - latitude of object @@ -144,6 +152,8 @@ public interface RGeoReactive extends RScoredSortedSetReactive { * borders of the area specified with the center location * and the maximum distance from the center (the radius) * in GeoUnit units. + *

+ * Requires Redis 3.2.10 and higher. * * @param longitude - longitude of object * @param latitude - latitude of object @@ -159,6 +169,8 @@ public interface RGeoReactive extends RScoredSortedSetReactive { * borders of the area specified with the center location * and the maximum distance from the center (the radius) * in GeoUnit units and limited by count. + *

+ * Requires Redis 3.2.10 and higher. * * @param longitude - longitude of object * @param latitude - latitude of object @@ -175,6 +187,8 @@ public interface RGeoReactive extends RScoredSortedSetReactive { * borders of the area specified with the center location * and the maximum distance from the center (the radius) * in GeoUnit units with GeoOrder + *

+ * Requires Redis 3.2.10 and higher. * * @param longitude - longitude of object * @param latitude - latitude of object @@ -192,6 +206,8 @@ public interface RGeoReactive extends RScoredSortedSetReactive { * and the maximum distance from the center (the radius) * in GeoUnit units with GeoOrder * and limited by count + *

+ * Requires Redis 3.2.10 and higher. * * @param longitude - longitude of object * @param latitude - latitude of object @@ -209,6 +225,8 @@ public interface RGeoReactive extends RScoredSortedSetReactive { * borders of the area specified with the center location * and the maximum distance from the center (the radius) * in GeoUnit units. + *

+ * Requires Redis 3.2.10 and higher. * * @param longitude - longitude of object * @param latitude - latitude of object @@ -224,6 +242,8 @@ public interface RGeoReactive extends RScoredSortedSetReactive { * borders of the area specified with the center location * and the maximum distance from the center (the radius) * in GeoUnit units and limited by count + *

+ * Requires Redis 3.2.10 and higher. * * @param longitude - longitude of object * @param latitude - latitude of object @@ -240,6 +260,8 @@ public interface RGeoReactive extends RScoredSortedSetReactive { * borders of the area specified with the center location * and the maximum distance from the center (the radius) * in GeoUnit units with GeoOrder + *

+ * Requires Redis 3.2.10 and higher. * * @param longitude - longitude of object * @param latitude - latitude of object @@ -257,6 +279,8 @@ public interface RGeoReactive extends RScoredSortedSetReactive { * and the maximum distance from the center (the radius) * in GeoUnit units with GeoOrder * and limited by count + *

+ * Requires Redis 3.2.10 and higher. * * @param longitude - longitude of object * @param latitude - latitude of object @@ -273,6 +297,8 @@ public interface RGeoReactive extends RScoredSortedSetReactive { * borders of the area specified with the defined member location * and the maximum distance from the defined member location (the radius) * in GeoUnit units. + *

+ * Requires Redis 3.2.10 and higher. * * @param member - object * @param radius - radius in geo units @@ -286,6 +312,8 @@ public interface RGeoReactive extends RScoredSortedSetReactive { * borders of the area specified with the defined member location * and the maximum distance from the defined member location (the radius) * in GeoUnit units and limited by count + *

+ * Requires Redis 3.2.10 and higher. * * @param member - object * @param radius - radius in geo units @@ -300,6 +328,8 @@ public interface RGeoReactive extends RScoredSortedSetReactive { * borders of the area specified with the defined member location * and the maximum distance from the defined member location (the radius) * in GeoUnit units with GeoOrder + *

+ * Requires Redis 3.2.10 and higher. * * @param member - object * @param radius - radius in geo units @@ -314,6 +344,8 @@ public interface RGeoReactive extends RScoredSortedSetReactive { * borders of the area specified with the defined member location * and the maximum distance from the defined member location (the radius) * in GeoUnit units with GeoOrder + *

+ * Requires Redis 3.2.10 and higher. * * @param member - object * @param radius - radius in geo units @@ -330,6 +362,8 @@ public interface RGeoReactive extends RScoredSortedSetReactive { * borders of the area specified with the defined member location * and the maximum distance from the defined member location (the radius) * in GeoUnit units. + *

+ * Requires Redis 3.2.10 and higher. * * @param member - object * @param radius - radius in geo units @@ -344,6 +378,8 @@ public interface RGeoReactive extends RScoredSortedSetReactive { * borders of the area specified with the defined member location * and the maximum distance from the defined member location (the radius) * in GeoUnit units and limited by count + *

+ * Requires Redis 3.2.10 and higher. * * @param member - object * @param radius - radius in geo units @@ -359,6 +395,8 @@ public interface RGeoReactive extends RScoredSortedSetReactive { * borders of the area specified with the defined member location * and the maximum distance from the defined member location (the radius) * in GeoUnit units with GeoOrder + *

+ * Requires Redis 3.2.10 and higher. * * @param member - object * @param radius - radius in geo units @@ -375,6 +413,8 @@ public interface RGeoReactive extends RScoredSortedSetReactive { * and the maximum distance from the defined member location (the radius) * in GeoUnit units with GeoOrder * and limited by count + *

+ * Requires Redis 3.2.10 and higher. * * @param member - object * @param radius - radius in geo units @@ -391,6 +431,8 @@ public interface RGeoReactive extends RScoredSortedSetReactive { * borders of the area specified with the defined member location * and the maximum distance from the defined member location (the radius) * in GeoUnit units. + *

+ * Requires Redis 3.2.10 and higher. * * @param member - object * @param radius - radius in geo units @@ -405,6 +447,8 @@ public interface RGeoReactive extends RScoredSortedSetReactive { * borders of the area specified with the defined member location * and the maximum distance from the defined member location (the radius) * in GeoUnit units and limited by count + *

+ * Requires Redis 3.2.10 and higher. * * @param member - object * @param radius - radius in geo units @@ -420,6 +464,8 @@ public interface RGeoReactive extends RScoredSortedSetReactive { * borders of the area specified with the defined member location * and the maximum distance from the defined member location (the radius) * in GeoUnit units with GeoOrder + *

+ * Requires Redis 3.2.10 and higher. * * @param member - object * @param radius - radius in geo units @@ -436,6 +482,8 @@ public interface RGeoReactive extends RScoredSortedSetReactive { * and the maximum distance from the defined member location (the radius) * in GeoUnit units with GeoOrder * and limited by count + *

+ * Requires Redis 3.2.10 and higher. * * @param member - object * @param radius - radius in geo units diff --git a/redisson/src/main/java/org/redisson/api/RGeoRx.java b/redisson/src/main/java/org/redisson/api/RGeoRx.java index 8285f48ff..bdd25dd57 100644 --- a/redisson/src/main/java/org/redisson/api/RGeoRx.java +++ b/redisson/src/main/java/org/redisson/api/RGeoRx.java @@ -82,6 +82,8 @@ public interface RGeoRx extends RScoredSortedSetRx { * borders of the area specified with the center location * and the maximum distance from the center (the radius) * in GeoUnit units. + *

+ * Requires Redis 3.2.10 and higher. * * @param longitude - longitude of object * @param latitude - latitude of object @@ -96,6 +98,8 @@ public interface RGeoRx extends RScoredSortedSetRx { * borders of the area specified with the center location * and the maximum distance from the center (the radius) * in GeoUnit units and limited by count + *

+ * Requires Redis 3.2.10 and higher. * * @param longitude - longitude of object * @param latitude - latitude of object @@ -111,6 +115,8 @@ public interface RGeoRx extends RScoredSortedSetRx { * borders of the area specified with the center location * and the maximum distance from the center (the radius) * in GeoUnit units with GeoOrder + *

+ * Requires Redis 3.2.10 and higher. * * @param longitude - longitude of object * @param latitude - latitude of object @@ -127,6 +133,8 @@ public interface RGeoRx extends RScoredSortedSetRx { * and the maximum distance from the center (the radius) * in GeoUnit units with GeoOrder * and limited by count + *

+ * Requires Redis 3.2.10 and higher. * * @param longitude - longitude of object * @param latitude - latitude of object @@ -144,6 +152,8 @@ public interface RGeoRx extends RScoredSortedSetRx { * borders of the area specified with the center location * and the maximum distance from the center (the radius) * in GeoUnit units. + *

+ * Requires Redis 3.2.10 and higher. * * @param longitude - longitude of object * @param latitude - latitude of object @@ -159,6 +169,8 @@ public interface RGeoRx extends RScoredSortedSetRx { * borders of the area specified with the center location * and the maximum distance from the center (the radius) * in GeoUnit units and limited by count. + *

+ * Requires Redis 3.2.10 and higher. * * @param longitude - longitude of object * @param latitude - latitude of object @@ -175,6 +187,8 @@ public interface RGeoRx extends RScoredSortedSetRx { * borders of the area specified with the center location * and the maximum distance from the center (the radius) * in GeoUnit units with GeoOrder + *

+ * Requires Redis 3.2.10 and higher. * * @param longitude - longitude of object * @param latitude - latitude of object @@ -192,6 +206,8 @@ public interface RGeoRx extends RScoredSortedSetRx { * and the maximum distance from the center (the radius) * in GeoUnit units with GeoOrder * and limited by count + *

+ * Requires Redis 3.2.10 and higher. * * @param longitude - longitude of object * @param latitude - latitude of object @@ -209,6 +225,8 @@ public interface RGeoRx extends RScoredSortedSetRx { * borders of the area specified with the center location * and the maximum distance from the center (the radius) * in GeoUnit units. + *

+ * Requires Redis 3.2.10 and higher. * * @param longitude - longitude of object * @param latitude - latitude of object @@ -224,6 +242,8 @@ public interface RGeoRx extends RScoredSortedSetRx { * borders of the area specified with the center location * and the maximum distance from the center (the radius) * in GeoUnit units and limited by count + *

+ * Requires Redis 3.2.10 and higher. * * @param longitude - longitude of object * @param latitude - latitude of object @@ -240,6 +260,8 @@ public interface RGeoRx extends RScoredSortedSetRx { * borders of the area specified with the center location * and the maximum distance from the center (the radius) * in GeoUnit units with GeoOrder + *

+ * Requires Redis 3.2.10 and higher. * * @param longitude - longitude of object * @param latitude - latitude of object @@ -257,6 +279,8 @@ public interface RGeoRx extends RScoredSortedSetRx { * and the maximum distance from the center (the radius) * in GeoUnit units with GeoOrder * and limited by count + *

+ * Requires Redis 3.2.10 and higher. * * @param longitude - longitude of object * @param latitude - latitude of object @@ -273,6 +297,8 @@ public interface RGeoRx extends RScoredSortedSetRx { * borders of the area specified with the defined member location * and the maximum distance from the defined member location (the radius) * in GeoUnit units. + *

+ * Requires Redis 3.2.10 and higher. * * @param member - object * @param radius - radius in geo units @@ -286,6 +312,8 @@ public interface RGeoRx extends RScoredSortedSetRx { * borders of the area specified with the defined member location * and the maximum distance from the defined member location (the radius) * in GeoUnit units and limited by count + *

+ * Requires Redis 3.2.10 and higher. * * @param member - object * @param radius - radius in geo units @@ -300,6 +328,8 @@ public interface RGeoRx extends RScoredSortedSetRx { * borders of the area specified with the defined member location * and the maximum distance from the defined member location (the radius) * in GeoUnit units with GeoOrder + *

+ * Requires Redis 3.2.10 and higher. * * @param member - object * @param radius - radius in geo units @@ -314,6 +344,8 @@ public interface RGeoRx extends RScoredSortedSetRx { * borders of the area specified with the defined member location * and the maximum distance from the defined member location (the radius) * in GeoUnit units with GeoOrder + *

+ * Requires Redis 3.2.10 and higher. * * @param member - object * @param radius - radius in geo units @@ -330,6 +362,8 @@ public interface RGeoRx extends RScoredSortedSetRx { * borders of the area specified with the defined member location * and the maximum distance from the defined member location (the radius) * in GeoUnit units. + *

+ * Requires Redis 3.2.10 and higher. * * @param member - object * @param radius - radius in geo units @@ -344,6 +378,8 @@ public interface RGeoRx extends RScoredSortedSetRx { * borders of the area specified with the defined member location * and the maximum distance from the defined member location (the radius) * in GeoUnit units and limited by count + *

+ * Requires Redis 3.2.10 and higher. * * @param member - object * @param radius - radius in geo units @@ -359,6 +395,8 @@ public interface RGeoRx extends RScoredSortedSetRx { * borders of the area specified with the defined member location * and the maximum distance from the defined member location (the radius) * in GeoUnit units with GeoOrder + *

+ * Requires Redis 3.2.10 and higher. * * @param member - object * @param radius - radius in geo units @@ -375,6 +413,8 @@ public interface RGeoRx extends RScoredSortedSetRx { * and the maximum distance from the defined member location (the radius) * in GeoUnit units with GeoOrder * and limited by count + *

+ * Requires Redis 3.2.10 and higher. * * @param member - object * @param radius - radius in geo units @@ -391,6 +431,8 @@ public interface RGeoRx extends RScoredSortedSetRx { * borders of the area specified with the defined member location * and the maximum distance from the defined member location (the radius) * in GeoUnit units. + *

+ * Requires Redis 3.2.10 and higher. * * @param member - object * @param radius - radius in geo units @@ -405,6 +447,8 @@ public interface RGeoRx extends RScoredSortedSetRx { * borders of the area specified with the defined member location * and the maximum distance from the defined member location (the radius) * in GeoUnit units and limited by count + *

+ * Requires Redis 3.2.10 and higher. * * @param member - object * @param radius - radius in geo units @@ -420,6 +464,8 @@ public interface RGeoRx extends RScoredSortedSetRx { * borders of the area specified with the defined member location * and the maximum distance from the defined member location (the radius) * in GeoUnit units with GeoOrder + *

+ * Requires Redis 3.2.10 and higher. * * @param member - object * @param radius - radius in geo units @@ -436,6 +482,8 @@ public interface RGeoRx extends RScoredSortedSetRx { * and the maximum distance from the defined member location (the radius) * in GeoUnit units with GeoOrder * and limited by count + *

+ * Requires Redis 3.2.10 and higher. * * @param member - object * @param radius - radius in geo units diff --git a/redisson/src/main/java/org/redisson/client/protocol/RedisCommands.java b/redisson/src/main/java/org/redisson/client/protocol/RedisCommands.java index 75ce207ef..9fd2ccb00 100644 --- a/redisson/src/main/java/org/redisson/client/protocol/RedisCommands.java +++ b/redisson/src/main/java/org/redisson/client/protocol/RedisCommands.java @@ -91,8 +91,8 @@ public interface RedisCommands { RedisStrictCommand GEOADD = new RedisStrictCommand("GEOADD"); RedisCommand GEODIST = new RedisCommand("GEODIST", new DoubleReplayConvertor()); - RedisCommand> GEORADIUS = new RedisCommand>("GEORADIUS", new ObjectListReplayDecoder()); - RedisCommand> GEORADIUSBYMEMBER = new RedisCommand>("GEORADIUSBYMEMBER", new ObjectListReplayDecoder()); + RedisCommand> GEORADIUS_RO = new RedisCommand>("GEORADIUS_RO", new ObjectListReplayDecoder()); + RedisCommand> GEORADIUSBYMEMBER_RO = new RedisCommand>("GEORADIUSBYMEMBER_RO", new ObjectListReplayDecoder()); RedisCommand GEORADIUS_STORE = new RedisCommand("GEORADIUS", new Long2MultiDecoder()); RedisCommand GEORADIUSBYMEMBER_STORE = new RedisCommand("GEORADIUSBYMEMBER", new Long2MultiDecoder());