Fix issue with namespace rebinding by aucampia · Pull Request #1800 · RDFLib/rdflib

aucampia · 2022-04-09T17:43:35Z

Also add additional tests for namespace rebinding.

Note

Commits with @gjhiggins as author are taken from:

Also add additional tests for namespace rebinding.

aucampia · 2022-04-09T17:44:27Z

pre-commit.ci autofix

for more information, see https://pre-commit.ci

aucampia · 2022-04-09T17:45:20Z

@gjhiggins Good spotting on this - I think we need to fix it for other stores also though, I will add an additional test to check this against other stores and then add fixes for that.

ghost

looks good, thank you

ghost · 2022-04-09T18:51:51Z

@gjhiggins Good spotting on this - I think we need to fix it for other stores also though, I will add an additional test to check this against other stores and then add fixes for that.

Maybe save you some time, here's a patch for berkeleydb.py

diff --git a/rdflib/plugins/stores/berkeleydb.py b/rdflib/plugins/stores/berkeleydb.py
index 9ca4380b..857b950d 100644
--- a/rdflib/plugins/stores/berkeleydb.py
+++ b/rdflib/plugins/stores/berkeleydb.py
@@ -470,10 +470,17 @@ class BerkeleyDB(Store):
         prefix = prefix.encode("utf-8")
         namespace = namespace.encode("utf-8")
         bound_prefix = self.__prefix.get(namespace)
-        if override and bound_prefix:
-            self.__namespace.delete(bound_prefix)
-        self.__prefix[namespace] = prefix
-        self.__namespace[prefix] = namespace
+        bound_namespace = self.__namespace.get(prefix)
+        if override:
+            if bound_prefix:
+                self.__namespace.delete(bound_prefix)
+            if bound_namespace:
+                self.__prefix.delete(bound_namespace)
+            self.__prefix[namespace] = prefix
+            self.__namespace[prefix] = namespace
+        else:
+            self.__prefix[bound_namespace or namespace] = bound_prefix or prefix
+            self.__namespace[bound_prefix or prefix] = bound_namespace or namespace
 
     def namespace(self, prefix):
         prefix = prefix.encode("utf-8")

aucampia · 2022-04-09T21:03:04Z

@nicholascar @gjhiggins I'm going to throw caution to the wind with this and fix some things which I would have liked to keep to separate PRs in this PR, but we really should try to keep these things less entangled in future so we can get changes in quicker.

aucampia · 2022-04-09T21:21:06Z

There are 4 stores doing about the same thing (rdflib.plugins.store.{memory.SimpleMemory,memory.Memory,memory.BerkeleyDB,}), I think the best option is to move the code for Store.{bind,prefix,namespace,namespaces} to a separate class.

aucampia · 2022-04-09T22:04:49Z

Will look at this further tomorrow, won't work that well with memory store, but there is also many cases where strings are checked for turthyness instead of is not None, will try fix them also.

aucampia · 2022-04-09T22:14:29Z

Actually, scratch the last comments, I will fix further issues and expand tests once this is in master. But beware, there are still at least one store with this issue and then this should be checking is None instead of turthyness, and it should also use a proper null coalescing method, and I'm not entirely sure of all the consequences, but I will figure it out once this and #1686 is merged.

aucampia · 2022-04-09T22:47:41Z

rdflib/plugins/stores/berkeleydb.py

-        self.__namespace[prefix] = namespace
+        bound_namespace = self.__namespace.get(prefix)
+        if override:
+            if bound_prefix:


Suggested change

if bound_prefix:

if bound_prefix is not None:

aucampia · 2022-04-09T22:47:52Z

rdflib/plugins/stores/berkeleydb.py

+        if override:
+            if bound_prefix:
+                self.__namespace.delete(bound_prefix)
+            if bound_namespace:


Suggested change

if bound_namespace:

if bound_namespace is not None:

aucampia · 2022-04-09T22:48:21Z

