gqlite 1.5.1 → 1.8.0

data/ext/gqlitedb/src/functions/path.rs

@@ -20,7 +20,8 @@ impl super::FunctionTrait for Length
     {
       value::Value::Array(arr) => Ok((arr.len() as i64).into()),
       value::Value::Map(obj) => Ok((obj.len() as i64).into()),
-      value::Value::Path(..) => Ok(1.into()),
+      value::Value::SinglePath(_) => Ok((1_i64).into()),
+      value::Value::Path(path) => Ok((path.elements_count() as i64).into()),
       _ => Err(
         RunTimeError::InvalidArgument {
           function_name: "length",
@@ -49,27 +50,63 @@ pub(super) struct Nodes {}
 
 impl Nodes
 {
-  fn call_impl(path: graph::Path) -> FResult<Vec<graph::Node>>
+  fn call_impl(path: value::Value) -> FResult<Vec<graph::Node>>
   {
-    Ok(vec![path.source().clone(), path.destination().clone()])
+    match path
+    {
+      value::Value::SinglePath(p) =>
+      {
+        let (node, _, destination) = p.unpack();
+        Ok(vec![node, destination])
+      }
+      value::Value::Path(p) =>
+      {
+        let (source, elements) = p.unpack();
+        Ok(
+          std::iter::once(source)
+            .chain(elements.into_iter().map(|(_, node)| node))
+            .collect(),
+        )
+      }
+      o => Err(RunTimeError::InvalidArgument {
+        function_name: "nodes",
+        index: 0,
+        expected_type: "path",
+        value: format!("{:?}", o),
+      }),
+    }
   }
 }
 
-super::declare_function!(nodes, Nodes, call_impl(crate::graph::Path) -> Vec<graph::Node>);
+super::declare_function!(nodes, Nodes, call_impl(value::Value) -> Vec<graph::Node>);
 
 #[derive(Debug, Default)]
 pub(super) struct Edges {}
 
 impl Edges
 {
-  fn call_impl(path: graph::Path) -> FResult<Vec<graph::Edge>>
+  fn call_impl(path: value::Value) -> FResult<Vec<graph::Edge>>
   {
-    Ok(vec![graph::Edge::new(
-      path.key(),
-      path.labels().clone(),
-      path.properties().clone(),
-    )])
+    match path
+    {
+      value::Value::SinglePath(p) =>
+      {
+        let (_, edge, _) = p.unpack();
+        Ok(vec![edge])
+      }
+      value::Value::Path(p) =>
+      {
+        let (_, elements) = p.unpack();
+        Ok(elements.into_iter().map(|(edge, _)| edge).collect())
+      }
+      o => Err(RunTimeError::InvalidArgument {
+        function_name: "edges",
+        index: 0,
+        expected_type: "path",
+        value: format!("{:?}", o),
+      }),
+    }
   }
 }
 
-super::declare_function!(edges, Edges, call_impl(crate::graph::Path) -> Vec<graph::Edge>);
+super::declare_function!(edges, Edges, call_impl(value::Value) -> Vec<graph::Edge>);

data/ext/gqlitedb/src/functions/value.rs

@@ -79,7 +79,7 @@ impl super::FunctionTrait for HasLabels
                 value: format!("{:?}", label),
               }
               .into(),
-            )
+            );
           }
         }
       }

data/ext/gqlitedb/src/functions.rs

@@ -219,6 +219,8 @@ impl Manager
         .clone(),
     )
   }
