gqlite 1.3.0 → 1.4.0

data/ext/graphcore/src/value.rs

@@ -8,6 +8,7 @@ use std::{
 mod value_map;
 
 pub(crate) use crate::prelude::*;
+use crate::TimeStamp;
 
 pub use value_map::ValueMap;
 
@@ -33,6 +34,8 @@ pub enum Value
   Float(f64),
   /// String value.
   String(String),
+  /// Timestamp value
+  TimeStamp(timestamp::TimeStamp),
   /// Array of values.
   Array(Vec<Value>),
   /// Unordered map of values.
@@ -97,6 +100,7 @@ impl Hash for Value
         bits.hash(state);
       }
       Value::String(s) => s.hash(state),
+      Value::TimeStamp(ts) => ts.hash(state),
       Value::Array(a) => a.hash(state),
       Value::Map(m) => m.hash(state),
       Value::Node(n) => n.hash(state),
@@ -118,6 +122,7 @@ impl Add for Value
       | Value::Node(..)
       | Value::Edge(..)
       | Value::Map(..)
+      | Value::TimeStamp(..)
       | Value::Path(..) => Err(Error::InvalidBinaryOperands),
       Value::Null => Ok(Value::Null),
       Self::Array(lhs) => match rhs
@@ -171,6 +176,7 @@ macro_rules! impl_mdsr {
           Value::Boolean(..)
           | Value::Key(..)
           | Value::String(..)
+          | Value::TimeStamp(..)
           | Value::Node(..)
           | Value::Edge(..)
           | Value::Array(..)
@@ -212,6 +218,7 @@ impl Value
       Value::Boolean(..)
       | Value::Key(..)
       | Value::String(..)
+      | Value::TimeStamp(..)
       | Value::Node(..)
       | Value::Edge(..)
       | Value::Array(..)
@@ -255,6 +262,7 @@ impl Neg for Value
       | Value::String(..)
       | Value::Node(..)
       | Value::Edge(..)
+      | Value::TimeStamp(..)
       | Value::Array(..)
       | Value::Map(..)
       | Value::Path(..) => Err(Error::InvalidNegationOperands),
@@ -274,6 +282,7 @@ impl std::fmt::Display for Value
       Value::Integer(i) => write!(f, "{}", i),
       Value::Float(fl) => write!(f, "{}", fl),
       Value::String(s) => write!(f, "{}", s),
+      Value::TimeStamp(t) => write!(f, "{}", t),
       Value::Array(v) => write!(f, "[{}]", v.iter().map(|x| x.to_string()).join(", ")),
       Value::Map(o) => write!(f, "{}", o),
       Value::Node(n) => write!(f, "{}", n),
@@ -298,7 +307,42 @@ impl ValueTryIntoRef<Value> for Value
   }
 }
 
