All omni tests passing except merge and test_has_with_text_p_step

criminosis · Nov 8, 2024 · baccdd5 · baccdd5
1 parent e9a0c6d
commit baccdd5
Show file tree

Hide file tree

Showing 2 changed files with 94 additions and 38 deletions.
diff --git a/gremlin-client/src/io/graph_binary_v1.rs b/gremlin-client/src/io/graph_binary_v1.rs
@@ -4,7 +4,13 @@ use chrono::{DateTime, TimeZone, Utc};
 use uuid::Uuid;
 
 use crate::{
-    conversion::FromGValue, io::graph_binary_v1, message::{ReponseStatus, Response, ResponseResult}, process::traversal::{Instruction, Order, Scope}, structure::{Column, Direction, Pop, Traverser, P, T}, Cardinality, Edge, GKey, GValue, GremlinError, GremlinResult, ToGValue, Vertex, VertexProperty, GID
+    conversion::FromGValue,
+    io::graph_binary_v1,
+    message::{ReponseStatus, Response, ResponseResult},
+    process::traversal::{Instruction, Order, Scope},
+    structure::{Column, Direction, Pop, Set, TextP, Traverser, P, T},
+    Cardinality, Edge, GKey, GValue, GremlinError, GremlinResult, Path, ToGValue, Vertex,
+    VertexProperty, GID,
 };
 
 use super::IoProtocol;
@@ -52,6 +58,7 @@ const T: u8 = 0x20;
 const TRAVERSER: u8 = 0x21;
 //...
 const BOOLEAN: u8 = 0x27;
+const TEXTP: u8 = 0x28;
 //...
 const UNSPECIFIED_NULL_OBEJECT: u8 = 0xFE;
 
@@ -374,6 +381,12 @@ impl GraphBinaryV1Ser for &GValue {
                 buf.push(VALUE_FLAG);
                 bool.to_be_bytes(buf)?;
             }
+            GValue::TextP(text_p) => {
+                todo!()
+                // buf.push(BOOLEAN);
+                // buf.push(VALUE_FLAG);
+                // text_p.to_be_bytes(buf)?;
+            }
             GValue::Null => {
                 //Type code of 0xfe: Unspecified null object
                 buf.push(UNSPECIFIED_NULL_OBEJECT);
@@ -386,40 +399,47 @@ impl GraphBinaryV1Ser for &GValue {
     }
 }
 
-impl GraphBinaryV1Ser for &crate::structure::P {
-    fn to_be_bytes(self, buf: &mut Vec<u8>) -> GremlinResult<()> {
-        self.operator().to_be_bytes(buf)?;
-        match self.value() {
-            //Singular values have a length of 1
-            //But still need to be written fully qualified
-            scalar @ GValue::Uuid(_) | 
-            scalar @ GValue::Int32(_) |
-            scalar @ GValue::Int64(_) |
-            scalar @ GValue::Float(_) |
-            scalar @ GValue::Double(_) |
-            scalar @ GValue::String(_) |
-            scalar @ GValue::Date(_) 
-            => {
-                GraphBinaryV1Ser::to_be_bytes(1i32, buf)?;
-                scalar.to_be_bytes(buf)?;
-            }
-            //"Collections" need to be unfurled, we don't write the collection but
-            //instead just its lengths and then the fully qualified form of each element
-            GValue::List(list) => {
-                write_usize_as_i32_be_bytes(list.len(), buf)?;
-                for item in list.iter() {
-                    item.to_be_bytes(buf)?;
-                }
+fn predicate_to_be_bytes(
+    operator: &String,
+    value: &GValue,
+    buf: &mut Vec<u8>,
+) -> GremlinResult<()> {
+    operator.to_be_bytes(buf)?;
+    match value {
+        //Singular values have a length of 1
+        //But still need to be written fully qualified
+        scalar @ GValue::Uuid(_)
+        | scalar @ GValue::Int32(_)
+        | scalar @ GValue::Int64(_)
+        | scalar @ GValue::Float(_)
+        | scalar @ GValue::Double(_)
+        | scalar @ GValue::String(_)
+        | scalar @ GValue::Date(_) => {
+            GraphBinaryV1Ser::to_be_bytes(1i32, buf)?;
+            scalar.to_be_bytes(buf)?;
+        }
+        //"Collections" need to be unfurled, we don't write the collection but
+        //instead just its lengths and then the fully qualified form of each element
+        GValue::List(list) => {
+            write_usize_as_i32_be_bytes(list.len(), buf)?;
+            for item in list.iter() {
+                item.to_be_bytes(buf)?;
             }
-            GValue::Set(set) => {
-                write_usize_as_i32_be_bytes(set.len(), buf)?;
-                for item in set.iter() {
-                    item.to_be_bytes(buf)?;
-                }
+        }
+        GValue::Set(set) => {
+            write_usize_as_i32_be_bytes(set.len(), buf)?;
+            for item in set.iter() {
+                item.to_be_bytes(buf)?;
             }
-            other => unimplemented!("P serialization of {other:?} not implemented"),
         }
-        Ok(())
+        other => unimplemented!("Predicate serialization of {other:?} not implemented"),
+    }
+    Ok(())
+}
+
+impl GraphBinaryV1Ser for &crate::structure::P {
+    fn to_be_bytes(self, buf: &mut Vec<u8>) -> GremlinResult<()> {
+        predicate_to_be_bytes(&self.operator, &self.value, buf)
     }
 }
 
@@ -526,9 +546,10 @@ pub trait GraphBinaryV1Deser: Sized {
             Some(VALUE_FLAG) => Self::from_be_bytes(bytes).map(Option::Some),
             Some(VALUE_NULL_FLAG) => Ok(None),
             other => {
+                let remainder: Vec<u8> = bytes.cloned().collect();
                 return Err(GremlinError::Cast(format!(
-                    "Unexpected byte for nullable check: {other:?}"
-                )))
+                    "Unexpected byte for nullable check: {other:?}. Remainder: {remainder:?}"
+                )));
             }
         }
     }
@@ -545,6 +566,12 @@ impl GraphBinaryV1Ser for bool {
     }
 }
 
