gqlite 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8b19f14f03ff7f92bf78f132e0c26f800e2d9ce3be108557bb9d23c11e0e8d1
-  data.tar.gz: aad435a97e100195806af926765c90f6c57d1232c51afe771d2b89f00ffa2ea2
+  metadata.gz: 38e53ea482654edda2dec42d18ba7aff7e5660f5643f80f66dfd966e21415ebd
+  data.tar.gz: ce0cb6a21adbca63605e86d753a3c20f281a2126601c5225c446d161efe97094
 SHA512:
-  metadata.gz: fe9d202a5b338e34141df0240867a68b4f794067dc506d173264a66decd973029dc04f64da9f0a1f6192da8cab652e8c71e8c63a1432c4110259d971d64d3697
-  data.tar.gz: 6f90979086a3be82858d38b62bc23a84ab8a05266ca048541d59c87d5f43757219e88c8a2d7c158762e19533e17720f2d5b583d24d8614a6bbef9196374b6004
+  metadata.gz: f1b60e9c256da4300381ef244158ea61a464529e7518dfe1ee532c0e5ada468860ea08a5c0ab91304b00b5e09590774131fd7487d0bb79d2435d7c13009bd0e6
+  data.tar.gz: 4009f247ebcdc9519bfa40853b5ab8b32ab3c53fd365cf6f9dd3a25e395596dc70a2c12f7e795496695d8227428f37edfb1375cbcc59ac35e71a76ba973bd318

data/ext/Cargo.toml

@@ -14,6 +14,7 @@ graphcore = { version = "0.2.0", path = "graphcore" }
 gqlitedb = { version = "0.6.0", path = "gqlitedb" }
 
 askama = { version = "0.14" }
+ccutils = { version = "0.4" }
 itertools = "0.14"
 serde = "1"
 thiserror = "2"

data/ext/gqlitedb/Cargo.toml

@@ -30,7 +30,7 @@ bundled = ["rusqlite/bundled"]
 graphcore = { workspace = true }
 
 askama = { workspace = true, optional = true }
-ccutils = { version = "0.4", features = ["alias", "pool", "sync"] }
+ccutils = { workspace = true, features = ["alias", "pool", "sync"] }
 ciborium = "0.2"
 itertools = { workspace = true }
 pgrx = { version = "0.16", optional = true }
@@ -49,7 +49,7 @@ thiserror = { workspace = true }
 uuid = { workspace = true }
 
 [dev-dependencies]
-ccutils = { version = "0.4", features = ["alias", "temporary"] }
+ccutils = { workspace = true, features = ["alias", "temporary"] }
 divan = "0.1"
 iai-callgrind = { version = "0.16" }
 regex = "1"

data/ext/gqlitedb/src/compiler.rs

@@ -19,6 +19,14 @@ macro_rules! compile_binary_op {
   };
 }
 
+struct CompiledReturnWith
+{
+  variables: Vec<(String, RWExpression)>,
+  filter: Instructions,
+  modifiers: Modifiers,
+  variables_sizes: VariablesSizes,
+}
+
 struct Compiler
 {
   function_manager: functions::Manager,
@@ -701,19 +709,13 @@ impl Compiler
     })
   }
 
-  #[allow(clippy::type_complexity)]
   fn compile_return_with(
     &mut self,
     all: bool,
     expressions: &[ast::NamedExpression],
     where_expression: &Option<ast::Expression>,
     modifiers: &ast::Modifiers,
-  ) -> Result<(
-    Vec<(String, RWExpression)>,
-    Instructions,
-    Modifiers,
-    VariablesSizes,
-  )>
+  ) -> Result<CompiledReturnWith>
   {
     let mut variables = Vec::<(ast::VariableIdentifier, RWExpression)>::new();
     let mut filter = Default::default();
@@ -775,7 +777,7 @@ impl Compiler
     }
 
     let modifiers = self.compile_modifiers(modifiers)?;
-    let variables_size = self.variables_size();
+    let variables_sizes = self.variables_size();
     self
       .variables_manager
       .keep_variables(variables.iter().map(|(n, _)| n))?;
@@ -784,7 +786,12 @@ impl Compiler
       .into_iter()
       .map(|(var_id, e)| (var_id.take_name(), e))
       .collect();
