Proto: Rename in RequestType enum according to Feng-Shui. (valkey-i…

…o#1387) * Rename in `RequestType` enum according to Feng-Shui. (#262) Signed-off-by: Yury-Fridlyand <[email protected]> Co-authored-by: Andrew Carbonetto <[email protected]>
Bit-Quill · Jun 24, 2024 · f619f76 · f619f76
1 parent fa009cc
commit f619f76
Show file tree

Hide file tree

Showing 23 changed files with 699 additions and 721 deletions.
diff --git 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,22 +154,22 @@ 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,
         IncrBy = 34,
         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,19 +188,19 @@ 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,
         HLen = 69,
         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
@@ -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::<f64>(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<ExpectedReturnType> {
             .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
@@ -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,22 +66,22 @@ 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;
     IncrBy=34;
     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,19 +100,19 @@ 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;
     HLen = 69;
     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;