lora-python 0.8.4__tar.gz → 0.9.0__tar.gz

{lora_python-0.8.4 → lora_python-0.9.0}/Cargo.lock

@@ -54,15 +54,6 @@ version = "1.0.102"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c"
 
-[[package]]
-name = "arc-swap"
-version = "1.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a3a1fd6f75306b68087b831f025c712524bcb19aad54e557b1129cfa0a2b207"
-dependencies = [
- "rustversion",
-]
-
 [[package]]
 name = "argon2"
 version = "0.5.3"
@@ -171,15 +162,6 @@ version = "1.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2af50177e190e07a26ab74f8b1efbfe2ef87da2116221318cb1c2e82baf7de06"
 
-[[package]]
-name = "bincode"
-version = "1.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "bindgen"
 version = "0.72.1"
@@ -242,12 +224,6 @@ version = "3.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5d20789868f4b01b2f2caec9f5c4e0213b41e3e5702a50157d699ae31ced2fcb"
 
-[[package]]
-name = "byteorder"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
-
 [[package]]
 name = "bytes"
 version = "1.11.1"
@@ -797,7 +773,7 @@ checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897"
 
 [[package]]
 name = "lora-analyzer"
-version = "0.8.4"
+version = "0.9.0"
 dependencies = [
  "lora-ast",
  "lora-parser",
@@ -807,14 +783,14 @@ dependencies = [
 
 [[package]]
 name = "lora-ast"
-version = "0.8.4"
+version = "0.9.0"
 dependencies = [
  "smallvec 2.0.0-alpha.12",
 ]
 
 [[package]]
 name = "lora-binding-buffer"
-version = "0.8.4"
+version = "0.9.0"
 dependencies = [
  "lora-database",
  "lora-store",
@@ -822,19 +798,23 @@ dependencies = [
 
 [[package]]
 name = "lora-compiler"
-version = "0.8.4"
+version = "0.9.0"
 dependencies = [
  "lora-analyzer",
  "lora-ast",
+ "lora-store",
 ]
 
 [[package]]
 name = "lora-database"
-version = "0.8.4"
+version = "0.9.0"
 dependencies = [
  "anyhow",
- "arc-swap",
+ "chacha20poly1305",
+ "crc32fast",
  "criterion",
+ "flate2",
+ "getrandom",
  "lora-analyzer",
  "lora-ast",
  "lora-compiler",
@@ -845,19 +825,18 @@ dependencies = [
  "lora-wal",
  "serde_json",
  "thiserror",
- "tower",
  "tracing",
- "zip",
 ]
 
 [[package]]
 name = "lora-executor"
-version = "0.8.4"
+version = "0.9.0"
 dependencies = [
  "lora-analyzer",
  "lora-ast",
  "lora-compiler",
  "lora-store",
+ "rayon",
  "regex",
  "serde",
  "smallvec 2.0.0-alpha.12",
@@ -867,7 +846,7 @@ dependencies = [
 
 [[package]]
 name = "lora-ffi"
-version = "0.8.4"
+version = "0.9.0"
 dependencies = [
  "anyhow",
  "lora-binding-buffer",
@@ -879,7 +858,7 @@ dependencies = [
 
 [[package]]
 name = "lora-node"
-version = "0.8.4"
+version = "0.9.0"
 dependencies = [
  "anyhow",
  "lora-binding-buffer",
@@ -894,7 +873,7 @@ dependencies = [
 
 [[package]]
 name = "lora-parser"
-version = "0.8.4"
+version = "0.9.0"
 dependencies = [
  "lora-ast",
  "pest",
@@ -905,7 +884,7 @@ dependencies = [
 
 [[package]]
 name = "lora-python"
-version = "0.8.4"
+version = "0.9.0"
 dependencies = [
  "anyhow",
  "lora-database",
@@ -917,7 +896,7 @@ dependencies = [
 
 [[package]]
 name = "lora-server"
-version = "0.8.4"
+version = "0.9.0"
 dependencies = [
  "anyhow",
  "axum",
@@ -931,10 +910,9 @@ dependencies = [
 
 [[package]]
 name = "lora-snapshot"
-version = "0.8.4"
+version = "0.9.0"
 dependencies = [
  "argon2",
- "bincode",
  "blake3",
  "chacha20poly1305",
  "flate2",
@@ -946,9 +924,8 @@ dependencies = [
 
 [[package]]
 name = "lora-store"
-version = "0.8.4"
+version = "0.9.0"
 dependencies = [
- "bincode",
  "crc32fast",
  "js-sys",
  "lora-ast",
@@ -958,7 +935,7 @@ dependencies = [
 
 [[package]]
 name = "lora-wal"
-version = "0.8.4"
+version = "0.9.0"
 dependencies = [
  "crc32fast",
  "lora-store",
@@ -968,7 +945,7 @@ dependencies = [
 
 [[package]]
 name = "lora-wasm"
-version = "0.8.4"
+version = "0.9.0"
 dependencies = [
  "anyhow",
  "console_error_panic_hook",
@@ -984,7 +961,7 @@ dependencies = [
 
 [[package]]
 name = "lora_ruby"
-version = "0.8.4"
+version = "0.9.0"
 dependencies = [
  "anyhow",
  "lora-database",
@@ -1984,18 +1961,6 @@ version = "1.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0"
 
-[[package]]
-name = "zip"
-version = "0.6.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261"
-dependencies = [
- "byteorder",
- "crc32fast",
- "crossbeam-utils",
- "flate2",
-]
-
 [[package]]
 name = "zmij"
 version = "1.0.21"

{lora_python-0.8.4 → lora_python-0.9.0}/Cargo.toml

@@ -4,7 +4,7 @@ resolver = "2"
 
 [workspace.package]
 edition = "2021"
-version = "0.8.4"
+version = "0.9.0"
 license = "BUSL-1.1"
 authors = ["LoraDB, Inc."]
 repository = "https://github.com/lora-db/lora"
@@ -15,20 +15,19 @@ 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.8.4" }
-lora-parser = { path = "crates/lora-parser", version = "=0.8.4" }
-lora-analyzer = { path = "crates/lora-analyzer", version = "=0.8.4" }
-lora-compiler = { path = "crates/lora-compiler", version = "=0.8.4" }
-lora-store = { path = "crates/lora-store", version = "=0.8.4" }
-lora-snapshot = { path = "crates/lora-snapshot", version = "=0.8.4", default-features = false }
-lora-wal = { path = "crates/lora-wal", version = "=0.8.4" }
-lora-executor = { path = "crates/lora-executor", version = "=0.8.4" }
-lora-database = { path = "crates/lora-database", version = "=0.8.4" }
-lora-binding-buffer = { path = "crates/bindings/lora-binding-buffer", version = "=0.8.4" }
+lora-ast = { path = "crates/lora-ast", version = "=0.9.0" }
+lora-parser = { path = "crates/lora-parser", version = "=0.9.0" }
+lora-analyzer = { path = "crates/lora-analyzer", version = "=0.9.0" }
+lora-compiler = { path = "crates/lora-compiler", version = "=0.9.0" }
+lora-store = { path = "crates/lora-store", version = "=0.9.0" }
+lora-snapshot = { path = "crates/lora-snapshot", version = "=0.9.0", default-features = false }
+lora-wal = { path = "crates/lora-wal", version = "=0.9.0" }
+lora-executor = { path = "crates/lora-executor", version = "=0.9.0", default-features = false }
+lora-database = { path = "crates/lora-database", version = "=0.9.0" }
+lora-binding-buffer = { path = "crates/bindings/lora-binding-buffer", version = "=0.9.0" }
 
 # External crates.
 anyhow = "1"
-arc-swap = "1"
 thiserror = "2"
 tracing = "0"
 axum = "0"
@@ -41,11 +40,10 @@ serde_json = "1.0.149"
 regex = "1"
 tower = "0.5.3"
 criterion = { version = "0.8.2", features = ["html_reports"] }
-bincode = "1.3"
 crc32fast = "1.4"
-zip = { version = "0.6", default-features = false, features = ["deflate"] }
 chacha20poly1305 = "0.10"
 blake3 = "1"
 getrandom = "0.2"
 argon2 = "0.5"
 flate2 = "1"
+rayon = "1"

{lora_python-0.8.4 → lora_python-0.9.0}/PKG-INFO

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

{lora_python-0.8.4 → lora_python-0.9.0}/crates/lora-analyzer/src/analyzer/expressions.rs

@@ -5,6 +5,16 @@ use lora_store::GraphCatalog;
 use std::collections::{BTreeMap, BTreeSet};
 
 impl<'a, S: GraphCatalog + ?Sized> Analyzer<'a, S> {
+    fn with_child_scope<T>(
+        &mut self,
+        f: impl FnOnce(&mut Self) -> Result<T, SemanticError>,
+    ) -> Result<T, SemanticError> {
+        self.scopes.push();
+        let result = f(self);
+        self.scopes.pop();
+        result
+    }
+
     /// Analyze an expression, but allow resolution of projection aliases
     /// (used for ORDER BY which can reference aliases from RETURN/WITH).
     pub(super) fn analyze_expr_with_aliases(
@@ -188,10 +198,10 @@ impl<'a, S: GraphCatalog + ?Sized> Analyzer<'a, S> {
             } => {
                 let list = self.analyze_expr(list)?;
                 let var_id = self.symbols.new_var();
-                self.scopes.push();
-                self.scopes.declare(variable.name.clone(), var_id);
-                let predicate = self.analyze_expr(predicate)?;
-                self.scopes.pop();
+                let predicate = self.with_child_scope(|this| {
+                    this.scopes.declare(variable.name.clone(), var_id);
+                    this.analyze_expr(predicate)
+                })?;
 
                 Ok(ResolvedExpr::ListPredicate {
                     kind: *kind,
@@ -210,14 +220,15 @@ impl<'a, S: GraphCatalog + ?Sized> Analyzer<'a, S> {
             } => {
                 let list = self.analyze_expr(list)?;
                 let var_id = self.symbols.new_var();
-                self.scopes.push();
-                self.scopes.declare(variable.name.clone(), var_id);
-                let filter = filter.as_ref().map(|e| self.analyze_expr(e)).transpose()?;
-                let map_expr = map_expr
-                    .as_ref()
-                    .map(|e| self.analyze_expr(e))
-                    .transpose()?;
-                self.scopes.pop();
+                let (filter, map_expr) = self.with_child_scope(|this| {
+                    this.scopes.declare(variable.name.clone(), var_id);
+                    let filter = filter.as_ref().map(|e| this.analyze_expr(e)).transpose()?;
+                    let map_expr = map_expr
+                        .as_ref()
+                        .map(|e| this.analyze_expr(e))
+                        .transpose()?;
+                    Ok((filter, map_expr))
+                })?;
 
                 Ok(ResolvedExpr::ListComprehension {
                     variable: var_id,
@@ -239,11 +250,11 @@ impl<'a, S: GraphCatalog + ?Sized> Analyzer<'a, S> {
                 let list = self.analyze_expr(list)?;
                 let acc_id = self.symbols.new_var();
                 let var_id = self.symbols.new_var();
-                self.scopes.push();
-                self.scopes.declare(accumulator.name.clone(), acc_id);
-                self.scopes.declare(variable.name.clone(), var_id);
-                let expr = self.analyze_expr(expr)?;
-                self.scopes.pop();
+                let expr = self.with_child_scope(|this| {
+                    this.scopes.declare(accumulator.name.clone(), acc_id);
+                    this.scopes.declare(variable.name.clone(), var_id);
+                    this.analyze_expr(expr)
+                })?;
 
                 Ok(ResolvedExpr::Reduce {
                     accumulator: acc_id,
@@ -451,7 +462,8 @@ fn function_arity(name: &str) -> Option<(usize, Option<usize>)> {
         }
         // Spatial
         "point" => Some((1, Some(1))),
-        "distance" => Some((2, Some(2))),
+        "distance" | "point.distance" => Some((2, Some(2))),
+        "point.withinbbox" => Some((3, Some(3))),
         // Vector
         "vector" => Some((3, Some(3))),
         "tointegerlist" | "tofloatlist" => Some((1, Some(1))),
@@ -488,7 +500,9 @@ fn try_vector_enum_literal(fn_name: &str, arg_idx: usize, expr: &Expr) -> Option
 }
 
 fn is_aggregate_function(name: &str) -> bool {
-    AGGREGATE_FUNCTIONS.contains(&name.to_ascii_lowercase().as_str())
+    AGGREGATE_FUNCTIONS
+        .iter()
+        .any(|function| name.eq_ignore_ascii_case(function))
 }
 
 fn validate_function_name(name: &str, start: usize, end: usize) -> Result<(), SemanticError> {

{lora_python-0.8.4 → lora_python-0.9.0}/crates/lora-analyzer/src/analyzer/state.rs

@@ -32,6 +32,9 @@ impl<'a, S: GraphCatalog + ?Sized> Analyzer<'a, S> {
     pub fn analyze(&mut self, doc: &Document) -> Result<ResolvedQuery, SemanticError> {
         match &doc.statement {
             Statement::Query(q) => self.analyze_query(q),
+            Statement::Schema(_) => Err(SemanticError::UnsupportedFeature(
+                "schema commands are dispatched outside the analyzer".to_string(),
+            )),
         }
     }
 

{lora_python-0.8.4 → lora_python-0.9.0}/crates/lora-analyzer/src/analyzer/tests.rs

@@ -300,3 +300,20 @@ fn dotted_similarity_typo_is_rejected() {
             if name == "vector.similarity.manhattan"
     ));
 }
+
+#[test]
+fn list_expression_scope_is_popped_after_analysis_error() {
+    let graph = InMemoryGraph::new();
+    let bad = parse_query("RETURN any(x IN [1] WHERE missing) AS ok").unwrap();
+    let mut analyzer = Analyzer::new(&graph);
+    assert!(matches!(
+        analyzer.analyze(&bad),
+        Err(SemanticError::UnknownVariable(name)) if name == "missing"
+    ));
+
+    let leaked = parse_query("RETURN x AS leaked").unwrap();
+    assert!(matches!(
+        analyzer.analyze(&leaked),
+        Err(SemanticError::UnknownVariable(name)) if name == "x"
+    ));
+}