GH-5221 fix bug where added statements from a SPARQL update were not notified and were also not added. This only happens when the exact statement was removed by the DELETE clause.

Author: hmottestad

core/repository/sail/src/main/java/org/eclipse/rdf4j/repository/sail/helpers/SailUpdateExecutor.java

@@ -447,8 +447,8 @@ protected void executeModify(Modify modify, UpdateContext uc, int maxExecutionTi
 					whereClause, uc, maxExecutionTime)) {
 				while (sourceBindings.hasNext()) {
 					BindingSet sourceBinding = sourceBindings.next();
-					deleteBoundTriples(sourceBinding, modify.getDeleteExpr(), uc);
 
+					deleteBoundTriples(sourceBinding, modify.getDeleteExpr(), uc);
 					insertBoundTriples(sourceBinding, modify.getInsertExpr(), uc);
 				}
 			}

core/sail/base/src/main/java/org/eclipse/rdf4j/sail/base/Changeset.java

@@ -29,6 +29,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import org.eclipse.rdf4j.common.annotation.Experimental;
 import org.eclipse.rdf4j.common.annotation.InternalUseOnly;
 import org.eclipse.rdf4j.common.transaction.IsolationLevels;
 import org.eclipse.rdf4j.model.IRI;
@@ -175,7 +176,8 @@ boolean hasApproved(Resource subj, IRI pred, Value obj, Resource[] contexts) {
 		}
 	}
 
-	boolean hasDeprecated(Resource subj, IRI pred, Value obj, Resource[] contexts) {
+	@Experimental
+	public boolean hasDeprecated(Resource subj, IRI pred, Value obj, Resource[] contexts) {
 		assert !closed;
 		if ((deprecated == null || deprecatedEmpty) && deprecatedContexts == null) {
 			return false;

core/sail/base/src/main/java/org/eclipse/rdf4j/sail/base/SailSourceConnection.java

@@ -763,8 +763,13 @@ private void add(Resource subj, IRI pred, Value obj, SailDataset dataset, SailSi
 			if (hasConnectionListeners()) {
 				if (!hasStatement(dataset, subj, pred, obj, NULL_CTX)) {
 					notifyStatementAdded(vf.createStatement(subj, pred, obj));
-					sink.approve(subj, pred, obj, null);
+				} else if (sink instanceof Changeset && ((Changeset) sink).hasDeprecated(subj, pred, obj, NULL_CTX)) {
+					notifyStatementAdded(vf.createStatement(subj, pred, obj));
 				}
+
+				// always approve the statement, even if it already exists
+				sink.approve(subj, pred, obj, null);
+
 			} else {
 				sink.approve(subj, pred, obj, null);
 			}
@@ -784,8 +789,11 @@ private void add(Resource subj, IRI pred, Value obj, SailDataset dataset, SailSi
 				if (hasConnectionListeners()) {
 					if (!hasStatement(dataset, subj, pred, obj, contextsToCheck)) {
 						notifyStatementAdded(vf.createStatement(subj, pred, obj, ctx));
-						sink.approve(subj, pred, obj, ctx);
+					} else if (sink instanceof Changeset
+							&& ((Changeset) sink).hasDeprecated(subj, pred, obj, contextsToCheck)) {
+						notifyStatementAdded(vf.createStatement(subj, pred, obj));
 					}
+					sink.approve(subj, pred, obj, ctx);
 				} else {
 					sink.approve(subj, pred, obj, ctx);
 				}
@@ -830,7 +838,6 @@ private boolean remove(Resource subj, IRI pred, Value obj, SailDataset dataset,
 			while (iter.hasNext()) {
 				Statement st = iter.next();
 				sink.deprecate(st);
-
 				statementsRemoved = true;
 				notifyStatementRemoved(st);
 			}

core/sail/extensible-store/src/main/java/org/eclipse/rdf4j/sail/extensiblestore/valuefactory/ExtensibleStatementImpl.java

@@ -14,6 +14,7 @@
 
 import org.eclipse.rdf4j.model.IRI;
 import org.eclipse.rdf4j.model.Resource;
+import org.eclipse.rdf4j.model.Statement;
 import org.eclipse.rdf4j.model.Value;
 import org.eclipse.rdf4j.model.impl.GenericStatement;
 
@@ -45,19 +46,17 @@ public boolean equals(Object o) {
 		if (this == o) {
 			return true;
 		}
-		if (!(o instanceof ExtensibleStatementImpl)) {
+		if (!(o instanceof Statement)) {
 			return false;
 		}
+		if (!(o instanceof ExtensibleStatement)) {
+			return super.equals(o);
+		}
 		if (!super.equals(o)) {
 			return false;
 		}
-		ExtensibleStatementImpl that = (ExtensibleStatementImpl) o;
-		return inferred == that.inferred;
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(super.hashCode(), inferred);
+		ExtensibleStatement that = (ExtensibleStatement) o;
+		return inferred == that.isInferred();
 	}
 
 }