Bump maplib dep

DataTreehouse · Feb 6, 2025 · de5837c · de5837c
1 parent 2117539
commit de5837c
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 32 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -16,11 +16,11 @@ members = [
 #pydf_io = { path = "../maplib/lib/pydf_io"}
 #representation = { path = "../maplib/lib/representation", features = ["rdf-star"]}
 #templates = { path = "../maplib/lib/templates"}
-spargebra = { git = "https://github.com/DataTreehouse/maplib", rev="14f10616cdb49cdc7853af047efba85afe7367a0" }
-query_processing = { git = "https://github.com/DataTreehouse/maplib", rev="14f10616cdb49cdc7853af047efba85afe7367a0" }
-pydf_io = { git = "https://github.com/DataTreehouse/maplib", rev="14f10616cdb49cdc7853af047efba85afe7367a0" }
-representation = { git = "https://github.com/DataTreehouse/maplib", rev="14f10616cdb49cdc7853af047efba85afe7367a0" }
-templates = { git = "https://github.com/DataTreehouse/maplib", rev="14f10616cdb49cdc7853af047efba85afe7367a0" }
+spargebra = { git = "https://github.com/DataTreehouse/maplib", rev="01c9ad280fb890478a7900844433fa62df24d511" }
+query_processing = { git = "https://github.com/DataTreehouse/maplib", rev="01c9ad280fb890478a7900844433fa62df24d511" }
+pydf_io = { git = "https://github.com/DataTreehouse/maplib", rev="01c9ad280fb890478a7900844433fa62df24d511" }
+representation = { git = "https://github.com/DataTreehouse/maplib", rev="01c9ad280fb890478a7900844433fa62df24d511" }
+templates = { git = "https://github.com/DataTreehouse/maplib", rev="01c9ad280fb890478a7900844433fa62df24d511" }
 
 
 sparesults = { version = "0.2.3" }

diff --git a/lib/chrontext/src/combiner/lazy_expressions.rs b/lib/chrontext/src/combiner/lazy_expressions.rs
@@ -4,7 +4,7 @@ use crate::combiner::virtualized_queries::split_virtualized_queries;
 use crate::combiner::CombinerError;
 use async_recursion::async_recursion;
 use oxrdf::vocab::xsd;
-use polars::prelude::{col, Expr, LiteralValue, Operator};
+use polars::prelude::{col, Expr, LiteralValue};
 use query_processing::exists_helper::rewrite_exists_graph_pattern;
 use query_processing::expressions::{
     binary_expression, bound, coalesce_expression, exists, func_expression, if_expression,
@@ -64,7 +64,7 @@ impl Combiner {
                     .await?;
                 binary_expression(
                     output_solution_mappings,
-                    Operator::Or,
+                    expr,
                     &left_context,
                     &right_context,
                     context,
@@ -101,7 +101,7 @@ impl Combiner {
                     .await?;
                 binary_expression(
                     output_solution_mappings,
-                    Operator::And,
+                    expr,
                     &left_context,
                     &right_context,
                     context,
@@ -138,7 +138,7 @@ impl Combiner {
                     .await?;
                 binary_expression(
                     output_solution_mappings,
-                    Operator::Eq,
+                    expr,
                     &left_context,
                     &right_context,
                     context,
@@ -178,7 +178,7 @@ impl Combiner {
                     .await?;
                 binary_expression(
                     output_solution_mappings,
-                    Operator::Gt,
+                    expr,
                     &left_context,
                     &right_context,
                     context,
@@ -216,7 +216,7 @@ impl Combiner {
 
                 binary_expression(
                     output_solution_mappings,
-                    Operator::GtEq,
+                    expr,
                     &left_context,
                     &right_context,
                     context,
@@ -253,7 +253,7 @@ impl Combiner {
                     .await?;
                 binary_expression(
                     output_solution_mappings,
-                    Operator::Lt,
+                    expr,
                     &left_context,
                     &right_context,
                     context,
@@ -291,7 +291,7 @@ impl Combiner {
 
                 binary_expression(
                     output_solution_mappings,
-                    Operator::LtEq,
+                    expr,
                     &left_context,
                     &right_context,
                     context,
@@ -373,7 +373,7 @@ impl Combiner {
                     .await?;
                 binary_expression(
                     output_solution_mappings,
-                    Operator::Plus,
+                    expr,
                     &left_context,
                     &right_context,
                     context,
@@ -410,7 +410,7 @@ impl Combiner {
                     .await?;
                 binary_expression(
                     output_solution_mappings,
-                    Operator::Minus,
+                    expr,
                     &left_context,
                     &right_context,
                     context,
@@ -448,7 +448,7 @@ impl Combiner {
 
                 binary_expression(
                     output_solution_mappings,
-                    Operator::Multiply,
+                    expr,
                     &left_context,
                     &right_context,
                     context,
@@ -486,7 +486,7 @@ impl Combiner {
 
                 binary_expression(
                     output_solution_mappings,
-                    Operator::Divide,
+                    expr,
                     &left_context,
                     &right_context,
                     context,

diff --git a/py_chrontext/pyproject.toml b/py_chrontext/pyproject.toml
@@ -6,6 +6,7 @@ dependencies = ["polars>=0.20.2",
                 "pandas",
                 "sqlalchemy>=2.0.31",
                 "sqlalchemy_bigquery==1.11.0",
+                "databricks-sqlalchemy==2.0.4",
                 "databricks-sql-connector>=3.3.0",
                 "pyoxigraph>=0.4.2"]
 readme = "README.md"

diff --git a/py_chrontext/src/lib.rs b/py_chrontext/src/lib.rs
@@ -40,7 +40,6 @@ use chrontext::engine::{Engine, EngineConfig};
 use flight::client::ChrontextFlightClient;
 use flight::server::ChrontextFlightServer;
 use log::{debug, info};
-use oxrdfio::RdfFormat;
 use postgres::catalog::{Catalog, DataProduct};
 use postgres::server::{start_server, Config};
 use pydf_io::to_python::{df_to_py_df, fix_cats_and_multicolumns};
@@ -367,15 +366,6 @@ impl PyFlightClient {
     }
 }
 
-fn resolve_format(format: &str) -> RdfFormat {
-    match format.to_lowercase().as_str() {
-        "ntriples" => RdfFormat::NTriples,
-        "turtle" => RdfFormat::Turtle,
-        "rdf/xml" | "xml" | "rdfxml" => RdfFormat::RdfXml,
-        _ => unimplemented!("Unknown format {}", format),
-    }
-}
-
 #[pyclass(name = "VirtualizedBigQueryDatabase")]
 #[derive(Clone)]
 pub struct PyVirtualizedBigQueryDatabase {