Merge branch 'mb/fetch' into develop

1 files changed, 96 insertions, 0 deletions

diff --git a/test/triple_store/sparql/test_sparql.py b/test/triple_store/sparql/test_sparql.py
index 7fbfb65..30876f2 100644
--- a/test/triple_store/sparql/test_sparql.py
+++ b/test/triple_store/sparql/test_sparql.py
@@ -34,6 +34,7 @@ class TestSparqlStore(unittest.TestCase):
             bsfs:User rdfs:subClassOf bsfs:Node .
             xsd:string rdfs:subClassOf bsfs:Literal .
             bsfs:Number rdfs:subClassOf bsfs:Literal .
+            bsfs:BinaryBlob rdfs:subClassOf bsfs:Literal .
             xsd:integer rdfs:subClassOf bsfs:Number .
 
             # non-unique literal
@@ -60,6 +61,11 @@ class TestSparqlStore(unittest.TestCase):
                 rdfs:range bsfs:User ;
                 bsfs:unique "true"^^xsd:boolean .
 
+            # binary range
+            bse:asset rdfs:subClassOf bsfs:Predicate ;
+                rdfs:domain bsfs:Entity ;
+                rdfs:range bsfs:BinaryBlob .
+
             ''')
         self.schema_triples = {
             # schema hierarchy
@@ -68,6 +74,7 @@ class TestSparqlStore(unittest.TestCase):
             (rdflib.URIRef(ns.bsfs.User), rdflib.RDFS.subClassOf, rdflib.URIRef(ns.bsfs.Node)),
             (rdflib.URIRef(ns.xsd.string), rdflib.RDFS.subClassOf, rdflib.URIRef(ns.bsfs.Literal)),
             (rdflib.URIRef(ns.bsfs.Array), rdflib.RDFS.subClassOf, rdflib.URIRef(ns.bsfs.Literal)),
+            (rdflib.URIRef(ns.bsfs.BinaryBlob), rdflib.RDFS.subClassOf, rdflib.URIRef(ns.bsfs.Literal)),
             (rdflib.URIRef(ns.bsfs.Feature), rdflib.RDFS.subClassOf, rdflib.URIRef(ns.bsfs.Array)),
             (rdflib.URIRef(ns.bsfs.Number), rdflib.RDFS.subClassOf, rdflib.URIRef(ns.bsfs.Literal)),
             (rdflib.URIRef(ns.bsfs.Time), rdflib.RDFS.subClassOf, rdflib.URIRef(ns.bsfs.Literal)),
@@ -76,6 +83,7 @@ class TestSparqlStore(unittest.TestCase):
             (rdflib.URIRef(ns.bse.filesize), rdflib.RDFS.subClassOf, rdflib.URIRef(ns.bsfs.Predicate)),
             (rdflib.URIRef(ns.bse.tag), rdflib.RDFS.subClassOf, rdflib.URIRef(ns.bsfs.Predicate)),
             (rdflib.URIRef(ns.bse.author), rdflib.RDFS.subClassOf, rdflib.URIRef(ns.bsfs.Predicate)),
+            (rdflib.URIRef(ns.bse.asset), rdflib.RDFS.subClassOf, rdflib.URIRef(ns.bsfs.Predicate)),
             }
 
     def test_essentials(self):
@@ -358,6 +366,7 @@ class TestSparqlStore(unittest.TestCase):
             (rdflib.URIRef(ns.bsfs.User), rdflib.RDFS.subClassOf, rdflib.URIRef(ns.bsfs.Node)),
             (rdflib.URIRef(ns.xsd.boolean), rdflib.RDFS.subClassOf, rdflib.URIRef(ns.bsfs.Literal)),
             (rdflib.URIRef(ns.bsfs.Array), rdflib.RDFS.subClassOf, rdflib.URIRef(ns.bsfs.Literal)),
+            (rdflib.URIRef(ns.bsfs.BinaryBlob), rdflib.RDFS.subClassOf, rdflib.URIRef(ns.bsfs.Literal)),
             (rdflib.URIRef(ns.bsfs.Feature), rdflib.RDFS.subClassOf, rdflib.URIRef(ns.bsfs.Array)),
             (rdflib.URIRef(ns.bsfs.Number), rdflib.RDFS.subClassOf, rdflib.URIRef(ns.bsfs.Literal)),
             (rdflib.URIRef(ns.bsfs.Time), rdflib.RDFS.subClassOf, rdflib.URIRef(ns.bsfs.Literal)),
@@ -556,6 +565,76 @@ class TestSparqlStore(unittest.TestCase):
         self.assertSetEqual(set(q), tag_ids)
 
 
+    def test_fetch(self):
+        # store setup
+        store = SparqlStore.Open()
+        store.schema = self.schema
+        # add instances
+        ent_type = self.schema.node(ns.bsfs.Entity)
+        tag_type = self.schema.node(ns.bsfs.Tag)
+        ent_ids = {URI('http://example.com/me/entity#1234'), URI('http://example.com/me/entity#4321')}
+        tag_ids = {URI('http://example.com/me/tag#1234'), URI('http://example.com/me/tag#4321')}
+        store.create(ent_type, ent_ids)
+        store.create(tag_type, tag_ids)
+        store.set(ent_type, ent_ids, self.schema.predicate(ns.bse.tag), tag_ids)
+        store.set(ent_type, {URI('http://example.com/me/entity#1234')}, self.schema.predicate(ns.bse.filesize), {1234})
+        store.set(ent_type, {URI('http://example.com/me/entity#4321')}, self.schema.predicate(ns.bse.filesize), {4321})
+        store.set(ent_type, {URI('http://example.com/me/entity#1234')}, self.schema.predicate(ns.bse.comment), {'hello world'})
+        # node_type must be a node from the schema
+        self.assertRaises(errors.ConsistencyError, list, store.fetch(self.schema.literal(ns.bsfs.Literal),
+            ast.filter.FilterExpression(), ast.fetch.FetchExpression()))
+        self.assertRaises(errors.ConsistencyError, list, store.fetch(self.schema.node(ns.bsfs.Node).child(ns.bsfs.Invalid),
+            ast.filter.FilterExpression(), ast.fetch.FetchExpression()))
+        # requires a filter and a fetch query
+        self.assertRaises(TypeError, list, store.fetch(self.schema.node(ns.bsfs.Entity), None, ast.fetch.FetchExpression()))
+        self.assertRaises(TypeError, list, store.fetch(self.schema.node(ns.bsfs.Entity), 1234, ast.fetch.FetchExpression()))
+        self.assertRaises(TypeError, list, store.fetch(self.schema.node(ns.bsfs.Entity), 'hello', ast.fetch.FetchExpression()))
+        self.assertRaises(TypeError, list, store.fetch(self.schema.node(ns.bsfs.Entity), ast.filter.FilterExpression(), None))
+        self.assertRaises(TypeError, list, store.fetch(self.schema.node(ns.bsfs.Entity), ast.filter.FilterExpression(), 1234))
+        self.assertRaises(TypeError, list, store.fetch(self.schema.node(ns.bsfs.Entity), ast.filter.FilterExpression(), 'hello'))
+        # fetch emits triples
+        self.assertSetEqual(set(store.fetch(self.schema.node(ns.bsfs.Entity),
+            ast.filter.Is('http://example.com/me/entity#1234'),
+            ast.fetch.Value(ns.bse.filesize, 'filesize'),
+            )), {
+            (URI('http://example.com/me/entity#1234'), 'filesize', 1234),
+            })
+        # fetch respects filter query
+        self.assertSetEqual(set(store.fetch(self.schema.node(ns.bsfs.Entity),
+            ast.filter.IsIn('http://example.com/me/entity#1234', 'http://example.com/me/entity#4321'),
+            ast.fetch.Value(ns.bse.filesize, 'filesize'),
+            )), {
+            (URI('http://example.com/me/entity#1234'), 'filesize', 1234),
+            (URI('http://example.com/me/entity#4321'), 'filesize', 4321),
+            })
+        # fetch ignores missing data
+        self.assertSetEqual(set(store.fetch(self.schema.node(ns.bsfs.Entity),
+            ast.filter.IsIn('http://example.com/me/entity#1234', 'http://example.com/me/entity#4321'),
+            ast.fetch.Value(ns.bse.comment, 'comment'),
+            )), {
+            (URI('http://example.com/me/entity#1234'), 'comment', 'hello world'),
+            })
+        # fetch emits all triples
+        self.assertSetEqual(set(store.fetch(self.schema.node(ns.bsfs.Entity),
+            ast.filter.Is('http://example.com/me/entity#1234'),
+            ast.fetch.All(
+                ast.fetch.Value(ns.bse.filesize, 'filesize'),
+                ast.fetch.Node(ns.bse.tag, 'tag'),
+                )
+            )), {
+            (URI('http://example.com/me/entity#1234'), 'filesize', 1234),
+            (URI('http://example.com/me/entity#1234'), 'tag', URI('http://example.com/me/tag#1234')),
+            (URI('http://example.com/me/entity#1234'), 'tag', URI('http://example.com/me/tag#4321')),
+            })
+        # triples do not repeat
+        triples = list(store.fetch(self.schema.node(ns.bsfs.Entity), ast.filter.Is('http://example.com/me/entity#1234'),
+            ast.fetch.All(
+                ast.fetch.Value(ns.bse.filesize, 'filesize'),
+                ast.fetch.Node(ns.bse.tag, 'tag'),
+                )
+            ))
+        self.assertEqual(len(triples), 3)
+
     def test_exists(self):
         # store setup
         store = SparqlStore.Open()
@@ -861,6 +940,23 @@ class TestSparqlStore(unittest.TestCase):
         # inexistent guids
         self.assertRaises(errors.InstanceError, store.set, ent_type, {URI('http://example.com/me/entity#foobar')}, p_comment, {'xyz'})
 
+        # BinaryBlob values are base64 encoded
+        p_asset = store.schema.predicate(ns.bse.asset)
+        store.set(ent_type, ent_ids, p_asset, {bytes(range(128)), bytes(range(128, 256))})
+        blob1 = rdflib.Literal('AAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHh8gISIjJCUmJygpKissLS4vMDEyMzQ1Njc4OTo7PD0+P0BBQkNERUZHSElKS0xNTk9QUVJTVFVWV1hZWltcXV5fYGFiY2RlZmdoaWprbG1ub3BxcnN0dXZ3eHl6e3x9fn8=',
+            datatype=rdflib.URIRef(ns.bsfs.BinaryBlob))
+        blob2 = rdflib.Literal('gIGCg4SFhoeIiYqLjI2Oj5CRkpOUlZaXmJmam5ydnp+goaKjpKWmp6ipqqusra6vsLGys7S1tre4ubq7vL2+v8DBwsPExcbHyMnKy8zNzs/Q0dLT1NXW19jZ2tvc3d7f4OHi4+Tl5ufo6err7O3u7/Dx8vP09fb3+Pn6+/z9/v8=',
+            datatype=rdflib.URIRef(ns.bsfs.BinaryBlob))
+        self.assertTrue(set(store._graph).issuperset({
+            (rdflib.URIRef('http://example.com/me/entity#1234'), rdflib.URIRef(p_asset.uri), blob1),
+            (rdflib.URIRef('http://example.com/me/entity#1234'), rdflib.URIRef(p_asset.uri), blob2),
+            (rdflib.URIRef('http://example.com/me/entity#4321'), rdflib.URIRef(p_asset.uri), blob1),
+            (rdflib.URIRef('http://example.com/me/entity#4321'), rdflib.URIRef(p_asset.uri), blob2),
+            }))
+        # lit.value returns the original bytes value
+        self.assertSetEqual({lit.value for lit in store._graph.objects(None, rdflib.URIRef(p_asset.uri))},
+            {bytes(range(128)), bytes(range(128, 256))})
+
 
 ## main ##