+  // It has future use in the compiler to optimize constant expressions
+  #[allow(dead_code)]
   pub(crate) fn is_deterministic(&self, name: impl Into<String>) -> Result<bool>
   {
     let name = name.into();
@@ -377,7 +379,7 @@ macro_rules! validate_args_ {
 }
 
 macro_rules! declare_function_ {
-  ($function_name: ident, $type_name: ty, $f_name: ident (  $( $arg_type: ty $(,)? )* ) -> $ret_type: ty, $null_handling: block, $validator: block , $default_args: block ) => {
+  ($function_name: ident, $type_name: ty, $f_name: ident (  $( $arg_type: ty $(,)? )* ) -> $ret_type: ty, $null_handling: block, $validator: block , $default_args: block, $deterministic: expr ) => {
     impl $type_name
     {
       pub(super) fn create() -> (String, crate::functions::Function)
@@ -422,7 +424,7 @@ macro_rules! declare_function_ {
       }
       fn is_deterministic(&self) -> bool
       {
-        true
+        $deterministic
       }
     }
   };
@@ -490,7 +492,17 @@ macro_rules! declare_function {
       $f_name (  $( $arg_type, )* ) -> $ret_type,
       {$crate::functions::no_null_handling_!()},
       {$crate::functions::default_validate_!($function_name, $ret_type)},
-      {$crate::functions::no_default_args_!()}
+      {$crate::functions::no_default_args_!()},
+      true
+    );
+  };
+  ($function_name: ident, $type_name: ty, $f_name: ident (  $( $arg_type: ty $(,)? )* ) -> $ret_type: ty, non_deterministic ) => {
+    $crate::functions::declare_function_!($function_name, $type_name,
+      $f_name (  $( $arg_type, )* ) -> $ret_type,
+      {$crate::functions::no_null_handling_!()},
+      {$crate::functions::default_validate_!($function_name, $ret_type)},
+      {$crate::functions::no_default_args_!()},
+      false
     );
   };
   ($function_name: ident, $type_name: ty, $f_name: ident (  $( $arg_type: ty $(,)? )* ) -> $ret_type: ty, null_handling( $( $null_mode: ident ),+ ) ) => {
@@ -498,7 +510,8 @@ macro_rules! declare_function {
       $f_name (  $( $arg_type, )* ) -> $ret_type,
       {$crate::functions::null_handling_!($($null_mode),+)},
       {$crate::functions::default_validate_!($function_name, $ret_type)},
-      {$crate::functions::no_default_args_!()}
+      {$crate::functions::no_default_args_!()},
+      true
     );
   };
   ($function_name: ident, $type_name: ty, $f_name: ident (  $( $arg_type: ty $(,)? )* ) -> $ret_type: ty, validate_args( $( $expression_types: pat ),+ ) ) => {
@@ -506,7 +519,8 @@ macro_rules! declare_function {
       $f_name (  $( $arg_type, )* ) -> $ret_type,
       {$crate::functions::no_null_handling_!()},
       {$crate::functions::validate_args_!($function_name, $ret_type, $( $expression_types ),+ )},
-      {$crate::functions::no_default_args_!()}
+      {$crate::functions::no_default_args_!()},
+      true
     );
   };
   ($function_name: ident, $type_name: ty, $f_name: ident (  $( $arg_type: ty $(,)? )* ) -> $ret_type: ty, null_handling( $( $null_mode: ident ),+ ), validate_args( $( $expression_types: pat ),+ ) ) => {
@@ -514,7 +528,8 @@ macro_rules! declare_function {
       $f_name (  $( $arg_type, )* ) -> $ret_type,
       {$crate::functions::null_handling_!($($null_mode),+)},
       {$crate::functions::validate_args_!($function_name, $ret_type, $( $expression_types ),+ )},
-      {$crate::functions::no_default_args_!()}
+      {$crate::functions::no_default_args_!()},
+      true
     );
   };
   ($function_name: ident, $type_name: ty, $f_name: ident (  $( $arg_type: ty $(,)? )* ) -> $ret_type: ty, null_handling( $( $null_mode: ident ),+ ), validate_args( $( $expression_types: pat ),+ ), default_args( $required: expr, $( $default_args: expr ),+ ) ) => {
@@ -522,7 +537,8 @@ macro_rules! declare_function {
       $f_name (  $( $arg_type, )* ) -> $ret_type,
       {$crate::functions::null_handling_!($($null_mode),+)},
       {$crate::functions::validate_args_!($function_name, $required, $ret_type, $( $expression_types ),+ )},
-      {$crate::functions::default_args_!( $required, $($default_args),+)}
+      {$crate::functions::default_args_!( $required, $($default_args),+)},
+      true
     );
   };
   ($function_name: ident, $type_name: ty, custom_trait ) => {

data/ext/gqlitedb/src/graph.rs

@@ -1,11 +1,3 @@
-pub(crate) use graphcore::SinglePath;
-pub use graphcore::{Edge, Key, Node, SinglePath as Path};
+pub use graphcore::{Edge, Key, Node, Path, SinglePath};
 
 pub use graphcore::labels;
-
-#[derive(Debug, Clone, Copy)]
-pub(crate) enum EdgeDirectivity
-{
-  Undirected,
-  Directed,
-}