Merge pull request #3573 from eclipse/GH-3572-concurreny-weak-object-…

…registry GH-3572 Concurrent WeakObjectRegistry
eclipse-rdf4j · Jan 11, 2022 · bf89717 · bf89717
2 parents 61e0551 + 066ba5a
commit bf89717
Show file tree

Hide file tree

Showing 9 changed files with 607 additions and 115 deletions.
diff --git a/core/rio/turtle/src/main/java/org/eclipse/rdf4j/rio/turtle/TurtleParser.java b/core/rio/turtle/src/main/java/org/eclipse/rdf4j/rio/turtle/TurtleParser.java
@@ -278,12 +278,11 @@ protected void parsePrefixID() throws IOException, RDFParseException, RDFHandler
 		skipWSC();
 
 		// Read the namespace URI
-		IRI namespace = parseURI();
+		String namespaceStr = parseURI().toString();
 
-		// Store and report this namespace mapping
 		String prefixStr = prefixID.toString();
-		String namespaceStr = namespace.toString();
 
+		// Store and report this namespace mapping
 		setNamespace(prefixStr, namespaceStr);
 
 		if (rdfHandler != null) {

diff --git a/core/sail/memory/src/main/java/org/eclipse/rdf4j/sail/memory/MemorySailStore.java b/core/sail/memory/src/main/java/org/eclipse/rdf4j/sail/memory/MemorySailStore.java
@@ -40,6 +40,7 @@
 import org.eclipse.rdf4j.sail.base.SailSink;
 import org.eclipse.rdf4j.sail.base.SailSource;
 import org.eclipse.rdf4j.sail.base.SailStore;
+import org.eclipse.rdf4j.sail.memory.model.MemBNode;
 import org.eclipse.rdf4j.sail.memory.model.MemIRI;
 import org.eclipse.rdf4j.sail.memory.model.MemResource;
 import org.eclipse.rdf4j.sail.memory.model.MemStatement;
@@ -49,6 +50,7 @@
 import org.eclipse.rdf4j.sail.memory.model.MemTriple;
 import org.eclipse.rdf4j.sail.memory.model.MemValue;
 import org.eclipse.rdf4j.sail.memory.model.MemValueFactory;
+import org.eclipse.rdf4j.sail.memory.model.WeakObjectRegistry;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -782,20 +784,27 @@ public CloseableIteration<? extends Resource, SailException> getContextIDs() thr
 
 			Lock stLock = openStatementsReadLock();
 			try {
-				synchronized (valueFactory) {
-					int snapshot = getCurrentSnapshot();
-					for (MemResource memResource : valueFactory.getMemURIs()) {
+				int snapshot = getCurrentSnapshot();
+				try (WeakObjectRegistry.AutoCloseableIterator<MemIRI> memIRIsIterator = valueFactory
+						.getMemIRIsIterator()) {
+					while (memIRIsIterator.hasNext()) {
+						MemResource memResource = memIRIsIterator.next();
 						if (isContextResource(memResource, snapshot)) {
 							contextIDs.add(memResource);
 						}
 					}
+				}
 
-					for (MemResource memResource : valueFactory.getMemBNodes()) {
+				try (WeakObjectRegistry.AutoCloseableIterator<MemBNode> memBNodesIterator = valueFactory
+						.getMemBNodesIterator()) {
+					while (memBNodesIterator.hasNext()) {
+						MemResource memResource = memBNodesIterator.next();
 						if (isContextResource(memResource, snapshot)) {
 							contextIDs.add(memResource);
 						}
 					}
 				}
+
 			} finally {
 				stLock.release();
 			}