+impl GraphBinaryV1Ser for &TextP {
+    fn to_be_bytes(self, buf: &mut Vec<u8>) -> GremlinResult<()> {
+        predicate_to_be_bytes(&self.operator, &self.value, buf)
+    }
+}
+
 impl GraphBinaryV1Deser for bool {
     fn from_be_bytes<'a, S: Iterator<Item = &'a u8>>(bytes: &mut S) -> GremlinResult<Self> {
         match bytes.next() {
@@ -619,9 +646,10 @@ impl GraphBinaryV1Deser for GValue {
                 Some(value) => GValue::Edge(value),
                 None => GValue::Null,
             }),
-            PATH => {
-                todo!()
-            }
+            PATH => Ok(match Path::from_be_bytes_nullable(bytes)? {
+                Some(value) => GValue::Path(value),
+                None => GValue::Null,
+            }),
             PROPERTY => {
                 todo!()
             }
@@ -743,6 +771,16 @@ impl GraphBinaryV1Deser for Edge {
     }
 }
 
+impl GraphBinaryV1Deser for Path {
+    fn from_be_bytes<'a, S: Iterator<Item = &'a u8>>(bytes: &mut S) -> GremlinResult<Self> {
+        let labels = GValue::from_be_bytes(bytes)?;
+        let GValue::List(objects) = GValue::from_be_bytes(bytes)? else {
+            return Err(GremlinError::Cast(format!("Path objects should be a list")));
+        };
+        Ok(Path::new(labels, objects))
+    }
+}
+
 impl GraphBinaryV1Deser for VertexProperty {
     fn from_be_bytes<'a, S: Iterator<Item = &'a u8>>(bytes: &mut S) -> GremlinResult<Self> {
         //Format: {id}{label}{value}{parent}{properties}
@@ -1045,9 +1083,9 @@ impl GraphBinaryV1Deser for Uuid {
 
 #[cfg(test)]
 mod tests {
-    use std::iter;
     use chrono::DateTime;
     use rstest::rstest;
+    use std::iter;
     use uuid::uuid;
 
     use super::*;

diff --git a/gremlin-client/tests/integration_traversal_omni.rs b/gremlin-client/tests/integration_traversal_omni.rs
@@ -1201,6 +1201,12 @@ fn test_value_map(client: GremlinClient) {
         Some("test".to_owned()).as_ref(),
         get_map(&value, "name").unwrap()
     );
+    assert!(results[0].get("id").or(results[0].get(T::Id)).is_some());
+    assert!(results[0]
+        .get("label")
+        .or(results[0].get(T::Label))
+        .is_some());
+    assert_eq!(true, results[0].get("name").is_some());
 }
 
 #[apply(serializers)]
@@ -1265,6 +1271,12 @@ fn test_element_map(client: GremlinClient) {
         get_map_id(&value).unwrap()
     );
     assert_eq!(Some(vertex.label()), get_map_label(&value).unwrap());
+    assert_eq!(2, results[0].len());
+    assert!(results[0].get("id").or(results[0].get(T::Id)).is_some());
+    assert!(results[0]
+        .get("label")
+        .or(results[0].get(T::Label))
+        .is_some());
 
     let results = g.v(vertex.id()).element_map(()).to_list().unwrap();
     let value = &results[0];
@@ -1278,6 +1290,12 @@ fn test_element_map(client: GremlinClient) {
         Some("test".to_owned()).as_ref(),
         get_map(&value, "name").unwrap()
     );
+    assert!(results[0].get("id").or(results[0].get(T::Id)).is_some());
+    assert!(results[0]
+        .get("label")
+        .or(results[0].get(T::Label))
+        .is_some());
+    assert_eq!(true, results[0].get("name").is_some());
 }
 
 #[apply(serializers)]