-    Ok((variables, filter, modifiers, variables_size))
+    Ok(CompiledReturnWith {
+      variables,
+      filter,
+      modifiers,
+      variables_sizes,
+    })
   }
 
   fn compile_match_patterns(
@@ -951,17 +958,17 @@ pub(crate) fn compile(
         ),
         ast::Statement::Return(return_statement) =>
         {
-          let (variables, filter, modifiers, variables_size) = compiler.compile_return_with(
+          let compiled_return_with = compiler.compile_return_with(
             return_statement.all,
             &return_statement.expressions,
             &return_statement.where_expression,
             &return_statement.modifiers,
           )?;
           Ok(Block::Return {
-            variables,
-            filter,
-            modifiers,
-            variables_size,
+            variables: compiled_return_with.variables,
+            filter: compiled_return_with.filter,
+            modifiers: compiled_return_with.modifiers,
+            variables_sizes: compiled_return_with.variables_sizes,
           })
         }
         ast::Statement::Call(call) =>
@@ -978,17 +985,21 @@ pub(crate) fn compile(
         }
         ast::Statement::With(with) =>
         {
-          let (variables, filter, modifiers, variables_size) = compiler.compile_return_with(
+          let compiled_return_with = compiler.compile_return_with(
             with.all,
             &with.expressions,
             &with.where_expression,
             &with.modifiers,
           )?;
           Ok(Block::With {
-            variables: variables.into_iter().map(|(_, v)| v).collect(),
-            filter,
-            modifiers,
-            variables_size,
+            variables: compiled_return_with
+              .variables
+              .into_iter()
+              .map(|(_, v)| v)
+              .collect(),
+            filter: compiled_return_with.filter,
+            modifiers: compiled_return_with.modifiers,
+            variables_sizes: compiled_return_with.variables_sizes,
           })
         }
         ast::Statement::Unwind(unwind) =>

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

@@ -74,7 +74,7 @@ impl super::FunctionTrait for Size
   {
     let container = arguments
       .first()
-      .ok_or_else(|| RunTimeError::InvalidNumberOfArguments {
+      .ok_or(RunTimeError::InvalidNumberOfArguments {
         function_name: "size",
         got: arguments.len(),
         expected: 1,

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

@@ -10,7 +10,7 @@ impl super::FunctionTrait for Length
   {
     let container = arguments
       .first()
-      .ok_or_else(|| RunTimeError::InvalidNumberOfArguments {
+      .ok_or(RunTimeError::InvalidNumberOfArguments {
         function_name: "length",
         got: arguments.len(),
         expected: 1,

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

@@ -32,6 +32,29 @@ impl super::FunctionTrait for Coalesce
 
 super::declare_function!(coalesce, Coalesce, custom_trait);
 
+#[derive(Debug, Default)]
+pub(super) struct Id {}
+
+impl Id
+{
+  fn call_impl(value: &value::Value) -> FResult<graph::Key>
+  {
+    match value
+    {
+      value::Value::Node(n) => Ok(n.key()),
+      value::Value::Edge(e) => Ok(e.key()),
+      _ => Err(RunTimeError::InvalidArgument {
+        function_name: "id",
+        index: 0,
+        expected_type: "node or edge",
+        value: format!("{:?}", value),
+      }),
+    }
+  }
+}
+
+super::declare_function!(id, Id, call_impl(crate::value::Value) -> graph::Key);
+
 #[derive(Debug, Default)]
 pub(super) struct ToInteger {}
 

data/ext/gqlitedb/src/functions.rs

@@ -59,6 +59,13 @@ impl FunctionTypeTrait for f64
   }
 }
 
+impl FunctionTypeTrait for graph::Key
+{
+  fn result_type() -> ExpressionType
+  {
+    ExpressionType::Key
+  }
+}
 impl<T> FunctionTypeTrait for Vec<T>
 {
   fn result_type() -> ExpressionType
@@ -146,6 +153,7 @@ impl Manager
           path::Nodes::create(),
           path::Edges::create(),
           scalar::Coalesce::create(),
+          scalar::Id::create(),
           scalar::Properties::create(),
           scalar::ToInteger::create(),
           string::ToString::create(),

data/ext/gqlitedb/src/interpreter/evaluators.rs

@@ -950,7 +950,6 @@ fn compute_return_with_table(
     for row in input_table.into_row_iter()
     {
       // a) compute non-aggregated columns
-      let mut row = row.extended(variables_sizes.total_size())?;
       let out_row = variables
         .iter()
         .map(|rw_expr| {
@@ -959,9 +958,7 @@ fn compute_return_with_table(
             assert_eq!(rw_expr.aggregations.len(), 0);
             let mut stack = Stack::default();
             eval_instructions(&mut stack, &row, &rw_expr.instructions, parameters)?;
-            let value: value::Value = stack.try_pop_into()?;
-            row.set(rw_expr.col_id, value.to_owned())?;
-            Ok(value)
+            stack.try_pop_into()
           }
           else
           {
@@ -1039,12 +1036,12 @@ fn compute_return_with_table(
     output_table = input_table
       .into_row_iter()
       .map(|row| {
-        let mut out_row = row.extended(variables_sizes.total_size())?;
+        let mut out_row = row.clone().extended(variables_sizes.total_size())?;
         for rw_expr in variables.iter()
         {
           assert_eq!(rw_expr.aggregations.len(), 0);
           let mut stack = Stack::default();
-          eval_instructions(&mut stack, &out_row, &rw_expr.instructions, parameters)?;
+          eval_instructions(&mut stack, &row, &rw_expr.instructions, parameters)?;
           let value: value::Value = stack.try_pop_into()?;
           out_row.set(rw_expr.col_id, value.to_owned())?;
         }
@@ -1429,7 +1426,7 @@ pub(crate) fn eval_program<TStore: store::Store>(
         variables,
         filter,
         modifiers,
-        variables_size,
+        variables_sizes: variables_size,
       } =>
       {
         let (names, variables): (Vec<_>, Vec<_>) = variables.iter().map(|(s, e)| (s, e)).unzip();
@@ -1454,7 +1451,7 @@ pub(crate) fn eval_program<TStore: store::Store>(
         variables,
         filter,
         modifiers,
-        variables_size,
+        variables_sizes: variables_size,
       } =>
       {
         input_table = compute_return_with_table(

data/ext/gqlitedb/src/interpreter/instructions.rs

@@ -234,7 +234,7 @@ pub(crate) enum Block
     variables: Vec<(String, RWExpression)>,
     filter: Instructions,
     modifiers: Modifiers,
-    variables_size: VariablesSizes,
+    variables_sizes: VariablesSizes,
   },
   Call
   {
@@ -247,7 +247,7 @@ pub(crate) enum Block
     variables: Vec<RWExpression>,
     filter: Instructions,
     modifiers: Modifiers,
-    variables_size: VariablesSizes,
+    variables_sizes: VariablesSizes,
   },
   Unwind
   {

data/ext/gqlitedb/src/lib.rs

@@ -7,9 +7,7 @@
 //! for an example of use.
 
 #![warn(missing_docs)]
-#![deny(warnings)]
 #![allow(clippy::result_large_err)]
-#![allow(clippy::unnecessary_lazy_evaluations)]
 
 mod aggregators;
 #[cfg(feature = "capi")]

data/ext/gqlitedb/src/tests/templates/programs.rs

@@ -71,7 +71,7 @@ pub(crate) fn create_named_node() -> Program
         skip: None,
         order_by: vec![],
       },
-      variables_size: create_variable_size(2, 0),
+      variables_sizes: create_variable_size(2, 0),
     },
   ]
 }
@@ -133,7 +133,7 @@ pub(crate) fn create_named_node_double_return() -> Program
         skip: None,
         order_by: vec![],
       },
-      variables_size: create_variable_size(3, 0),
+      variables_sizes: create_variable_size(3, 0),
     },
   ]
 }
@@ -161,7 +161,7 @@ pub(crate) fn double_with_return() -> Program
         skip: None,
         order_by: vec![],
       },
-      variables_size: create_variable_size(2, 0),
+      variables_sizes: create_variable_size(2, 0),
     },
     Block::With {
       variables: vec![
@@ -182,7 +182,7 @@ pub(crate) fn double_with_return() -> Program
         skip: None,
         order_by: vec![],
       },
-      variables_size: create_variable_size(4, 0),
+      variables_sizes: create_variable_size(4, 0),
     },
     Block::Return {
       variables: vec![(
@@ -199,7 +199,7 @@ pub(crate) fn double_with_return() -> Program
         skip: None,
         order_by: vec![],
       },
-      variables_size: create_variable_size(2, 0),
+      variables_sizes: create_variable_size(2, 0),
     },
   ]
 }
@@ -234,7 +234,7 @@ pub(crate) fn unwind() -> Program
         skip: None,
         order_by: vec![],
       },
-      variables_size: create_variable_size(1, 0),
+      variables_sizes: create_variable_size(1, 0),
     },
   ]
 }
@@ -288,7 +288,7 @@ pub(crate) fn match_loop() -> Program
         skip: None,
         order_by: vec![],
       },
-      variables_size: create_variable_size(1, 0),
+      variables_sizes: create_variable_size(1, 0),
     },
   ]
 }
@@ -327,7 +327,7 @@ pub(crate) fn optional_match() -> Program
         skip: None,
         order_by: vec![],
       },
-      variables_size: create_variable_size(1, 0),
+      variables_sizes: create_variable_size(1, 0),
     },
   ]
 }
