From f619f76b5c8b8b58a9aaa108fea3af383531048d Mon Sep 17 00:00:00 2001 From: Yury-Fridlyand Date: Fri, 10 May 2024 10:39:00 -0700 Subject: [PATCH] Proto: Rename in `RequestType` enum according to Feng-Shui. (#1387) * Rename in `RequestType` enum according to Feng-Shui. (#262) Signed-off-by: Yury-Fridlyand Co-authored-by: Andrew Carbonetto --- csharp/lib/AsyncClient.cs | 48 +++--- glide-core/src/client/value_conversion.rs | 18 +- glide-core/src/protobuf/redis_request.proto | 56 +++--- glide-core/src/request_type.rs | 162 +++++++++--------- glide-core/src/rotating_buffer.rs | 32 ++-- glide-core/tests/test_socket_listener.rs | 8 +- .../src/main/java/glide/api/BaseClient.java | 118 ++++++------- .../src/main/java/glide/api/RedisClient.java | 10 +- .../java/glide/api/RedisClusterClient.java | 18 +- .../api/commands/SortedSetBaseCommands.java | 14 +- .../glide/api/models/BaseTransaction.java | 134 +++++++-------- .../{ZaddOptions.java => ZAddOptions.java} | 8 +- .../test/java/glide/api/RedisClientTest.java | 160 ++++++++--------- .../glide/api/RedisClusterClientTest.java | 18 +- .../glide/api/models/TransactionTests.java | 122 ++++++------- .../test/java/glide/SharedCommandTests.java | 60 +++---- node/src/BaseClient.ts | 98 +++++------ node/src/Commands.ts | 100 ++++++----- node/src/Transaction.ts | 98 +++++------ node/tests/RedisClientInternals.test.ts | 20 +-- python/python/glide/async_commands/core.py | 60 +++---- .../glide/async_commands/transaction.py | 54 +++--- python/python/tests/test_proto_coded.py | 4 +- 23 files changed, 699 insertions(+), 721 deletions(-) rename java/client/src/main/java/glide/api/models/commands/{ZaddOptions.java => ZAddOptions.java} (93%) diff --git a/csharp/lib/AsyncClient.cs b/csharp/lib/AsyncClient.cs index a584a58af1..db28bd7194 100644 --- a/csharp/lib/AsyncClient.cs +++ b/csharp/lib/AsyncClient.cs @@ -38,7 +38,7 @@ public AsyncClient(string host, uint port, bool useTLS) IntPtr[] args = _arrayPool.Rent(2); args[0] = Marshal.StringToHGlobalAnsi(key); args[1] = Marshal.StringToHGlobalAnsi(value); - string? result = await Command(args, 2, RequestType.SetString); + string? result = await Command(args, 2, RequestType.Set); _arrayPool.Return(args); return result; } @@ -47,7 +47,7 @@ public AsyncClient(string host, uint port, bool useTLS) { IntPtr[] args = _arrayPool.Rent(1); args[0] = Marshal.StringToHGlobalAnsi(key); - string? result = await Command(args, 1, RequestType.GetString); + string? result = await Command(args, 1, RequestType.Get); _arrayPool.Return(args); return result; } @@ -129,8 +129,8 @@ private enum RequestType { InvalidRequest = 0, CustomCommand = 1, - GetString = 2, - SetString = 3, + Get = 2, + Set = 3, Ping = 4, Info = 5, Del = 6, @@ -154,10 +154,10 @@ private enum RequestType ClientUnblock = 24, ClientUnpause = 25, Expire = 26, - HashSet = 27, - HashGet = 28, - HashDel = 29, - HashExists = 30, + HSet = 27, + HGet = 28, + HDel = 29, + HExists = 30, MGet = 31, MSet = 32, Incr = 33, @@ -165,11 +165,11 @@ private enum RequestType Decr = 35, IncrByFloat = 36, DecrBy = 37, - HashGetAll = 38, - HashMSet = 39, - HashMGet = 40, - HashIncrBy = 41, - HashIncrByFloat = 42, + HGetAll = 38, + HMSet = 39, + HMGet = 40, + HIncrBy = 41, + HIncrByFloat = 42, LPush = 43, LPop = 44, RPush = 45, @@ -188,11 +188,11 @@ private enum RequestType Exists = 58, Unlink = 59, TTL = 60, - Zadd = 61, - Zrem = 62, - Zrange = 63, - Zcard = 64, - Zcount = 65, + ZAdd = 61, + ZRem = 62, + ZRange = 63, + ZCard = 64, + ZCount = 65, ZIncrBy = 66, ZScore = 67, Type = 68, @@ -200,7 +200,7 @@ private enum RequestType Echo = 70, ZPopMin = 71, Strlen = 72, - Lindex = 73, + LIndex = 73, ZPopMax = 74, XRead = 75, XAdd = 76, @@ -211,21 +211,21 @@ private enum RequestType XGroupDestroy = 81, HSetNX = 82, SIsMember = 83, - Hvals = 84, + HVals = 84, PTTL = 85, ZRemRangeByRank = 86, Persist = 87, ZRemRangeByScore = 88, Time = 89, - Zrank = 90, + ZRank = 90, Rename = 91, DBSize = 92, - Brpop = 93, - Hkeys = 94, + BRPop = 93, + HKeys = 94, PfAdd = 96, PfCount = 97, PfMerge = 98, - Blpop = 100, + BLPop = 100, RPushX = 102, LPushX = 103, } diff --git a/glide-core/src/client/value_conversion.rs b/glide-core/src/client/value_conversion.rs index 89919fe8dd..6afaf56e17 100644 --- a/glide-core/src/client/value_conversion.rs +++ b/glide-core/src/client/value_conversion.rs @@ -14,7 +14,7 @@ pub(crate) enum ExpectedReturnType { BulkString, Set, DoubleOrNull, - ZrankReturnType, + ZRankReturnType, JsonToggleReturnType, ArrayOfBools, ArrayOfDoubleOrNull, @@ -101,7 +101,7 @@ pub(crate) fn convert_to_expected_type( Value::Nil => Ok(value), _ => Ok(Value::Double(from_owned_redis_value::(value)?)), }, - ExpectedReturnType::ZrankReturnType => match value { + ExpectedReturnType::ZRankReturnType => match value { Value::Nil => Ok(value), Value::Array(mut array) => { if array.len() != 2 { @@ -119,7 +119,7 @@ pub(crate) fn convert_to_expected_type( } _ => Err(( ErrorKind::TypeError, - "Response couldn't be converted to Array (ZrankResponseType)", + "Response couldn't be converted to Array (ZRankResponseType)", format!("(response was {:?})", value), ) .into()), @@ -419,7 +419,7 @@ pub(crate) fn expected_type_for_cmd(cmd: &Cmd) -> Option { .map(|_| ExpectedReturnType::MapOfStringToDouble), b"ZRANK" | b"ZREVRANK" => cmd .position(b"WITHSCORE") - .map(|_| ExpectedReturnType::ZrankReturnType), + .map(|_| ExpectedReturnType::ZRankReturnType), b"SPOP" => { if cmd.arg_idx(2).is_some() { Some(ExpectedReturnType::Set) @@ -751,7 +751,7 @@ mod tests { .arg("member") .arg("withscore") ), - Some(ExpectedReturnType::ZrankReturnType) + Some(ExpectedReturnType::ZRankReturnType) )); assert!(expected_type_for_cmd(redis::cmd("zrank").arg("key").arg("member")).is_none()); @@ -763,7 +763,7 @@ mod tests { .arg("member") .arg("withscore") ), - Some(ExpectedReturnType::ZrankReturnType) + Some(ExpectedReturnType::ZRankReturnType) )); assert!(expected_type_for_cmd(redis::cmd("ZREVRANK").arg("key").arg("member")).is_none()); @@ -899,7 +899,7 @@ mod tests { #[test] fn test_convert_to_zrank_return_type() { assert_eq!( - convert_to_expected_type(Value::Nil, Some(ExpectedReturnType::ZrankReturnType)), + convert_to_expected_type(Value::Nil, Some(ExpectedReturnType::ZRankReturnType)), Ok(Value::Nil) ); @@ -910,7 +910,7 @@ mod tests { let array_result = convert_to_expected_type( Value::Array(array), - Some(ExpectedReturnType::ZrankReturnType), + Some(ExpectedReturnType::ZRankReturnType), ) .unwrap(); @@ -927,7 +927,7 @@ mod tests { let array_err = vec![Value::BulkString(b"key".to_vec())]; assert!(convert_to_expected_type( Value::Array(array_err), - Some(ExpectedReturnType::ZrankReturnType) + Some(ExpectedReturnType::ZRankReturnType) ) .is_err()); } diff --git a/glide-core/src/protobuf/redis_request.proto b/glide-core/src/protobuf/redis_request.proto index 86081c4c32..32564b53c4 100644 --- a/glide-core/src/protobuf/redis_request.proto +++ b/glide-core/src/protobuf/redis_request.proto @@ -41,10 +41,8 @@ enum RequestType { InvalidRequest = 0; /// An unknown command, where all arguments are defined by the user. CustomCommand = 1; - /// Type of a get string request. - GetString = 2; - /// Type of a set string request. - SetString = 3; + Get = 2; + Set = 3; Ping = 4; Info = 5; Del = 6; @@ -68,10 +66,10 @@ enum RequestType { ClientUnblock = 24; ClientUnpause = 25; Expire = 26; - HashSet = 27; - HashGet = 28; - HashDel = 29; - HashExists = 30; + HSet = 27; + HGet = 28; + HDel = 29; + HExists = 30; MGet=31; MSet=32; Incr=33; @@ -79,11 +77,11 @@ enum RequestType { Decr=35; IncrByFloat=36; DecrBy=37; - HashGetAll=38; - HashMSet=39; - HashMGet=40; - HashIncrBy = 41; - HashIncrByFloat = 42; + HGetAll=38; + HMSet=39; + HMGet=40; + HIncrBy = 41; + HIncrByFloat = 42; LPush = 43; LPop = 44; RPush = 45; @@ -102,11 +100,11 @@ enum RequestType { Exists = 58; Unlink = 59; TTL = 60; - Zadd = 61; - Zrem = 62; - Zrange = 63; - Zcard = 64; - Zcount = 65; + ZAdd = 61; + ZRem = 62; + ZRange = 63; + ZCard = 64; + ZCount = 65; ZIncrBy = 66; ZScore = 67; Type = 68; @@ -114,7 +112,7 @@ enum RequestType { Echo = 70; ZPopMin = 71; Strlen = 72; - Lindex = 73; + LIndex = 73; ZPopMax = 74; XRead = 75; XAdd = 76; @@ -125,22 +123,22 @@ enum RequestType { XGroupDestroy = 81; HSetNX = 82; SIsMember = 83; - Hvals = 84; + HVals = 84; PTTL = 85; ZRemRangeByRank = 86; Persist = 87; ZRemRangeByScore = 88; Time = 89; - Zrank = 90; + ZRank = 90; Rename = 91; DBSize = 92; - Brpop = 93; - Hkeys = 94; - Spop = 95; + BRPop = 93; + HKeys = 94; + SPop = 95; PfAdd = 96; PfCount = 97; PfMerge = 98; - Blpop = 100; + BLPop = 100; LInsert = 101; RPushX = 102; LPushX = 103; @@ -165,14 +163,14 @@ enum RequestType { GeoHash = 122; ObjectEncoding = 123; SDiff = 124; - ObjectIdletime = 125; - ObjectRefcount = 126; - LOLWUT = 100500; + ObjectIdleTime = 125; + ObjectRefCount = 126; + Lolwut = 100500; GeoDist = 127; GeoPos = 128; BZPopMax = 129; ObjectFreq = 130; - RenameNx = 131; + RenameNX = 131; Touch = 132; ZRevRank = 133; ZInterStore = 134; diff --git a/glide-core/src/request_type.rs b/glide-core/src/request_type.rs index f2e2143013..3ae4823e11 100644 --- a/glide-core/src/request_type.rs +++ b/glide-core/src/request_type.rs @@ -11,8 +11,8 @@ use crate::redis_request::RequestType as ProtobufRequestType; pub enum RequestType { InvalidRequest = 0, CustomCommand = 1, - GetString = 2, - SetString = 3, + Get = 2, + Set = 3, Ping = 4, Info = 5, Del = 6, @@ -36,10 +36,10 @@ pub enum RequestType { ClientUnblock = 24, ClientUnpause = 25, Expire = 26, - HashSet = 27, - HashGet = 28, - HashDel = 29, - HashExists = 30, + HSet = 27, + HGet = 28, + HDel = 29, + HExists = 30, MGet = 31, MSet = 32, Incr = 33, @@ -47,11 +47,11 @@ pub enum RequestType { Decr = 35, IncrByFloat = 36, DecrBy = 37, - HashGetAll = 38, - HashMSet = 39, - HashMGet = 40, - HashIncrBy = 41, - HashIncrByFloat = 42, + HGetAll = 38, + HMSet = 39, + HMGet = 40, + HIncrBy = 41, + HIncrByFloat = 42, LPush = 43, LPop = 44, RPush = 45, @@ -70,11 +70,11 @@ pub enum RequestType { Exists = 58, Unlink = 59, TTL = 60, - Zadd = 61, - Zrem = 62, - Zrange = 63, - Zcard = 64, - Zcount = 65, + ZAdd = 61, + ZRem = 62, + ZRange = 63, + ZCard = 64, + ZCount = 65, ZIncrBy = 66, ZScore = 67, Type = 68, @@ -82,7 +82,7 @@ pub enum RequestType { Echo = 70, ZPopMin = 71, Strlen = 72, - Lindex = 73, + LIndex = 73, ZPopMax = 74, XRead = 75, XAdd = 76, @@ -93,22 +93,22 @@ pub enum RequestType { XGroupDestroy = 81, HSetNX = 82, SIsMember = 83, - Hvals = 84, + HVals = 84, PTTL = 85, ZRemRangeByRank = 86, Persist = 87, ZRemRangeByScore = 88, Time = 89, - Zrank = 90, + ZRank = 90, Rename = 91, DBSize = 92, - Brpop = 93, - Hkeys = 94, - Spop = 95, + BRPop = 93, + HKeys = 94, + SPop = 95, PfAdd = 96, PfCount = 97, PfMerge = 98, - Blpop = 100, + BLPop = 100, LInsert = 101, RPushX = 102, LPushX = 103, @@ -133,14 +133,14 @@ pub enum RequestType { GeoHash = 122, ObjectEncoding = 123, SDiff = 124, - ObjectIdletime = 125, - ObjectRefcount = 126, - LOLWUT = 100500, + ObjectIdleTime = 125, + ObjectRefCount = 126, + Lolwut = 100500, GeoDist = 127, GeoPos = 128, BZPopMax = 129, ObjectFreq = 130, - RenameNx = 131, + RenameNX = 131, Touch = 132, ZRevRank = 133, ZInterStore = 134, @@ -163,8 +163,8 @@ impl From<::protobuf::EnumOrUnknown> for RequestType { match value.enum_value_or(ProtobufRequestType::InvalidRequest) { ProtobufRequestType::InvalidRequest => RequestType::InvalidRequest, ProtobufRequestType::CustomCommand => RequestType::CustomCommand, - ProtobufRequestType::GetString => RequestType::GetString, - ProtobufRequestType::SetString => RequestType::SetString, + ProtobufRequestType::Get => RequestType::Get, + ProtobufRequestType::Set => RequestType::Set, ProtobufRequestType::Ping => RequestType::Ping, ProtobufRequestType::Info => RequestType::Info, ProtobufRequestType::Del => RequestType::Del, @@ -188,10 +188,10 @@ impl From<::protobuf::EnumOrUnknown> for RequestType { ProtobufRequestType::ClientUnblock => RequestType::ClientUnblock, ProtobufRequestType::ClientUnpause => RequestType::ClientUnpause, ProtobufRequestType::Expire => RequestType::Expire, - ProtobufRequestType::HashSet => RequestType::HashSet, - ProtobufRequestType::HashGet => RequestType::HashGet, - ProtobufRequestType::HashDel => RequestType::HashDel, - ProtobufRequestType::HashExists => RequestType::HashExists, + ProtobufRequestType::HSet => RequestType::HSet, + ProtobufRequestType::HGet => RequestType::HGet, + ProtobufRequestType::HDel => RequestType::HDel, + ProtobufRequestType::HExists => RequestType::HExists, ProtobufRequestType::MSet => RequestType::MSet, ProtobufRequestType::MGet => RequestType::MGet, ProtobufRequestType::Incr => RequestType::Incr, @@ -199,11 +199,11 @@ impl From<::protobuf::EnumOrUnknown> for RequestType { ProtobufRequestType::IncrByFloat => RequestType::IncrByFloat, ProtobufRequestType::Decr => RequestType::Decr, ProtobufRequestType::DecrBy => RequestType::DecrBy, - ProtobufRequestType::HashGetAll => RequestType::HashGetAll, - ProtobufRequestType::HashMSet => RequestType::HashMSet, - ProtobufRequestType::HashMGet => RequestType::HashMGet, - ProtobufRequestType::HashIncrBy => RequestType::HashIncrBy, - ProtobufRequestType::HashIncrByFloat => RequestType::HashIncrByFloat, + ProtobufRequestType::HGetAll => RequestType::HGetAll, + ProtobufRequestType::HMSet => RequestType::HMSet, + ProtobufRequestType::HMGet => RequestType::HMGet, + ProtobufRequestType::HIncrBy => RequestType::HIncrBy, + ProtobufRequestType::HIncrByFloat => RequestType::HIncrByFloat, ProtobufRequestType::LPush => RequestType::LPush, ProtobufRequestType::LPop => RequestType::LPop, ProtobufRequestType::RPush => RequestType::RPush, @@ -222,11 +222,11 @@ impl From<::protobuf::EnumOrUnknown> for RequestType { ProtobufRequestType::Exists => RequestType::Exists, ProtobufRequestType::Unlink => RequestType::Unlink, ProtobufRequestType::TTL => RequestType::TTL, - ProtobufRequestType::Zadd => RequestType::Zadd, - ProtobufRequestType::Zrem => RequestType::Zrem, - ProtobufRequestType::Zrange => RequestType::Zrange, - ProtobufRequestType::Zcard => RequestType::Zcard, - ProtobufRequestType::Zcount => RequestType::Zcount, + ProtobufRequestType::ZAdd => RequestType::ZAdd, + ProtobufRequestType::ZRem => RequestType::ZRem, + ProtobufRequestType::ZRange => RequestType::ZRange, + ProtobufRequestType::ZCard => RequestType::ZCard, + ProtobufRequestType::ZCount => RequestType::ZCount, ProtobufRequestType::ZIncrBy => RequestType::ZIncrBy, ProtobufRequestType::ZScore => RequestType::ZScore, ProtobufRequestType::Type => RequestType::Type, @@ -234,7 +234,7 @@ impl From<::protobuf::EnumOrUnknown> for RequestType { ProtobufRequestType::Echo => RequestType::Echo, ProtobufRequestType::ZPopMin => RequestType::ZPopMin, ProtobufRequestType::Strlen => RequestType::Strlen, - ProtobufRequestType::Lindex => RequestType::Lindex, + ProtobufRequestType::LIndex => RequestType::LIndex, ProtobufRequestType::ZPopMax => RequestType::ZPopMax, ProtobufRequestType::XAck => RequestType::XAck, ProtobufRequestType::XAdd => RequestType::XAdd, @@ -245,25 +245,25 @@ impl From<::protobuf::EnumOrUnknown> for RequestType { ProtobufRequestType::XTrim => RequestType::XTrim, ProtobufRequestType::HSetNX => RequestType::HSetNX, ProtobufRequestType::SIsMember => RequestType::SIsMember, - ProtobufRequestType::Hvals => RequestType::Hvals, + ProtobufRequestType::HVals => RequestType::HVals, ProtobufRequestType::PTTL => RequestType::PTTL, ProtobufRequestType::ZRemRangeByRank => RequestType::ZRemRangeByRank, ProtobufRequestType::Persist => RequestType::Persist, ProtobufRequestType::ZRemRangeByScore => RequestType::ZRemRangeByScore, ProtobufRequestType::Time => RequestType::Time, - ProtobufRequestType::Zrank => RequestType::Zrank, + ProtobufRequestType::ZRank => RequestType::ZRank, ProtobufRequestType::Rename => RequestType::Rename, ProtobufRequestType::DBSize => RequestType::DBSize, - ProtobufRequestType::Brpop => RequestType::Brpop, - ProtobufRequestType::Hkeys => RequestType::Hkeys, + ProtobufRequestType::BRPop => RequestType::BRPop, + ProtobufRequestType::HKeys => RequestType::HKeys, ProtobufRequestType::PfAdd => RequestType::PfAdd, ProtobufRequestType::PfCount => RequestType::PfCount, ProtobufRequestType::PfMerge => RequestType::PfMerge, ProtobufRequestType::RPushX => RequestType::RPushX, ProtobufRequestType::LPushX => RequestType::LPushX, - ProtobufRequestType::Blpop => RequestType::Blpop, + ProtobufRequestType::BLPop => RequestType::BLPop, ProtobufRequestType::LInsert => RequestType::LInsert, - ProtobufRequestType::Spop => RequestType::Spop, + ProtobufRequestType::SPop => RequestType::SPop, ProtobufRequestType::ZMScore => RequestType::ZMScore, ProtobufRequestType::ZDiff => RequestType::ZDiff, ProtobufRequestType::ZDiffStore => RequestType::ZDiffStore, @@ -285,14 +285,14 @@ impl From<::protobuf::EnumOrUnknown> for RequestType { ProtobufRequestType::GeoHash => RequestType::GeoHash, ProtobufRequestType::ObjectEncoding => RequestType::ObjectEncoding, ProtobufRequestType::ObjectFreq => RequestType::ObjectFreq, - ProtobufRequestType::ObjectIdletime => RequestType::ObjectIdletime, + ProtobufRequestType::ObjectIdleTime => RequestType::ObjectIdleTime, ProtobufRequestType::GeoDist => RequestType::GeoDist, ProtobufRequestType::SDiff => RequestType::SDiff, - ProtobufRequestType::ObjectRefcount => RequestType::ObjectRefcount, - ProtobufRequestType::LOLWUT => RequestType::LOLWUT, + ProtobufRequestType::ObjectRefCount => RequestType::ObjectRefCount, + ProtobufRequestType::Lolwut => RequestType::Lolwut, ProtobufRequestType::GeoPos => RequestType::GeoPos, ProtobufRequestType::BZPopMax => RequestType::BZPopMax, - ProtobufRequestType::RenameNx => RequestType::RenameNx, + ProtobufRequestType::RenameNX => RequestType::RenameNX, ProtobufRequestType::Touch => RequestType::Touch, ProtobufRequestType::ZRevRank => RequestType::ZRevRank, ProtobufRequestType::ZInterStore => RequestType::ZInterStore, @@ -311,8 +311,8 @@ impl RequestType { match self { RequestType::InvalidRequest => None, RequestType::CustomCommand => Some(Cmd::new()), - RequestType::GetString => Some(cmd("GET")), - RequestType::SetString => Some(cmd("SET")), + RequestType::Get => Some(cmd("GET")), + RequestType::Set => Some(cmd("SET")), RequestType::Ping => Some(cmd("PING")), RequestType::Info => Some(cmd("INFO")), RequestType::Del => Some(cmd("DEL")), @@ -336,10 +336,10 @@ impl RequestType { RequestType::ClientUnblock => Some(get_two_word_command("CLIENT", "UNBLOCK")), RequestType::ClientUnpause => Some(get_two_word_command("CLIENT", "UNPAUSE")), RequestType::Expire => Some(cmd("EXPIRE")), - RequestType::HashSet => Some(cmd("HSET")), - RequestType::HashGet => Some(cmd("HGET")), - RequestType::HashDel => Some(cmd("HDEL")), - RequestType::HashExists => Some(cmd("HEXISTS")), + RequestType::HSet => Some(cmd("HSET")), + RequestType::HGet => Some(cmd("HGET")), + RequestType::HDel => Some(cmd("HDEL")), + RequestType::HExists => Some(cmd("HEXISTS")), RequestType::MSet => Some(cmd("MSET")), RequestType::MGet => Some(cmd("MGET")), RequestType::Incr => Some(cmd("INCR")), @@ -347,11 +347,11 @@ impl RequestType { RequestType::IncrByFloat => Some(cmd("INCRBYFLOAT")), RequestType::Decr => Some(cmd("DECR")), RequestType::DecrBy => Some(cmd("DECRBY")), - RequestType::HashGetAll => Some(cmd("HGETALL")), - RequestType::HashMSet => Some(cmd("HMSET")), - RequestType::HashMGet => Some(cmd("HMGET")), - RequestType::HashIncrBy => Some(cmd("HINCRBY")), - RequestType::HashIncrByFloat => Some(cmd("HINCRBYFLOAT")), + RequestType::HGetAll => Some(cmd("HGETALL")), + RequestType::HMSet => Some(cmd("HMSET")), + RequestType::HMGet => Some(cmd("HMGET")), + RequestType::HIncrBy => Some(cmd("HINCRBY")), + RequestType::HIncrByFloat => Some(cmd("HINCRBYFLOAT")), RequestType::LPush => Some(cmd("LPUSH")), RequestType::LPop => Some(cmd("LPOP")), RequestType::RPush => Some(cmd("RPUSH")), @@ -370,11 +370,11 @@ impl RequestType { RequestType::Exists => Some(cmd("EXISTS")), RequestType::Unlink => Some(cmd("UNLINK")), RequestType::TTL => Some(cmd("TTL")), - RequestType::Zadd => Some(cmd("ZADD")), - RequestType::Zrem => Some(cmd("ZREM")), - RequestType::Zrange => Some(cmd("ZRANGE")), - RequestType::Zcard => Some(cmd("ZCARD")), - RequestType::Zcount => Some(cmd("ZCOUNT")), + RequestType::ZAdd => Some(cmd("ZADD")), + RequestType::ZRem => Some(cmd("ZREM")), + RequestType::ZRange => Some(cmd("ZRANGE")), + RequestType::ZCard => Some(cmd("ZCARD")), + RequestType::ZCount => Some(cmd("ZCOUNT")), RequestType::ZIncrBy => Some(cmd("ZINCRBY")), RequestType::ZScore => Some(cmd("ZSCORE")), RequestType::Type => Some(cmd("TYPE")), @@ -382,7 +382,7 @@ impl RequestType { RequestType::Echo => Some(cmd("ECHO")), RequestType::ZPopMin => Some(cmd("ZPOPMIN")), RequestType::Strlen => Some(cmd("STRLEN")), - RequestType::Lindex => Some(cmd("LINDEX")), + RequestType::LIndex => Some(cmd("LINDEX")), RequestType::ZPopMax => Some(cmd("ZPOPMAX")), RequestType::XAck => Some(cmd("XACK")), RequestType::XAdd => Some(cmd("XADD")), @@ -393,25 +393,25 @@ impl RequestType { RequestType::XTrim => Some(cmd("XTRIM")), RequestType::HSetNX => Some(cmd("HSETNX")), RequestType::SIsMember => Some(cmd("SISMEMBER")), - RequestType::Hvals => Some(cmd("HVALS")), + RequestType::HVals => Some(cmd("HVALS")), RequestType::PTTL => Some(cmd("PTTL")), RequestType::ZRemRangeByRank => Some(cmd("ZREMRANGEBYRANK")), RequestType::Persist => Some(cmd("PERSIST")), RequestType::ZRemRangeByScore => Some(cmd("ZREMRANGEBYSCORE")), RequestType::Time => Some(cmd("TIME")), - RequestType::Zrank => Some(cmd("ZRANK")), + RequestType::ZRank => Some(cmd("ZRANK")), RequestType::Rename => Some(cmd("RENAME")), RequestType::DBSize => Some(cmd("DBSIZE")), - RequestType::Brpop => Some(cmd("BRPOP")), - RequestType::Hkeys => Some(cmd("HKEYS")), + RequestType::BRPop => Some(cmd("BRPOP")), + RequestType::HKeys => Some(cmd("HKEYS")), RequestType::PfAdd => Some(cmd("PFADD")), RequestType::PfCount => Some(cmd("PFCOUNT")), RequestType::PfMerge => Some(cmd("PFMERGE")), RequestType::RPushX => Some(cmd("RPUSHX")), RequestType::LPushX => Some(cmd("LPUSHX")), - RequestType::Blpop => Some(cmd("BLPOP")), + RequestType::BLPop => Some(cmd("BLPOP")), RequestType::LInsert => Some(cmd("LINSERT")), - RequestType::Spop => Some(cmd("SPOP")), + RequestType::SPop => Some(cmd("SPOP")), RequestType::ZMScore => Some(cmd("ZMSCORE")), RequestType::ZDiff => Some(cmd("ZDIFF")), RequestType::ZDiffStore => Some(cmd("ZDIFFSTORE")), @@ -433,14 +433,14 @@ impl RequestType { RequestType::GeoHash => Some(cmd("GEOHASH")), RequestType::ObjectEncoding => Some(get_two_word_command("OBJECT", "ENCODING")), RequestType::ObjectFreq => Some(get_two_word_command("OBJECT", "FREQ")), - RequestType::ObjectIdletime => Some(get_two_word_command("OBJECT", "IDLETIME")), + RequestType::ObjectIdleTime => Some(get_two_word_command("OBJECT", "IDLETIME")), RequestType::GeoDist => Some(cmd("GEODIST")), RequestType::SDiff => Some(cmd("SDIFF")), - RequestType::ObjectRefcount => Some(get_two_word_command("OBJECT", "REFCOUNT")), - RequestType::LOLWUT => Some(cmd("LOLWUT")), + RequestType::ObjectRefCount => Some(get_two_word_command("OBJECT", "REFCOUNT")), + RequestType::Lolwut => Some(cmd("LOLWUT")), RequestType::GeoPos => Some(cmd("GEOPOS")), RequestType::BZPopMax => Some(cmd("BZPOPMAX")), - RequestType::RenameNx => Some(cmd("RENAMENX")), + RequestType::RenameNX => Some(cmd("RENAMENX")), RequestType::Touch => Some(cmd("TOUCH")), RequestType::ZRevRank => Some(cmd("ZREVRANK")), RequestType::ZInterStore => Some(cmd("ZINTERSTORE")), diff --git a/glide-core/src/rotating_buffer.rs b/glide-core/src/rotating_buffer.rs index bbc736162e..efc0f15d4b 100644 --- a/glide-core/src/rotating_buffer.rs +++ b/glide-core/src/rotating_buffer.rs @@ -118,7 +118,7 @@ mod tests { buffer, callback_index, vec![key.to_string()], - RequestType::GetString, + RequestType::Get, args_pointer, ); } @@ -134,7 +134,7 @@ mod tests { buffer, callback_index, vec![key.to_string(), value], - RequestType::SetString, + RequestType::Set, args_pointer, ); } @@ -195,14 +195,14 @@ mod tests { assert_eq!(requests.len(), 2); assert_request( &requests[0], - RequestType::GetString, + RequestType::Get, 100, vec!["key".to_string()], args_pointer, ); assert_request( &requests[1], - RequestType::SetString, + RequestType::Set, 5, vec!["key".to_string(), "value".to_string()], args_pointer, @@ -217,7 +217,7 @@ mod tests { let requests = rotating_buffer.get_requests().unwrap(); assert_request( &requests[0], - RequestType::GetString, + RequestType::Get, 100, vec!["key".to_string()], args_pointer, @@ -233,7 +233,7 @@ mod tests { assert_eq!(requests.len(), 1); assert_request( &requests[0], - RequestType::SetString, + RequestType::Set, 5, vec!["key".to_string(), "value".to_string()], args_pointer, @@ -250,7 +250,7 @@ mod tests { assert_eq!(requests.len(), 1); assert_request( &requests[0], - RequestType::GetString, + RequestType::Get, 100, vec!["key".to_string()], false, @@ -261,7 +261,7 @@ mod tests { } assert_request( &requests[0], - RequestType::GetString, + RequestType::Get, 100, vec!["key".to_string()], false, @@ -284,7 +284,7 @@ mod tests { assert_eq!(requests.len(), 1); assert_request( &requests[0], - RequestType::GetString, + RequestType::Get, 100, vec!["key1".to_string()], args_pointer, @@ -296,7 +296,7 @@ mod tests { assert_eq!(requests.len(), 1); assert_request( &requests[0], - RequestType::GetString, + RequestType::Get, 101, vec!["key2".to_string()], args_pointer, @@ -322,13 +322,7 @@ mod tests { buffer.extend_from_slice(&request_bytes[NUM_OF_LENGTH_BYTES..]); let requests = rotating_buffer.get_requests().unwrap(); assert_eq!(requests.len(), 1); - assert_request( - &requests[0], - RequestType::GetString, - 100, - vec![key], - args_pointer, - ); + assert_request(&requests[0], RequestType::Get, 100, vec![key], args_pointer); } #[rstest] @@ -351,7 +345,7 @@ mod tests { assert_eq!(requests.len(), 1); assert_request( &requests[0], - RequestType::GetString, + RequestType::Get, 100, vec!["key1".to_string()], args_pointer, @@ -363,7 +357,7 @@ mod tests { assert_eq!(requests.len(), 1); assert_request( &requests[0], - RequestType::GetString, + RequestType::Get, 101, vec![key2], args_pointer, diff --git a/glide-core/tests/test_socket_listener.rs b/glide-core/tests/test_socket_listener.rs index 816d0e2992..7bcd1c3ffe 100644 --- a/glide-core/tests/test_socket_listener.rs +++ b/glide-core/tests/test_socket_listener.rs @@ -322,7 +322,7 @@ mod socket_listener { socket, callback_index, vec![key.to_string()], - RequestType::GetString.into(), + RequestType::Get.into(), args_pointer, ) } @@ -340,7 +340,7 @@ mod socket_listener { socket, callback_index, vec![key.to_string(), value], - RequestType::SetString.into(), + RequestType::Set.into(), args_pointer, ) } @@ -1154,7 +1154,7 @@ mod socket_listener { CommandComponents { args: vec![key.clone(), "bar".to_string()], args_pointer: true, - request_type: RequestType::SetString.into(), + request_type: RequestType::Set.into(), }, CommandComponents { args: vec!["GET".to_string(), key.clone()], @@ -1169,7 +1169,7 @@ mod socket_listener { CommandComponents { args: vec![key], args_pointer: false, - request_type: RequestType::GetString.into(), + request_type: RequestType::Get.into(), }, ]; let mut buffer = Vec::with_capacity(200); diff --git a/java/client/src/main/java/glide/api/BaseClient.java b/java/client/src/main/java/glide/api/BaseClient.java index 53dbb8583e..e2fe12758d 100644 --- a/java/client/src/main/java/glide/api/BaseClient.java +++ b/java/client/src/main/java/glide/api/BaseClient.java @@ -8,10 +8,10 @@ import static glide.utils.ArrayTransformUtils.convertMapToKeyValueStringArray; import static glide.utils.ArrayTransformUtils.convertMapToValueKeyStringArray; import static glide.utils.ArrayTransformUtils.mapGeoDataToArray; +import static redis_request.RedisRequestOuterClass.RequestType.BLPop; +import static redis_request.RedisRequestOuterClass.RequestType.BRPop; import static redis_request.RedisRequestOuterClass.RequestType.BZPopMax; import static redis_request.RedisRequestOuterClass.RequestType.BZPopMin; -import static redis_request.RedisRequestOuterClass.RequestType.Blpop; -import static redis_request.RedisRequestOuterClass.RequestType.Brpop; import static redis_request.RedisRequestOuterClass.RequestType.Decr; import static redis_request.RedisRequestOuterClass.RequestType.DecrBy; import static redis_request.RedisRequestOuterClass.RequestType.Del; @@ -20,23 +20,24 @@ import static redis_request.RedisRequestOuterClass.RequestType.ExpireAt; import static redis_request.RedisRequestOuterClass.RequestType.GeoAdd; import static redis_request.RedisRequestOuterClass.RequestType.GeoPos; +import static redis_request.RedisRequestOuterClass.RequestType.Get; import static redis_request.RedisRequestOuterClass.RequestType.GetRange; -import static redis_request.RedisRequestOuterClass.RequestType.GetString; +import static redis_request.RedisRequestOuterClass.RequestType.HDel; +import static redis_request.RedisRequestOuterClass.RequestType.HExists; +import static redis_request.RedisRequestOuterClass.RequestType.HGet; +import static redis_request.RedisRequestOuterClass.RequestType.HGetAll; +import static redis_request.RedisRequestOuterClass.RequestType.HIncrBy; +import static redis_request.RedisRequestOuterClass.RequestType.HIncrByFloat; +import static redis_request.RedisRequestOuterClass.RequestType.HKeys; import static redis_request.RedisRequestOuterClass.RequestType.HLen; +import static redis_request.RedisRequestOuterClass.RequestType.HMGet; +import static redis_request.RedisRequestOuterClass.RequestType.HSet; import static redis_request.RedisRequestOuterClass.RequestType.HSetNX; -import static redis_request.RedisRequestOuterClass.RequestType.HashDel; -import static redis_request.RedisRequestOuterClass.RequestType.HashExists; -import static redis_request.RedisRequestOuterClass.RequestType.HashGet; -import static redis_request.RedisRequestOuterClass.RequestType.HashGetAll; -import static redis_request.RedisRequestOuterClass.RequestType.HashIncrBy; -import static redis_request.RedisRequestOuterClass.RequestType.HashIncrByFloat; -import static redis_request.RedisRequestOuterClass.RequestType.HashMGet; -import static redis_request.RedisRequestOuterClass.RequestType.HashSet; -import static redis_request.RedisRequestOuterClass.RequestType.Hkeys; -import static redis_request.RedisRequestOuterClass.RequestType.Hvals; +import static redis_request.RedisRequestOuterClass.RequestType.HVals; import static redis_request.RedisRequestOuterClass.RequestType.Incr; import static redis_request.RedisRequestOuterClass.RequestType.IncrBy; import static redis_request.RedisRequestOuterClass.RequestType.IncrByFloat; +import static redis_request.RedisRequestOuterClass.RequestType.LIndex; import static redis_request.RedisRequestOuterClass.RequestType.LInsert; import static redis_request.RedisRequestOuterClass.RequestType.LLen; import static redis_request.RedisRequestOuterClass.RequestType.LPop; @@ -45,13 +46,12 @@ import static redis_request.RedisRequestOuterClass.RequestType.LRange; import static redis_request.RedisRequestOuterClass.RequestType.LRem; import static redis_request.RedisRequestOuterClass.RequestType.LTrim; -import static redis_request.RedisRequestOuterClass.RequestType.Lindex; import static redis_request.RedisRequestOuterClass.RequestType.MGet; import static redis_request.RedisRequestOuterClass.RequestType.MSet; import static redis_request.RedisRequestOuterClass.RequestType.ObjectEncoding; import static redis_request.RedisRequestOuterClass.RequestType.ObjectFreq; -import static redis_request.RedisRequestOuterClass.RequestType.ObjectIdletime; -import static redis_request.RedisRequestOuterClass.RequestType.ObjectRefcount; +import static redis_request.RedisRequestOuterClass.RequestType.ObjectIdleTime; +import static redis_request.RedisRequestOuterClass.RequestType.ObjectRefCount; import static redis_request.RedisRequestOuterClass.RequestType.PExpire; import static redis_request.RedisRequestOuterClass.RequestType.PExpireAt; import static redis_request.RedisRequestOuterClass.RequestType.PTTL; @@ -62,7 +62,7 @@ import static redis_request.RedisRequestOuterClass.RequestType.RPop; import static redis_request.RedisRequestOuterClass.RequestType.RPush; import static redis_request.RedisRequestOuterClass.RequestType.RPushX; -import static redis_request.RedisRequestOuterClass.RequestType.RenameNx; +import static redis_request.RedisRequestOuterClass.RequestType.RenameNX; import static redis_request.RedisRequestOuterClass.RequestType.SAdd; import static redis_request.RedisRequestOuterClass.RequestType.SCard; import static redis_request.RedisRequestOuterClass.RequestType.SDiff; @@ -75,8 +75,8 @@ import static redis_request.RedisRequestOuterClass.RequestType.SMove; import static redis_request.RedisRequestOuterClass.RequestType.SRem; import static redis_request.RedisRequestOuterClass.RequestType.SUnionStore; +import static redis_request.RedisRequestOuterClass.RequestType.Set; import static redis_request.RedisRequestOuterClass.RequestType.SetRange; -import static redis_request.RedisRequestOuterClass.RequestType.SetString; import static redis_request.RedisRequestOuterClass.RequestType.Strlen; import static redis_request.RedisRequestOuterClass.RequestType.TTL; import static redis_request.RedisRequestOuterClass.RequestType.Touch; @@ -84,6 +84,9 @@ import static redis_request.RedisRequestOuterClass.RequestType.Unlink; import static redis_request.RedisRequestOuterClass.RequestType.XAdd; import static redis_request.RedisRequestOuterClass.RequestType.XTrim; +import static redis_request.RedisRequestOuterClass.RequestType.ZAdd; +import static redis_request.RedisRequestOuterClass.RequestType.ZCard; +import static redis_request.RedisRequestOuterClass.RequestType.ZCount; import static redis_request.RedisRequestOuterClass.RequestType.ZDiff; import static redis_request.RedisRequestOuterClass.RequestType.ZDiffStore; import static redis_request.RedisRequestOuterClass.RequestType.ZInterStore; @@ -92,7 +95,10 @@ import static redis_request.RedisRequestOuterClass.RequestType.ZPopMax; import static redis_request.RedisRequestOuterClass.RequestType.ZPopMin; import static redis_request.RedisRequestOuterClass.RequestType.ZRandMember; +import static redis_request.RedisRequestOuterClass.RequestType.ZRange; import static redis_request.RedisRequestOuterClass.RequestType.ZRangeStore; +import static redis_request.RedisRequestOuterClass.RequestType.ZRank; +import static redis_request.RedisRequestOuterClass.RequestType.ZRem; import static redis_request.RedisRequestOuterClass.RequestType.ZRemRangeByLex; import static redis_request.RedisRequestOuterClass.RequestType.ZRemRangeByRank; import static redis_request.RedisRequestOuterClass.RequestType.ZRemRangeByScore; @@ -100,12 +106,6 @@ import static redis_request.RedisRequestOuterClass.RequestType.ZScore; import static redis_request.RedisRequestOuterClass.RequestType.ZUnion; import static redis_request.RedisRequestOuterClass.RequestType.ZUnionStore; -import static redis_request.RedisRequestOuterClass.RequestType.Zadd; -import static redis_request.RedisRequestOuterClass.RequestType.Zcard; -import static redis_request.RedisRequestOuterClass.RequestType.Zcount; -import static redis_request.RedisRequestOuterClass.RequestType.Zrange; -import static redis_request.RedisRequestOuterClass.RequestType.Zrank; -import static redis_request.RedisRequestOuterClass.RequestType.Zrem; import glide.api.commands.GenericBaseCommands; import glide.api.commands.GeospatialIndicesBaseCommands; @@ -128,7 +128,7 @@ import glide.api.models.commands.SetOptions; import glide.api.models.commands.WeightAggregateOptions.Aggregate; import glide.api.models.commands.WeightAggregateOptions.KeysOrWeightedKeys; -import glide.api.models.commands.ZaddOptions; +import glide.api.models.commands.ZAddOptions; import glide.api.models.commands.geospatial.GeoAddOptions; import glide.api.models.commands.geospatial.GeospatialData; import glide.api.models.commands.stream.StreamAddOptions; @@ -333,20 +333,20 @@ public CompletableFuture del(@NonNull String[] keys) { @Override public CompletableFuture get(@NonNull String key) { return commandManager.submitNewCommand( - GetString, new String[] {key}, this::handleStringOrNullResponse); + Get, new String[] {key}, this::handleStringOrNullResponse); } @Override public CompletableFuture set(@NonNull String key, @NonNull String value) { return commandManager.submitNewCommand( - SetString, new String[] {key, value}, this::handleStringResponse); + Set, new String[] {key, value}, this::handleStringResponse); } @Override public CompletableFuture set( @NonNull String key, @NonNull String value, @NonNull SetOptions options) { String[] arguments = ArrayUtils.addAll(new String[] {key, value}, options.toArgs()); - return commandManager.submitNewCommand(SetString, arguments, this::handleStringOrNullResponse); + return commandManager.submitNewCommand(Set, arguments, this::handleStringOrNullResponse); } @Override @@ -376,19 +376,19 @@ public CompletableFuture objectFreq(@NonNull String key) { @Override public CompletableFuture objectIdletime(@NonNull String key) { return commandManager.submitNewCommand( - ObjectIdletime, new String[] {key}, this::handleLongOrNullResponse); + ObjectIdleTime, new String[] {key}, this::handleLongOrNullResponse); } @Override public CompletableFuture objectRefcount(@NonNull String key) { return commandManager.submitNewCommand( - ObjectRefcount, new String[] {key}, this::handleLongOrNullResponse); + ObjectRefCount, new String[] {key}, this::handleLongOrNullResponse); } @Override public CompletableFuture renamenx(@NonNull String key, @NonNull String newKey) { return commandManager.submitNewCommand( - RenameNx, new String[] {key, newKey}, this::handleBooleanResponse); + RenameNX, new String[] {key, newKey}, this::handleBooleanResponse); } @Override @@ -439,14 +439,14 @@ public CompletableFuture getrange(@NonNull String key, int start, int en @Override public CompletableFuture hget(@NonNull String key, @NonNull String field) { return commandManager.submitNewCommand( - HashGet, new String[] {key, field}, this::handleStringOrNullResponse); + HGet, new String[] {key, field}, this::handleStringOrNullResponse); } @Override public CompletableFuture hset( @NonNull String key, @NonNull Map fieldValueMap) { String[] args = ArrayUtils.addFirst(convertMapToKeyValueStringArray(fieldValueMap), key); - return commandManager.submitNewCommand(HashSet, args, this::handleLongResponse); + return commandManager.submitNewCommand(HSet, args, this::handleLongResponse); } @Override @@ -459,7 +459,7 @@ public CompletableFuture hsetnx( @Override public CompletableFuture hdel(@NonNull String key, @NonNull String[] fields) { String[] args = ArrayUtils.addFirst(fields, key); - return commandManager.submitNewCommand(HashDel, args, this::handleLongResponse); + return commandManager.submitNewCommand(HDel, args, this::handleLongResponse); } @Override @@ -470,7 +470,7 @@ public CompletableFuture hlen(@NonNull String key) { @Override public CompletableFuture hvals(@NonNull String key) { return commandManager.submitNewCommand( - Hvals, + HVals, new String[] {key}, response -> castArray(handleArrayResponse(response), String.class)); } @@ -479,31 +479,31 @@ public CompletableFuture hvals(@NonNull String key) { public CompletableFuture hmget(@NonNull String key, @NonNull String[] fields) { String[] arguments = ArrayUtils.addFirst(fields, key); return commandManager.submitNewCommand( - HashMGet, arguments, response -> castArray(handleArrayResponse(response), String.class)); + HMGet, arguments, response -> castArray(handleArrayResponse(response), String.class)); } @Override public CompletableFuture hexists(@NonNull String key, @NonNull String field) { return commandManager.submitNewCommand( - HashExists, new String[] {key, field}, this::handleBooleanResponse); + HExists, new String[] {key, field}, this::handleBooleanResponse); } @Override public CompletableFuture> hgetall(@NonNull String key) { - return commandManager.submitNewCommand(HashGetAll, new String[] {key}, this::handleMapResponse); + return commandManager.submitNewCommand(HGetAll, new String[] {key}, this::handleMapResponse); } @Override public CompletableFuture hincrBy(@NonNull String key, @NonNull String field, long amount) { return commandManager.submitNewCommand( - HashIncrBy, new String[] {key, field, Long.toString(amount)}, this::handleLongResponse); + HIncrBy, new String[] {key, field, Long.toString(amount)}, this::handleLongResponse); } @Override public CompletableFuture hincrByFloat( @NonNull String key, @NonNull String field, double amount) { return commandManager.submitNewCommand( - HashIncrByFloat, + HIncrByFloat, new String[] {key, field, Double.toString(amount)}, this::handleDoubleResponse); } @@ -511,7 +511,7 @@ public CompletableFuture hincrByFloat( @Override public CompletableFuture hkeys(@NonNull String key) { return commandManager.submitNewCommand( - Hkeys, + HKeys, new String[] {key}, response -> castArray(handleArrayResponse(response), String.class)); } @@ -547,7 +547,7 @@ public CompletableFuture lrange(@NonNull String key, long start, long @Override public CompletableFuture lindex(@NonNull String key, long index) { return commandManager.submitNewCommand( - Lindex, new String[] {key, Long.toString(index)}, this::handleStringOrNullResponse); + LIndex, new String[] {key, Long.toString(index)}, this::handleStringOrNullResponse); } @Override @@ -750,7 +750,7 @@ public CompletableFuture invokeScript( public CompletableFuture zadd( @NonNull String key, @NonNull Map membersScoresMap, - @NonNull ZaddOptions options, + @NonNull ZAddOptions options, boolean changed) { String[] changedArg = changed ? new String[] {"CH"} : new String[] {}; String[] membersScores = convertMapToValueKeyStringArray(membersScoresMap); @@ -758,39 +758,39 @@ public CompletableFuture zadd( String[] arguments = concatenateArrays(new String[] {key}, options.toArgs(), changedArg, membersScores); - return commandManager.submitNewCommand(Zadd, arguments, this::handleLongResponse); + return commandManager.submitNewCommand(ZAdd, arguments, this::handleLongResponse); } @Override public CompletableFuture zadd( @NonNull String key, @NonNull Map membersScoresMap, - @NonNull ZaddOptions options) { + @NonNull ZAddOptions options) { return this.zadd(key, membersScoresMap, options, false); } @Override public CompletableFuture zadd( @NonNull String key, @NonNull Map membersScoresMap, boolean changed) { - return this.zadd(key, membersScoresMap, ZaddOptions.builder().build(), changed); + return this.zadd(key, membersScoresMap, ZAddOptions.builder().build(), changed); } @Override public CompletableFuture zadd( @NonNull String key, @NonNull Map membersScoresMap) { - return this.zadd(key, membersScoresMap, ZaddOptions.builder().build(), false); + return this.zadd(key, membersScoresMap, ZAddOptions.builder().build(), false); } @Override public CompletableFuture zaddIncr( - @NonNull String key, @NonNull String member, double increment, @NonNull ZaddOptions options) { + @NonNull String key, @NonNull String member, double increment, @NonNull ZAddOptions options) { String[] arguments = concatenateArrays( new String[] {key}, options.toArgs(), new String[] {"INCR", Double.toString(increment), member}); - return commandManager.submitNewCommand(Zadd, arguments, this::handleDoubleOrNullResponse); + return commandManager.submitNewCommand(ZAdd, arguments, this::handleDoubleOrNullResponse); } @Override @@ -800,18 +800,18 @@ public CompletableFuture zaddIncr( concatenateArrays( new String[] {key}, new String[] {"INCR", Double.toString(increment), member}); - return commandManager.submitNewCommand(Zadd, arguments, this::handleDoubleResponse); + return commandManager.submitNewCommand(ZAdd, arguments, this::handleDoubleResponse); } @Override public CompletableFuture zrem(@NonNull String key, @NonNull String[] members) { String[] arguments = ArrayUtils.addFirst(members, key); - return commandManager.submitNewCommand(Zrem, arguments, this::handleLongResponse); + return commandManager.submitNewCommand(ZRem, arguments, this::handleLongResponse); } @Override public CompletableFuture zcard(@NonNull String key) { - return commandManager.submitNewCommand(Zcard, new String[] {key}, this::handleLongResponse); + return commandManager.submitNewCommand(ZCard, new String[] {key}, this::handleLongResponse); } @Override @@ -857,13 +857,13 @@ public CompletableFuture zscore(@NonNull String key, @NonNull String mem @Override public CompletableFuture zrank(@NonNull String key, @NonNull String member) { return commandManager.submitNewCommand( - Zrank, new String[] {key, member}, this::handleLongOrNullResponse); + ZRank, new String[] {key, member}, this::handleLongOrNullResponse); } @Override public CompletableFuture zrankWithScore(@NonNull String key, @NonNull String member) { return commandManager.submitNewCommand( - Zrank, new String[] {key, member, WITH_SCORE_REDIS_API}, this::handleArrayOrNullResponse); + ZRank, new String[] {key, member, WITH_SCORE_REDIS_API}, this::handleArrayOrNullResponse); } @Override @@ -915,7 +915,7 @@ public CompletableFuture zdiffstore(@NonNull String destination, @NonNull public CompletableFuture zcount( @NonNull String key, @NonNull ScoreRange minScore, @NonNull ScoreRange maxScore) { return commandManager.submitNewCommand( - Zcount, new String[] {key, minScore.toArgs(), maxScore.toArgs()}, this::handleLongResponse); + ZCount, new String[] {key, minScore.toArgs(), maxScore.toArgs()}, this::handleLongResponse); } @Override @@ -1112,14 +1112,14 @@ public CompletableFuture linsert( public CompletableFuture blpop(@NonNull String[] keys, double timeout) { String[] arguments = ArrayUtils.add(keys, Double.toString(timeout)); return commandManager.submitNewCommand( - Blpop, arguments, response -> castArray(handleArrayOrNullResponse(response), String.class)); + BLPop, arguments, response -> castArray(handleArrayOrNullResponse(response), String.class)); } @Override public CompletableFuture brpop(@NonNull String[] keys, double timeout) { String[] arguments = ArrayUtils.add(keys, Double.toString(timeout)); return commandManager.submitNewCommand( - Brpop, arguments, response -> castArray(handleArrayOrNullResponse(response), String.class)); + BRPop, arguments, response -> castArray(handleArrayOrNullResponse(response), String.class)); } @Override @@ -1140,7 +1140,7 @@ public CompletableFuture zrange( String[] arguments = RangeOptions.createZRangeArgs(key, rangeQuery, reverse, false); return commandManager.submitNewCommand( - Zrange, + ZRange, arguments, response -> castArray(handleArrayOrNullResponse(response), String.class)); } @@ -1155,7 +1155,7 @@ public CompletableFuture> zrangeWithScores( @NonNull String key, @NonNull ScoredRangeQuery rangeQuery, boolean reverse) { String[] arguments = RangeOptions.createZRangeArgs(key, rangeQuery, reverse, true); - return commandManager.submitNewCommand(Zrange, arguments, this::handleMapResponse); + return commandManager.submitNewCommand(ZRange, arguments, this::handleMapResponse); } @Override diff --git a/java/client/src/main/java/glide/api/RedisClient.java b/java/client/src/main/java/glide/api/RedisClient.java index e5236cbe1d..114763a67f 100644 --- a/java/client/src/main/java/glide/api/RedisClient.java +++ b/java/client/src/main/java/glide/api/RedisClient.java @@ -14,8 +14,8 @@ import static redis_request.RedisRequestOuterClass.RequestType.Echo; import static redis_request.RedisRequestOuterClass.RequestType.FlushAll; import static redis_request.RedisRequestOuterClass.RequestType.Info; -import static redis_request.RedisRequestOuterClass.RequestType.LOLWUT; import static redis_request.RedisRequestOuterClass.RequestType.LastSave; +import static redis_request.RedisRequestOuterClass.RequestType.Lolwut; import static redis_request.RedisRequestOuterClass.RequestType.Ping; import static redis_request.RedisRequestOuterClass.RequestType.Select; import static redis_request.RedisRequestOuterClass.RequestType.Time; @@ -157,20 +157,20 @@ public CompletableFuture flushall(@NonNull FlushMode mode) { @Override public CompletableFuture lolwut() { - return commandManager.submitNewCommand(LOLWUT, new String[0], this::handleStringResponse); + return commandManager.submitNewCommand(Lolwut, new String[0], this::handleStringResponse); } @Override public CompletableFuture lolwut(int @NonNull [] parameters) { String[] arguments = Arrays.stream(parameters).mapToObj(Integer::toString).toArray(String[]::new); - return commandManager.submitNewCommand(LOLWUT, arguments, this::handleStringResponse); + return commandManager.submitNewCommand(Lolwut, arguments, this::handleStringResponse); } @Override public CompletableFuture lolwut(int version) { return commandManager.submitNewCommand( - LOLWUT, + Lolwut, new String[] {VERSION_REDIS_API, Integer.toString(version)}, this::handleStringResponse); } @@ -181,6 +181,6 @@ public CompletableFuture lolwut(int version, int @NonNull [] parameters) concatenateArrays( new String[] {VERSION_REDIS_API, Integer.toString(version)}, Arrays.stream(parameters).mapToObj(Integer::toString).toArray(String[]::new)); - return commandManager.submitNewCommand(LOLWUT, arguments, this::handleStringResponse); + return commandManager.submitNewCommand(Lolwut, arguments, this::handleStringResponse); } } diff --git a/java/client/src/main/java/glide/api/RedisClusterClient.java b/java/client/src/main/java/glide/api/RedisClusterClient.java index 09185583d7..2523af5d35 100644 --- a/java/client/src/main/java/glide/api/RedisClusterClient.java +++ b/java/client/src/main/java/glide/api/RedisClusterClient.java @@ -16,8 +16,8 @@ import static redis_request.RedisRequestOuterClass.RequestType.Echo; import static redis_request.RedisRequestOuterClass.RequestType.FlushAll; import static redis_request.RedisRequestOuterClass.RequestType.Info; -import static redis_request.RedisRequestOuterClass.RequestType.LOLWUT; import static redis_request.RedisRequestOuterClass.RequestType.LastSave; +import static redis_request.RedisRequestOuterClass.RequestType.Lolwut; import static redis_request.RedisRequestOuterClass.RequestType.Ping; import static redis_request.RedisRequestOuterClass.RequestType.Time; @@ -330,20 +330,20 @@ public CompletableFuture flushall( @Override public CompletableFuture lolwut() { - return commandManager.submitNewCommand(LOLWUT, new String[0], this::handleStringResponse); + return commandManager.submitNewCommand(Lolwut, new String[0], this::handleStringResponse); } @Override public CompletableFuture lolwut(int @NonNull [] parameters) { String[] arguments = Arrays.stream(parameters).mapToObj(Integer::toString).toArray(String[]::new); - return commandManager.submitNewCommand(LOLWUT, arguments, this::handleStringResponse); + return commandManager.submitNewCommand(Lolwut, arguments, this::handleStringResponse); } @Override public CompletableFuture lolwut(int version) { return commandManager.submitNewCommand( - LOLWUT, + Lolwut, new String[] {VERSION_REDIS_API, Integer.toString(version)}, this::handleStringResponse); } @@ -354,13 +354,13 @@ public CompletableFuture lolwut(int version, int @NonNull [] parameters) concatenateArrays( new String[] {VERSION_REDIS_API, Integer.toString(version)}, Arrays.stream(parameters).mapToObj(Integer::toString).toArray(String[]::new)); - return commandManager.submitNewCommand(LOLWUT, arguments, this::handleStringResponse); + return commandManager.submitNewCommand(Lolwut, arguments, this::handleStringResponse); } @Override public CompletableFuture> lolwut(@NonNull Route route) { return commandManager.submitNewCommand( - LOLWUT, + Lolwut, new String[0], route, response -> @@ -375,7 +375,7 @@ public CompletableFuture> lolwut( String[] arguments = Arrays.stream(parameters).mapToObj(Integer::toString).toArray(String[]::new); return commandManager.submitNewCommand( - LOLWUT, + Lolwut, arguments, route, response -> @@ -387,7 +387,7 @@ public CompletableFuture> lolwut( @Override public CompletableFuture> lolwut(int version, @NonNull Route route) { return commandManager.submitNewCommand( - LOLWUT, + Lolwut, new String[] {VERSION_REDIS_API, Integer.toString(version)}, route, response -> @@ -404,7 +404,7 @@ public CompletableFuture> lolwut( new String[] {VERSION_REDIS_API, Integer.toString(version)}, Arrays.stream(parameters).mapToObj(Integer::toString).toArray(String[]::new)); return commandManager.submitNewCommand( - LOLWUT, + Lolwut, arguments, route, response -> diff --git a/java/client/src/main/java/glide/api/commands/SortedSetBaseCommands.java b/java/client/src/main/java/glide/api/commands/SortedSetBaseCommands.java index 8478d9e5a1..83615ab824 100644 --- a/java/client/src/main/java/glide/api/commands/SortedSetBaseCommands.java +++ b/java/client/src/main/java/glide/api/commands/SortedSetBaseCommands.java @@ -16,7 +16,7 @@ import glide.api.models.commands.WeightAggregateOptions.KeyArray; import glide.api.models.commands.WeightAggregateOptions.KeysOrWeightedKeys; import glide.api.models.commands.WeightAggregateOptions.WeightedKeys; -import glide.api.models.commands.ZaddOptions; +import glide.api.models.commands.ZAddOptions; import java.util.Map; import java.util.concurrent.CompletableFuture; @@ -37,7 +37,7 @@ public interface SortedSetBaseCommands { * @see redis.io for more details. * @param key The key of the sorted set. * @param membersScoresMap A Map of members to their corresponding scores. - * @param options The Zadd options. + * @param options The ZAdd options. * @param changed Modify the return value from the number of new elements added, to the total * number of elements changed. * @return The number of elements added to the sorted set.
@@ -54,7 +54,7 @@ public interface SortedSetBaseCommands { * } */ CompletableFuture zadd( - String key, Map membersScoresMap, ZaddOptions options, boolean changed); + String key, Map membersScoresMap, ZAddOptions options, boolean changed); /** * Adds members with their scores to the sorted set stored at key.
@@ -63,7 +63,7 @@ CompletableFuture zadd( * @see redis.io for more details. * @param key The key of the sorted set. * @param membersScoresMap A Map of members to their corresponding scores. - * @param options The Zadd options. + * @param options The ZAdd options. * @return The number of elements added to the sorted set. * @example * 
{@code
@@ -77,7 +77,7 @@ CompletableFuture zadd(
      * }
*/ CompletableFuture zadd( - String key, Map membersScoresMap, ZaddOptions options); + String key, Map membersScoresMap, ZAddOptions options); /** * Adds members with their scores to the sorted set stored at key.
@@ -126,7 +126,7 @@ CompletableFuture zadd( * @param key The key of the sorted set. * @param member A member in the sorted set to increment. * @param increment The score to increment the member. - * @param options The Zadd options. + * @param options The ZAdd options. * @return The score of the member.
* If there was a conflict with the options, the operation aborts and null is * returned. @@ -142,7 +142,7 @@ CompletableFuture zadd( * } */ CompletableFuture zaddIncr( - String key, String member, double increment, ZaddOptions options); + String key, String member, double increment, ZAddOptions options); /** * Increments the score of member in the sorted set stored at key by increment diff --git a/java/client/src/main/java/glide/api/models/BaseTransaction.java b/java/client/src/main/java/glide/api/models/BaseTransaction.java index b5ac417c5e..b2a1575241 100644 --- a/java/client/src/main/java/glide/api/models/BaseTransaction.java +++ b/java/client/src/main/java/glide/api/models/BaseTransaction.java @@ -9,10 +9,10 @@ import static glide.utils.ArrayTransformUtils.convertMapToKeyValueStringArray; import static glide.utils.ArrayTransformUtils.convertMapToValueKeyStringArray; import static glide.utils.ArrayTransformUtils.mapGeoDataToArray; +import static redis_request.RedisRequestOuterClass.RequestType.BLPop; +import static redis_request.RedisRequestOuterClass.RequestType.BRPop; import static redis_request.RedisRequestOuterClass.RequestType.BZPopMax; import static redis_request.RedisRequestOuterClass.RequestType.BZPopMin; -import static redis_request.RedisRequestOuterClass.RequestType.Blpop; -import static redis_request.RedisRequestOuterClass.RequestType.Brpop; import static redis_request.RedisRequestOuterClass.RequestType.ClientGetName; import static redis_request.RedisRequestOuterClass.RequestType.ClientId; import static redis_request.RedisRequestOuterClass.RequestType.ConfigGet; @@ -30,27 +30,27 @@ import static redis_request.RedisRequestOuterClass.RequestType.FlushAll; import static redis_request.RedisRequestOuterClass.RequestType.GeoAdd; import static redis_request.RedisRequestOuterClass.RequestType.GeoPos; +import static redis_request.RedisRequestOuterClass.RequestType.Get; import static redis_request.RedisRequestOuterClass.RequestType.GetRange; -import static redis_request.RedisRequestOuterClass.RequestType.GetString; +import static redis_request.RedisRequestOuterClass.RequestType.HDel; +import static redis_request.RedisRequestOuterClass.RequestType.HExists; +import static redis_request.RedisRequestOuterClass.RequestType.HGet; +import static redis_request.RedisRequestOuterClass.RequestType.HGetAll; +import static redis_request.RedisRequestOuterClass.RequestType.HIncrBy; +import static redis_request.RedisRequestOuterClass.RequestType.HIncrByFloat; +import static redis_request.RedisRequestOuterClass.RequestType.HKeys; import static redis_request.RedisRequestOuterClass.RequestType.HLen; +import static redis_request.RedisRequestOuterClass.RequestType.HMGet; +import static redis_request.RedisRequestOuterClass.RequestType.HSet; import static redis_request.RedisRequestOuterClass.RequestType.HSetNX; -import static redis_request.RedisRequestOuterClass.RequestType.HashDel; -import static redis_request.RedisRequestOuterClass.RequestType.HashExists; -import static redis_request.RedisRequestOuterClass.RequestType.HashGet; -import static redis_request.RedisRequestOuterClass.RequestType.HashGetAll; -import static redis_request.RedisRequestOuterClass.RequestType.HashIncrBy; -import static redis_request.RedisRequestOuterClass.RequestType.HashIncrByFloat; -import static redis_request.RedisRequestOuterClass.RequestType.HashMGet; -import static redis_request.RedisRequestOuterClass.RequestType.HashSet; -import static redis_request.RedisRequestOuterClass.RequestType.Hkeys; -import static redis_request.RedisRequestOuterClass.RequestType.Hvals; +import static redis_request.RedisRequestOuterClass.RequestType.HVals; import static redis_request.RedisRequestOuterClass.RequestType.Incr; import static redis_request.RedisRequestOuterClass.RequestType.IncrBy; import static redis_request.RedisRequestOuterClass.RequestType.IncrByFloat; import static redis_request.RedisRequestOuterClass.RequestType.Info; +import static redis_request.RedisRequestOuterClass.RequestType.LIndex; import static redis_request.RedisRequestOuterClass.RequestType.LInsert; import static redis_request.RedisRequestOuterClass.RequestType.LLen; -import static redis_request.RedisRequestOuterClass.RequestType.LOLWUT; import static redis_request.RedisRequestOuterClass.RequestType.LPop; import static redis_request.RedisRequestOuterClass.RequestType.LPush; import static redis_request.RedisRequestOuterClass.RequestType.LPushX; @@ -58,13 +58,13 @@ import static redis_request.RedisRequestOuterClass.RequestType.LRem; import static redis_request.RedisRequestOuterClass.RequestType.LTrim; import static redis_request.RedisRequestOuterClass.RequestType.LastSave; -import static redis_request.RedisRequestOuterClass.RequestType.Lindex; +import static redis_request.RedisRequestOuterClass.RequestType.Lolwut; import static redis_request.RedisRequestOuterClass.RequestType.MGet; import static redis_request.RedisRequestOuterClass.RequestType.MSet; import static redis_request.RedisRequestOuterClass.RequestType.ObjectEncoding; import static redis_request.RedisRequestOuterClass.RequestType.ObjectFreq; -import static redis_request.RedisRequestOuterClass.RequestType.ObjectIdletime; -import static redis_request.RedisRequestOuterClass.RequestType.ObjectRefcount; +import static redis_request.RedisRequestOuterClass.RequestType.ObjectIdleTime; +import static redis_request.RedisRequestOuterClass.RequestType.ObjectRefCount; import static redis_request.RedisRequestOuterClass.RequestType.PExpire; import static redis_request.RedisRequestOuterClass.RequestType.PExpireAt; import static redis_request.RedisRequestOuterClass.RequestType.PTTL; @@ -76,7 +76,7 @@ import static redis_request.RedisRequestOuterClass.RequestType.RPop; import static redis_request.RedisRequestOuterClass.RequestType.RPush; import static redis_request.RedisRequestOuterClass.RequestType.RPushX; -import static redis_request.RedisRequestOuterClass.RequestType.RenameNx; +import static redis_request.RedisRequestOuterClass.RequestType.RenameNX; import static redis_request.RedisRequestOuterClass.RequestType.SAdd; import static redis_request.RedisRequestOuterClass.RequestType.SCard; import static redis_request.RedisRequestOuterClass.RequestType.SDiff; @@ -89,8 +89,8 @@ import static redis_request.RedisRequestOuterClass.RequestType.SMove; import static redis_request.RedisRequestOuterClass.RequestType.SRem; import static redis_request.RedisRequestOuterClass.RequestType.SUnionStore; +import static redis_request.RedisRequestOuterClass.RequestType.Set; import static redis_request.RedisRequestOuterClass.RequestType.SetRange; -import static redis_request.RedisRequestOuterClass.RequestType.SetString; import static redis_request.RedisRequestOuterClass.RequestType.Strlen; import static redis_request.RedisRequestOuterClass.RequestType.TTL; import static redis_request.RedisRequestOuterClass.RequestType.Time; @@ -99,6 +99,9 @@ import static redis_request.RedisRequestOuterClass.RequestType.Unlink; import static redis_request.RedisRequestOuterClass.RequestType.XAdd; import static redis_request.RedisRequestOuterClass.RequestType.XTrim; +import static redis_request.RedisRequestOuterClass.RequestType.ZAdd; +import static redis_request.RedisRequestOuterClass.RequestType.ZCard; +import static redis_request.RedisRequestOuterClass.RequestType.ZCount; import static redis_request.RedisRequestOuterClass.RequestType.ZDiff; import static redis_request.RedisRequestOuterClass.RequestType.ZDiffStore; import static redis_request.RedisRequestOuterClass.RequestType.ZInterStore; @@ -107,7 +110,10 @@ import static redis_request.RedisRequestOuterClass.RequestType.ZPopMax; import static redis_request.RedisRequestOuterClass.RequestType.ZPopMin; import static redis_request.RedisRequestOuterClass.RequestType.ZRandMember; +import static redis_request.RedisRequestOuterClass.RequestType.ZRange; import static redis_request.RedisRequestOuterClass.RequestType.ZRangeStore; +import static redis_request.RedisRequestOuterClass.RequestType.ZRank; +import static redis_request.RedisRequestOuterClass.RequestType.ZRem; import static redis_request.RedisRequestOuterClass.RequestType.ZRemRangeByLex; import static redis_request.RedisRequestOuterClass.RequestType.ZRemRangeByRank; import static redis_request.RedisRequestOuterClass.RequestType.ZRemRangeByScore; @@ -115,12 +121,6 @@ import static redis_request.RedisRequestOuterClass.RequestType.ZScore; import static redis_request.RedisRequestOuterClass.RequestType.ZUnion; import static redis_request.RedisRequestOuterClass.RequestType.ZUnionStore; -import static redis_request.RedisRequestOuterClass.RequestType.Zadd; -import static redis_request.RedisRequestOuterClass.RequestType.Zcard; -import static redis_request.RedisRequestOuterClass.RequestType.Zcount; -import static redis_request.RedisRequestOuterClass.RequestType.Zrange; -import static redis_request.RedisRequestOuterClass.RequestType.Zrank; -import static redis_request.RedisRequestOuterClass.RequestType.Zrem; import glide.api.models.commands.ExpireOptions; import glide.api.models.commands.FlushMode; @@ -147,7 +147,7 @@ import glide.api.models.commands.WeightAggregateOptions.KeyArray; import glide.api.models.commands.WeightAggregateOptions.KeysOrWeightedKeys; import glide.api.models.commands.WeightAggregateOptions.WeightedKeys; -import glide.api.models.commands.ZaddOptions; +import glide.api.models.commands.ZAddOptions; import glide.api.models.commands.geospatial.GeoAddOptions; import glide.api.models.commands.geospatial.GeospatialData; import glide.api.models.commands.stream.StreamAddOptions; @@ -289,7 +289,7 @@ public T del(@NonNull String[] keys) { */ public T get(@NonNull String key) { ArgsArray commandArgs = buildArgs(key); - protobufTransaction.addCommands(buildCommand(GetString, commandArgs)); + protobufTransaction.addCommands(buildCommand(Get, commandArgs)); return getThis(); } @@ -303,7 +303,7 @@ public T get(@NonNull String key) { */ public T set(@NonNull String key, @NonNull String value) { ArgsArray commandArgs = buildArgs(key, value); - protobufTransaction.addCommands(buildCommand(SetString, commandArgs)); + protobufTransaction.addCommands(buildCommand(Set, commandArgs)); return getThis(); } @@ -324,7 +324,7 @@ public T set(@NonNull String key, @NonNull String value, @NonNull SetOptions opt ArgsArray commandArgs = buildArgs(ArrayUtils.addAll(new String[] {key, value}, options.toArgs())); - protobufTransaction.addCommands(buildCommand(SetString, commandArgs)); + protobufTransaction.addCommands(buildCommand(Set, commandArgs)); return getThis(); } @@ -498,7 +498,7 @@ public T getrange(@NonNull String key, int start, int end) { */ public T hget(@NonNull String key, @NonNull String field) { ArgsArray commandArgs = buildArgs(key, field); - protobufTransaction.addCommands(buildCommand(HashGet, commandArgs)); + protobufTransaction.addCommands(buildCommand(HGet, commandArgs)); return getThis(); } @@ -515,7 +515,7 @@ public T hset(@NonNull String key, @NonNull Map fieldValueMap) { ArgsArray commandArgs = buildArgs(ArrayUtils.addFirst(convertMapToKeyValueStringArray(fieldValueMap), key)); - protobufTransaction.addCommands(buildCommand(HashSet, commandArgs)); + protobufTransaction.addCommands(buildCommand(HSet, commandArgs)); return getThis(); } @@ -551,7 +551,7 @@ public T hsetnx(@NonNull String key, @NonNull String field, @NonNull String valu */ public T hdel(@NonNull String key, @NonNull String[] fields) { ArgsArray commandArgs = buildArgs(ArrayUtils.addFirst(fields, key)); - protobufTransaction.addCommands(buildCommand(HashDel, commandArgs)); + protobufTransaction.addCommands(buildCommand(HDel, commandArgs)); return getThis(); } @@ -580,7 +580,7 @@ public T hlen(@NonNull String key) { */ public T hvals(@NonNull String key) { ArgsArray commandArgs = buildArgs(key); - protobufTransaction.addCommands(buildCommand(Hvals, commandArgs)); + protobufTransaction.addCommands(buildCommand(HVals, commandArgs)); return getThis(); } @@ -598,7 +598,7 @@ public T hvals(@NonNull String key) { */ public T hmget(@NonNull String key, @NonNull String[] fields) { ArgsArray commandArgs = buildArgs(ArrayUtils.addFirst(fields, key)); - protobufTransaction.addCommands(buildCommand(HashMGet, commandArgs)); + protobufTransaction.addCommands(buildCommand(HMGet, commandArgs)); return getThis(); } @@ -614,7 +614,7 @@ public T hmget(@NonNull String key, @NonNull String[] fields) { */ public T hexists(@NonNull String key, @NonNull String field) { ArgsArray commandArgs = buildArgs(key, field); - protobufTransaction.addCommands(buildCommand(HashExists, commandArgs)); + protobufTransaction.addCommands(buildCommand(HExists, commandArgs)); return getThis(); } @@ -629,7 +629,7 @@ public T hexists(@NonNull String key, @NonNull String field) { */ public T hgetall(@NonNull String key) { ArgsArray commandArgs = buildArgs(key); - protobufTransaction.addCommands(buildCommand(HashGetAll, commandArgs)); + protobufTransaction.addCommands(buildCommand(HGetAll, commandArgs)); return getThis(); } @@ -650,7 +650,7 @@ public T hgetall(@NonNull String key) { */ public T hincrBy(@NonNull String key, @NonNull String field, long amount) { ArgsArray commandArgs = buildArgs(key, field, Long.toString(amount)); - protobufTransaction.addCommands(buildCommand(HashIncrBy, commandArgs)); + protobufTransaction.addCommands(buildCommand(HIncrBy, commandArgs)); return getThis(); } @@ -672,7 +672,7 @@ public T hincrBy(@NonNull String key, @NonNull String field, long amount) { */ public T hincrByFloat(@NonNull String key, @NonNull String field, double amount) { ArgsArray commandArgs = buildArgs(key, field, Double.toString(amount)); - protobufTransaction.addCommands(buildCommand(HashIncrByFloat, commandArgs)); + protobufTransaction.addCommands(buildCommand(HIncrByFloat, commandArgs)); return getThis(); } @@ -685,7 +685,7 @@ public T hincrByFloat(@NonNull String key, @NonNull String field, double amount) * empty array when the key does not exist. */ public T hkeys(@NonNull String key) { - protobufTransaction.addCommands(buildCommand(Hkeys, buildArgs(key))); + protobufTransaction.addCommands(buildCommand(HKeys, buildArgs(key))); return getThis(); } @@ -781,7 +781,7 @@ public T lrange(@NonNull String key, long start, long end) { public T lindex(@NonNull String key, long index) { ArgsArray commandArgs = buildArgs(key, Long.toString(index)); - protobufTransaction.addCommands(buildCommand(Lindex, commandArgs)); + protobufTransaction.addCommands(buildCommand(LIndex, commandArgs)); return getThis(); } @@ -1415,7 +1415,7 @@ public T configResetStat() { * @see redis.io for more details. * @param key The key of the sorted set. * @param membersScoresMap A Map of members to their corresponding scores. - * @param options The Zadd options. + * @param options The ZAdd options. * @param changed Modify the return value from the number of new elements added, to the total * number of elements changed. * @return Command Response - The number of elements added to the sorted set.
@@ -1424,7 +1424,7 @@ public T configResetStat() { public T zadd( @NonNull String key, @NonNull Map membersScoresMap, - @NonNull ZaddOptions options, + @NonNull ZAddOptions options, boolean changed) { String[] changedArg = changed ? new String[] {"CH"} : new String[] {}; String[] membersScores = convertMapToValueKeyStringArray(membersScoresMap); @@ -1434,7 +1434,7 @@ public T zadd( ArgsArray commandArgs = buildArgs(arguments); - protobufTransaction.addCommands(buildCommand(Zadd, commandArgs)); + protobufTransaction.addCommands(buildCommand(ZAdd, commandArgs)); return getThis(); } @@ -1445,13 +1445,13 @@ public T zadd( * @see redis.io for more details. * @param key The key of the sorted set. * @param membersScoresMap A Map of members to their corresponding scores. - * @param options The Zadd options. + * @param options The ZAdd options. * @return Command Response - The number of elements added to the sorted set. */ public T zadd( @NonNull String key, @NonNull Map membersScoresMap, - @NonNull ZaddOptions options) { + @NonNull ZAddOptions options) { return zadd(key, membersScoresMap, options, false); } @@ -1469,7 +1469,7 @@ public T zadd( */ public T zadd( @NonNull String key, @NonNull Map membersScoresMap, boolean changed) { - return zadd(key, membersScoresMap, ZaddOptions.builder().build(), changed); + return zadd(key, membersScoresMap, ZAddOptions.builder().build(), changed); } /** @@ -1482,7 +1482,7 @@ public T zadd( * @return Command Response - The number of elements added to the sorted set. */ public T zadd(@NonNull String key, @NonNull Map membersScoresMap) { - return zadd(key, membersScoresMap, ZaddOptions.builder().build(), false); + return zadd(key, membersScoresMap, ZAddOptions.builder().build(), false); } /** @@ -1497,13 +1497,13 @@ public T zadd(@NonNull String key, @NonNull Map membersScoresMap * @param key The key of the sorted set. * @param member A member in the sorted set to increment. * @param increment The score to increment the member. - * @param options The Zadd options. + * @param options The ZAdd options. * @return Command Response - The score of the member.
* If there was a conflict with the options, the operation aborts and null is * returned.
*/ public T zaddIncr( - @NonNull String key, @NonNull String member, double increment, @NonNull ZaddOptions options) { + @NonNull String key, @NonNull String member, double increment, @NonNull ZAddOptions options) { ArgsArray commandArgs = buildArgs( concatenateArrays( @@ -1511,7 +1511,7 @@ public T zaddIncr( options.toArgs(), new String[] {"INCR", Double.toString(increment), member})); - protobufTransaction.addCommands(buildCommand(Zadd, commandArgs)); + protobufTransaction.addCommands(buildCommand(ZAdd, commandArgs)); return getThis(); } @@ -1530,7 +1530,7 @@ public T zaddIncr( * @return Command Response - The score of the member. */ public T zaddIncr(@NonNull String key, @NonNull String member, double increment) { - return zaddIncr(key, member, increment, ZaddOptions.builder().build()); + return zaddIncr(key, member, increment, ZAddOptions.builder().build()); } /** @@ -1547,7 +1547,7 @@ public T zaddIncr(@NonNull String key, @NonNull String member, double increment) */ public T zrem(@NonNull String key, @NonNull String[] members) { ArgsArray commandArgs = buildArgs(ArrayUtils.addFirst(members, key)); - protobufTransaction.addCommands(buildCommand(Zrem, commandArgs)); + protobufTransaction.addCommands(buildCommand(ZRem, commandArgs)); return getThis(); } @@ -1562,7 +1562,7 @@ public T zrem(@NonNull String key, @NonNull String[] members) { */ public T zcard(@NonNull String key) { ArgsArray commandArgs = buildArgs(key); - protobufTransaction.addCommands(buildCommand(Zcard, commandArgs)); + protobufTransaction.addCommands(buildCommand(ZCard, commandArgs)); return getThis(); } @@ -1771,7 +1771,7 @@ public T zscore(@NonNull String key, @NonNull String member) { */ public T zrank(@NonNull String key, @NonNull String member) { ArgsArray commandArgs = buildArgs(key, member); - protobufTransaction.addCommands(buildCommand(Zrank, commandArgs)); + protobufTransaction.addCommands(buildCommand(ZRank, commandArgs)); return getThis(); } @@ -1789,7 +1789,7 @@ public T zrank(@NonNull String key, @NonNull String member) { */ public T zrankWithScore(@NonNull String key, @NonNull String member) { ArgsArray commandArgs = buildArgs(key, member, WITH_SCORE_REDIS_API); - protobufTransaction.addCommands(buildCommand(Zrank, commandArgs)); + protobufTransaction.addCommands(buildCommand(ZRank, commandArgs)); return getThis(); } @@ -1920,7 +1920,7 @@ public T zdiffstore(@NonNull String destination, @NonNull String[] keys) { */ public T zcount(@NonNull String key, @NonNull ScoreRange minScore, @NonNull ScoreRange maxScore) { ArgsArray commandArgs = buildArgs(key, minScore.toArgs(), maxScore.toArgs()); - protobufTransaction.addCommands(buildCommand(Zcount, commandArgs)); + protobufTransaction.addCommands(buildCommand(ZCount, commandArgs)); return getThis(); } @@ -2413,7 +2413,7 @@ public T flushall(FlushMode mode) { * version. */ public T lolwut() { - protobufTransaction.addCommands(buildCommand(LOLWUT)); + protobufTransaction.addCommands(buildCommand(Lolwut)); return getThis(); } @@ -2435,7 +2435,7 @@ public T lolwut() { public T lolwut(int @NonNull [] parameters) { String[] arguments = Arrays.stream(parameters).mapToObj(Integer::toString).toArray(String[]::new); - protobufTransaction.addCommands(buildCommand(LOLWUT, buildArgs(arguments))); + protobufTransaction.addCommands(buildCommand(Lolwut, buildArgs(arguments))); return getThis(); } @@ -2450,7 +2450,7 @@ public T lolwut(int @NonNull [] parameters) { */ public T lolwut(int version) { ArgsArray commandArgs = buildArgs(VERSION_REDIS_API, Integer.toString(version)); - protobufTransaction.addCommands(buildCommand(LOLWUT, commandArgs)); + protobufTransaction.addCommands(buildCommand(Lolwut, commandArgs)); return getThis(); } @@ -2475,7 +2475,7 @@ public T lolwut(int version, int @NonNull [] parameters) { concatenateArrays( new String[] {VERSION_REDIS_API, Integer.toString(version)}, Arrays.stream(parameters).mapToObj(Integer::toString).toArray(String[]::new)); - protobufTransaction.addCommands(buildCommand(LOLWUT, buildArgs(arguments))); + protobufTransaction.addCommands(buildCommand(Lolwut, buildArgs(arguments))); return getThis(); } @@ -2504,7 +2504,7 @@ public T type(@NonNull String key) { */ public T renamenx(@NonNull String key, @NonNull String newKey) { ArgsArray commandArgs = buildArgs(key, newKey); - protobufTransaction.addCommands(buildCommand(RenameNx, commandArgs)); + protobufTransaction.addCommands(buildCommand(RenameNX, commandArgs)); return getThis(); } @@ -2552,7 +2552,7 @@ public T linsert( */ public T brpop(@NonNull String[] keys, double timeout) { ArgsArray commandArgs = buildArgs(ArrayUtils.add(keys, Double.toString(timeout))); - protobufTransaction.addCommands(buildCommand(Brpop, commandArgs)); + protobufTransaction.addCommands(buildCommand(BRPop, commandArgs)); return getThis(); } @@ -2608,7 +2608,7 @@ public T rpushx(@NonNull String key, @NonNull String[] elements) { */ public T blpop(@NonNull String[] keys, double timeout) { ArgsArray commandArgs = buildArgs(ArrayUtils.add(keys, Double.toString(timeout))); - protobufTransaction.addCommands(buildCommand(Blpop, commandArgs)); + protobufTransaction.addCommands(buildCommand(BLPop, commandArgs)); return getThis(); } @@ -2635,7 +2635,7 @@ public T blpop(@NonNull String[] keys, double timeout) { */ public T zrange(@NonNull String key, @NonNull RangeQuery rangeQuery, boolean reverse) { ArgsArray commandArgs = buildArgs(createZRangeArgs(key, rangeQuery, reverse, false)); - protobufTransaction.addCommands(buildCommand(Zrange, commandArgs)); + protobufTransaction.addCommands(buildCommand(ZRange, commandArgs)); return getThis(); } @@ -2683,7 +2683,7 @@ public T zrange(@NonNull String key, @NonNull RangeQuery rangeQuery) { public T zrangeWithScores( @NonNull String key, @NonNull ScoredRangeQuery rangeQuery, boolean reverse) { ArgsArray commandArgs = buildArgs(createZRangeArgs(key, rangeQuery, reverse, true)); - protobufTransaction.addCommands(buildCommand(Zrange, commandArgs)); + protobufTransaction.addCommands(buildCommand(ZRange, commandArgs)); return getThis(); } @@ -2803,7 +2803,7 @@ public T objectFreq(@NonNull String key) { */ public T objectIdletime(@NonNull String key) { ArgsArray commandArgs = buildArgs(key); - protobufTransaction.addCommands(buildCommand(ObjectIdletime, commandArgs)); + protobufTransaction.addCommands(buildCommand(ObjectIdleTime, commandArgs)); return getThis(); } @@ -2818,7 +2818,7 @@ public T objectIdletime(@NonNull String key) { */ public T objectRefcount(@NonNull String key) { ArgsArray commandArgs = buildArgs(key); - protobufTransaction.addCommands(buildCommand(ObjectRefcount, commandArgs)); + protobufTransaction.addCommands(buildCommand(ObjectRefCount, commandArgs)); return getThis(); } diff --git a/java/client/src/main/java/glide/api/models/commands/ZaddOptions.java b/java/client/src/main/java/glide/api/models/commands/ZAddOptions.java similarity index 93% rename from java/client/src/main/java/glide/api/models/commands/ZaddOptions.java rename to java/client/src/main/java/glide/api/models/commands/ZAddOptions.java index 625e3b6f7b..09d5e0e2f4 100644 --- a/java/client/src/main/java/glide/api/models/commands/ZaddOptions.java +++ b/java/client/src/main/java/glide/api/models/commands/ZAddOptions.java @@ -9,14 +9,14 @@ import lombok.RequiredArgsConstructor; /** - * Optional arguments to {@link SortedSetBaseCommands#zadd(String, Map, ZaddOptions, boolean)}, - * {@link SortedSetBaseCommands#zadd(String, Map, ZaddOptions)} and {@link - * SortedSetBaseCommands#zaddIncr(String, String, double, ZaddOptions)} + * Optional arguments to {@link SortedSetBaseCommands#zadd(String, Map, ZAddOptions, boolean)}, + * {@link SortedSetBaseCommands#zadd(String, Map, ZAddOptions)} and {@link + * SortedSetBaseCommands#zaddIncr(String, String, double, ZAddOptions)} * * @see redis.io */ @Builder -public final class ZaddOptions { +public final class ZAddOptions { /** * Defines conditions for updating or adding elements with {@link SortedSetBaseCommands#zadd} * command. diff --git a/java/client/src/test/java/glide/api/RedisClientTest.java b/java/client/src/test/java/glide/api/RedisClientTest.java index b0314b907e..ca0ec9997a 100644 --- a/java/client/src/test/java/glide/api/RedisClientTest.java +++ b/java/client/src/test/java/glide/api/RedisClientTest.java @@ -30,10 +30,10 @@ import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; +import static redis_request.RedisRequestOuterClass.RequestType.BLPop; +import static redis_request.RedisRequestOuterClass.RequestType.BRPop; import static redis_request.RedisRequestOuterClass.RequestType.BZPopMax; import static redis_request.RedisRequestOuterClass.RequestType.BZPopMin; -import static redis_request.RedisRequestOuterClass.RequestType.Blpop; -import static redis_request.RedisRequestOuterClass.RequestType.Brpop; import static redis_request.RedisRequestOuterClass.RequestType.ClientGetName; import static redis_request.RedisRequestOuterClass.RequestType.ClientId; import static redis_request.RedisRequestOuterClass.RequestType.ConfigGet; @@ -51,27 +51,27 @@ import static redis_request.RedisRequestOuterClass.RequestType.FlushAll; import static redis_request.RedisRequestOuterClass.RequestType.GeoAdd; import static redis_request.RedisRequestOuterClass.RequestType.GeoPos; +import static redis_request.RedisRequestOuterClass.RequestType.Get; import static redis_request.RedisRequestOuterClass.RequestType.GetRange; -import static redis_request.RedisRequestOuterClass.RequestType.GetString; +import static redis_request.RedisRequestOuterClass.RequestType.HDel; +import static redis_request.RedisRequestOuterClass.RequestType.HExists; +import static redis_request.RedisRequestOuterClass.RequestType.HGet; +import static redis_request.RedisRequestOuterClass.RequestType.HGetAll; +import static redis_request.RedisRequestOuterClass.RequestType.HIncrBy; +import static redis_request.RedisRequestOuterClass.RequestType.HIncrByFloat; +import static redis_request.RedisRequestOuterClass.RequestType.HKeys; import static redis_request.RedisRequestOuterClass.RequestType.HLen; +import static redis_request.RedisRequestOuterClass.RequestType.HMGet; +import static redis_request.RedisRequestOuterClass.RequestType.HSet; import static redis_request.RedisRequestOuterClass.RequestType.HSetNX; -import static redis_request.RedisRequestOuterClass.RequestType.HashDel; -import static redis_request.RedisRequestOuterClass.RequestType.HashExists; -import static redis_request.RedisRequestOuterClass.RequestType.HashGet; -import static redis_request.RedisRequestOuterClass.RequestType.HashGetAll; -import static redis_request.RedisRequestOuterClass.RequestType.HashIncrBy; -import static redis_request.RedisRequestOuterClass.RequestType.HashIncrByFloat; -import static redis_request.RedisRequestOuterClass.RequestType.HashMGet; -import static redis_request.RedisRequestOuterClass.RequestType.HashSet; -import static redis_request.RedisRequestOuterClass.RequestType.Hkeys; -import static redis_request.RedisRequestOuterClass.RequestType.Hvals; +import static redis_request.RedisRequestOuterClass.RequestType.HVals; import static redis_request.RedisRequestOuterClass.RequestType.Incr; import static redis_request.RedisRequestOuterClass.RequestType.IncrBy; import static redis_request.RedisRequestOuterClass.RequestType.IncrByFloat; import static redis_request.RedisRequestOuterClass.RequestType.Info; +import static redis_request.RedisRequestOuterClass.RequestType.LIndex; import static redis_request.RedisRequestOuterClass.RequestType.LInsert; import static redis_request.RedisRequestOuterClass.RequestType.LLen; -import static redis_request.RedisRequestOuterClass.RequestType.LOLWUT; import static redis_request.RedisRequestOuterClass.RequestType.LPop; import static redis_request.RedisRequestOuterClass.RequestType.LPush; import static redis_request.RedisRequestOuterClass.RequestType.LPushX; @@ -79,13 +79,13 @@ import static redis_request.RedisRequestOuterClass.RequestType.LRem; import static redis_request.RedisRequestOuterClass.RequestType.LTrim; import static redis_request.RedisRequestOuterClass.RequestType.LastSave; -import static redis_request.RedisRequestOuterClass.RequestType.Lindex; +import static redis_request.RedisRequestOuterClass.RequestType.Lolwut; import static redis_request.RedisRequestOuterClass.RequestType.MGet; import static redis_request.RedisRequestOuterClass.RequestType.MSet; import static redis_request.RedisRequestOuterClass.RequestType.ObjectEncoding; import static redis_request.RedisRequestOuterClass.RequestType.ObjectFreq; -import static redis_request.RedisRequestOuterClass.RequestType.ObjectIdletime; -import static redis_request.RedisRequestOuterClass.RequestType.ObjectRefcount; +import static redis_request.RedisRequestOuterClass.RequestType.ObjectIdleTime; +import static redis_request.RedisRequestOuterClass.RequestType.ObjectRefCount; import static redis_request.RedisRequestOuterClass.RequestType.PExpire; import static redis_request.RedisRequestOuterClass.RequestType.PExpireAt; import static redis_request.RedisRequestOuterClass.RequestType.PTTL; @@ -97,7 +97,7 @@ import static redis_request.RedisRequestOuterClass.RequestType.RPop; import static redis_request.RedisRequestOuterClass.RequestType.RPush; import static redis_request.RedisRequestOuterClass.RequestType.RPushX; -import static redis_request.RedisRequestOuterClass.RequestType.RenameNx; +import static redis_request.RedisRequestOuterClass.RequestType.RenameNX; import static redis_request.RedisRequestOuterClass.RequestType.SAdd; import static redis_request.RedisRequestOuterClass.RequestType.SCard; import static redis_request.RedisRequestOuterClass.RequestType.SDiff; @@ -112,7 +112,6 @@ import static redis_request.RedisRequestOuterClass.RequestType.SUnionStore; import static redis_request.RedisRequestOuterClass.RequestType.Select; import static redis_request.RedisRequestOuterClass.RequestType.SetRange; -import static redis_request.RedisRequestOuterClass.RequestType.SetString; import static redis_request.RedisRequestOuterClass.RequestType.Strlen; import static redis_request.RedisRequestOuterClass.RequestType.TTL; import static redis_request.RedisRequestOuterClass.RequestType.Time; @@ -121,6 +120,9 @@ import static redis_request.RedisRequestOuterClass.RequestType.Unlink; import static redis_request.RedisRequestOuterClass.RequestType.XAdd; import static redis_request.RedisRequestOuterClass.RequestType.XTrim; +import static redis_request.RedisRequestOuterClass.RequestType.ZAdd; +import static redis_request.RedisRequestOuterClass.RequestType.ZCard; +import static redis_request.RedisRequestOuterClass.RequestType.ZCount; import static redis_request.RedisRequestOuterClass.RequestType.ZDiff; import static redis_request.RedisRequestOuterClass.RequestType.ZDiffStore; import static redis_request.RedisRequestOuterClass.RequestType.ZInterStore; @@ -129,7 +131,10 @@ import static redis_request.RedisRequestOuterClass.RequestType.ZPopMax; import static redis_request.RedisRequestOuterClass.RequestType.ZPopMin; import static redis_request.RedisRequestOuterClass.RequestType.ZRandMember; +import static redis_request.RedisRequestOuterClass.RequestType.ZRange; import static redis_request.RedisRequestOuterClass.RequestType.ZRangeStore; +import static redis_request.RedisRequestOuterClass.RequestType.ZRank; +import static redis_request.RedisRequestOuterClass.RequestType.ZRem; import static redis_request.RedisRequestOuterClass.RequestType.ZRemRangeByLex; import static redis_request.RedisRequestOuterClass.RequestType.ZRemRangeByRank; import static redis_request.RedisRequestOuterClass.RequestType.ZRemRangeByScore; @@ -137,12 +142,6 @@ import static redis_request.RedisRequestOuterClass.RequestType.ZScore; import static redis_request.RedisRequestOuterClass.RequestType.ZUnion; import static redis_request.RedisRequestOuterClass.RequestType.ZUnionStore; -import static redis_request.RedisRequestOuterClass.RequestType.Zadd; -import static redis_request.RedisRequestOuterClass.RequestType.Zcard; -import static redis_request.RedisRequestOuterClass.RequestType.Zcount; -import static redis_request.RedisRequestOuterClass.RequestType.Zrange; -import static redis_request.RedisRequestOuterClass.RequestType.Zrank; -import static redis_request.RedisRequestOuterClass.RequestType.Zrem; import glide.api.models.Script; import glide.api.models.Transaction; @@ -163,7 +162,7 @@ import glide.api.models.commands.WeightAggregateOptions.Aggregate; import glide.api.models.commands.WeightAggregateOptions.KeyArray; import glide.api.models.commands.WeightAggregateOptions.WeightedKeys; -import glide.api.models.commands.ZaddOptions; +import glide.api.models.commands.ZAddOptions; import glide.api.models.commands.geospatial.GeoAddOptions; import glide.api.models.commands.geospatial.GeospatialData; import glide.api.models.commands.stream.StreamAddOptions; @@ -187,9 +186,13 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; +import redis_request.RedisRequestOuterClass.RequestType; public class RedisClientTest { + // bypass import conflict between Set (collection) and Set (enum variant) + private static final RequestType pSet = RequestType.Set; + RedisClient service; ConnectionManager connectionManager; @@ -385,7 +388,7 @@ public void get_returns_success() { String value = "testValue"; CompletableFuture testResponse = new CompletableFuture<>(); testResponse.complete(value); - when(commandManager.submitNewCommand(eq(GetString), eq(new String[] {key}), any())) + when(commandManager.submitNewCommand(eq(Get), eq(new String[] {key}), any())) .thenReturn(testResponse); // exercise @@ -405,8 +408,7 @@ public void set_returns_success() { String value = "testValue"; CompletableFuture testResponse = new CompletableFuture<>(); testResponse.complete(null); - when(commandManager.submitNewCommand( - eq(SetString), eq(new String[] {key, value}), any())) + when(commandManager.submitNewCommand(eq(pSet), eq(new String[] {key, value}), any())) .thenReturn(testResponse); // exercise @@ -434,7 +436,7 @@ public void set_with_SetOptions_OnlyIfExists_returns_success() { CompletableFuture testResponse = new CompletableFuture<>(); testResponse.complete(null); - when(commandManager.submitNewCommand(eq(SetString), eq(arguments), any())) + when(commandManager.submitNewCommand(eq(pSet), eq(arguments), any())) .thenReturn(testResponse); // exercise @@ -463,7 +465,7 @@ public void set_with_SetOptions_OnlyIfDoesNotExist_returns_success() { }; CompletableFuture testResponse = new CompletableFuture<>(); testResponse.complete(value); - when(commandManager.submitNewCommand(eq(SetString), eq(arguments), any())) + when(commandManager.submitNewCommand(eq(pSet), eq(arguments), any())) .thenReturn(testResponse); // exercise @@ -1117,7 +1119,7 @@ public void hget_success() { CompletableFuture testResponse = new CompletableFuture<>(); testResponse.complete(value); - when(commandManager.submitNewCommand(eq(HashGet), eq(args), any())) + when(commandManager.submitNewCommand(eq(HGet), eq(args), any())) .thenReturn(testResponse); // exercise @@ -1142,8 +1144,7 @@ public void hset_success() { CompletableFuture testResponse = new CompletableFuture<>(); testResponse.complete(value); - when(commandManager.submitNewCommand(eq(HashSet), eq(args), any())) - .thenReturn(testResponse); + when(commandManager.submitNewCommand(eq(HSet), eq(args), any())).thenReturn(testResponse); // exercise CompletableFuture response = service.hset(key, fieldValueMap); @@ -1192,8 +1193,7 @@ public void hdel_success() { testResponse.complete(value); // match on protobuf request - when(commandManager.submitNewCommand(eq(HashDel), eq(args), any())) - .thenReturn(testResponse); + when(commandManager.submitNewCommand(eq(HDel), eq(args), any())).thenReturn(testResponse); // exercise CompletableFuture response = service.hdel(key, fields); @@ -1239,7 +1239,7 @@ public void hvals_success() { testResponse.complete(values); // match on protobuf request - when(commandManager.submitNewCommand(eq(Hvals), eq(args), any())) + when(commandManager.submitNewCommand(eq(HVals), eq(args), any())) .thenReturn(testResponse); // exercise @@ -1264,7 +1264,7 @@ public void hmget_success() { testResponse.complete(value); // match on protobuf request - when(commandManager.submitNewCommand(eq(HashMGet), eq(args), any())) + when(commandManager.submitNewCommand(eq(HMGet), eq(args), any())) .thenReturn(testResponse); // exercise @@ -1289,7 +1289,7 @@ public void hexists_success() { testResponse.complete(value); // match on protobuf request - when(commandManager.submitNewCommand(eq(HashExists), eq(args), any())) + when(commandManager.submitNewCommand(eq(HExists), eq(args), any())) .thenReturn(testResponse); // exercise @@ -1315,7 +1315,7 @@ public void hgetall_success() { testResponse.complete(value); // match on protobuf request - when(commandManager.>submitNewCommand(eq(HashGetAll), eq(args), any())) + when(commandManager.>submitNewCommand(eq(HGetAll), eq(args), any())) .thenReturn(testResponse); // exercise @@ -1341,7 +1341,7 @@ public void hincrBy_returns_success() { // match on protobuf request when(commandManager.submitNewCommand( - eq(HashIncrBy), eq(new String[] {key, field, Long.toString(amount)}), any())) + eq(HIncrBy), eq(new String[] {key, field, Long.toString(amount)}), any())) .thenReturn(testResponse); // exercise @@ -1367,7 +1367,7 @@ public void hincrByFloat_returns_success() { // match on protobuf request when(commandManager.submitNewCommand( - eq(HashIncrByFloat), eq(new String[] {key, field, Double.toString(amount)}), any())) + eq(HIncrByFloat), eq(new String[] {key, field, Double.toString(amount)}), any())) .thenReturn(testResponse); // exercise @@ -1391,7 +1391,7 @@ public void hkeys_returns_success() { testResponse.complete(values); // match on protobuf request - when(commandManager.submitNewCommand(eq(Hkeys), eq(args), any())) + when(commandManager.submitNewCommand(eq(HKeys), eq(args), any())) .thenReturn(testResponse); // exercise @@ -1516,7 +1516,7 @@ public void lindex_returns_success() { testResponse.complete(value); // match on protobuf request - when(commandManager.submitNewCommand(eq(Lindex), eq(args), any())) + when(commandManager.submitNewCommand(eq(LIndex), eq(args), any())) .thenReturn(testResponse); // exercise @@ -1983,12 +1983,12 @@ public void zadd_noOptions_returns_success() { testResponse.complete(value); // match on protobuf request - when(commandManager.submitNewCommand(eq(Zadd), eq(arguments), any())) + when(commandManager.submitNewCommand(eq(ZAdd), eq(arguments), any())) .thenReturn(testResponse); // exercise CompletableFuture response = - service.zadd(key, membersScores, ZaddOptions.builder().build(), false); + service.zadd(key, membersScores, ZAddOptions.builder().build(), false); Long payload = response.get(); // verify @@ -2001,10 +2001,10 @@ public void zadd_noOptions_returns_success() { public void zadd_withOptions_returns_success() { // setup String key = "testKey"; - ZaddOptions options = - ZaddOptions.builder() - .conditionalChange(ZaddOptions.ConditionalChange.ONLY_IF_EXISTS) - .updateOptions(ZaddOptions.UpdateOptions.SCORE_GREATER_THAN_CURRENT) + ZAddOptions options = + ZAddOptions.builder() + .conditionalChange(ZAddOptions.ConditionalChange.ONLY_IF_EXISTS) + .updateOptions(ZAddOptions.UpdateOptions.SCORE_GREATER_THAN_CURRENT) .build(); Map membersScores = new LinkedHashMap<>(); membersScores.put("testMember1", 1.0); @@ -2018,7 +2018,7 @@ public void zadd_withOptions_returns_success() { testResponse.complete(value); // match on protobuf request - when(commandManager.submitNewCommand(eq(Zadd), eq(arguments), any())) + when(commandManager.submitNewCommand(eq(ZAdd), eq(arguments), any())) .thenReturn(testResponse); // exercise @@ -2035,10 +2035,10 @@ public void zadd_withOptions_returns_success() { public void zadd_withIllegalArgument_throws_exception() { // setup String key = "testKey"; - ZaddOptions options = - ZaddOptions.builder() - .conditionalChange(ZaddOptions.ConditionalChange.ONLY_IF_DOES_NOT_EXIST) - .updateOptions(ZaddOptions.UpdateOptions.SCORE_GREATER_THAN_CURRENT) + ZAddOptions options = + ZAddOptions.builder() + .conditionalChange(ZAddOptions.ConditionalChange.ONLY_IF_DOES_NOT_EXIST) + .updateOptions(ZAddOptions.UpdateOptions.SCORE_GREATER_THAN_CURRENT) .build(); Map membersScores = new LinkedHashMap<>(); membersScores.put("testMember1", 1.0); @@ -2062,12 +2062,12 @@ public void zaddIncr_noOptions_returns_success() { testResponse.complete(value); // match on protobuf request - when(commandManager.submitNewCommand(eq(Zadd), eq(arguments), any())) + when(commandManager.submitNewCommand(eq(ZAdd), eq(arguments), any())) .thenReturn(testResponse); // exercise CompletableFuture response = - service.zaddIncr(key, member, increment, ZaddOptions.builder().build()); + service.zaddIncr(key, member, increment, ZAddOptions.builder().build()); Double payload = response.get(); // verify @@ -2080,9 +2080,9 @@ public void zaddIncr_noOptions_returns_success() { public void zaddIncr_withOptions_returns_success() { // setup String key = "testKey"; - ZaddOptions options = - ZaddOptions.builder() - .updateOptions(ZaddOptions.UpdateOptions.SCORE_GREATER_THAN_CURRENT) + ZAddOptions options = + ZAddOptions.builder() + .updateOptions(ZAddOptions.UpdateOptions.SCORE_GREATER_THAN_CURRENT) .build(); String member = "member"; double increment = 3.0; @@ -2097,7 +2097,7 @@ public void zaddIncr_withOptions_returns_success() { testResponse.complete(value); // match on protobuf request - when(commandManager.submitNewCommand(eq(Zadd), eq(arguments), any())) + when(commandManager.submitNewCommand(eq(ZAdd), eq(arguments), any())) .thenReturn(testResponse); // exercise @@ -2242,7 +2242,7 @@ public void zrem_returns_success() { testResponse.complete(value); // match on protobuf request - when(commandManager.submitNewCommand(eq(Zrem), eq(arguments), any())) + when(commandManager.submitNewCommand(eq(ZRem), eq(arguments), any())) .thenReturn(testResponse); // exercise @@ -2266,7 +2266,7 @@ public void zcard_returns_success() { testResponse.complete(value); // match on protobuf request - when(commandManager.submitNewCommand(eq(Zcard), eq(arguments), any())) + when(commandManager.submitNewCommand(eq(ZCard), eq(arguments), any())) .thenReturn(testResponse); // exercise @@ -2464,7 +2464,7 @@ public void zrange_by_index_returns_success() { testResponse.complete(value); // match on protobuf request - when(commandManager.submitNewCommand(eq(Zrange), eq(arguments), any())) + when(commandManager.submitNewCommand(eq(ZRange), eq(arguments), any())) .thenReturn(testResponse); // exercise @@ -2491,7 +2491,7 @@ public void zrange_by_score_with_reverse_returns_success() { testResponse.complete(value); // match on protobuf request - when(commandManager.submitNewCommand(eq(Zrange), eq(arguments), any())) + when(commandManager.submitNewCommand(eq(ZRange), eq(arguments), any())) .thenReturn(testResponse); // exercise @@ -2517,7 +2517,7 @@ public void zrange_by_lex_returns_success() { testResponse.complete(value); // match on protobuf request - when(commandManager.submitNewCommand(eq(Zrange), eq(arguments), any())) + when(commandManager.submitNewCommand(eq(ZRange), eq(arguments), any())) .thenReturn(testResponse); // exercise @@ -2543,7 +2543,7 @@ public void zrangeWithScores_by_index_returns_success() { testResponse.complete(value); // match on protobuf request - when(commandManager.>submitNewCommand(eq(Zrange), eq(arguments), any())) + when(commandManager.>submitNewCommand(eq(ZRange), eq(arguments), any())) .thenReturn(testResponse); // exercise @@ -2582,7 +2582,7 @@ public void zrangeWithScores_by_score_returns_success() { testResponse.complete(value); // match on protobuf request - when(commandManager.>submitNewCommand(eq(Zrange), eq(arguments), any())) + when(commandManager.>submitNewCommand(eq(ZRange), eq(arguments), any())) .thenReturn(testResponse); // exercise @@ -2608,7 +2608,7 @@ public void zrank_returns_success() { testResponse.complete(value); // match on protobuf request - when(commandManager.submitNewCommand(eq(Zrank), eq(arguments), any())) + when(commandManager.submitNewCommand(eq(ZRank), eq(arguments), any())) .thenReturn(testResponse); // exercise @@ -2633,7 +2633,7 @@ public void zrankWithScore_returns_success() { testResponse.complete(value); // match on protobuf request - when(commandManager.submitNewCommand(eq(Zrank), eq(arguments), any())) + when(commandManager.submitNewCommand(eq(ZRank), eq(arguments), any())) .thenReturn(testResponse); // exercise @@ -2808,7 +2808,7 @@ public void zcount_returns_success() { testResponse.complete(value); // match on protobuf request - when(commandManager.submitNewCommand(eq(Zcount), eq(arguments), any())) + when(commandManager.submitNewCommand(eq(ZCount), eq(arguments), any())) .thenReturn(testResponse); // exercise @@ -3552,7 +3552,7 @@ public void renamenx_returns_success() { testResponse.complete(true); // match on protobuf request - when(commandManager.submitNewCommand(eq(RenameNx), eq(arguments), any())) + when(commandManager.submitNewCommand(eq(RenameNX), eq(arguments), any())) .thenReturn(testResponse); // exercise @@ -3651,7 +3651,7 @@ public void lolwut_returns_success() { testResponse.complete(value); // match on protobuf request - when(commandManager.submitNewCommand(eq(LOLWUT), eq(new String[0]), any())) + when(commandManager.submitNewCommand(eq(Lolwut), eq(new String[0]), any())) .thenReturn(testResponse); // exercise @@ -3673,7 +3673,7 @@ public void lolwut_with_params_returns_success() { testResponse.complete(value); // match on protobuf request - when(commandManager.submitNewCommand(eq(LOLWUT), eq(arguments), any())) + when(commandManager.submitNewCommand(eq(Lolwut), eq(arguments), any())) .thenReturn(testResponse); // exercise @@ -3694,7 +3694,7 @@ public void lolwut_with_version_returns_success() { // match on protobuf request when(commandManager.submitNewCommand( - eq(LOLWUT), eq(new String[] {VERSION_REDIS_API, "42"}), any())) + eq(Lolwut), eq(new String[] {VERSION_REDIS_API, "42"}), any())) .thenReturn(testResponse); // exercise @@ -3716,7 +3716,7 @@ public void lolwut_with_version_and_params_returns_success() { testResponse.complete(value); // match on protobuf request - when(commandManager.submitNewCommand(eq(LOLWUT), eq(arguments), any())) + when(commandManager.submitNewCommand(eq(Lolwut), eq(arguments), any())) .thenReturn(testResponse); // exercise @@ -3767,7 +3767,7 @@ public void blpop_returns_success() { testResponse.complete(value); // match on protobuf request - when(commandManager.submitNewCommand(eq(Blpop), eq(arguments), any())) + when(commandManager.submitNewCommand(eq(BLPop), eq(arguments), any())) .thenReturn(testResponse); // exercise @@ -3842,7 +3842,7 @@ public void brpop_returns_success() { testResponse.complete(value); // match on protobuf request - when(commandManager.submitNewCommand(eq(Brpop), eq(arguments), any())) + when(commandManager.submitNewCommand(eq(BRPop), eq(arguments), any())) .thenReturn(testResponse); // exercise @@ -3980,7 +3980,7 @@ public void objectIdletime_returns_success() { testResponse.complete(idletime); // match on protobuf request - when(commandManager.submitNewCommand(eq(ObjectIdletime), eq(new String[] {key}), any())) + when(commandManager.submitNewCommand(eq(ObjectIdleTime), eq(new String[] {key}), any())) .thenReturn(testResponse); // exercise @@ -4002,7 +4002,7 @@ public void objectRefcount_returns_success() { testResponse.complete(refcount); // match on protobuf request - when(commandManager.submitNewCommand(eq(ObjectRefcount), eq(new String[] {key}), any())) + when(commandManager.submitNewCommand(eq(ObjectRefCount), eq(new String[] {key}), any())) .thenReturn(testResponse); // exercise diff --git a/java/client/src/test/java/glide/api/RedisClusterClientTest.java b/java/client/src/test/java/glide/api/RedisClusterClientTest.java index 6f43d01715..1244b43a92 100644 --- a/java/client/src/test/java/glide/api/RedisClusterClientTest.java +++ b/java/client/src/test/java/glide/api/RedisClusterClientTest.java @@ -24,8 +24,8 @@ import static redis_request.RedisRequestOuterClass.RequestType.Echo; import static redis_request.RedisRequestOuterClass.RequestType.FlushAll; import static redis_request.RedisRequestOuterClass.RequestType.Info; -import static redis_request.RedisRequestOuterClass.RequestType.LOLWUT; import static redis_request.RedisRequestOuterClass.RequestType.LastSave; +import static redis_request.RedisRequestOuterClass.RequestType.Lolwut; import static redis_request.RedisRequestOuterClass.RequestType.Ping; import static redis_request.RedisRequestOuterClass.RequestType.Time; @@ -912,7 +912,7 @@ public void lolwut_returns_success() { testResponse.complete(value); // match on protobuf request - when(commandManager.submitNewCommand(eq(LOLWUT), eq(new String[0]), any())) + when(commandManager.submitNewCommand(eq(Lolwut), eq(new String[0]), any())) .thenReturn(testResponse); // exercise @@ -934,7 +934,7 @@ public void lolwut_with_params_returns_success() { testResponse.complete(value); // match on protobuf request - when(commandManager.submitNewCommand(eq(LOLWUT), eq(arguments), any())) + when(commandManager.submitNewCommand(eq(Lolwut), eq(arguments), any())) .thenReturn(testResponse); // exercise @@ -955,7 +955,7 @@ public void lolwut_with_version_returns_success() { // match on protobuf request when(commandManager.submitNewCommand( - eq(LOLWUT), eq(new String[] {VERSION_REDIS_API, "42"}), any())) + eq(Lolwut), eq(new String[] {VERSION_REDIS_API, "42"}), any())) .thenReturn(testResponse); // exercise @@ -977,7 +977,7 @@ public void lolwut_with_version_and_params_returns_success() { testResponse.complete(value); // match on protobuf request - when(commandManager.submitNewCommand(eq(LOLWUT), eq(arguments), any())) + when(commandManager.submitNewCommand(eq(Lolwut), eq(arguments), any())) .thenReturn(testResponse); // exercise @@ -998,7 +998,7 @@ public void lolwut_with_route_returns_success() { // match on protobuf request when(commandManager.>submitNewCommand( - eq(LOLWUT), eq(new String[0]), eq(RANDOM), any())) + eq(Lolwut), eq(new String[0]), eq(RANDOM), any())) .thenReturn(testResponse); // exercise @@ -1021,7 +1021,7 @@ public void lolwut_with_params_and_route_returns_success() { // match on protobuf request when(commandManager.>submitNewCommand( - eq(LOLWUT), eq(arguments), eq(RANDOM), any())) + eq(Lolwut), eq(arguments), eq(RANDOM), any())) .thenReturn(testResponse); // exercise @@ -1042,7 +1042,7 @@ public void lolwut_with_version_and_route_returns_success() { // match on protobuf request when(commandManager.>submitNewCommand( - eq(LOLWUT), eq(new String[] {VERSION_REDIS_API, "42"}), eq(RANDOM), any())) + eq(Lolwut), eq(new String[] {VERSION_REDIS_API, "42"}), eq(RANDOM), any())) .thenReturn(testResponse); // exercise @@ -1065,7 +1065,7 @@ public void lolwut_with_version_and_params_and_route_returns_success() { // match on protobuf request when(commandManager.>submitNewCommand( - eq(LOLWUT), eq(arguments), eq(RANDOM), any())) + eq(Lolwut), eq(arguments), eq(RANDOM), any())) .thenReturn(testResponse); // exercise diff --git a/java/client/src/test/java/glide/api/models/TransactionTests.java b/java/client/src/test/java/glide/api/models/TransactionTests.java index cd77321843..264c2759e8 100644 --- a/java/client/src/test/java/glide/api/models/TransactionTests.java +++ b/java/client/src/test/java/glide/api/models/TransactionTests.java @@ -15,15 +15,15 @@ import static glide.api.models.commands.SetOptions.RETURN_OLD_VALUE; import static glide.api.models.commands.WeightAggregateOptions.AGGREGATE_REDIS_API; import static glide.api.models.commands.WeightAggregateOptions.WEIGHTS_REDIS_API; -import static glide.api.models.commands.ZaddOptions.UpdateOptions.SCORE_LESS_THAN_CURRENT; +import static glide.api.models.commands.ZAddOptions.UpdateOptions.SCORE_LESS_THAN_CURRENT; import static glide.api.models.commands.geospatial.GeoAddOptions.CHANGED_REDIS_API; import static glide.api.models.commands.stream.StreamTrimOptions.TRIM_EXACT_REDIS_API; import static glide.api.models.commands.stream.StreamTrimOptions.TRIM_MINID_REDIS_API; import static org.junit.jupiter.api.Assertions.assertEquals; +import static redis_request.RedisRequestOuterClass.RequestType.BLPop; +import static redis_request.RedisRequestOuterClass.RequestType.BRPop; import static redis_request.RedisRequestOuterClass.RequestType.BZPopMax; import static redis_request.RedisRequestOuterClass.RequestType.BZPopMin; -import static redis_request.RedisRequestOuterClass.RequestType.Blpop; -import static redis_request.RedisRequestOuterClass.RequestType.Brpop; import static redis_request.RedisRequestOuterClass.RequestType.ClientGetName; import static redis_request.RedisRequestOuterClass.RequestType.ClientId; import static redis_request.RedisRequestOuterClass.RequestType.ConfigGet; @@ -40,27 +40,27 @@ import static redis_request.RedisRequestOuterClass.RequestType.FlushAll; import static redis_request.RedisRequestOuterClass.RequestType.GeoAdd; import static redis_request.RedisRequestOuterClass.RequestType.GeoPos; +import static redis_request.RedisRequestOuterClass.RequestType.Get; import static redis_request.RedisRequestOuterClass.RequestType.GetRange; -import static redis_request.RedisRequestOuterClass.RequestType.GetString; +import static redis_request.RedisRequestOuterClass.RequestType.HDel; +import static redis_request.RedisRequestOuterClass.RequestType.HExists; +import static redis_request.RedisRequestOuterClass.RequestType.HGet; +import static redis_request.RedisRequestOuterClass.RequestType.HGetAll; +import static redis_request.RedisRequestOuterClass.RequestType.HIncrBy; +import static redis_request.RedisRequestOuterClass.RequestType.HIncrByFloat; +import static redis_request.RedisRequestOuterClass.RequestType.HKeys; import static redis_request.RedisRequestOuterClass.RequestType.HLen; +import static redis_request.RedisRequestOuterClass.RequestType.HMGet; +import static redis_request.RedisRequestOuterClass.RequestType.HSet; import static redis_request.RedisRequestOuterClass.RequestType.HSetNX; -import static redis_request.RedisRequestOuterClass.RequestType.HashDel; -import static redis_request.RedisRequestOuterClass.RequestType.HashExists; -import static redis_request.RedisRequestOuterClass.RequestType.HashGet; -import static redis_request.RedisRequestOuterClass.RequestType.HashGetAll; -import static redis_request.RedisRequestOuterClass.RequestType.HashIncrBy; -import static redis_request.RedisRequestOuterClass.RequestType.HashIncrByFloat; -import static redis_request.RedisRequestOuterClass.RequestType.HashMGet; -import static redis_request.RedisRequestOuterClass.RequestType.HashSet; -import static redis_request.RedisRequestOuterClass.RequestType.Hkeys; -import static redis_request.RedisRequestOuterClass.RequestType.Hvals; +import static redis_request.RedisRequestOuterClass.RequestType.HVals; import static redis_request.RedisRequestOuterClass.RequestType.Incr; import static redis_request.RedisRequestOuterClass.RequestType.IncrBy; import static redis_request.RedisRequestOuterClass.RequestType.IncrByFloat; import static redis_request.RedisRequestOuterClass.RequestType.Info; +import static redis_request.RedisRequestOuterClass.RequestType.LIndex; import static redis_request.RedisRequestOuterClass.RequestType.LInsert; import static redis_request.RedisRequestOuterClass.RequestType.LLen; -import static redis_request.RedisRequestOuterClass.RequestType.LOLWUT; import static redis_request.RedisRequestOuterClass.RequestType.LPop; import static redis_request.RedisRequestOuterClass.RequestType.LPush; import static redis_request.RedisRequestOuterClass.RequestType.LPushX; @@ -68,13 +68,13 @@ import static redis_request.RedisRequestOuterClass.RequestType.LRem; import static redis_request.RedisRequestOuterClass.RequestType.LTrim; import static redis_request.RedisRequestOuterClass.RequestType.LastSave; -import static redis_request.RedisRequestOuterClass.RequestType.Lindex; +import static redis_request.RedisRequestOuterClass.RequestType.Lolwut; import static redis_request.RedisRequestOuterClass.RequestType.MGet; import static redis_request.RedisRequestOuterClass.RequestType.MSet; import static redis_request.RedisRequestOuterClass.RequestType.ObjectEncoding; import static redis_request.RedisRequestOuterClass.RequestType.ObjectFreq; -import static redis_request.RedisRequestOuterClass.RequestType.ObjectIdletime; -import static redis_request.RedisRequestOuterClass.RequestType.ObjectRefcount; +import static redis_request.RedisRequestOuterClass.RequestType.ObjectIdleTime; +import static redis_request.RedisRequestOuterClass.RequestType.ObjectRefCount; import static redis_request.RedisRequestOuterClass.RequestType.PExpire; import static redis_request.RedisRequestOuterClass.RequestType.PExpireAt; import static redis_request.RedisRequestOuterClass.RequestType.PTTL; @@ -86,7 +86,7 @@ import static redis_request.RedisRequestOuterClass.RequestType.RPop; import static redis_request.RedisRequestOuterClass.RequestType.RPush; import static redis_request.RedisRequestOuterClass.RequestType.RPushX; -import static redis_request.RedisRequestOuterClass.RequestType.RenameNx; +import static redis_request.RedisRequestOuterClass.RequestType.RenameNX; import static redis_request.RedisRequestOuterClass.RequestType.SAdd; import static redis_request.RedisRequestOuterClass.RequestType.SCard; import static redis_request.RedisRequestOuterClass.RequestType.SDiff; @@ -99,8 +99,8 @@ import static redis_request.RedisRequestOuterClass.RequestType.SMove; import static redis_request.RedisRequestOuterClass.RequestType.SRem; import static redis_request.RedisRequestOuterClass.RequestType.SUnionStore; +import static redis_request.RedisRequestOuterClass.RequestType.Set; import static redis_request.RedisRequestOuterClass.RequestType.SetRange; -import static redis_request.RedisRequestOuterClass.RequestType.SetString; import static redis_request.RedisRequestOuterClass.RequestType.Strlen; import static redis_request.RedisRequestOuterClass.RequestType.TTL; import static redis_request.RedisRequestOuterClass.RequestType.Time; @@ -109,6 +109,9 @@ import static redis_request.RedisRequestOuterClass.RequestType.Unlink; import static redis_request.RedisRequestOuterClass.RequestType.XAdd; import static redis_request.RedisRequestOuterClass.RequestType.XTrim; +import static redis_request.RedisRequestOuterClass.RequestType.ZAdd; +import static redis_request.RedisRequestOuterClass.RequestType.ZCard; +import static redis_request.RedisRequestOuterClass.RequestType.ZCount; import static redis_request.RedisRequestOuterClass.RequestType.ZDiff; import static redis_request.RedisRequestOuterClass.RequestType.ZDiffStore; import static redis_request.RedisRequestOuterClass.RequestType.ZInterStore; @@ -117,7 +120,10 @@ import static redis_request.RedisRequestOuterClass.RequestType.ZPopMax; import static redis_request.RedisRequestOuterClass.RequestType.ZPopMin; import static redis_request.RedisRequestOuterClass.RequestType.ZRandMember; +import static redis_request.RedisRequestOuterClass.RequestType.ZRange; import static redis_request.RedisRequestOuterClass.RequestType.ZRangeStore; +import static redis_request.RedisRequestOuterClass.RequestType.ZRank; +import static redis_request.RedisRequestOuterClass.RequestType.ZRem; import static redis_request.RedisRequestOuterClass.RequestType.ZRemRangeByLex; import static redis_request.RedisRequestOuterClass.RequestType.ZRemRangeByRank; import static redis_request.RedisRequestOuterClass.RequestType.ZRemRangeByScore; @@ -125,12 +131,6 @@ import static redis_request.RedisRequestOuterClass.RequestType.ZScore; import static redis_request.RedisRequestOuterClass.RequestType.ZUnion; import static redis_request.RedisRequestOuterClass.RequestType.ZUnionStore; -import static redis_request.RedisRequestOuterClass.RequestType.Zadd; -import static redis_request.RedisRequestOuterClass.RequestType.Zcard; -import static redis_request.RedisRequestOuterClass.RequestType.Zcount; -import static redis_request.RedisRequestOuterClass.RequestType.Zrange; -import static redis_request.RedisRequestOuterClass.RequestType.Zrank; -import static redis_request.RedisRequestOuterClass.RequestType.Zrem; import glide.api.models.commands.ConditionalChange; import glide.api.models.commands.InfoOptions; @@ -146,7 +146,7 @@ import glide.api.models.commands.WeightAggregateOptions.Aggregate; import glide.api.models.commands.WeightAggregateOptions.KeyArray; import glide.api.models.commands.WeightAggregateOptions.WeightedKeys; -import glide.api.models.commands.ZaddOptions; +import glide.api.models.commands.ZAddOptions; import glide.api.models.commands.geospatial.GeoAddOptions; import glide.api.models.commands.geospatial.GeospatialData; import glide.api.models.commands.stream.StreamAddOptions; @@ -176,13 +176,13 @@ public void transaction_builds_protobuf_request(BaseTransaction transaction) List> results = new LinkedList<>(); transaction.get("key"); - results.add(Pair.of(GetString, buildArgs("key"))); + results.add(Pair.of(Get, buildArgs("key"))); transaction.set("key", "value"); - results.add(Pair.of(SetString, buildArgs("key", "value"))); + results.add(Pair.of(Set, buildArgs("key", "value"))); transaction.set("key", "value", SetOptions.builder().returnOldValue(true).build()); - results.add(Pair.of(SetString, buildArgs("key", "value", RETURN_OLD_VALUE))); + results.add(Pair.of(Set, buildArgs("key", "value", RETURN_OLD_VALUE))); transaction.del(new String[] {"key1", "key2"}); results.add(Pair.of(Del, buildArgs("key1", "key2"))); @@ -233,40 +233,40 @@ public void transaction_builds_protobuf_request(BaseTransaction transaction) results.add(Pair.of(GetRange, buildArgs("key", "42", "54"))); transaction.hset("key", Map.of("field", "value")); - results.add(Pair.of(HashSet, buildArgs("key", "field", "value"))); + results.add(Pair.of(HSet, buildArgs("key", "field", "value"))); transaction.hsetnx("key", "field", "value"); results.add(Pair.of(HSetNX, buildArgs("key", "field", "value"))); transaction.hget("key", "field"); - results.add(Pair.of(HashGet, buildArgs("key", "field"))); + results.add(Pair.of(HGet, buildArgs("key", "field"))); transaction.hdel("key", new String[] {"field"}); - results.add(Pair.of(HashDel, buildArgs("key", "field"))); + results.add(Pair.of(HDel, buildArgs("key", "field"))); transaction.hlen("key"); results.add(Pair.of(HLen, buildArgs("key"))); transaction.hvals("key"); - results.add(Pair.of(Hvals, buildArgs("key"))); + results.add(Pair.of(HVals, buildArgs("key"))); transaction.hmget("key", new String[] {"field"}); - results.add(Pair.of(HashMGet, buildArgs("key", "field"))); + results.add(Pair.of(HMGet, buildArgs("key", "field"))); transaction.hexists("key", "field"); - results.add(Pair.of(HashExists, buildArgs("key", "field"))); + results.add(Pair.of(HExists, buildArgs("key", "field"))); transaction.hgetall("key"); - results.add(Pair.of(HashGetAll, buildArgs("key"))); + results.add(Pair.of(HGetAll, buildArgs("key"))); transaction.hincrBy("key", "field", 1); - results.add(Pair.of(HashIncrBy, buildArgs("key", "field", "1"))); + results.add(Pair.of(HIncrBy, buildArgs("key", "field", "1"))); transaction.hincrByFloat("key", "field", 1.5); - results.add(Pair.of(HashIncrByFloat, buildArgs("key", "field", "1.5"))); + results.add(Pair.of(HIncrByFloat, buildArgs("key", "field", "1.5"))); transaction.hkeys("key"); - results.add(Pair.of(Hkeys, buildArgs("key"))); + results.add(Pair.of(HKeys, buildArgs("key"))); transaction.lpush("key", new String[] {"element1", "element2"}); results.add(Pair.of(LPush, buildArgs("key", "element1", "element2"))); @@ -281,7 +281,7 @@ public void transaction_builds_protobuf_request(BaseTransaction transaction) results.add(Pair.of(LRange, buildArgs("key", "1", "2"))); transaction.lindex("key", 1); - results.add(Pair.of(Lindex, ArgsArray.newBuilder().addArgs("key").addArgs("1").build())); + results.add(Pair.of(LIndex, ArgsArray.newBuilder().addArgs("key").addArgs("1").build())); transaction.ltrim("key", 1, 2); results.add(Pair.of(LTrim, buildArgs("key", "1", "2"))); @@ -392,22 +392,22 @@ public void transaction_builds_protobuf_request(BaseTransaction transaction) transaction.zadd( "key", membersScores, - ZaddOptions.builder().updateOptions(SCORE_LESS_THAN_CURRENT).build(), + ZAddOptions.builder().updateOptions(SCORE_LESS_THAN_CURRENT).build(), true); - results.add(Pair.of(Zadd, buildArgs("key", "LT", "CH", "1.0", "member1", "2.0", "member2"))); + results.add(Pair.of(ZAdd, buildArgs("key", "LT", "CH", "1.0", "member1", "2.0", "member2"))); transaction.zaddIncr( "key", "member1", 3.0, - ZaddOptions.builder().updateOptions(SCORE_LESS_THAN_CURRENT).build()); - results.add(Pair.of(Zadd, buildArgs("key", "LT", "INCR", "3.0", "member1"))); + ZAddOptions.builder().updateOptions(SCORE_LESS_THAN_CURRENT).build()); + results.add(Pair.of(ZAdd, buildArgs("key", "LT", "INCR", "3.0", "member1"))); transaction.zrem("key", new String[] {"member1", "member2"}); - results.add(Pair.of(Zrem, buildArgs("key", "member1", "member2"))); + results.add(Pair.of(ZRem, buildArgs("key", "member1", "member2"))); transaction.zcard("key"); - results.add(Pair.of(Zcard, buildArgs("key"))); + results.add(Pair.of(ZCard, buildArgs("key"))); transaction.zpopmin("key"); results.add(Pair.of(ZPopMin, buildArgs("key"))); @@ -431,10 +431,10 @@ public void transaction_builds_protobuf_request(BaseTransaction transaction) results.add(Pair.of(ZScore, buildArgs("key", "member"))); transaction.zrank("key", "member"); - results.add(Pair.of(Zrank, buildArgs("key", "member"))); + results.add(Pair.of(ZRank, buildArgs("key", "member"))); transaction.zrankWithScore("key", "member"); - results.add(Pair.of(Zrank, buildArgs("key", "member", WITH_SCORE_REDIS_API))); + results.add(Pair.of(ZRank, buildArgs("key", "member", WITH_SCORE_REDIS_API))); transaction.zrevrank("key", "member"); results.add(Pair.of(ZRevRank, buildArgs("key", "member"))); @@ -463,7 +463,7 @@ public void transaction_builds_protobuf_request(BaseTransaction transaction) results.add(Pair.of(ZDiffStore, buildArgs("destKey", "2", "key1", "key2"))); transaction.zcount("key", new ScoreBoundary(5, false), InfScoreBound.POSITIVE_INFINITY); - results.add(Pair.of(Zcount, buildArgs("key", "(5.0", "+inf"))); + results.add(Pair.of(ZCount, buildArgs("key", "(5.0", "+inf"))); transaction.zremrangebyrank("key", 0, -1); results.add(Pair.of(ZRemRangeByRank, buildArgs("key", "0", "-1"))); @@ -588,10 +588,10 @@ InfScoreBound.NEGATIVE_INFINITY, new ScoreBoundary(3, false), new Limit(1, 2)), results.add(Pair.of(FlushAll, buildArgs(ASYNC.toString()))); transaction.lolwut().lolwut(5).lolwut(new int[] {1, 2}).lolwut(6, new int[] {42}); - results.add(Pair.of(LOLWUT, buildArgs())); - results.add(Pair.of(LOLWUT, buildArgs(VERSION_REDIS_API, "5"))); - results.add(Pair.of(LOLWUT, buildArgs("1", "2"))); - results.add(Pair.of(LOLWUT, buildArgs(VERSION_REDIS_API, "6", "42"))); + results.add(Pair.of(Lolwut, buildArgs())); + results.add(Pair.of(Lolwut, buildArgs(VERSION_REDIS_API, "5"))); + results.add(Pair.of(Lolwut, buildArgs("1", "2"))); + results.add(Pair.of(Lolwut, buildArgs(VERSION_REDIS_API, "6", "42"))); transaction.persist("key"); results.add(Pair.of(Persist, buildArgs("key"))); @@ -616,15 +616,15 @@ InfScoreBound.NEGATIVE_INFINITY, new ScoreBoundary(3, false), new Limit(1, 2)), results.add(Pair.of(Type, buildArgs("key"))); transaction.renamenx("key", "newKey"); - results.add(Pair.of(RenameNx, buildArgs("key", "newKey"))); + results.add(Pair.of(RenameNX, buildArgs("key", "newKey"))); transaction.linsert("key", AFTER, "pivot", "elem"); results.add(Pair.of(LInsert, buildArgs("key", "AFTER", "pivot", "elem"))); transaction.brpop(new String[] {"key1", "key2"}, 0.5); - results.add(Pair.of(Brpop, buildArgs("key1", "key2", "0.5"))); + results.add(Pair.of(BRPop, buildArgs("key1", "key2", "0.5"))); transaction.blpop(new String[] {"key1", "key2"}, 0.5); - results.add(Pair.of(Blpop, buildArgs("key1", "key2", "0.5"))); + results.add(Pair.of(BLPop, buildArgs("key1", "key2", "0.5"))); transaction.rpushx("key", new String[] {"element1", "element2"}); results.add(Pair.of(RPushX, buildArgs("key", "element1", "element2"))); @@ -637,7 +637,7 @@ InfScoreBound.NEGATIVE_INFINITY, new ScoreBoundary(3, false), new Limit(1, 2)), new RangeByScore(NEGATIVE_INFINITY, new ScoreBoundary(3, false), new Limit(1, 2)), true); results.add( - Pair.of(Zrange, buildArgs("key", "-inf", "(3.0", "BYSCORE", "REV", "LIMIT", "1", "2"))); + Pair.of(ZRange, buildArgs("key", "-inf", "(3.0", "BYSCORE", "REV", "LIMIT", "1", "2"))); transaction.zrangeWithScores( "key", @@ -645,7 +645,7 @@ InfScoreBound.NEGATIVE_INFINITY, new ScoreBoundary(3, false), new Limit(1, 2)), false); results.add( Pair.of( - Zrange, + ZRange, buildArgs("key", "5.0", "+inf", "BYSCORE", "LIMIT", "1", "2", WITH_SCORES_REDIS_API))); transaction.pfadd("hll", new String[] {"a", "b", "c"}); @@ -675,10 +675,10 @@ InfScoreBound.NEGATIVE_INFINITY, new ScoreBoundary(3, false), new Limit(1, 2)), results.add(Pair.of(ObjectFreq, buildArgs("key"))); transaction.objectIdletime("key"); - results.add(Pair.of(ObjectIdletime, buildArgs("key"))); + results.add(Pair.of(ObjectIdleTime, buildArgs("key"))); transaction.objectRefcount("key"); - results.add(Pair.of(ObjectRefcount, buildArgs("key"))); + results.add(Pair.of(ObjectRefCount, buildArgs("key"))); transaction.touch(new String[] {"key1", "key2"}); results.add(Pair.of(Touch, buildArgs("key1", "key2"))); diff --git a/java/integTest/src/test/java/glide/SharedCommandTests.java b/java/integTest/src/test/java/glide/SharedCommandTests.java index 15e94ab61a..014c9fd395 100644 --- a/java/integTest/src/test/java/glide/SharedCommandTests.java +++ b/java/integTest/src/test/java/glide/SharedCommandTests.java @@ -42,7 +42,7 @@ import glide.api.models.commands.WeightAggregateOptions.Aggregate; import glide.api.models.commands.WeightAggregateOptions.KeyArray; import glide.api.models.commands.WeightAggregateOptions.WeightedKeys; -import glide.api.models.commands.ZaddOptions; +import glide.api.models.commands.ZAddOptions; import glide.api.models.commands.geospatial.GeoAddOptions; import glide.api.models.commands.geospatial.GeospatialData; import glide.api.models.commands.stream.StreamAddOptions; @@ -1569,13 +1569,13 @@ public void zadd_and_zaddIncr_with_NX_XX(BaseClient client) { String key = UUID.randomUUID().toString(); Map membersScores = Map.of("one", 1.0, "two", 2.0, "three", 3.0); - ZaddOptions onlyIfExistsOptions = - ZaddOptions.builder() - .conditionalChange(ZaddOptions.ConditionalChange.ONLY_IF_EXISTS) + ZAddOptions onlyIfExistsOptions = + ZAddOptions.builder() + .conditionalChange(ZAddOptions.ConditionalChange.ONLY_IF_EXISTS) .build(); - ZaddOptions onlyIfDoesNotExistOptions = - ZaddOptions.builder() - .conditionalChange(ZaddOptions.ConditionalChange.ONLY_IF_DOES_NOT_EXIST) + ZAddOptions onlyIfDoesNotExistOptions = + ZAddOptions.builder() + .conditionalChange(ZAddOptions.ConditionalChange.ONLY_IF_DOES_NOT_EXIST) .build(); assertEquals(0, client.zadd(key, membersScores, onlyIfExistsOptions).get()); @@ -1597,13 +1597,13 @@ public void zadd_and_zaddIncr_with_GT_LT(BaseClient client) { assertEquals(3, client.zadd(key, membersScores).get()); membersScores.put("one", 10.0); - ZaddOptions scoreGreaterThanOptions = - ZaddOptions.builder() - .updateOptions(ZaddOptions.UpdateOptions.SCORE_GREATER_THAN_CURRENT) + ZAddOptions scoreGreaterThanOptions = + ZAddOptions.builder() + .updateOptions(ZAddOptions.UpdateOptions.SCORE_GREATER_THAN_CURRENT) .build(); - ZaddOptions scoreLessThanOptions = - ZaddOptions.builder() - .updateOptions(ZaddOptions.UpdateOptions.SCORE_LESS_THAN_CURRENT) + ZAddOptions scoreLessThanOptions = + ZAddOptions.builder() + .updateOptions(ZAddOptions.UpdateOptions.SCORE_LESS_THAN_CURRENT) .build(); assertEquals(1, client.zadd(key, membersScores, scoreGreaterThanOptions, true).get()); @@ -1615,33 +1615,33 @@ public void zadd_and_zaddIncr_with_GT_LT(BaseClient client) { // TODO move to another class @Test public void zadd_illegal_arguments() { - ZaddOptions existsGreaterThanOptions = - ZaddOptions.builder() - .conditionalChange(ZaddOptions.ConditionalChange.ONLY_IF_DOES_NOT_EXIST) - .updateOptions(ZaddOptions.UpdateOptions.SCORE_GREATER_THAN_CURRENT) + ZAddOptions existsGreaterThanOptions = + ZAddOptions.builder() + .conditionalChange(ZAddOptions.ConditionalChange.ONLY_IF_DOES_NOT_EXIST) + .updateOptions(ZAddOptions.UpdateOptions.SCORE_GREATER_THAN_CURRENT) .build(); assertThrows(IllegalArgumentException.class, existsGreaterThanOptions::toArgs); - ZaddOptions existsLessThanOptions = - ZaddOptions.builder() - .conditionalChange(ZaddOptions.ConditionalChange.ONLY_IF_DOES_NOT_EXIST) - .updateOptions(ZaddOptions.UpdateOptions.SCORE_LESS_THAN_CURRENT) + ZAddOptions existsLessThanOptions = + ZAddOptions.builder() + .conditionalChange(ZAddOptions.ConditionalChange.ONLY_IF_DOES_NOT_EXIST) + .updateOptions(ZAddOptions.UpdateOptions.SCORE_LESS_THAN_CURRENT) .build(); assertThrows(IllegalArgumentException.class, existsLessThanOptions::toArgs); - ZaddOptions options = - ZaddOptions.builder() - .conditionalChange(ZaddOptions.ConditionalChange.ONLY_IF_DOES_NOT_EXIST) + ZAddOptions options = + ZAddOptions.builder() + .conditionalChange(ZAddOptions.ConditionalChange.ONLY_IF_DOES_NOT_EXIST) .build(); options.toArgs(); options = - ZaddOptions.builder() - .conditionalChange(ZaddOptions.ConditionalChange.ONLY_IF_EXISTS) - .updateOptions(ZaddOptions.UpdateOptions.SCORE_GREATER_THAN_CURRENT) + ZAddOptions.builder() + .conditionalChange(ZAddOptions.ConditionalChange.ONLY_IF_EXISTS) + .updateOptions(ZAddOptions.UpdateOptions.SCORE_GREATER_THAN_CURRENT) .build(); options.toArgs(); options = - ZaddOptions.builder() - .conditionalChange(ZaddOptions.ConditionalChange.ONLY_IF_EXISTS) - .updateOptions(ZaddOptions.UpdateOptions.SCORE_LESS_THAN_CURRENT) + ZAddOptions.builder() + .conditionalChange(ZAddOptions.ConditionalChange.ONLY_IF_EXISTS) + .updateOptions(ZAddOptions.UpdateOptions.SCORE_LESS_THAN_CURRENT) .build(); options.toArgs(); } diff --git a/node/src/BaseClient.ts b/node/src/BaseClient.ts index 267f757307..7c38c47da9 100644 --- a/node/src/BaseClient.ts +++ b/node/src/BaseClient.ts @@ -20,9 +20,9 @@ import { StreamAddOptions, StreamReadOptions, StreamTrimOptions, - ZaddOptions, - createBlpop, - createBrpop, + ZAddOptions, + createBLPop, + createBRPop, createDecr, createDecrBy, createDel, @@ -40,53 +40,53 @@ import { createHMGet, createHSet, createHSetNX, - createHvals, + createHVals, createIncr, createIncrBy, createIncrByFloat, + createLIndex, createLLen, createLPop, createLPush, createLRange, createLRem, createLTrim, - createLindex, createMGet, createMSet, createPExpire, createPExpireAt, + createPTTL, createPersist, createPfAdd, - createPttl, createRPop, createRPush, createRename, createSAdd, createSCard, + createSIsMember, createSMembers, createSPop, createSRem, createSet, - createSismember, createStrlen, createTTL, createType, createUnlink, - createXadd, - createXread, - createXtrim, - createZadd, - createZcard, - createZcount, - createZpopmax, - createZpopmin, - createZrange, - createZrangeWithScores, - createZrank, - createZrem, - createZremRangeByRank, - createZremRangeByScore, - createZscore, + createXAdd, + createXRead, + createXTrim, + createZAdd, + createZCard, + createZCount, + createZPopMax, + createZPopMin, + createZRange, + createZRangeWithScores, + createZRank, + createZRem, + createZRemRangeByRank, + createZRemRangeByScore, + createZScore, } from "./Commands"; import { ClosingError, @@ -899,7 +899,7 @@ export class BaseClient { * ``` */ public hvals(key: string): Promise { - return this.createWritePromise(createHvals(key)); + return this.createWritePromise(createHVals(key)); } /** Inserts all the specified values at the head of the list stored at `key`. @@ -1262,7 +1262,7 @@ export class BaseClient { * ``` */ public sismember(key: string, member: string): Promise { - return this.createWritePromise(createSismember(key, member)); + return this.createWritePromise(createSIsMember(key, member)); } /** Removes and returns one random member from the set value store at `key`. @@ -1547,7 +1547,7 @@ export class BaseClient { * * @param key - The key of the sorted set. * @param membersScoresMap - A mapping of members to their corresponding scores. - * @param options - The Zadd options. + * @param options - The ZAdd options. * @param changed - Modify the return value from the number of new elements added, to the total number of elements changed. * @returns The number of elements added to the sorted set. * If `changed` is set, returns the number of elements updated in the sorted set. @@ -1569,11 +1569,11 @@ export class BaseClient { public zadd( key: string, membersScoresMap: Record, - options?: ZaddOptions, + options?: ZAddOptions, changed?: boolean, ): Promise { return this.createWritePromise( - createZadd( + createZAdd( key, membersScoresMap, options, @@ -1590,7 +1590,7 @@ export class BaseClient { * @param key - The key of the sorted set. * @param member - A member in the sorted set to increment. * @param increment - The score to increment the member. - * @param options - The Zadd options. + * @param options - The ZAdd options. * @returns The score of the member. * If there was a conflict with the options, the operation aborts and null is returned. * @@ -1612,10 +1612,10 @@ export class BaseClient { key: string, member: string, increment: number, - options?: ZaddOptions, + options?: ZAddOptions, ): Promise { return this.createWritePromise( - createZadd(key, { [member]: increment }, options, "INCR"), + createZAdd(key, { [member]: increment }, options, "INCR"), ); } @@ -1643,7 +1643,7 @@ export class BaseClient { * ``` */ public zrem(key: string, members: string[]): Promise { - return this.createWritePromise(createZrem(key, members)); + return this.createWritePromise(createZRem(key, members)); } /** Returns the cardinality (number of elements) of the sorted set stored at `key`. @@ -1668,7 +1668,7 @@ export class BaseClient { * ``` */ public zcard(key: string): Promise { - return this.createWritePromise(createZcard(key)); + return this.createWritePromise(createZCard(key)); } /** Returns the score of `member` in the sorted set stored at `key`. @@ -1702,7 +1702,7 @@ export class BaseClient { * ``` */ public zscore(key: string, member: string): Promise { - return this.createWritePromise(createZscore(key, member)); + return this.createWritePromise(createZScore(key, member)); } /** Returns the number of members in the sorted set stored at `key` with scores between `minScore` and `maxScore`. @@ -1734,7 +1734,7 @@ export class BaseClient { minScore: ScoreBoundary, maxScore: ScoreBoundary, ): Promise { - return this.createWritePromise(createZcount(key, minScore, maxScore)); + return this.createWritePromise(createZCount(key, minScore, maxScore)); } /** Returns the specified range of elements in the sorted set stored at `key`. @@ -1774,7 +1774,7 @@ export class BaseClient { rangeQuery: RangeByScore | RangeByLex | RangeByIndex, reverse: boolean = false, ): Promise { - return this.createWritePromise(createZrange(key, rangeQuery, reverse)); + return this.createWritePromise(createZRange(key, rangeQuery, reverse)); } /** Returns the specified range of elements with their scores in the sorted set stored at `key`. @@ -1817,7 +1817,7 @@ export class BaseClient { reverse: boolean = false, ): Promise> { return this.createWritePromise( - createZrangeWithScores(key, rangeQuery, reverse), + createZRangeWithScores(key, rangeQuery, reverse), ); } @@ -1902,7 +1902,7 @@ export class BaseClient { key: string, count?: number, ): Promise> { - return this.createWritePromise(createZpopmin(key, count)); + return this.createWritePromise(createZPopMin(key, count)); } /** Removes and returns the members with the highest scores from the sorted set stored at `key`. @@ -1934,7 +1934,7 @@ export class BaseClient { key: string, count?: number, ): Promise> { - return this.createWritePromise(createZpopmax(key, count)); + return this.createWritePromise(createZPopMax(key, count)); } /** Returns the remaining time to live of `key` that has a timeout, in milliseconds. @@ -1965,7 +1965,7 @@ export class BaseClient { * ``` */ public pttl(key: string): Promise { - return this.createWritePromise(createPttl(key)); + return this.createWritePromise(createPTTL(key)); } /** Removes all elements in the sorted set stored at `key` with rank between `start` and `end`. @@ -1993,7 +1993,7 @@ export class BaseClient { start: number, end: number, ): Promise { - return this.createWritePromise(createZremRangeByRank(key, start, end)); + return this.createWritePromise(createZRemRangeByRank(key, start, end)); } /** Removes all elements in the sorted set stored at `key` with a score between `minScore` and `maxScore`. @@ -2026,7 +2026,7 @@ export class BaseClient { maxScore: ScoreBoundary, ): Promise { return this.createWritePromise( - createZremRangeByScore(key, minScore, maxScore), + createZRemRangeByScore(key, minScore, maxScore), ); } @@ -2054,7 +2054,7 @@ export class BaseClient { * ``` */ public zrank(key: string, member: string): Promise { - return this.createWritePromise(createZrank(key, member)); + return this.createWritePromise(createZRank(key, member)); } /** Returns the rank of `member` in the sorted set stored at `key` with its score, where scores are ordered from the lowest to highest. @@ -2085,7 +2085,7 @@ export class BaseClient { key: string, member: string, ): Promise { - return this.createWritePromise(createZrank(key, member, true)); + return this.createWritePromise(createZRank(key, member, true)); } /** @@ -2101,7 +2101,7 @@ export class BaseClient { values: [string, string][], options?: StreamAddOptions, ): Promise { - return this.createWritePromise(createXadd(key, values, options)); + return this.createWritePromise(createXAdd(key, values, options)); } /** @@ -2113,7 +2113,7 @@ export class BaseClient { * @returns The number of entries deleted from the stream. If `key` doesn't exist, 0 is returned. */ public xtrim(key: string, options: StreamTrimOptions): Promise { - return this.createWritePromise(createXtrim(key, options)); + return this.createWritePromise(createXTrim(key, options)); } /** @@ -2128,7 +2128,7 @@ export class BaseClient { keys_and_ids: Record, options?: StreamReadOptions, ): Promise> { - return this.createWritePromise(createXread(keys_and_ids, options)); + return this.createWritePromise(createXRead(keys_and_ids, options)); } private readonly MAP_READ_FROM_STRATEGY: Record< @@ -2165,7 +2165,7 @@ export class BaseClient { * ``` */ public lindex(key: string, index: number): Promise { - return this.createWritePromise(createLindex(key, index)); + return this.createWritePromise(createLIndex(key, index)); } /** Remove the existing timeout on `key`, turning the key from volatile (a key with an expire set) to @@ -2236,7 +2236,7 @@ export class BaseClient { keys: string[], timeout: number, ): Promise<[string, string] | null> { - return this.createWritePromise(createBrpop(keys, timeout)); + return this.createWritePromise(createBRPop(keys, timeout)); } /** Blocking list pop primitive. @@ -2265,7 +2265,7 @@ export class BaseClient { keys: string[], timeout: number, ): Promise<[string, string] | null> { - return this.createWritePromise(createBlpop(keys, timeout)); + return this.createWritePromise(createBLPop(keys, timeout)); } /** Adds all elements to the HyperLogLog data structure stored at the specified `key`. diff --git a/node/src/Commands.ts b/node/src/Commands.ts index 0ec57288cf..65fec321f8 100644 --- a/node/src/Commands.ts +++ b/node/src/Commands.ts @@ -65,7 +65,7 @@ function createCommand( * @internal */ export function createGet(key: string): redis_request.Command { - return createCommand(RequestType.GetString, [key]); + return createCommand(RequestType.Get, [key]); } export type SetOptions = { @@ -155,7 +155,7 @@ export function createSet( } } - return createCommand(RequestType.SetString, args); + return createCommand(RequestType.Set, args); } /** @@ -357,7 +357,7 @@ export function createConfigSet( * @internal */ export function createHGet(key: string, field: string): redis_request.Command { - return createCommand(RequestType.HashGet, [key, field]); + return createCommand(RequestType.HGet, [key, field]); } /** @@ -368,7 +368,7 @@ export function createHSet( fieldValueMap: Record, ): redis_request.Command { return createCommand( - RequestType.HashSet, + RequestType.HSet, [key].concat(Object.entries(fieldValueMap).flat()), ); } @@ -408,7 +408,7 @@ export function createHDel( key: string, fields: string[], ): redis_request.Command { - return createCommand(RequestType.HashDel, [key].concat(fields)); + return createCommand(RequestType.HDel, [key].concat(fields)); } /** @@ -418,7 +418,7 @@ export function createHMGet( key: string, fields: string[], ): redis_request.Command { - return createCommand(RequestType.HashMGet, [key].concat(fields)); + return createCommand(RequestType.HMGet, [key].concat(fields)); } /** @@ -428,14 +428,14 @@ export function createHExists( key: string, field: string, ): redis_request.Command { - return createCommand(RequestType.HashExists, [key, field]); + return createCommand(RequestType.HExists, [key, field]); } /** * @internal */ export function createHGetAll(key: string): redis_request.Command { - return createCommand(RequestType.HashGetAll, [key]); + return createCommand(RequestType.HGetAll, [key]); } /** @@ -559,7 +559,7 @@ export function createSCard(key: string): redis_request.Command { /** * @internal */ -export function createSismember( +export function createSIsMember( key: string, member: string, ): redis_request.Command { @@ -571,7 +571,7 @@ export function createSismember( */ export function createSPop(key: string, count?: number): redis_request.Command { const args: string[] = count == undefined ? [key] : [key, count.toString()]; - return createCommand(RequestType.Spop, args); + return createCommand(RequestType.SPop, args); } /** @@ -589,11 +589,7 @@ export function createHIncrBy( field: string, amount: number, ): redis_request.Command { - return createCommand(RequestType.HashIncrBy, [ - key, - field, - amount.toString(), - ]); + return createCommand(RequestType.HIncrBy, [key, field, amount.toString()]); } /** @@ -604,7 +600,7 @@ export function createHIncrByFloat( field: string, amount: number, ): redis_request.Command { - return createCommand(RequestType.HashIncrByFloat, [ + return createCommand(RequestType.HIncrByFloat, [ key, field, amount.toString(), @@ -621,8 +617,8 @@ export function createHLen(key: string): redis_request.Command { /** * @internal */ -export function createHvals(key: string): redis_request.Command { - return createCommand(RequestType.Hvals, [key]); +export function createHVals(key: string): redis_request.Command { + return createCommand(RequestType.HVals, [key]); } /** @@ -725,7 +721,7 @@ export function createTTL(key: string): redis_request.Command { return createCommand(RequestType.TTL, [key]); } -export type ZaddOptions = { +export type ZAddOptions = { /** * `onlyIfDoesNotExist` - Only add new elements. Don't update already existing elements. Equivalent to `NX` in the Redis API. * `onlyIfExists` - Only update elements that already exist. Don't add new elements. Equivalent to `XX` in the Redis API. @@ -743,10 +739,10 @@ export type ZaddOptions = { /** * @internal */ -export function createZadd( +export function createZAdd( key: string, membersScoresMap: Record, - options?: ZaddOptions, + options?: ZAddOptions, changedOrIncr?: "CH" | "INCR", ): redis_request.Command { let args = [key]; @@ -781,30 +777,30 @@ export function createZadd( key, ]), ); - return createCommand(RequestType.Zadd, args); + return createCommand(RequestType.ZAdd, args); } /** * @internal */ -export function createZrem( +export function createZRem( key: string, members: string[], ): redis_request.Command { - return createCommand(RequestType.Zrem, [key].concat(members)); + return createCommand(RequestType.ZRem, [key].concat(members)); } /** * @internal */ -export function createZcard(key: string): redis_request.Command { - return createCommand(RequestType.Zcard, [key]); +export function createZCard(key: string): redis_request.Command { + return createCommand(RequestType.ZCard, [key]); } /** * @internal */ -export function createZscore( +export function createZScore( key: string, member: string, ): redis_request.Command { @@ -910,7 +906,7 @@ function getScoreBoundaryArg( return value; } -function createZrangeArgs( +function createZRangeArgs( key: string, rangeQuery: RangeByScore | RangeByLex | RangeByIndex, reverse: boolean, @@ -951,7 +947,7 @@ function createZrangeArgs( /** * @internal */ -export function createZcount( +export function createZCount( key: string, minScore: ScoreBoundary, maxScore: ScoreBoundary, @@ -959,31 +955,31 @@ export function createZcount( const args = [key]; args.push(getScoreBoundaryArg(minScore)); args.push(getScoreBoundaryArg(maxScore)); - return createCommand(RequestType.Zcount, args); + return createCommand(RequestType.ZCount, args); } /** * @internal */ -export function createZrange( +export function createZRange( key: string, rangeQuery: RangeByIndex | RangeByScore | RangeByLex, reverse: boolean = false, ): redis_request.Command { - const args = createZrangeArgs(key, rangeQuery, reverse, false); - return createCommand(RequestType.Zrange, args); + const args = createZRangeArgs(key, rangeQuery, reverse, false); + return createCommand(RequestType.ZRange, args); } /** * @internal */ -export function createZrangeWithScores( +export function createZRangeWithScores( key: string, rangeQuery: RangeByIndex | RangeByScore | RangeByLex, reverse: boolean = false, ): redis_request.Command { - const args = createZrangeArgs(key, rangeQuery, reverse, true); - return createCommand(RequestType.Zrange, args); + const args = createZRangeArgs(key, rangeQuery, reverse, true); + return createCommand(RequestType.ZRange, args); } /** @@ -1003,17 +999,17 @@ export function createStrlen(key: string): redis_request.Command { /** * @internal */ -export function createLindex( +export function createLIndex( key: string, index: number, ): redis_request.Command { - return createCommand(RequestType.Lindex, [key, index.toString()]); + return createCommand(RequestType.LIndex, [key, index.toString()]); } /** * @internal */ -export function createZpopmin( +export function createZPopMin( key: string, count?: number, ): redis_request.Command { @@ -1024,7 +1020,7 @@ export function createZpopmin( /** * @internal */ -export function createZpopmax( +export function createZPopMax( key: string, count?: number, ): redis_request.Command { @@ -1042,14 +1038,14 @@ export function createEcho(message: string): redis_request.Command { /** * @internal */ -export function createPttl(key: string): redis_request.Command { +export function createPTTL(key: string): redis_request.Command { return createCommand(RequestType.PTTL, [key]); } /** * @internal */ -export function createZremRangeByRank( +export function createZRemRangeByRank( key: string, start: number, stop: number, @@ -1064,7 +1060,7 @@ export function createZremRangeByRank( /** * @internal */ -export function createZremRangeByScore( +export function createZRemRangeByScore( key: string, minScore: ScoreBoundary, maxScore: ScoreBoundary, @@ -1079,7 +1075,7 @@ export function createPersist(key: string): redis_request.Command { return createCommand(RequestType.Persist, [key]); } -export function createZrank( +export function createZRank( key: string, member: string, withScores?: boolean, @@ -1090,7 +1086,7 @@ export function createZrank( args.push("WITHSCORE"); } - return createCommand(RequestType.Zrank, args); + return createCommand(RequestType.ZRank, args); } export type StreamTrimOptions = ( @@ -1162,7 +1158,7 @@ function addTrimOptions(options: StreamTrimOptions, args: string[]) { } } -export function createXadd( +export function createXAdd( key: string, values: [string, string][], options?: StreamAddOptions, @@ -1194,7 +1190,7 @@ export function createXadd( /** * @internal */ -export function createXtrim( +export function createXTrim( key: string, options: StreamTrimOptions, ): redis_request.Command { @@ -1213,23 +1209,23 @@ export function createTime(): redis_request.Command { /** * @internal */ -export function createBrpop( +export function createBRPop( keys: string[], timeout: number, ): redis_request.Command { const args = [...keys, timeout.toString()]; - return createCommand(RequestType.Brpop, args); + return createCommand(RequestType.BRPop, args); } /** * @internal */ -export function createBlpop( +export function createBLPop( keys: string[], timeout: number, ): redis_request.Command { const args = [...keys, timeout.toString()]; - return createCommand(RequestType.Blpop, args); + return createCommand(RequestType.BLPop, args); } export type StreamReadOptions = { @@ -1274,7 +1270,7 @@ function addStreamsArgs(keys_and_ids: Record, args: string[]) { /** * @internal */ -export function createXread( +export function createXRead( keys_and_ids: Record, options?: StreamReadOptions, ): redis_request.Command { diff --git a/node/src/Transaction.ts b/node/src/Transaction.ts index da8182a4bd..a457ba5e41 100644 --- a/node/src/Transaction.ts +++ b/node/src/Transaction.ts @@ -13,9 +13,9 @@ import { StreamAddOptions, StreamReadOptions, StreamTrimOptions, - ZaddOptions, - createBlpop, - createBrpop, + ZAddOptions, + createBLPop, + createBRPop, createClientGetName, createClientId, createConfigGet, @@ -41,57 +41,57 @@ import { createHMGet, createHSet, createHSetNX, - createHvals, + createHVals, createIncr, createIncrBy, createIncrByFloat, createInfo, + createLIndex, createLLen, createLPop, createLPush, createLRange, createLRem, createLTrim, - createLindex, createMGet, createMSet, createPExpire, createPExpireAt, + createPTTL, createPersist, createPfAdd, createPing, - createPttl, createRPop, createRPush, createRename, createSAdd, createSCard, + createSIsMember, createSMembers, createSPop, createSRem, createSelect, createSet, - createSismember, createStrlen, createTTL, createTime, createType, createUnlink, - createXadd, - createXread, - createXtrim, - createZadd, - createZcard, - createZcount, - createZpopmax, - createZpopmin, - createZrange, - createZrangeWithScores, - createZrank, - createZrem, - createZremRangeByRank, - createZremRangeByScore, - createZscore, + createXAdd, + createXRead, + createXTrim, + createZAdd, + createZCard, + createZCount, + createZPopMax, + createZPopMin, + createZRange, + createZRangeWithScores, + createZRank, + createZRem, + createZRemRangeByRank, + createZRemRangeByScore, + createZScore, } from "./Commands"; import { redis_request } from "./ProtobufMessage"; @@ -491,7 +491,7 @@ export class BaseTransaction> { * Command Response - a list of values in the hash, or an empty list when the key does not exist. */ public hvals(key: string): T { - return this.addAndReturn(createHvals(key)); + return this.addAndReturn(createHVals(key)); } /** Inserts all the specified values at the head of the list stored at `key`. @@ -699,7 +699,7 @@ export class BaseTransaction> { * If `key` doesn't exist, it is treated as an empty set and the command returns `false`. */ public sismember(key: string, member: string): T { - return this.addAndReturn(createSismember(key, member)); + return this.addAndReturn(createSIsMember(key, member)); } /** Removes and returns one random member from the set value store at `key`. @@ -852,7 +852,7 @@ export class BaseTransaction> { * * @param key - The key of the sorted set. * @param membersScoresMap - A mapping of members to their corresponding scores. - * @param options - The Zadd options. + * @param options - The ZAdd options. * @param changed - Modify the return value from the number of new elements added, to the total number of elements changed. * * Command Response - The number of elements added to the sorted set. @@ -861,11 +861,11 @@ export class BaseTransaction> { public zadd( key: string, membersScoresMap: Record, - options?: ZaddOptions, + options?: ZAddOptions, changed?: boolean, ): T { return this.addAndReturn( - createZadd( + createZAdd( key, membersScoresMap, options, @@ -882,7 +882,7 @@ export class BaseTransaction> { * @param key - The key of the sorted set. * @param member - A member in the sorted set to increment. * @param increment - The score to increment the member. - * @param options - The Zadd options. + * @param options - The ZAdd options. * * Command Response - The score of the member. * If there was a conflict with the options, the operation aborts and null is returned. @@ -891,10 +891,10 @@ export class BaseTransaction> { key: string, member: string, increment: number, - options?: ZaddOptions, + options?: ZAddOptions, ): T { return this.addAndReturn( - createZadd(key, { [member]: increment }, options, "INCR"), + createZAdd(key, { [member]: increment }, options, "INCR"), ); } @@ -909,7 +909,7 @@ export class BaseTransaction> { * If `key` does not exist, it is treated as an empty sorted set, and this command returns 0. */ public zrem(key: string, members: string[]): T { - return this.addAndReturn(createZrem(key, members)); + return this.addAndReturn(createZRem(key, members)); } /** Returns the cardinality (number of elements) of the sorted set stored at `key`. @@ -921,7 +921,7 @@ export class BaseTransaction> { * If `key` does not exist, it is treated as an empty sorted set, and this command returns 0. */ public zcard(key: string): T { - return this.addAndReturn(createZcard(key)); + return this.addAndReturn(createZCard(key)); } /** Returns the score of `member` in the sorted set stored at `key`. @@ -935,7 +935,7 @@ export class BaseTransaction> { * If `key` does not exist, null is returned. */ public zscore(key: string, member: string): T { - return this.addAndReturn(createZscore(key, member)); + return this.addAndReturn(createZScore(key, member)); } /** Returns the number of members in the sorted set stored at `key` with scores between `minScore` and `maxScore`. @@ -954,7 +954,7 @@ export class BaseTransaction> { minScore: ScoreBoundary, maxScore: ScoreBoundary, ): T { - return this.addAndReturn(createZcount(key, minScore, maxScore)); + return this.addAndReturn(createZCount(key, minScore, maxScore)); } /** Returns the specified range of elements in the sorted set stored at `key`. @@ -978,7 +978,7 @@ export class BaseTransaction> { rangeQuery: RangeByScore | RangeByLex | RangeByIndex, reverse: boolean = false, ): T { - return this.addAndReturn(createZrange(key, rangeQuery, reverse)); + return this.addAndReturn(createZRange(key, rangeQuery, reverse)); } /** Returns the specified range of elements with their scores in the sorted set stored at `key`. @@ -1001,7 +1001,7 @@ export class BaseTransaction> { reverse: boolean = false, ): T { return this.addAndReturn( - createZrangeWithScores(key, rangeQuery, reverse), + createZRangeWithScores(key, rangeQuery, reverse), ); } @@ -1041,7 +1041,7 @@ export class BaseTransaction> { * If `count` is higher than the sorted set's cardinality, returns all members and their scores. */ public zpopmin(key: string, count?: number): T { - return this.addAndReturn(createZpopmin(key, count)); + return this.addAndReturn(createZPopMin(key, count)); } /** Removes and returns the members with the highest scores from the sorted set stored at `key`. @@ -1057,7 +1057,7 @@ export class BaseTransaction> { * If `count` is higher than the sorted set's cardinality, returns all members and their scores, ordered from highest to lowest. */ public zpopmax(key: string, count?: number): T { - return this.addAndReturn(createZpopmax(key, count)); + return this.addAndReturn(createZPopMax(key, count)); } /** Echoes the provided `message` back. @@ -1079,7 +1079,7 @@ export class BaseTransaction> { * Command Response - TTL in milliseconds. -2 if `key` does not exist, -1 if `key` exists but has no associated expire. */ public pttl(key: string): T { - return this.addAndReturn(createPttl(key)); + return this.addAndReturn(createPTTL(key)); } /** Removes all elements in the sorted set stored at `key` with rank between `start` and `end`. @@ -1097,7 +1097,7 @@ export class BaseTransaction> { * If `key` does not exist 0 will be returned. */ public zremRangeByRank(key: string, start: number, end: number): T { - return this.addAndReturn(createZremRangeByRank(key, start, end)); + return this.addAndReturn(createZRemRangeByRank(key, start, end)); } /** Removes all elements in the sorted set stored at `key` with a score between `minScore` and `maxScore`. @@ -1117,7 +1117,7 @@ export class BaseTransaction> { maxScore: ScoreBoundary, ): T { return this.addAndReturn( - createZremRangeByScore(key, minScore, maxScore), + createZRemRangeByScore(key, minScore, maxScore), ); } @@ -1132,7 +1132,7 @@ export class BaseTransaction> { * If `key` doesn't exist, or if `member` is not present in the set, null will be returned. */ public zrank(key: string, member: string): T { - return this.addAndReturn(createZrank(key, member)); + return this.addAndReturn(createZRank(key, member)); } /** Returns the rank of `member` in the sorted set stored at `key` with its score, where scores are ordered from the lowest to highest. @@ -1147,7 +1147,7 @@ export class BaseTransaction> { * since - Redis version 7.2.0. */ public zrankWithScore(key: string, member: string): T { - return this.addAndReturn(createZrank(key, member, true)); + return this.addAndReturn(createZRank(key, member, true)); } /** Remove the existing timeout on `key`, turning the key from volatile (a key with an expire set) to @@ -1186,7 +1186,7 @@ export class BaseTransaction> { * If `index` is out of range or if `key` does not exist, null is returned. */ public lindex(key: string, index: number): T { - return this.addAndReturn(createLindex(key, index)); + return this.addAndReturn(createLIndex(key, index)); } /** @@ -1202,7 +1202,7 @@ export class BaseTransaction> { values: [string, string][], options?: StreamAddOptions, ): T { - return this.addAndReturn(createXadd(key, values, options)); + return this.addAndReturn(createXAdd(key, values, options)); } /** @@ -1214,7 +1214,7 @@ export class BaseTransaction> { * @returns The number of entries deleted from the stream. If `key` doesn't exist, 0 is returned. */ public xtrim(key: string, options: StreamTrimOptions): T { - return this.addAndReturn(createXtrim(key, options)); + return this.addAndReturn(createXTrim(key, options)); } /** Returns the server time. @@ -1240,7 +1240,7 @@ export class BaseTransaction> { keys_and_ids: Record, options?: StreamReadOptions, ): T { - return this.addAndReturn(createXread(keys_and_ids, options)); + return this.addAndReturn(createXRead(keys_and_ids, options)); } /** @@ -1272,7 +1272,7 @@ export class BaseTransaction> { * formatted as [key, value]. If no element could be popped and the timeout expired, returns `null`. */ public brpop(keys: string[], timeout: number): T { - return this.addAndReturn(createBrpop(keys, timeout)); + return this.addAndReturn(createBRPop(keys, timeout)); } /** Blocking list pop primitive. @@ -1289,7 +1289,7 @@ export class BaseTransaction> { * formatted as [key, value]. If no element could be popped and the timeout expired, returns `null`. */ public blpop(keys: string[], timeout: number): T { - return this.addAndReturn(createBlpop(keys, timeout)); + return this.addAndReturn(createBLPop(keys, timeout)); } /** Adds all elements to the HyperLogLog data structure stored at the specified `key`. diff --git a/node/tests/RedisClientInternals.test.ts b/node/tests/RedisClientInternals.test.ts index 9842a4fffb..768faa67bc 100644 --- a/node/tests/RedisClientInternals.test.ts +++ b/node/tests/RedisClientInternals.test.ts @@ -290,7 +290,7 @@ describe("SocketConnectionInternals", () => { const reader = Reader.create(data); const request = RedisRequest.decodeDelimited(reader); expect(request.singleCommand?.requestType).toEqual( - RequestType.GetString, + RequestType.Get, ); expect( request.singleCommand?.argsArray?.args?.length, @@ -344,7 +344,7 @@ describe("SocketConnectionInternals", () => { const reader = Reader.create(data); const request = RedisRequest.decodeDelimited(reader); expect(request.singleCommand?.requestType).toEqual( - RequestType.GetString, + RequestType.Get, ); expect(request.singleCommand?.argsArray?.args?.length).toEqual( 1, @@ -365,7 +365,7 @@ describe("SocketConnectionInternals", () => { expect( request.transaction?.commands?.at(0)?.requestType, - ).toEqual(RequestType.SetString); + ).toEqual(RequestType.Set); expect( request.transaction?.commands?.at(0)?.argsArray?.args ?.length, @@ -420,7 +420,7 @@ describe("SocketConnectionInternals", () => { const reader = Reader.create(data); const request = RedisRequest.decodeDelimited(reader); expect(request.singleCommand?.requestType).toEqual( - RequestType.SetString, + RequestType.Set, ); expect(request.singleCommand?.argsArray?.args?.length).toEqual( 2, @@ -440,7 +440,7 @@ describe("SocketConnectionInternals", () => { const reader = Reader.create(data); const request = RedisRequest.decodeDelimited(reader); expect(request.singleCommand?.requestType).toEqual( - RequestType.GetString, + RequestType.Get, ); expect(request.singleCommand?.argsArray?.args?.length).toEqual( 1, @@ -465,7 +465,7 @@ describe("SocketConnectionInternals", () => { const reader = Reader.create(data); const request = RedisRequest.decodeDelimited(reader); expect(request.singleCommand?.requestType).toEqual( - RequestType.GetString, + RequestType.Get, ); expect(request.singleCommand?.argsArray?.args?.length).toEqual( 1, @@ -493,7 +493,7 @@ describe("SocketConnectionInternals", () => { const request = redis_request.RedisRequest.decodeDelimited(reader); expect(request.singleCommand?.requestType).toEqual( - RequestType.GetString, + RequestType.Get, ); sendResponse( socket, @@ -516,7 +516,7 @@ describe("SocketConnectionInternals", () => { const reader = Reader.create(data); const request = RedisRequest.decodeDelimited(reader); expect(request.singleCommand?.requestType).toEqual( - RequestType.SetString, + RequestType.Set, ); const args = request.singleCommand?.argsArray?.args; @@ -549,7 +549,7 @@ describe("SocketConnectionInternals", () => { const request = redis_request.RedisRequest.decodeDelimited(reader); expect(request.singleCommand?.requestType).toEqual( - RequestType.GetString, + RequestType.Get, ); expect(request.singleCommand?.argsVecPointer).not.toBeNull(); expect(request.singleCommand?.argsArray).toBeNull(); @@ -570,7 +570,7 @@ describe("SocketConnectionInternals", () => { const request = redis_request.RedisRequest.decodeDelimited(reader); expect(request.singleCommand?.requestType).toEqual( - RequestType.GetString, + RequestType.Get, ); expect(request.singleCommand?.argsArray).not.toBeNull(); expect(request.singleCommand?.argsVecPointer).toBeNull(); diff --git a/python/python/glide/async_commands/core.py b/python/python/glide/async_commands/core.py index eabf4547d1..921535ab84 100644 --- a/python/python/glide/async_commands/core.py +++ b/python/python/glide/async_commands/core.py @@ -427,9 +427,7 @@ async def set( args.append("GET") if expiry is not None: args.extend(expiry.get_cmd_args()) - return cast( - Optional[str], await self._execute_command(RequestType.SetString, args) - ) + return cast(Optional[str], await self._execute_command(RequestType.Set, args)) async def get(self, key: str) -> Optional[str]: """ @@ -446,9 +444,7 @@ async def get(self, key: str) -> Optional[str]: >>> await client.get("key") 'value' """ - return cast( - Optional[str], await self._execute_command(RequestType.GetString, [key]) - ) + return cast(Optional[str], await self._execute_command(RequestType.Get, [key])) async def append(self, key: str, value: str) -> int: """ @@ -701,7 +697,7 @@ async def hset(self, key: str, field_value_map: Mapping[str, str]) -> int: field_value_list.extend(pair) return cast( int, - await self._execute_command(RequestType.HashSet, field_value_list), + await self._execute_command(RequestType.HSet, field_value_list), ) async def hget(self, key: str, field: str) -> Optional[str]: @@ -726,7 +722,7 @@ async def hget(self, key: str, field: str) -> Optional[str]: """ return cast( Optional[str], - await self._execute_command(RequestType.HashGet, [key, field]), + await self._execute_command(RequestType.HGet, [key, field]), ) async def hsetnx( @@ -782,9 +778,7 @@ async def hincrby(self, key: str, field: str, amount: int) -> int: """ return cast( int, - await self._execute_command( - RequestType.HashIncrBy, [key, field, str(amount)] - ), + await self._execute_command(RequestType.HIncrBy, [key, field, str(amount)]), ) async def hincrbyfloat(self, key: str, field: str, amount: float) -> float: @@ -811,7 +805,7 @@ async def hincrbyfloat(self, key: str, field: str, amount: float) -> float: return cast( float, await self._execute_command( - RequestType.HashIncrByFloat, [key, field, str(amount)] + RequestType.HIncrByFloat, [key, field, str(amount)] ), ) @@ -835,7 +829,7 @@ async def hexists(self, key: str, field: str) -> bool: False """ return cast( - bool, await self._execute_command(RequestType.HashExists, [key, field]) + bool, await self._execute_command(RequestType.HExists, [key, field]) ) async def hgetall(self, key: str) -> Dict[str, str]: @@ -856,7 +850,7 @@ async def hgetall(self, key: str) -> Dict[str, str]: {"field1": "value1", "field2": "value2"} """ return cast( - Dict[str, str], await self._execute_command(RequestType.HashGetAll, [key]) + Dict[str, str], await self._execute_command(RequestType.HGetAll, [key]) ) async def hmget(self, key: str, fields: List[str]) -> List[Optional[str]]: @@ -879,7 +873,7 @@ async def hmget(self, key: str, fields: List[str]) -> List[Optional[str]]: """ return cast( List[Optional[str]], - await self._execute_command(RequestType.HashMGet, [key] + fields), + await self._execute_command(RequestType.HMGet, [key] + fields), ) async def hdel(self, key: str, fields: List[str]) -> int: @@ -899,9 +893,7 @@ async def hdel(self, key: str, fields: List[str]) -> int: >>> await client.hdel("my_hash", ["field1", "field2"]) 2 # Indicates that two fields were successfully removed from the hash. """ - return cast( - int, await self._execute_command(RequestType.HashDel, [key] + fields) - ) + return cast(int, await self._execute_command(RequestType.HDel, [key] + fields)) async def hlen(self, key: str) -> int: """ @@ -940,7 +932,7 @@ async def hvals(self, key: str) -> List[str]: >>> await client.hvals("my_hash") ["value1", "value2", "value3"] # Returns all the values stored in the hash "my_hash". """ - return cast(List[str], await self._execute_command(RequestType.Hvals, [key])) + return cast(List[str], await self._execute_command(RequestType.HVals, [key])) async def hkeys(self, key: str) -> List[str]: """ @@ -958,7 +950,7 @@ async def hkeys(self, key: str) -> List[str]: >>> await client.hkeys("my_hash") ["field1", "field2", "field3"] # Returns all the field names stored in the hash "my_hash". """ - return cast(List[str], await self._execute_command(RequestType.Hkeys, [key])) + return cast(List[str], await self._execute_command(RequestType.HKeys, [key])) async def hrandfield(self, key: str) -> Optional[str]: """ @@ -1157,7 +1149,7 @@ async def blpop(self, keys: List[str], timeout: float) -> Optional[List[str]]: """ return cast( Optional[List[str]], - await self._execute_command(RequestType.Blpop, keys + [str(timeout)]), + await self._execute_command(RequestType.BLPop, keys + [str(timeout)]), ) async def lrange(self, key: str, start: int, end: int) -> List[str]: @@ -1224,7 +1216,7 @@ async def lindex( """ return cast( Optional[str], - await self._execute_command(RequestType.Lindex, [key, str(index)]), + await self._execute_command(RequestType.LIndex, [key, str(index)]), ) async def rpush(self, key: str, elements: List[str]) -> int: @@ -1348,7 +1340,7 @@ async def brpop(self, keys: List[str], timeout: float) -> Optional[List[str]]: """ return cast( Optional[List[str]], - await self._execute_command(RequestType.Brpop, keys + [str(timeout)]), + await self._execute_command(RequestType.BRPop, keys + [str(timeout)]), ) async def linsert( @@ -1477,7 +1469,7 @@ async def spop(self, key: str) -> Optional[str]: >>> await client.spop("non_exiting_key") None """ - return cast(Optional[str], await self._execute_command(RequestType.Spop, [key])) + return cast(Optional[str], await self._execute_command(RequestType.SPop, [key])) async def spop_count(self, key: str, count: int) -> Set[str]: """ @@ -1501,7 +1493,7 @@ async def spop_count(self, key: str, count: int) -> Set[str]: Set() """ return cast( - Set[str], await self._execute_command(RequestType.Spop, [key, str(count)]) + Set[str], await self._execute_command(RequestType.SPop, [key, str(count)]) ) async def sismember( @@ -2131,7 +2123,7 @@ async def zadd( return cast( int, - await self._execute_command(RequestType.Zadd, args), + await self._execute_command(RequestType.ZAdd, args), ) async def zadd_incr( @@ -2189,7 +2181,7 @@ async def zadd_incr( args += [str(increment), member] return cast( Optional[float], - await self._execute_command(RequestType.Zadd, args), + await self._execute_command(RequestType.ZAdd, args), ) async def zcard(self, key: str) -> int: @@ -2211,7 +2203,7 @@ async def zcard(self, key: str) -> int: >>> await client.zcard("non_existing_key") 0 """ - return cast(int, await self._execute_command(RequestType.Zcard, [key])) + return cast(int, await self._execute_command(RequestType.ZCard, [key])) async def zcount( self, @@ -2257,7 +2249,7 @@ async def zcount( return cast( int, await self._execute_command( - RequestType.Zcount, [key, score_min, score_max] + RequestType.ZCount, [key, score_min, score_max] ), ) @@ -2360,7 +2352,7 @@ async def zrange( """ args = _create_zrange_args(key, range_query, reverse, with_scores=False) - return cast(List[str], await self._execute_command(RequestType.Zrange, args)) + return cast(List[str], await self._execute_command(RequestType.ZRange, args)) async def zrange_withscores( self, @@ -2394,7 +2386,7 @@ async def zrange_withscores( args = _create_zrange_args(key, range_query, reverse, with_scores=True) return cast( - Mapping[str, float], await self._execute_command(RequestType.Zrange, args) + Mapping[str, float], await self._execute_command(RequestType.ZRange, args) ) async def zrangestore( @@ -2464,7 +2456,7 @@ async def zrank( None # Indicates that "non_existing_member" is not present in the sorted set "my_sorted_set". """ return cast( - Optional[int], await self._execute_command(RequestType.Zrank, [key, member]) + Optional[int], await self._execute_command(RequestType.ZRank, [key, member]) ) async def zrank_withscore( @@ -2495,7 +2487,7 @@ async def zrank_withscore( """ return cast( Optional[List[Union[int, float]]], - await self._execute_command(RequestType.Zrank, [key, member, "WITHSCORE"]), + await self._execute_command(RequestType.ZRank, [key, member, "WITHSCORE"]), ) async def zrem( @@ -2525,7 +2517,7 @@ async def zrem( """ return cast( int, - await self._execute_command(RequestType.Zrem, [key] + members), + await self._execute_command(RequestType.ZRem, [key] + members), ) async def zremrangebyscore( diff --git a/python/python/glide/async_commands/transaction.py b/python/python/glide/async_commands/transaction.py index 7885ef6fb4..dbf3651d8f 100644 --- a/python/python/glide/async_commands/transaction.py +++ b/python/python/glide/async_commands/transaction.py @@ -74,7 +74,7 @@ def get(self: TTransaction, key: str) -> TTransaction: Command response: Optional[str]: If the key exists, returns the value of the key as a string. Otherwise, return None. """ - return self.append_command(RequestType.GetString, [key]) + return self.append_command(RequestType.Get, [key]) def set( self: TTransaction, @@ -119,7 +119,7 @@ def set( args.append("GET") if expiry is not None: args.extend(expiry.get_cmd_args()) - return self.append_command(RequestType.SetString, args) + return self.append_command(RequestType.Set, args) def strlen(self: TTransaction, key: str) -> TTransaction: """ @@ -418,7 +418,7 @@ def hset( field_value_list: List[str] = [key] for pair in field_value_map.items(): field_value_list.extend(pair) - return self.append_command(RequestType.HashSet, field_value_list) + return self.append_command(RequestType.HSet, field_value_list) def hget(self: TTransaction, key: str, field: str) -> TTransaction: """ @@ -433,7 +433,7 @@ def hget(self: TTransaction, key: str, field: str) -> TTransaction: Optional[str]: The value associated `field` in the hash. Returns None if `field` is not presented in the hash or `key` does not exist. """ - return self.append_command(RequestType.HashGet, [key, field]) + return self.append_command(RequestType.HGet, [key, field]) def hsetnx( self: TTransaction, @@ -473,7 +473,7 @@ def hincrby(self: TTransaction, key: str, field: str, amount: int) -> TTransacti Command response: int: The value of the specified field in the hash stored at `key` after the increment or decrement. """ - return self.append_command(RequestType.HashIncrBy, [key, field, str(amount)]) + return self.append_command(RequestType.HIncrBy, [key, field, str(amount)]) def hincrbyfloat( self: TTransaction, key: str, field: str, amount: float @@ -494,9 +494,7 @@ def hincrbyfloat( Command response: float: The value of the specified field in the hash stored at `key` after the increment as a string. """ - return self.append_command( - RequestType.HashIncrByFloat, [key, field, str(amount)] - ) + return self.append_command(RequestType.HIncrByFloat, [key, field, str(amount)]) def hexists(self: TTransaction, key: str, field: str) -> TTransaction: """ @@ -511,7 +509,7 @@ def hexists(self: TTransaction, key: str, field: str) -> TTransaction: bool: Returns 'True' if the hash contains the specified field. If the hash does not contain the field, or if the key does not exist, it returns 'False'. """ - return self.append_command(RequestType.HashExists, [key, field]) + return self.append_command(RequestType.HExists, [key, field]) def hlen(self: TTransaction, key: str) -> TTransaction: """ @@ -552,7 +550,7 @@ def hgetall(self: TTransaction, key: str) -> TTransaction: its value. If `key` does not exist, it returns an empty dictionary. """ - return self.append_command(RequestType.HashGetAll, [key]) + return self.append_command(RequestType.HGetAll, [key]) def hmget(self: TTransaction, key: str, fields: List[str]) -> TTransaction: """ @@ -568,7 +566,7 @@ def hmget(self: TTransaction, key: str, fields: List[str]) -> TTransaction: For every field that does not exist in the hash, a null value is returned. If `key` does not exist, it is treated as an empty hash, and the function returns a list of null values. """ - return self.append_command(RequestType.HashMGet, [key] + fields) + return self.append_command(RequestType.HMGet, [key] + fields) def hdel(self: TTransaction, key: str, fields: List[str]) -> TTransaction: """ @@ -583,7 +581,7 @@ def hdel(self: TTransaction, key: str, fields: List[str]) -> TTransaction: int: The number of fields that were removed from the hash, excluding specified but non-existing fields. If `key` does not exist, it is treated as an empty hash, and the function returns 0. """ - return self.append_command(RequestType.HashDel, [key] + fields) + return self.append_command(RequestType.HDel, [key] + fields) def hvals(self: TTransaction, key: str) -> TTransaction: """ @@ -597,7 +595,7 @@ def hvals(self: TTransaction, key: str) -> TTransaction: Command response: List[str]: A list of values in the hash, or an empty list when the key does not exist. """ - return self.append_command(RequestType.Hvals, [key]) + return self.append_command(RequestType.HVals, [key]) def hkeys(self: TTransaction, key: str) -> TTransaction: """ @@ -611,7 +609,7 @@ def hkeys(self: TTransaction, key: str) -> TTransaction: Command response: List[str]: A list of field names for the hash, or an empty list when the key does not exist. """ - return self.append_command(RequestType.Hkeys, [key]) + return self.append_command(RequestType.HKeys, [key]) def hrandfield(self: TTransaction, key: str) -> TTransaction: """ @@ -746,7 +744,7 @@ def blpop(self: TTransaction, keys: List[str], timeout: float) -> TTransaction: Optional[List[str]]: A two-element list containing the key from which the element was popped and the value of the popped element, formatted as `[key, value]`. If no element could be popped and the `timeout` expired, returns None. """ - return self.append_command(RequestType.Blpop, keys + [str(timeout)]) + return self.append_command(RequestType.BLPop, keys + [str(timeout)]) def lrange(self: TTransaction, key: str, start: int, end: int) -> TTransaction: """ @@ -791,7 +789,7 @@ def lindex( Optional[str]: The element at `index` in the list stored at `key`. If `index` is out of range or if `key` does not exist, None is returned. """ - return self.append_command(RequestType.Lindex, [key, str(index)]) + return self.append_command(RequestType.LIndex, [key, str(index)]) def rpush(self: TTransaction, key: str, elements: List[str]) -> TTransaction: """Inserts all the specified values at the tail of the list stored at `key`. @@ -872,7 +870,7 @@ def brpop(self: TTransaction, keys: List[str], timeout: float) -> TTransaction: Optional[List[str]]: A two-element list containing the key from which the element was popped and the value of the popped element, formatted as `[key, value]`. If no element could be popped and the `timeout` expired, returns None. """ - return self.append_command(RequestType.Brpop, keys + [str(timeout)]) + return self.append_command(RequestType.BRPop, keys + [str(timeout)]) def linsert( self: TTransaction, key: str, position: InsertPosition, pivot: str, element: str @@ -971,7 +969,7 @@ def spop(self: TTransaction, key: str) -> TTransaction: Optional[str]: The value of the popped member. If `key` does not exist, None will be returned. """ - return self.append_command(RequestType.Spop, [key]) + return self.append_command(RequestType.SPop, [key]) def spop_count(self: TTransaction, key: str, count: int) -> TTransaction: """ @@ -988,7 +986,7 @@ def spop_count(self: TTransaction, key: str, count: int) -> TTransaction: Set[str]: A set of popped elements will be returned depending on the set's length. If `key` does not exist, an empty set will be returned. """ - return self.append_command(RequestType.Spop, [key, str(count)]) + return self.append_command(RequestType.SPop, [key, str(count)]) def sismember( self: TTransaction, @@ -1500,7 +1498,7 @@ def zadd( ] args += members_scores_list - return self.append_command(RequestType.Zadd, args) + return self.append_command(RequestType.ZAdd, args) def zadd_incr( self: TTransaction, @@ -1549,7 +1547,7 @@ def zadd_incr( ) args += [str(increment), member] - return self.append_command(RequestType.Zadd, args) + return self.append_command(RequestType.ZAdd, args) def zcard(self: TTransaction, key: str) -> TTransaction: """ @@ -1564,7 +1562,7 @@ def zcard(self: TTransaction, key: str) -> TTransaction: int: The number of elements in the sorted set. If `key` does not exist, it is treated as an empty sorted set, and the command returns 0. """ - return self.append_command(RequestType.Zcard, [key]) + return self.append_command(RequestType.ZCard, [key]) def zcount( self: TTransaction, @@ -1601,7 +1599,7 @@ def zcount( if type(max_score) == InfBound else max_score.value ) - return self.append_command(RequestType.Zcount, [key, score_min, score_max]) + return self.append_command(RequestType.ZCount, [key, score_min, score_max]) def zpopmax( self: TTransaction, key: str, count: Optional[int] = None @@ -1676,7 +1674,7 @@ def zrange( """ args = _create_zrange_args(key, range_query, reverse, with_scores=False) - return self.append_command(RequestType.Zrange, args) + return self.append_command(RequestType.ZRange, args) def zrange_withscores( self: TTransaction, @@ -1703,7 +1701,7 @@ def zrange_withscores( """ args = _create_zrange_args(key, range_query, reverse, with_scores=True) - return self.append_command(RequestType.Zrange, args) + return self.append_command(RequestType.ZRange, args) def zrangestore( self: TTransaction, @@ -1757,7 +1755,7 @@ def zrank( Optional[int]: The rank of `member` in the sorted set. If `key` doesn't exist, or if `member` is not present in the set, None will be returned. """ - return self.append_command(RequestType.Zrank, [key, member]) + return self.append_command(RequestType.ZRank, [key, member]) def zrank_withscore( self: TTransaction, @@ -1779,7 +1777,7 @@ def zrank_withscore( Since: Redis version 7.2.0. """ - return self.append_command(RequestType.Zrank, [key, member, "WITHSCORE"]) + return self.append_command(RequestType.ZRank, [key, member, "WITHSCORE"]) def zrem( self: TTransaction, @@ -1800,7 +1798,7 @@ def zrem( int: The number of members that were removed from the sorted set, not including non-existing members. If `key` does not exist, it is treated as an empty sorted set, and the command returns 0. """ - return self.append_command(RequestType.Zrem, [key] + members) + return self.append_command(RequestType.ZRem, [key] + members) def zremrangebyscore( self: TTransaction, diff --git a/python/python/tests/test_proto_coded.py b/python/python/tests/test_proto_coded.py index db8bd1118f..801db19d3c 100644 --- a/python/python/tests/test_proto_coded.py +++ b/python/python/tests/test_proto_coded.py @@ -10,7 +10,7 @@ class TestProtobufCodec: def test_encode_decode_delimited(self): request = RedisRequest() request.callback_idx = 1 - request.single_command.request_type = RequestType.SetString + request.single_command.request_type = RequestType.Set args = [ "foo", "bar", @@ -28,7 +28,7 @@ def test_encode_decode_delimited(self): ) assert new_offset == len(b_arr) assert parsed_request.callback_idx == 1 - assert parsed_request.single_command.request_type == RequestType.SetString + assert parsed_request.single_command.request_type == RequestType.Set assert parsed_request.single_command.args_array.args == args def test_decode_partial_message_fails(self):