-macro_rules! impl_to_value {
+impl<T> From<Option<T>> for Value
+where
+  Value: From<T>,
+{
+  fn from(value: Option<T>) -> Self
+  {
+    match value
+    {
+      Some(value) => value.into(),
+      None => Value::Null,
+    }
+  }
+}
+
+macro_rules! impl_from_value {
+  ($type:ty, $vn:tt, try) => {
+    impl_from_value!($type, $vn);
+    impl TryFrom<Value> for $type
+    {
+      type Error = Error;
+      fn try_from(value: Value) -> Result<$type, Self::Error>
+      {
+        match value
+        {
+          Value::$vn(v) => Ok(v),
+          _ => Err(
+            Error::InvalidValueCast {
+              value: Box::new(value),
+              typename: stringify!($type),
+            }
+            .into(),
+          ),
+        }
+      }
+    }
+  };
   ($type:ty, $vn:tt) => {
     impl From<$type> for Value
     {
@@ -315,25 +359,38 @@ macro_rules! impl_to_value {
         Value::Array(v.into_iter().map(|v| v.into()).collect())
       }
     }
-    impl TryInto<$type> for Value
+    impl TryFrom<&Value> for $type
     {
       type Error = Error;
-      fn try_into(self) -> Result<$type, Self::Error>
+      fn try_from(value: &Value) -> Result<$type, Self::Error>
       {
-        match self
+        <$type>::try_from(value.to_owned())
+      }
+    }
+    impl TryFrom<Value> for Option<$type>
+    {
+      type Error = Error;
+      fn try_from(value: Value) -> Result<Self>
+      {
+        match value
         {
-          Value::$vn(v) => Ok(v),
-          _ => Err(
-            Error::InvalidValueCast {
-              value: Box::new(self),
-              typename: stringify!($type),
-            }
-            .into(),
-          ),
+          Value::Null => Ok(None),
+          _ =>
+          {
+            let t: $type = value.try_into()?;
+            Ok(Some(t))
+          }
         }
       }
     }
-
+    impl TryFrom<&Value> for Option<$type>
+    {
+      type Error = Error;
+      fn try_from(value: &Value) -> Result<Option<$type>, Self::Error>
+      {
+        <Option<$type>>::try_from(value.to_owned())
+      }
+    }
     impl ValueTryIntoRef<$type> for Value
     {
       fn try_into_ref(&self) -> Result<&$type, Error>
@@ -354,16 +411,42 @@ macro_rules! impl_to_value {
   };
 }
 
-impl_to_value!(graph::Key, Key);
-impl_to_value!(bool, Boolean);
-impl_to_value!(i64, Integer);
-impl_to_value!(f64, Float);
-impl_to_value!(String, String);
-impl_to_value!(graph::Node, Node);
-impl_to_value!(graph::Edge, Edge);
-impl_to_value!(graph::SinglePath, Path);
-impl_to_value!(Vec<Value>, Array);
-impl_to_value!(ValueMap, Map);
+impl_from_value!(graph::Key, Key, try);
+impl_from_value!(bool, Boolean, try);
+impl_from_value!(i64, Integer, try);
+impl_from_value!(f64, Float, try);
+impl_from_value!(String, String, try);
+impl_from_value!(TimeStamp, TimeStamp);
+impl_from_value!(graph::Node, Node, try);
+impl_from_value!(graph::Edge, Edge, try);
+impl_from_value!(graph::SinglePath, Path, try);
+impl_from_value!(Vec<Value>, Array, try);
+impl_from_value!(ValueMap, Map, try);
+
+impl TryFrom<Value> for TimeStamp
+{
+  type Error = Error;
+  fn try_from(value: Value) -> Result<TimeStamp, Self::Error>
+  {
+    match value
+    {
+      Value::String(s) => Ok(TimeStamp::parse(&s)?),
+      Value::TimeStamp(v) => Ok(v),
+      _ => Err(Error::InvalidValueCast {
+        value: Box::new(value),
+        typename: stringify!($type),
+      }),
+    }
+  }
+}
+
+impl From<()> for Value
+{
+  fn from(_: ()) -> Self
+  {
+    Self::Null
+  }
+}
 
 impl From<&str> for Value
 {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gqlite
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Cyrille Berger
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-09-01 00:00:00.000000000 Z
+date: 2025-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rb_sys
@@ -69,9 +69,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
@@ -106,8 +103,14 @@ files:
 - ext/gqlitedb/src/prelude.rs
 - ext/gqlitedb/src/query_result.rs
 - ext/gqlitedb/src/store.rs
-- ext/gqlitedb/src/store/pgql.rs
+- ext/gqlitedb/src/store/pgrx.rs
+- ext/gqlitedb/src/store/postgres.rs
 - ext/gqlitedb/src/store/redb.rs
+- ext/gqlitedb/src/store/sqlbase.rs
+- ext/gqlitedb/src/store/sqlbase/sqlmetadata.rs
+- ext/gqlitedb/src/store/sqlbase/sqlqueries.rs
+- ext/gqlitedb/src/store/sqlbase/sqlstore.rs
+- ext/gqlitedb/src/store/sqlbase/sqlvalue.rs
 - ext/gqlitedb/src/store/sqlite.rs
 - ext/gqlitedb/src/tests.rs
 - ext/gqlitedb/src/tests/compiler.rs
@@ -148,13 +151,13 @@ files:
 - ext/gqliterb/src/lib.rs
 - ext/graphcore/Cargo.toml
 - ext/graphcore/README.MD
-- ext/graphcore/release.toml
 - ext/graphcore/src/error.rs
 - ext/graphcore/src/graph.rs
 - ext/graphcore/src/lib.rs
 - ext/graphcore/src/prelude.rs
 - ext/graphcore/src/serialize_with.rs
 - ext/graphcore/src/table.rs
+- ext/graphcore/src/timestamp.rs
 - ext/graphcore/src/value.rs
 - ext/graphcore/src/value/value_map.rs
 - lib/gqlite.rb

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

data/ext/graphcore/release.toml

@@ -1 +0,0 @@
-tag = false