rdflib/plugins/stores/berkeleydb.py

+            self.__prefix[namespace] = prefix
+            self.__namespace[prefix] = namespace
+        else:
+            self.__prefix[bound_namespace or namespace] = bound_prefix or prefix


This will not do the right thing if bound_namespace is ""

aucampia · 2022-04-09T22:48:30Z

rdflib/plugins/stores/berkeleydb.py

+            self.__namespace[prefix] = namespace
+        else:
+            self.__prefix[bound_namespace or namespace] = bound_prefix or prefix
+            self.__namespace[bound_prefix or prefix] = bound_namespace or namespace


This will not do the right thing if bound_prefix is ""

aucampia · 2022-04-09T22:48:48Z

rdflib/plugins/stores/memory.py

+            bound_namespace
+        )
+        if override:
+            if bound_prefix:


Suggested change

if bound_prefix:

if bound_prefix is not None:

aucampia · 2022-04-09T22:48:54Z

rdflib/plugins/stores/memory.py

+        if override:
+            if bound_prefix:
+                del self.__namespace[bound_prefix]
+            if bound_namespace:


Suggested change

if bound_namespace:

if bound_namespace is not None:

aucampia · 2022-04-09T22:49:17Z

rdflib/plugins/stores/memory.py

+            self.__prefix[namespace] = prefix
+            self.__namespace[prefix] = namespace
+        else:
+            self.__prefix[bound_namespace or namespace] = bound_prefix or prefix


This will not do the right thing if bound_namespace is ""

aucampia · 2022-04-09T22:49:26Z

rdflib/plugins/stores/memory.py

+            self.__namespace[prefix] = namespace
+        else:
+            self.__prefix[bound_namespace or namespace] = bound_prefix or prefix
+            self.__namespace[bound_prefix or prefix] = bound_namespace or namespace


This will not do the right thing if bound_prefix is ""

Should use null coalesing, something like this:

_AnyT = TypeVar("_AnyT") def _coalesce(*args: Optional[_AnyT]) -> Optional[_AnyT]: for arg in args: if arg is not None: return arg return None

aucampia · 2022-04-15T15:27:49Z

@gjhiggins I will redo this on master.

Fix issue with namespace rebinding

2c6f3f4

Also add additional tests for namespace rebinding.

[pre-commit.ci] auto fixes from pre-commit.com hooks

3738806

for more information, see https://pre-commit.ci

aucampia mentioned this pull request Apr 9, 2022

Bind prefixes choices #1686

Merged

aucampia requested review from a user and nicholascar April 9, 2022 17:50

ghost approved these changes Apr 9, 2022

View reviewed changes

here's a patch for berkleydb.py

32341bb

aucampia commented Apr 9, 2022

View reviewed changes

nicholascar deleted the branch RDFLib:default_prefixes April 15, 2022 14:39

nicholascar closed this Apr 15, 2022

This was referenced Apr 15, 2022

Issue with namespace rebinding #1826

Closed

fix: namespace rebinding in Memory, SimpleMemory and BerkelyDB stores. #1843

Merged

Conversation

aucampia commented Apr 9, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Note

Uh oh!

aucampia commented Apr 9, 2022

Uh oh!

aucampia commented Apr 9, 2022

Uh oh!

ghost left a comment

Choose a reason for hiding this comment

Uh oh!

ghost commented Apr 9, 2022 • edited by ghost Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

aucampia commented Apr 9, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

aucampia commented Apr 9, 2022

Uh oh!

aucampia commented Apr 9, 2022

Uh oh!

aucampia commented Apr 9, 2022

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

aucampia Apr 9, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

aucampia commented Apr 15, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

aucampia commented Apr 9, 2022 •

edited

Loading

ghost commented Apr 9, 2022 •

edited by ghost

Loading

aucampia commented Apr 9, 2022 •

edited

Loading

aucampia Apr 9, 2022 •

edited

Loading