lora-python 0.26.2__tar.gz → 0.27.0__tar.gz

{lora_python-0.26.2 → lora_python-0.27.0}/Cargo.lock

@@ -854,7 +854,7 @@ checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897"
 
 [[package]]
 name = "lora-analyzer"
-version = "0.26.2"
+version = "0.27.0"
 dependencies = [
  "lora-ast",
  "lora-builtins-meta",
@@ -865,14 +865,14 @@ dependencies = [
 
 [[package]]
 name = "lora-ast"
-version = "0.26.2"
+version = "0.27.0"
 dependencies = [
  "smallvec 2.0.0-alpha.12",
 ]
 
 [[package]]
 name = "lora-binding-buffer"
-version = "0.26.2"
+version = "0.27.0"
 dependencies = [
  "lora-database",
  "lora-store",
@@ -880,11 +880,11 @@ dependencies = [
 
 [[package]]
 name = "lora-builtins-meta"
-version = "0.26.2"
+version = "0.27.0"
 
 [[package]]
 name = "lora-compiler"
-version = "0.26.2"
+version = "0.27.0"
 dependencies = [
  "lora-analyzer",
  "lora-ast",
@@ -893,7 +893,7 @@ dependencies = [
 
 [[package]]
 name = "lora-database"
-version = "0.26.2"
+version = "0.27.0"
 dependencies = [
  "anyhow",
  "chacha20poly1305",
@@ -918,7 +918,7 @@ dependencies = [
 
 [[package]]
 name = "lora-executor"
-version = "0.26.2"
+version = "0.27.0"
 dependencies = [
  "blake3",
  "crc32fast",
@@ -941,7 +941,7 @@ dependencies = [
 
 [[package]]
 name = "lora-ffi"
-version = "0.26.2"
+version = "0.27.0"
 dependencies = [
  "anyhow",
  "lora-binding-buffer",
@@ -953,7 +953,7 @@ dependencies = [
 
 [[package]]
 name = "lora-io"
-version = "0.26.2"
+version = "0.27.0"
 dependencies = [
  "lora-executor",
  "lora-store",
@@ -964,7 +964,7 @@ dependencies = [
 
 [[package]]
 name = "lora-node"
-version = "0.26.2"
+version = "0.27.0"
 dependencies = [
  "anyhow",
  "lora-binding-buffer",
@@ -979,7 +979,7 @@ dependencies = [
 
 [[package]]
 name = "lora-parser"
-version = "0.26.2"
+version = "0.27.0"
 dependencies = [
  "lora-ast",
  "pest",
@@ -990,7 +990,7 @@ dependencies = [
 
 [[package]]
 name = "lora-python"
-version = "0.26.2"
+version = "0.27.0"
 dependencies = [
  "anyhow",
  "lora-binding-buffer",
@@ -1003,7 +1003,7 @@ dependencies = [
 
 [[package]]
 name = "lora-query-wasm"
-version = "0.26.2"
+version = "0.27.0"
 dependencies = [
  "console_error_panic_hook",
  "js-sys",
@@ -1017,7 +1017,7 @@ dependencies = [
 
 [[package]]
 name = "lora-server"
-version = "0.26.2"
+version = "0.27.0"
 dependencies = [
  "anyhow",
  "axum",
@@ -1032,7 +1032,7 @@ dependencies = [
 
 [[package]]
 name = "lora-snapshot"
-version = "0.26.2"
+version = "0.27.0"
 dependencies = [
  "argon2",
  "blake3",
@@ -1047,7 +1047,7 @@ dependencies = [
 
 [[package]]
 name = "lora-store"
-version = "0.26.2"
+version = "0.27.0"
 dependencies = [
  "crc32fast",
  "jiff",
@@ -1062,7 +1062,7 @@ dependencies = [
 
 [[package]]
 name = "lora-wal"
-version = "0.26.2"
+version = "0.27.0"
 dependencies = [
  "crc32fast",
  "lora-store",
@@ -1072,7 +1072,7 @@ dependencies = [
 
 [[package]]
 name = "lora-wasm"
-version = "0.26.2"
+version = "0.27.0"
 dependencies = [
  "anyhow",
  "console_error_panic_hook",
@@ -1088,7 +1088,7 @@ dependencies = [
 
 [[package]]
 name = "lora_ruby"
-version = "0.26.2"
+version = "0.27.0"
 dependencies = [
  "anyhow",
  "lora-database",

{lora_python-0.26.2 → lora_python-0.27.0}/Cargo.toml

@@ -4,7 +4,7 @@ resolver = "2"
 
 [workspace.package]
 edition = "2021"
-version = "0.26.2"
+version = "0.27.0"
 license = "BUSL-1.1"
 authors = ["LoraDB, Inc."]
 repository = "https://github.com/lora-db/lora"
@@ -15,18 +15,18 @@ rust-version = "1.87"
 # Internal crates — versions are kept in lockstep with [workspace.package].version
 # by `scripts/sync-versions.mjs`. Both `path` and `version` are set so that
 # `cargo publish` works (crates.io cannot resolve path-only deps).
-lora-ast = { path = "crates/lora-ast", version = "=0.26.2" }
-lora-parser = { path = "crates/lora-parser", version = "=0.26.2" }
-lora-builtins-meta = { path = "crates/lora-builtins-meta", version = "=0.26.2" }
-lora-analyzer = { path = "crates/lora-analyzer", version = "=0.26.2" }
-lora-compiler = { path = "crates/lora-compiler", version = "=0.26.2" }
-lora-store = { path = "crates/lora-store", version = "=0.26.2" }
-lora-snapshot = { path = "crates/lora-snapshot", version = "=0.26.2", default-features = false }
-lora-io = { path = "crates/lora-io", version = "=0.26.2" }
-lora-wal = { path = "crates/lora-wal", version = "=0.26.2" }
-lora-executor = { path = "crates/lora-executor", version = "=0.26.2", default-features = false }
-lora-database = { path = "crates/lora-database", version = "=0.26.2" }
-lora-binding-buffer = { path = "crates/bindings/lora-binding-buffer", version = "=0.26.2" }
+lora-ast = { path = "crates/lora-ast", version = "=0.27.0" }
+lora-parser = { path = "crates/lora-parser", version = "=0.27.0" }
+lora-builtins-meta = { path = "crates/lora-builtins-meta", version = "=0.27.0" }
+lora-analyzer = { path = "crates/lora-analyzer", version = "=0.27.0" }
+lora-compiler = { path = "crates/lora-compiler", version = "=0.27.0" }
+lora-store = { path = "crates/lora-store", version = "=0.27.0" }
+lora-snapshot = { path = "crates/lora-snapshot", version = "=0.27.0", default-features = false }
+lora-io = { path = "crates/lora-io", version = "=0.27.0" }
+lora-wal = { path = "crates/lora-wal", version = "=0.27.0" }
+lora-executor = { path = "crates/lora-executor", version = "=0.27.0", default-features = false }
+lora-database = { path = "crates/lora-database", version = "=0.27.0" }
+lora-binding-buffer = { path = "crates/bindings/lora-binding-buffer", version = "=0.27.0" }
 
 # External crates.
 anyhow = "1"

{lora_python-0.26.2 → lora_python-0.27.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lora-python
-Version: 0.26.2
+Version: 0.27.0
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.8

{lora_python-0.26.2 → lora_python-0.27.0}/crates/lora-compiler/src/lib.rs

@@ -3,19 +3,21 @@ pub mod optimizer;
 pub mod physical;
 pub mod plan_tree;
 
+mod param_fold;
 mod pattern;
 mod planner;
 
 pub use plan_tree::{plan_tree_from_compiled, PlanTree, PlanTreeNode};
 
 pub use logical::{
-    Aggregation, Argument, Create, Delete, Expand, Filter, Foreach, Limit, LogicalOp, LogicalPlan,
-    Merge, NodeByIdSeek, NodeByPointScan, NodeByPropertyRangeScan, NodeByPropertyScan,
-    NodeByTextScan, NodeScan, OptionalMatch, PathBuild, PlanNodeId, PointPredicate, Projection,
-    RelByIdSeek, RelByPointScan, RelByPropertyRangeScan, RelByTextScan, Remove, Set, Sort,
-    SortLimit, TextPredicate, Unwind,
+    Aggregation, Argument, Create, Delete, Expand, ExtraRangeBound, Filter, Foreach, Limit,
+    LogicalOp, LogicalPlan, Merge, NodeByIdSeek, NodeByPointScan, NodeByPropertyRangeScan,
+    NodeByPropertyScan, NodeByTextScan, NodeScan, OptionalMatch, PathBuild, PlanNodeId,
+    PointPredicate, Projection, RelByIdSeek, RelByPointScan, RelByPropertyRangeScan, RelByTextScan,
+    Remove, Set, Sort, SortLimit, TextPredicate, Unwind,
 };
 pub use optimizer::Optimizer;
+pub use param_fold::NullnessOf;
 pub use physical::{
     ArgumentExec, CreateExec, DeleteExec, ExpandExec, FilterExec, ForeachExec, HashAggregationExec,
     LimitExec, MergeExec, NodeByIdSeekExec, NodeByLabelScanExec, NodeByPointScanExec,
@@ -36,6 +38,21 @@ pub struct CompiledQuery {
     pub parameters: std::collections::BTreeSet<String>,
     /// Additional UNION branches, each compiled independently.
     pub unions: Vec<CompiledUnionBranch>,
+    /// Parameters a filter tests with `IS NULL` / `IS NOT NULL`, with the
+    /// nullness the plan folded the test for (`Some(true)`: null; `None`:
+    /// unknown, not folded). The plan is valid only for parameters with
+    /// the same nullness; see [`CompiledQuery::fits`].
+    pub null_params: std::collections::BTreeMap<String, Option<bool>>,
+}
+
+impl CompiledQuery {
+    /// Whether this plan was built for parameters with the nullness
+    /// `nullness` reports.
+    pub fn fits(&self, nullness: NullnessOf<'_>) -> bool {
+        self.null_params
+            .iter()
+            .all(|(name, assumed)| nullness(name) == *assumed)
+    }
 }
 
 #[derive(Debug, Clone)]
@@ -54,7 +71,21 @@ impl Compiler {
     /// then falls back to the conservative "commit any matching
     /// rewrite" behaviour that the runtime executor handles safely.
     pub fn compile(query: &ResolvedQuery, stats: &GraphStats) -> CompiledQuery {
-        let physical = compile_physical(query, stats);
+        Self::compile_for(query, stats, &|_| None)
+    }
+
+    /// [`Self::compile`] for parameters whose nullness `nullness` knows:
+    /// `$p IS NULL` and `$p IS NOT NULL` in a filter fold to constants, so
+    /// `$p IS NULL OR n.k IN $p` plans as the `IN` alone (or as no filter).
+    /// The result records what it assumed in
+    /// [`CompiledQuery::null_params`].
+    pub fn compile_for(
+        query: &ResolvedQuery,
+        stats: &GraphStats,
+        nullness: NullnessOf<'_>,
+    ) -> CompiledQuery {
+        let mut null_params = std::collections::BTreeMap::new();
+        let physical = compile_physical(query, stats, nullness, &mut null_params);
         let unions = query
             .unions
             .iter()
@@ -66,7 +97,7 @@ impl Compiler {
                 };
                 CompiledUnionBranch {
                     all: union_part.all,
-                    physical: compile_physical(&branch_query, stats),
+                    physical: compile_physical(&branch_query, stats, nullness, &mut null_params),
                 }
             })
             .collect();
@@ -75,13 +106,20 @@ impl Compiler {
             physical,
             unions,
             parameters: query.parameters.clone(),
+            null_params,
         }
     }
 }
 
-fn compile_physical(query: &ResolvedQuery, stats: &GraphStats) -> PhysicalPlan {
+fn compile_physical(
+    query: &ResolvedQuery,
+    stats: &GraphStats,
+    nullness: NullnessOf<'_>,
+    null_params: &mut std::collections::BTreeMap<String, Option<bool>>,
+) -> PhysicalPlan {
     let mut planner = Planner::with_stats(stats);
-    let logical = planner.plan(query);
+    let mut logical = planner.plan(query);
+    param_fold::fold_parameter_null_tests(&mut logical, nullness, null_params);
 
     let mut optimizer = Optimizer::new();
     let optimized = optimizer.optimize(logical, stats);

{lora_python-0.26.2 → lora_python-0.27.0}/crates/lora-compiler/src/logical.rs

@@ -150,6 +150,8 @@ pub struct NodeByPropertyRangeScan {
     pub lo_inclusive: bool,
     pub hi: Option<ResolvedExpr>,
     pub hi_inclusive: bool,
+    /// More bounds on `key`, intersected with `lo`/`hi` per row.
+    pub extra_bounds: Vec<ExtraRangeBound>,
     /// Set when the optimizer replaced an `ORDER BY var.key` above this
     /// scan: rows must come out in that order (from the index when it can
     /// supply it, otherwise sorted by the operator itself).
@@ -223,6 +225,20 @@ pub struct RelByPropertyRangeScan {
     pub lo_inclusive: bool,
     pub hi: Option<ResolvedExpr>,
     pub hi_inclusive: bool,
+    /// More bounds on `key`, intersected with `lo`/`hi` per row.
+    pub extra_bounds: Vec<ExtraRangeBound>,
+}
+
+/// A range-scan bound the planner cannot order against the scan's `lo` or
+/// `hi` (a parameter, say, where `lo` is a STARTS WITH prefix). The
+/// executor evaluates it per row and seeks from the tighter of the two, so
+/// `x STARTS WITH $p AND x > $after` reads from `max($p, $after)`.
+#[derive(Debug, Clone)]
+pub struct ExtraRangeBound {
+    /// `true` for a lower bound (`>`, `>=`), `false` for an upper one.
+    pub lower: bool,
+    pub value: ResolvedExpr,
+    pub inclusive: bool,
 }
 
 /// Trigram-backed relationship scan. Mirror of [`NodeByTextScan`].