Fix whereami bug

Author: ohsayan

CHANGELOG.md

@@ -2,6 +2,13 @@
 
 All changes in this project will be noted in this file.
 
+## 0.7.5
+
+- Fixes:
+  - Fixed bug with `whereami` action response
+- Maintenance:
+  - Upgraded deps
+
 ## 0.7.4
 
 - Additions:

Cargo.toml

@@ -31,19 +31,19 @@ dbg = []
 
 [dependencies]
 bytes = { version = "1.4.0", optional = true }
-openssl = { version = "0.10.45", optional = true }
-tokio = { version = "1.26.0", features = [
+openssl = { version = "0.10.52", optional = true }
+tokio = { version = "1.28.1", features = [
     "net",
     "io-util",
     "io-std",
 ], optional = true, default-features = false }
 tokio-openssl = { version = "0.6.3", optional = true }
 r2d2 = { version = "0.8.10", optional = true }
 bb8 = { version = "0.8.0", optional = true }
-async-trait = { version = "0.1.65", optional = true }
+async-trait = { version = "0.1.68", optional = true }
 
 [dev-dependencies]
-tokio = { version = "1.26.0", features = [
+tokio = { version = "1.28.1", features = [
     "test-util",
     "macros",
 ], default-features = false }

src/ddl.rs

@@ -34,13 +34,11 @@
 //! ```
 //!
 
-use crate::error::{errorstring, SkyhashError};
-use crate::types::{Array, FlatElement};
-use crate::Element;
-use crate::IntoSkyhashBytes;
-use crate::Query;
-use crate::RespCode;
-use crate::SkyResult;
+use crate::{
+    error::{errorstring, SkyhashError},
+    types::Array,
+    Element, IntoSkyhashBytes, Query, RespCode, SkyResult,
+};
 
 cfg_async! {
     use crate::AsyncResult;
@@ -64,6 +62,7 @@ pub enum KeymapType {
 }
 
 /// A convenient representation for the `whereami` action
+#[derive(Debug, PartialEq)]
 pub enum WhereAmI {
     /// The ID of the keyspace
     Keyspace(String),
@@ -283,29 +282,13 @@ implement_ddl! {
         {
             Query::from("whereami")
         }
-        Element::Array(
-            Array::Flat(mut frr)
-        ) => {
-            if frr.iter().all(|v| matches!(v, FlatElement::String(_))) {
-                return Err(SkyhashError::InvalidResponse.into());
-            }
-            match frr.len() {
-                1 => WhereAmI::Keyspace(match frr.swap_remove(0) {
-                    FlatElement::String(st) => st,
-                    _ => unsafe {
-                        core::hint::unreachable_unchecked()
-                    }
-                }),
-                2 => {
-                    let (ks, tbl) = match (frr.swap_remove(0), frr.swap_remove(1)) {
-                        (FlatElement::String(ks),FlatElement::String(tbl)) => (ks, tbl),
-                        _ => unsafe {
-                            core::hint::unreachable_unchecked()
-                        }
-                    };
-                    WhereAmI::Table(ks, tbl)
+        Element::Array(Array::NonNullStr(mut a)) => {
+            unsafe {
+                match a.len() {
+                    1 => WhereAmI::Keyspace(a.pop().unwrap_unchecked()),
+                    2 => WhereAmI::Table(a.pop().unwrap_unchecked(), a.pop().unwrap_unchecked()),
+                    _ => return Err(SkyhashError::ParseError.into()),
                 }
-                _ => return Err(SkyhashError::InvalidResponse.into()),
             }
         }
     }