everything else

Author: hmottestad

compliance/sparql/src/test/java/org/eclipse/rdf4j/sail/lmdb/LmdbPARQL11UpdateComplianceTest.java

@@ -37,4 +37,9 @@ protected Repository newRepository() throws Exception {
 		return new DatasetRepository(
 				new SailRepository(new LmdbStore(temp, new LmdbStoreConfig("spoc"))));
 	}
+
+	@Override
+	protected boolean deleteDataDirAfterShutdown() {
+		return true;
+	}
 }

compliance/sparql/src/test/java/org/eclipse/rdf4j/sail/lmdb/LmdbSPARQL11QueryComplianceTest.java

@@ -36,4 +36,9 @@ protected Repository newRepository() throws Exception {
 				new SailRepository(new LmdbStore(temp, new LmdbStoreConfig("spoc"))));
 	}
 
+	@Override
+	protected boolean deleteDataDirAfterShutdown() {
+		return true;
+	}
+
 }

compliance/sparql/src/test/java/org/eclipse/rdf4j/sail/lmdb/LmdbSPARQLComplianceTest.java

@@ -30,4 +30,9 @@ public RepositoryImplConfig getConfig() {
 			}
 		});
 	}
+
+	@Override
+	protected boolean deleteDataDirAfterShutdown() {
+		return true;
+	}
 }

core/common/transaction/src/main/java/org/eclipse/rdf4j/common/transaction/DataImportMetrics.java

@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2026 Eclipse RDF4J contributors.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Distribution License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ *******************************************************************************/
+// Some portions generated by Codex
+package org.eclipse.rdf4j.common.transaction;
+
+/**
+ * Transaction setting that enables data import metrics for a single transaction.
+ */
+public enum DataImportMetrics implements TransactionSetting {
+	ENABLED
+}

core/model/src/main/java/org/eclipse/rdf4j/model/impl/AbstractMemoryOverflowModel.java

@@ -43,7 +43,8 @@
 import com.sun.management.GcInfo;
 
 @InternalUseOnly