@@ -378,7 +378,7 @@ pub(crate) fn match_count(function_manager: &functions::Manager) -> Program
         skip: None,
         order_by: vec![],
       },
-      variables_size: create_variable_size(2, 1),
+      variables_sizes: create_variable_size(2, 1),
     },
   ]
 }
@@ -449,7 +449,7 @@ pub(crate) fn aggregation(function_manager: &functions::Manager) -> Program
         skip: None,
         order_by: vec![],
       },
-      variables_size: create_variable_size(3, 1),
+      variables_sizes: create_variable_size(3, 1),
     },
   ]
 }

data/ext/gqliterb/src/lib.rs

@@ -1,5 +1,3 @@
-#![deny(warnings)]
-
 use std::fmt::Display;
 
 use magnus::{

data/ext/graphcore/Cargo.toml

@@ -2,7 +2,7 @@
 name = "graphcore"
 description = "Base data structure to represent and manipulate property graph."
 # version.workspace = true
-version = "0.2.0"
+version = "0.2.1"
 readme = "README.MD"
 edition.workspace = true
 license.workspace = true

data/ext/graphcore/src/lib.rs

@@ -1,6 +1,5 @@
 #![doc = include_str!("../README.MD")]
 #![warn(missing_docs)]
-#![deny(warnings)]
 #![allow(clippy::result_large_err)]
 
 mod error;

data/ext/graphcore/src/table.rs

@@ -15,7 +15,7 @@ impl Table
   /// of row is equal to length of data divided by number of columns.
   pub fn new(headers: Vec<String>, data: Vec<crate::Value>) -> Result<Table>
   {
-    if data.len() % headers.len() != 0
+    if !data.len().is_multiple_of(headers.len())
     {
       Err(error::Error::InvalidTableDimensions)?;
     }

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: gqlite
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Cyrille Berger
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-09-01 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rb_sys
@@ -56,7 +55,6 @@ description: "GQLite is a Rust-language library, with a C interface, that implem
   => ex\n  # Report any error\n  puts \"An error has occured: #{ex.message}\"\nend\n\n```\n\nThe
   documentation for the GQL query language can found in [OpenCypher](https://auksys.org/documentation/5/libraries/gqlite/opencypher/)
   and for the [API](https://auksys.org/documentation/5/libraries/gqlite/api/).\n\n"
-email:
 executables: []
 extensions:
 - ext/gqliterb/extconf.rb
@@ -69,9 +67,6 @@ files:
 - ext/gqlitedb/benches/common/pokec.rs
 - ext/gqlitedb/benches/pokec_divan.rs
 - ext/gqlitedb/benches/pokec_iai.rs
-- ext/gqlitedb/gqlite_bench_data/README.MD
-- ext/gqlitedb/gqlite_bench_data/scripts/generate_smaller_pokec.rb
-- ext/gqlitedb/gqlite_bench_data/scripts/to_efficient_pokec.rb
 - ext/gqlitedb/release.toml
 - ext/gqlitedb/src/aggregators.rs
 - ext/gqlitedb/src/aggregators/arithmetic.rs
@@ -162,7 +157,6 @@ homepage: https://gitlab.com/auksys/gqlite
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -177,8 +171,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.20
-signing_key:
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Ruby bindings for GQLite, a Graph Query library.
 test_files: []

data/ext/gqlitedb/gqlite_bench_data/README.MD

@@ -1,6 +0,0 @@
-![GQLite logo](logo.png) GQLite Benchnark Data
-==============================================
-
-This repository includes data used to benchmark GQLite.
-
-* `pokec_tiny_nodes.cypher` is a subset of the [pokec mini](https://github.com/memgraph/memgraph/tree/master/tests/mgbench#pokec) dataset ([original](https://snap.stanford.edu/data/soc-Pokec.html)). 

data/ext/gqlitedb/gqlite_bench_data/scripts/generate_smaller_pokec.rb

@@ -1,85 +0,0 @@
-# Script that reduces the pokec dataset, to reduce it to a subset of users. 
-# It also reduce the initial set of queries into a single one.
-#
-# Use as:
-# ```bash
-# ruby reduce_pokec.rb size input.cypher > output.cypher
-# ```
-
-require 'set'
-
-size = ARGV[0] or abort("Usage: ruby #{$0} micro/tiny input.cypher")
-input_file = ARGV[1] or abort("Usage: ruby #{$0} micro/tiny input.cypher")
-
-if size == "tiny"
-  initial = 5
-  increments = 2
-elsif size == "micro"
-  initial = 1
-  increments = 1
-else
-  abort("Unknown size '#{size}', should be 'tiny' or 'micro'")
-end
-
-user_lines = {}
-all_edges = []
-edges_by_user = Hash.new { |h, k| h[k] = [] }
-selected_edges = []
-seen_edges = Set.new
-selected_users = Set.new
-
-def edge_key(id1, id2)
-  [id1, id2].sort.join('-')
-end
-
-File.foreach(input_file) do |line|
-  if line =~ /CREATE\s+\(:User\s*(\{.*id:\s*(\d+)[^}]*\})\)/i
-    user_lines[$2.to_i] = $1
-
-  elsif line =~ /MATCH\s+\(n:User\s*\{id:\s*(\d+)\}\),\s*\(m:User\s*\{id:\s*(\d+)\}\).*CREATE.*Friend/i
-    id1, id2 = $1.to_i, $2.to_i
-    edge = { line: line, ids: [id1, id2] }
-    all_edges << edge
-    edges_by_user[id1] << edge
-    edges_by_user[id2] << edge
-  end
-end
-
-# Step 1: Select initial edges
-initial_edges = all_edges.take(initial)
-initial_edges.each do |edge|
-  k = edge_key(*edge[:ids])
-  next if seen_edges.include?(k)
-
-  seen_edges << k
-  selected_edges << edge
-  selected_users.merge(edge[:ids])
-end
-
-# Step 2: Find all other edges connected to selected users
-for i in 0...increments
-  for uid in selected_users.clone()
-    edges_by_user[uid].each do |edge|
-      k = edge_key(*edge[:ids])
-      next if seen_edges.include?(k)
-
-      seen_edges << k
-      selected_edges << edge
-
-      # Add any new user ID to the queue
-      selected_users.merge(edge[:ids])
-    end
-  end
-end
-
-puts "CREATE"
-# Output user CREATEs
-selected_users.each do |id|
-  puts "  (user_#{id}:User #{user_lines[id]})," if user_lines.key?(id)
-end
-
-# Output edges
-selected_edges.each do |edge|
-  ids = edge[:ids]
-  puts "  (user_#{ids[0]})-[:Friend]->(user_#{ids[1]}),"
-end

data/ext/gqlitedb/gqlite_bench_data/scripts/to_efficient_pokec.rb

@@ -1,34 +0,0 @@
-# Script that transform the pokec dataset into a more efficient query.
-#
-# Use as:
-# ```bash
-# ruby to_efficient_pokec.rb input.cypher > output.cypher
-# ```
-
-require 'set'
-
-input_file = ARGV[0] or abort("Usage: ruby #{$0} input.cypher")
-
-user_lines = []
-edge_lines = []
-
-File.foreach(input_file) do |line|
-  if line =~ /CREATE\s+\(:User\s*(\{.*id:\s*(\d+)[^}]*\})\)/i
-    user_lines.append({ id: $2.to_i, data: $1})
-
-  elsif line =~ /MATCH\s+\(n:User\s*\{id:\s*(\d+)\}\),\s*\(m:User\s*\{id:\s*(\d+)\}\).*CREATE.*Friend/i
-    id1, id2 = $1.to_i, $2.to_i
-    edge_lines.append({ id1: id1, id2: id2 })
-  end
-end
-
-puts "CREATE"
-# Output user CREATEs
-user_lines.each do |user|
-  puts "  (user_#{user[:id]}:User #{user[:data]}),"
-end
-
-# Output edges
-edge_lines.each do |edge|
-  puts "  (user_#{edge[:id1]})-[:Friend]->(user_#{edge[:id2]}),"
-end