Fixed precision of g:Date values to milliseconds

wolf4ood · Mar 31, 2021 · c8e4106 · c8e4106
1 parent c6936ad
commit c8e4106
Show file tree

Hide file tree

Showing 6 changed files with 80 additions and 11 deletions.
diff --git a/gremlin-client/src/io/mod.rs b/gremlin-client/src/io/mod.rs
@@ -59,10 +59,10 @@ impl GraphSON {
                 "@type" : "g:UUID",
                 "@value" : s.to_string()
             })),
-            (GraphSON::V1, GValue::Date(d)) => Ok(json!(d.timestamp())),
+            (GraphSON::V1, GValue::Date(d)) => Ok(json!(d.timestamp_millis())),
             (_, GValue::Date(d)) => Ok(json!({
                 "@type" : "g:Date",
-                "@value" : d.timestamp()
+                "@value" : d.timestamp_millis()
             })),
             (GraphSON::V1, GValue::List(d)) => {
                 let elements: GremlinResult<Vec<Value>> = d.iter().map(|e| self.write(e)).collect();

diff --git a/gremlin-client/src/io/serializer_v2.rs b/gremlin-client/src/io/serializer_v2.rs
@@ -41,7 +41,7 @@ where
     T: Fn(&Value) -> GremlinResult<GValue>,
 {
     let val = expect_i64!(val);
-    Ok(GValue::from(Utc.timestamp(val, 0)))
+    Ok(GValue::from(Utc.timestamp_millis(val)))
 }
 
 // Long deserializer [docs](http://tinkerpop.apache.org/docs/current/dev/io/#_long_2)
@@ -502,8 +502,8 @@ mod tests {
             "@value": 1551825863
         });
 
-        let result = deserializer_v2(&value).expect("Failed to deserialize Double");
-        assert_eq!(result, GValue::Date(chrono::Utc.timestamp(1551825863, 0)));
+        let result = deserializer_v2(&value).expect("Failed to deserialize Date");
+        assert_eq!(result, GValue::Date(chrono::Utc.timestamp_millis(1551825863)));
 
         // UUID
         let value = json!({

diff --git a/gremlin-client/src/io/serializer_v3.rs b/gremlin-client/src/io/serializer_v3.rs
@@ -42,7 +42,7 @@ where
     T: Fn(&Value) -> GremlinResult<GValue>,
 {
     let val = expect_i64!(val);
-    Ok(GValue::from(Utc.timestamp(val, 0)))
+    Ok(GValue::from(Utc.timestamp_millis(val)))
 }
 
 // Long deserializer [docs](http://tinkerpop.apache.org/docs/current/dev/io/#_long_2)
@@ -532,8 +532,8 @@ mod tests {
             "@value": 1551825863
         });
 
-        let result = deserializer_v3(&value).expect("Failed to deserialize Double");
-        assert_eq!(result, GValue::Date(chrono::Utc.timestamp(1551825863, 0)));
+        let result = deserializer_v3(&value).expect("Failed to deserialize Date");
+        assert_eq!(result, GValue::Date(chrono::Utc.timestamp_millis(1551825863)));
 
         // UUID
         let value = json!({

diff --git a/gremlin-client/tests/integration_client.rs b/gremlin-client/tests/integration_client.rs
@@ -220,7 +220,7 @@ fn test_complex_vertex_creation_with_properties() {
     );
 
     assert_eq!(
-        &chrono::Utc.timestamp(1551825863, 0),
+        &chrono::Utc.timestamp_millis(1551825863),
         properties["date"].get::<List>().unwrap()[0]
             .get::<VertexProperty>()
             .unwrap()
@@ -271,6 +271,41 @@ fn test_complex_vertex_creation_with_properties() {
     );
 }
 
+#[test]
+fn test_inserting_date_with_milisecond_precision() {
+    use chrono::offset::TimeZone;
+    use chrono::DateTime;
+    use chrono::Utc;
+
+    let graph = graph();
+
+    let q = r#"g.addV('person').property('dateTime',dateTime).propertyMap()"#;
+
+    let expected = chrono::Utc.timestamp(1551825863, 0);
+    let params: &[(&str, &dyn ToGValue)] = &[("dateTime", &expected)];
+
+    let results = graph
+        .execute(q, params)
+        .expect("it should execute addV")
+        .filter_map(Result::ok)
+        .map(|f| f.take::<Map>())
+        .collect::<Result<Vec<Map>, _>>()
+        .expect("It should be ok");
+
+    let properties = &results[0];
+
+    assert_eq!(1, properties.len());
+
+    assert_eq!(
+        &expected,
+        properties["dateTime"].get::<List>().unwrap()[0]
+            .get::<VertexProperty>()
+            .unwrap()
+            .get::<DateTime<Utc>>()
+            .unwrap()
+    );
+}
+
 #[test]
 fn test_edge_creation() {
     let graph = graph();

diff --git a/gremlin-client/tests/integration_client_v1.rs b/gremlin-client/tests/integration_client_v1.rs
@@ -250,7 +250,7 @@ fn test_complex_vertex_creation_with_properties_v1() {
     );
 
     assert_eq!(
-        &1551825863,
+        &1551825863000,
         properties["dateTime"].get::<List>().unwrap()[0]
             .get::<VertexProperty>()
             .unwrap()

diff --git a/gremlin-client/tests/integration_client_v2.rs b/gremlin-client/tests/integration_client_v2.rs
@@ -149,6 +149,40 @@ fn test_vertex_creation_v2() {
     );
 }
 
+#[test]
+fn test_inserting_date_with_milisecond_precision() {
+    use chrono::offset::TimeZone;
+    use chrono::DateTime;
+    use chrono::Utc;
+
+    let graph = graph_serializer(GraphSON::V2);
+
+    let q = r#"g.addV('person').property('dateTime',dateTime).propertyMap()"#;
+
+    let expected = chrono::Utc.timestamp(1551825863, 0);
+    let params: &[(&str, &dyn ToGValue)] = &[("dateTime", &expected)];
+
+    let results = graph
+        .execute(q, params)
+        .expect("it should execute addV")
+        .filter_map(Result::ok)
+        .map(|f| f.take::<Map>())
+        .collect::<Result<Vec<Map>, _>>()
+        .expect("It should be ok");
+
+    let properties = &results[0];
+    assert_eq!(1, properties.len());
+
+    assert_eq!(
+        &expected,
+        properties["dateTime"].get::<List>().unwrap()[0]
+            .get::<VertexProperty>()
+            .unwrap()
+            .get::<DateTime<Utc>>()
+            .unwrap()
+    );
+}
+
 #[test]
 fn test_complex_vertex_creation_with_properties_v2() {
     use chrono::offset::TimeZone;
@@ -208,7 +242,7 @@ fn test_complex_vertex_creation_with_properties_v2() {
     );
 
     assert_eq!(
-        &chrono::Utc.timestamp(1551825863, 0),
+        &chrono::Utc.timestamp_millis(1551825863),
         properties["date"].get::<List>().unwrap()[0]
             .get::<VertexProperty>()
             .unwrap()