-public abstract class AbstractMemoryOverflowModel<T extends AbstractModel> extends AbstractModel {
+public abstract class AbstractMemoryOverflowModel<T extends AbstractModel> extends AbstractModel
+		implements AutoCloseable {
 
 	private static final long serialVersionUID = 4119844228099208169L;
 
@@ -86,7 +87,7 @@ public abstract class AbstractMemoryOverflowModel<T extends AbstractModel> exten
 
 	static final Logger logger = LoggerFactory.getLogger(AbstractMemoryOverflowModel.class);
 
-	private volatile LinkedHashModel memory;
+	private volatile Model memory;
 
 	protected transient volatile T disk;
 
@@ -188,11 +189,12 @@ private static double mbFree() {
 	private volatile boolean closed;
 
 	public AbstractMemoryOverflowModel() {
-		memory = new LinkedHashModel();
+		memory = new DynamicModel(new LinkedHashModelFactory(), true);
 	}
 
 	public AbstractMemoryOverflowModel(Set<Namespace> namespaces) {
-		memory = new LinkedHashModel(namespaces, 0);
+		memory = new DynamicModel(new LinkedHashModelFactory(), true);
+		namespaces.forEach(memory::setNamespace);
 	}
 
 	@Override
@@ -225,6 +227,11 @@ public boolean contains(Resource subj, IRI pred, Value obj, Resource... contexts
 		return getDelegate().contains(subj, pred, obj, contexts);
 	}
 
+	@Override
+	public boolean isEmpty() {
+		return getDelegate().isEmpty();
+	}
+
 	@Override
 	public boolean add(Resource subj, IRI pred, Value obj, Resource... contexts) {
 		checkMemoryOverflow();
@@ -312,15 +319,55 @@ protected void removeFilteredTermIteration(Iterator<Statement> iter, Resource su
 	public synchronized void removeTermIteration(Iterator<Statement> iter, Resource subj, IRI pred, Value obj,
 			Resource... contexts) {
 		if (disk == null) {
-			memory.removeTermIteration(iter, subj, pred, obj, contexts);
+			if (memory instanceof AbstractModel) {
+				((AbstractModel) memory).removeTermIteration(iter, subj, pred, obj, contexts);
+			} else if (memory instanceof DynamicModel) {
+				((DynamicModel) memory).removeTermIteration(iter, subj, pred, obj, contexts);
+			} else {
+				iter.remove();
+				while (iter.hasNext()) {
+					Statement statement = iter.next();
+					if (matchesPattern(statement, subj, pred, obj, contexts)) {
+						iter.remove();
+					}
+				}
+			}
 		} else {
 			disk.removeTermIteration(iter, subj, pred, obj, contexts);
 		}
 	}
 
+	private static boolean matchesPattern(Statement statement, Resource subj, IRI pred, Value obj,
+			Resource... contexts) {
+		if (subj != null && !subj.equals(statement.getSubject())) {
+			return false;
+		}
+		if (pred != null && !pred.equals(statement.getPredicate())) {
+			return false;
+		}
+		if (obj != null && !obj.equals(statement.getObject())) {
+			return false;
+		}
+		if (contexts == null || contexts.length == 0) {
+			return true;
+		}
+		for (Resource context : contexts) {
+			boolean contextMatch = context == null
+					? statement.getContext() == null
+					: context.equals(statement.getContext());
+			if (contextMatch) {
+				return true;
+			}
+		}
+		return false;
+	}
+
 	private Model getDelegate() {
 		var memory = this.memory;
 		if (memory != null) {
+			if (memory instanceof DynamicModel) {
+				((DynamicModel) memory).maybeRegisterLargeStatementSetForReuse((DynamicModel) memory);
+			}
 			return memory;
 		} else {
 			var disk = this.disk;
@@ -418,7 +465,7 @@ private synchronized void overflowToDisk() {
 					return;
 				}
 
-				LinkedHashModel memory = this.memory;
+				Model memory = this.memory;
 				this.memory = null;
 				overflowToDiskInner(memory);
 
@@ -434,5 +481,44 @@ private synchronized void overflowToDisk() {
 
 	}
 
+	@Override
+	public void close() {
+		boolean wasClosed = false;
+		boolean interrupted = false;
+		try {
+			interrupted = Thread.interrupted();
+			lock.lockInterruptibly();
+			try {
+				if (closed) {
+					wasClosed = true;
+					return;
+				}
+				closed = true;
+				memory = null;
+				disk = null;
+			} finally {
+				lock.unlock();
+			}
+		} catch (InterruptedException e) {
+			Thread.currentThread().interrupt();
+			throw new RuntimeException(e);
+		} finally {
+			if (interrupted) {
+				Thread.currentThread().interrupt();
+			}
+
+			// even if we were interrupted we want to make sure we don't leave the model in an inconsistent state and
+			// that we free up any resources as soon as possible, so we null out the references to the memory and disk
+			// models and close the disk model if it was not already closed by another thread
+			memory = null;
+			disk = null;
+			if (!wasClosed) {
+				innerClose();
+			}
+		}
+	}
+
+	abstract protected void innerClose();
+
 	protected abstract void overflowToDiskInner(Model memory);
 }

core/model/src/main/java/org/eclipse/rdf4j/model/impl/AbstractModel.java

@@ -32,6 +32,7 @@ public abstract class AbstractModel extends AbstractSet<Statement> implements Mo
 
 	private static final long serialVersionUID = 4254119331281455614L;
 	public static final Resource[] NULL_CONTEXT = { null };
+	public static final Resource[] NO_CONTEXT = {};
 
 	@Override
 	public Model unmodifiable() {
@@ -45,7 +46,7 @@ public boolean add(Statement st) {
 
 	@Override
 	public boolean isEmpty() {
-		return !contains(null, null, null);
+		return !contains(null, null, null, NO_CONTEXT);
 	}
 
 	@Override