svn commit: r1402118 - in /jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql: graph/GraphOps.java modify/UpdateEngineWorker.java

[an...@apache.org]

Author: andy
Date: Thu Oct 25 12:00:24 2012
New Revision: 1402118

URL: http://svn.apache.org/viewvc?rev=1402118&view=rev
Log:
Rewrite to not use graph bulk update handler.

Modified:
    jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphOps.java
    jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngineWorker.java

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphOps.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphOps.java?rev=1402118&r1=1402117&r2=1402118&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphOps.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphOps.java Thu Oct 25 12:00:24 2012
@@ -18,15 +18,18 @@
 
 package com.hp.hpl.jena.sparql.graph;
 
+import java.util.Iterator ;
 import java.util.List ;
 
 import org.openjena.atlas.iterator.Iter ;
 
 import com.hp.hpl.jena.graph.Graph ;
 import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.Triple ;
 import com.hp.hpl.jena.sparql.core.DatasetGraph ;
 import com.hp.hpl.jena.sparql.core.Quad ;
 
+// Combine with Jena GraphUtils.
 public class GraphOps
 {
     
@@ -59,4 +62,28 @@ public class GraphOps
         return new GraphUnionRead(dsg, x) ;
     }
 
+    public static void addAll(Graph g, Iterator<Triple> iter)
+    {
+        while(iter.hasNext())
+            g.add(iter.next()) ;
+        Iter.close(iter) ;
+    }
+
+    public static void addAll(Graph g, Iterable<Triple> iter)
+    {
+        addAll(g, iter.iterator()) ;
+    }
+
+    public static void deleteAll(Graph g, Iterator<Triple> iter)
+    {
+        while(iter.hasNext())
+            g.delete(iter.next()) ;
+        Iter.close(iter) ;
+    }
+
+    public static void deleteAll(Graph g, Iterable<Triple> iter)
+    {
+        deleteAll(g, iter.iterator()) ;
+    }
+
 }

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngineWorker.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngineWorker.java?rev=1402118&r1=1402117&r2=1402118&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngineWorker.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngineWorker.java Thu Oct 25 12:00:24 2012
@@ -28,7 +28,6 @@ import org.openjena.atlas.data.DataBag ;
 import org.openjena.atlas.data.ThresholdPolicy ;
 import org.openjena.atlas.data.ThresholdPolicyFactory ;
 import org.openjena.atlas.iterator.Iter ;
-import org.openjena.riot.RiotException ;
 import org.openjena.riot.SerializationFactoryFinder ;
 
 import com.hp.hpl.jena.graph.Graph ;
@@ -38,11 +37,15 @@ import com.hp.hpl.jena.query.Query ;
 import com.hp.hpl.jena.query.QueryExecutionFactory ;
 import com.hp.hpl.jena.rdf.model.Model ;
 import com.hp.hpl.jena.sparql.ARQInternalErrorException ;
-import com.hp.hpl.jena.sparql.core.* ;
+import com.hp.hpl.jena.sparql.core.DatasetGraph ;
+import com.hp.hpl.jena.sparql.core.DatasetGraphWrapper ;
+import com.hp.hpl.jena.sparql.core.DynamicDatasets ;
+import com.hp.hpl.jena.sparql.core.Quad ;
 import com.hp.hpl.jena.sparql.engine.Plan ;
 import com.hp.hpl.jena.sparql.engine.binding.Binding ;
 import com.hp.hpl.jena.sparql.engine.binding.BindingRoot ;
 import com.hp.hpl.jena.sparql.graph.GraphFactory ;
+import com.hp.hpl.jena.sparql.graph.GraphOps ;
 import com.hp.hpl.jena.sparql.graph.NodeTransform ;
 import com.hp.hpl.jena.sparql.graph.NodeTransformLib ;
 import com.hp.hpl.jena.sparql.modify.request.* ;
@@ -247,15 +250,9 @@ public class UpdateEngineWorker implemen
             Iterator<Triple> triples = gSrc.find(null, null, null) ;
             db.addAll(triples) ;
             Iter.close(triples) ;
-            
-            Iterator<Triple> it = db.iterator() ;
-            gDest.getBulkUpdateHandler().add(it) ;
-            Iter.close(it);
-        }
-        finally
-        {
-            db.close() ;
+            GraphOps.addAll(gDest, db.iterator()) ;
         }
+        finally { db.close() ; }
     }
 
     protected static void gsClear(GraphStore gStore, Target target, boolean isSilent)