Return-Path: X-Original-To: apmail-jena-commits-archive@www.apache.org Delivered-To: apmail-jena-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8730718E14 for ; Mon, 1 Feb 2016 12:54:40 +0000 (UTC) Received: (qmail 27937 invoked by uid 500); 1 Feb 2016 12:54:40 -0000 Delivered-To: apmail-jena-commits-archive@jena.apache.org Received: (qmail 27908 invoked by uid 500); 1 Feb 2016 12:54:40 -0000 Mailing-List: contact commits-help@jena.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jena.apache.org Delivered-To: mailing list commits@jena.apache.org Received: (qmail 27771 invoked by uid 99); 1 Feb 2016 12:54:40 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Feb 2016 12:54:40 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 0F645DFD7D; Mon, 1 Feb 2016 12:54:40 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: andy@apache.org To: commits@jena.apache.org Date: Mon, 01 Feb 2016 12:54:43 -0000 Message-Id: In-Reply-To: <9096e686d33c4954b259cc0857e7a4a8@git.apache.org> References: <9096e686d33c4954b259cc0857e7a4a8@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [5/6] jena git commit: Update the storage, not the USING projection. Update the storage, not the USING projection. Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/22ed57e7 Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/22ed57e7 Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/22ed57e7 Branch: refs/heads/master Commit: 22ed57e7b3dfcd9de4c167ad0e74c8437d919a04 Parents: 18c86e7 Author: Andy Seaborne Authored: Mon Feb 1 12:00:36 2016 +0000 Committer: Andy Seaborne Committed: Mon Feb 1 12:00:36 2016 +0000 ---------------------------------------------------------------------- .../jena/sparql/modify/UpdateEngineWorker.java | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/22ed57e7/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateEngineWorker.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateEngineWorker.java b/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateEngineWorker.java index 1f4de10..4394655 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateEngineWorker.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateEngineWorker.java @@ -278,7 +278,7 @@ public class UpdateEngineWorker implements UpdateVisitor return new Sink() { @Override public void send(Quad quad) { - addTodatasetGraph(datasetGraph, quad); + addToDatasetGraph(datasetGraph, quad); } @Override @@ -294,7 +294,7 @@ public class UpdateEngineWorker implements UpdateVisitor @Override public void visit(UpdateDataInsert update) { for ( Quad quad : update.getQuads() ) - addTodatasetGraph(datasetGraph, quad); + addToDatasetGraph(datasetGraph, quad); } @Override @@ -407,11 +407,11 @@ public class UpdateEngineWorker implements UpdateVisitor Iter.close(bindings); Iterator it = db.iterator(); - execDelete(dsg, update.getDeleteQuads(), withGraph, it); + execDelete(datasetGraph, update.getDeleteQuads(), withGraph, it); Iter.close(it); Iterator it2 = db.iterator(); - execInsert(dsg, update.getInsertQuads(), withGraph, it2); + execInsert(datasetGraph, update.getInsertQuads(), withGraph, it2); Iter.close(it2); } finally { @@ -423,7 +423,6 @@ public class UpdateEngineWorker implements UpdateVisitor protected DatasetGraph processUsing(UpdateModify update) { if ( update.getUsing().size() == 0 && update.getUsingNamed().size() == 0 ) return null; - return DynamicDatasets.dynamicDataset(update.getUsing(), update.getUsingNamed(), datasetGraph, false); } @@ -530,16 +529,16 @@ public class UpdateEngineWorker implements UpdateVisitor protected static void execInsert(DatasetGraph dsg, List onceQuads, List templateQuads, Node dftGraph, Iterator bindings) { if ( onceQuads != null && bindings.hasNext() ) { onceQuads = remapDefaultGraph(onceQuads, dftGraph) ; - onceQuads.forEach((q)->addTodatasetGraph(dsg, q)) ; + onceQuads.forEach((q)->addToDatasetGraph(dsg, q)) ; } Iterator it = template(templateQuads, dftGraph, bindings) ; if ( it == null ) return ; - it.forEachRemaining((q)->addTodatasetGraph(dsg, q)) ; + it.forEachRemaining((q)->addToDatasetGraph(dsg, q)) ; } // Catch all individual adds of quads - private static void addTodatasetGraph(DatasetGraph datasetGraph, Quad quad) { + private static void addToDatasetGraph(DatasetGraph datasetGraph, Quad quad) { // Check legal triple. if ( quad.isLegalAsData() ) datasetGraph.add(quad); @@ -549,6 +548,8 @@ public class UpdateEngineWorker implements UpdateVisitor // Catch all individual deletes of quads private static void deleteFromDatasetGraph(DatasetGraph datasetGraph, Quad quad) { + if ( datasetGraph instanceof DatasetGraphReadOnly ) + System.err.println("READ ONLY") ; datasetGraph.delete(quad); }