Fix bug

Author: magbak

Cargo.lock

@@ -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="02df7b582260fa728807fc3cef50ce8c8af690b6" }
-query_processing = { git = "https://github.com/DataTreehouse/maplib", rev="02df7b582260fa728807fc3cef50ce8c8af690b6" }
-pydf_io = { git = "https://github.com/DataTreehouse/maplib", rev="02df7b582260fa728807fc3cef50ce8c8af690b6" }
-representation = { git = "https://github.com/DataTreehouse/maplib", rev="02df7b582260fa728807fc3cef50ce8c8af690b6" }
-templates = { git = "https://github.com/DataTreehouse/maplib", rev="02df7b582260fa728807fc3cef50ce8c8af690b6" }
+spargebra = { git = "https://github.com/DataTreehouse/maplib", rev="ec762caed6894a63f06943cac5c64cc8d8153a10" }
+query_processing = { git = "https://github.com/DataTreehouse/maplib", rev="ec762caed6894a63f06943cac5c64cc8d8153a10" }
+pydf_io = { git = "https://github.com/DataTreehouse/maplib", rev="ec762caed6894a63f06943cac5c64cc8d8153a10" }
+representation = { git = "https://github.com/DataTreehouse/maplib", rev="ec762caed6894a63f06943cac5c64cc8d8153a10" }
+templates = { git = "https://github.com/DataTreehouse/maplib", rev="ec762caed6894a63f06943cac5c64cc8d8153a10" }
 
 
 sparesults = { version = "0.2.3" }

Cargo.toml

@@ -1,4 +1,4 @@
-mod bgp_pattern;
+mod bg_pattern;
 mod distinct_pattern;
 mod extend_pattern;
 mod filter_pattern;

lib/chrontext/src/rewriting/graph_patterns.rs

@@ -209,10 +209,14 @@ impl BasicVirtualizedQuery {
     fn expected_columns(&self) -> HashSet<&str> {
         let mut s = HashSet::new();
         for tp in self.column_mapping.values() {
-            if let TermPattern::Variable(v) = tp {
-                s.insert(v.as_str());
-            } else {
-                todo!()
+            match tp {
+                TermPattern::BlankNode(b) => todo!("For the time being, replace {} with a variable", b),
+                TermPattern::Literal(_) | TermPattern::NamedNode(_) => {
+                    //No action required
+                }
+                TermPattern::Variable(v) => {
+                    s.insert(v.as_str());
+                }
             }
         }
         if let Some(grouping_var) = &self.grouping_col {

…/rewriting/graph_patterns/bgp_pattern.rs …c/rewriting/graph_patterns/bg_pattern.rslib/chrontext/src/rewriting/graph_patterns/bgp_pattern.rs renamed to lib/chrontext/src/rewriting/graph_patterns/bg_pattern.rs lib/chrontext/src/rewriting/graph_patterns/bgp_pattern.rs renamed to lib/chrontext/src/rewriting/graph_patterns/bg_pattern.rs

@@ -5,8 +5,8 @@ dependencies = ["polars>=0.20.2",
                 "pyarrow>=7.0.0",
                 "pandas",
                 "sqlalchemy>=2.0.31",
-                "sqlalchemy_bigquery==1.11.0",
-                "databricks-sqlalchemy==2.0.4",
+                "sqlalchemy-bigquery>=1.11.0",
+                "databricks-sqlalchemy>=2.0.4",
                 "databricks-sql-connector>=3.3.0",
                 "pyoxigraph>=0.4.2"]
 readme = "README.md"

lib/virtualized_query/src/lib.rs

@@ -1,8 +1,8 @@
-python-dotenv==1.0.0
-pytest==7.4.2
-pytest-order==1.2.0
-docker==7.1.0
+python-dotenv>=1.0.0
+pytest>=7.4.2
+pytest-order>=1.2.0
+docker>=7.1.0
 requests>=2.32.0
-sparqlwrapper==2.0.0
-asyncua==1.0.4
+sparqlwrapper>=2.0.0
+asyncua>=1.0.4
 duckdb>=1.0.0

py_chrontext/pyproject.toml

@@ -249,7 +249,7 @@ def test_pushdown_group_by_second_having_hybrid_query(engine):
     df = sm.mappings.cast({"sum_v": pl.Int64}).sort(by)
     expected = pl.read_csv(TESTDATA_PATH / "expected_pushdown_group_by_second_having_hybrid.csv", try_parse_dates=True).sort(by)
     assert_frame_equal(df, expected)
-    assert sm.pushdown_paths == [['ProjectInner', 'FilterInner', 'ExtendInner', 'ExtendInner']]
+    assert sm.pushdown_paths == [['ProjectInner', 'ExtendInner', 'ExtendInner', 'FilterInner']]
 
 
 def test_union_of_two_groupby_queries(engine):
@@ -300,8 +300,8 @@ def test_union_of_two_groupby_queries(engine):
     assert sm.pushdown_paths == [['ProjectInner',
                                   'UnionLeftSide',
                                   'ProjectInner',
-                                  'FilterInner',
                                   'ExtendInner',
+                                  'FilterInner',
                                   'GroupInner',
                                   'FilterInner',
                                   'ExtendInner',
@@ -310,8 +310,8 @@ def test_union_of_two_groupby_queries(engine):
                                  ['ProjectInner',
                                   'UnionRightSide',
                                   'ProjectInner',
-                                  'FilterInner',
                                   'ExtendInner',
+                                  'FilterInner',
                                   'GroupInner',
                                   'FilterInner',
                                   'ExtendInner',