Author: sallen
Date: Wed Feb 6 00:05:53 2013
New Revision: 1442804
URL: http://svn.apache.org/viewvc?rev=1442804&view=rev
Log:
Removed initial binding support for SPARQL Update executions
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngineBase.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngineFactory.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngineMain.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngineNonStreaming.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngineWorker.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateProcessRemote.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateProcessRemoteForm.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateProcessorBase.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateProcessorStreamingBase.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/update/UpdateAction.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/update/UpdateExecutionFactory.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/update/UpdateProcessor.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/update/UpdateProcessorStreaming.java
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/AbstractTestUpdateGraph.java
jena/trunk/jena-sdb/src/main/java/com/hp/hpl/jena/sdb/modify/UpdateEngineSDB.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/modify/UpdateEngineTDB.java
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngineBase.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngineBase.java?rev=1442804&r1=1442803&r2=1442804&view=diff
==============================================================================
---
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngineBase.java
(original)
+++
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngineBase.java
Wed Feb 6 00:05:53 2013
@@ -18,13 +18,9 @@
package com.hp.hpl.jena.sparql.modify;
-import org.apache.jena.atlas.logging.Log ;
-
import com.hp.hpl.jena.query.ARQ ;
import com.hp.hpl.jena.sparql.ARQConstants ;
import com.hp.hpl.jena.sparql.core.DatasetGraph ;
-import com.hp.hpl.jena.sparql.engine.binding.Binding ;
-import com.hp.hpl.jena.sparql.engine.binding.BindingRoot ;
import com.hp.hpl.jena.sparql.util.Context ;
import com.hp.hpl.jena.sparql.util.NodeFactory ;
import com.hp.hpl.jena.update.GraphStore ;
@@ -33,21 +29,12 @@ public abstract class UpdateEngineBase i
{
protected final GraphStore graphStore ;
protected final Context context ;
- protected final Binding startBinding ;
public UpdateEngineBase(GraphStore graphStore,
- Binding input,
Context context)
{
this.graphStore = graphStore ;
this.context = setupContext(context, graphStore) ;
-
- if ( input == null )
- {
- Log.warn(this, "Null initial input") ;
- input = BindingRoot.create() ;
- }
- this.startBinding = input ;
}
// Put any
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngineFactory.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngineFactory.java?rev=1442804&r1=1442803&r2=1442804&view=diff
==============================================================================
---
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngineFactory.java
(original)
+++
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngineFactory.java
Wed Feb 6 00:05:53 2013
@@ -18,7 +18,6 @@
package com.hp.hpl.jena.sparql.modify;
-import com.hp.hpl.jena.sparql.engine.binding.Binding ;
import com.hp.hpl.jena.sparql.util.Context ;
import com.hp.hpl.jena.update.GraphStore ;
@@ -31,5 +30,5 @@ public interface UpdateEngineFactory
public boolean accept(GraphStore graphStore, Context context) ;
/** Create the update engine - having returned true to accept, should not
fail */
- public UpdateEngine create(GraphStore graphStore, Binding inputBinding,
Context context);
+ public UpdateEngine create(GraphStore graphStore, Context context);
}
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngineMain.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngineMain.java?rev=1442804&r1=1442803&r2=1442804&view=diff
==============================================================================
---
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngineMain.java
(original)
+++
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngineMain.java
Wed Feb 6 00:05:53 2013
@@ -18,7 +18,6 @@
package com.hp.hpl.jena.sparql.modify;
-import com.hp.hpl.jena.sparql.engine.binding.Binding ;
import com.hp.hpl.jena.sparql.modify.request.UpdateVisitor ;
import com.hp.hpl.jena.sparql.util.Context ;
import com.hp.hpl.jena.update.GraphStore ;
@@ -34,12 +33,11 @@ public class UpdateEngineMain extends Up
/**
* Creates a new Update Engine
* @param graphStore Graph Store the updates operate over
- * @param initialBinding Initial Bindings
* @param context Execution Context
*/
- public UpdateEngineMain(GraphStore graphStore, Binding initialBinding,
Context context)
+ public UpdateEngineMain(GraphStore graphStore, Context context)
{
- super(graphStore, initialBinding, context) ;
+ super(graphStore, context) ;
}
@Override
@@ -68,7 +66,7 @@ public class UpdateEngineMain extends Up
* @return The update visitor to be used to apply the updates
*/
protected UpdateVisitor prepareWorker() {
- return new UpdateEngineWorker(graphStore, startBinding, context) ;
+ return new UpdateEngineWorker(graphStore, context) ;
}
private static UpdateEngineFactory factory = new UpdateEngineFactory()
@@ -80,9 +78,9 @@ public class UpdateEngineMain extends Up
}
@Override
- public UpdateEngine create(GraphStore graphStore, Binding
initialBinding, Context context)
+ public UpdateEngine create(GraphStore graphStore, Context context)
{
- return new UpdateEngineMain(graphStore, initialBinding, context);
+ return new UpdateEngineMain(graphStore, context);
}
} ;
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngineNonStreaming.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngineNonStreaming.java?rev=1442804&r1=1442803&r2=1442804&view=diff
==============================================================================
---
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngineNonStreaming.java
(original)
+++
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngineNonStreaming.java
Wed Feb 6 00:05:53 2013
@@ -18,7 +18,6 @@
package com.hp.hpl.jena.sparql.modify;
-import com.hp.hpl.jena.sparql.engine.binding.Binding ;
import com.hp.hpl.jena.sparql.modify.request.UpdateVisitor ;
import com.hp.hpl.jena.sparql.util.Context ;
import com.hp.hpl.jena.update.GraphStore ;
@@ -36,12 +35,11 @@ public class UpdateEngineNonStreaming ex
/**
* Creates a new Update Engine
* @param graphStore Graph Store the updates operate over
- * @param initialBinding Initial Bindings
* @param context Execution Context
*/
- public UpdateEngineNonStreaming(GraphStore graphStore, Binding
initialBinding, Context context)
+ public UpdateEngineNonStreaming(GraphStore graphStore, Context context)
{
- super(graphStore, initialBinding, context) ;
+ super(graphStore, context) ;
request = new UpdateRequest();
}
@@ -95,7 +93,7 @@ public class UpdateEngineNonStreaming ex
* @return The update visitor to be used to apply the updates
*/
protected UpdateVisitor prepareWorker() {
- return new UpdateEngineWorker(graphStore, startBinding, context) ;
+ return new UpdateEngineWorker(graphStore, context) ;
}
private static UpdateEngineFactory factory = new UpdateEngineFactory()
@@ -107,9 +105,9 @@ public class UpdateEngineNonStreaming ex
}
@Override
- public UpdateEngine create(GraphStore graphStore, Binding
initialBinding, Context context)
+ public UpdateEngine create(GraphStore graphStore, Context context)
{
- return new UpdateEngineNonStreaming(graphStore, initialBinding,
context);
+ return new UpdateEngineNonStreaming(graphStore, context);
}
} ;
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=1442804&r1=1442803&r2=1442804&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
Wed Feb 6 00:05:53 2013
@@ -79,14 +79,12 @@ import com.hp.hpl.jena.util.FileManager
public class UpdateEngineWorker implements UpdateVisitor
{
protected final GraphStore graphStore ;
- protected final Binding initialBinding ;
protected final boolean alwaysSilent = true ;
protected final Context context ;
- public UpdateEngineWorker(GraphStore graphStore, Binding initialBinding,
Context context)
+ public UpdateEngineWorker(GraphStore graphStore, Context context)
{
this.graphStore = graphStore ;
- this.initialBinding = initialBinding ;
this.context = context ;
}
@@ -400,7 +398,7 @@ public class UpdateEngineWorker implemen
DataBag<Binding> db = BagFactory.newDefaultBag(policy,
SerializationFactoryFinder.bindingSerializationFactory()) ;
try
{
- Iterator<Binding> bindings = evalBindings(query, dsg,
initialBinding, context) ;
+ Iterator<Binding> bindings = evalBindings(query, dsg, context) ;
if ( false )
{
@@ -591,11 +589,11 @@ public class UpdateEngineWorker implemen
}
}
- return evalBindings(query, dsg, initialBinding, context) ;
+ return evalBindings(query, dsg, context) ;
}
- protected static Iterator<Binding> evalBindings(Query query, DatasetGraph
dsg, Binding initialBinding, Context context)
+ protected static Iterator<Binding> evalBindings(Query query, DatasetGraph
dsg, Context context)
{
// SET UP CONTEXT
// The UpdateProcessorBase already copied the context and made it safe
... but that's going to happen again :-(
@@ -604,12 +602,12 @@ public class UpdateEngineWorker implemen
if ( query != null )
{
- Plan plan = QueryExecutionFactory.createPlan(query, dsg,
initialBinding, context) ;
+ Plan plan = QueryExecutionFactory.createPlan(query, dsg, null,
context) ;
toReturn = plan.iterator();
}
else
{
- toReturn = Iter.singleton((initialBinding != null) ?
initialBinding : BindingRoot.create()) ;
+ toReturn = Iter.singleton(BindingRoot.create()) ;
}
return toReturn ;
}
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateProcessRemote.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateProcessRemote.java?rev=1442804&r1=1442803&r2=1442804&view=diff
==============================================================================
---
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateProcessRemote.java
(original)
+++
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateProcessRemote.java
Wed Feb 6 00:05:53 2013
@@ -18,14 +18,13 @@
package com.hp.hpl.jena.sparql.modify;
-import org.apache.http.protocol.HttpContext;
+import org.apache.http.protocol.HttpContext ;
import org.apache.jena.riot.WebContent ;
import org.apache.jena.riot.web.HttpOp ;
-import com.hp.hpl.jena.query.QuerySolution ;
import com.hp.hpl.jena.sparql.ARQException ;
import com.hp.hpl.jena.sparql.util.Context ;
-import com.hp.hpl.jena.sparql.util.Symbol;
+import com.hp.hpl.jena.sparql.util.Symbol ;
import com.hp.hpl.jena.update.GraphStore ;
import com.hp.hpl.jena.update.UpdateProcessor ;
import com.hp.hpl.jena.update.UpdateRequest ;
@@ -49,12 +48,6 @@ public class UpdateProcessRemote impleme
}
@Override
- public void setInitialBinding(QuerySolution binding)
- {
- throw new ARQException("Initial bindings for a remote update execution
request not supported") ;
- }
-
- @Override
public GraphStore getGraphStore()
{
return null ;
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateProcessRemoteForm.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateProcessRemoteForm.java?rev=1442804&r1=1442803&r2=1442804&view=diff
==============================================================================
---
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateProcessRemoteForm.java
(original)
+++
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateProcessRemoteForm.java
Wed Feb 6 00:05:53 2013
@@ -23,16 +23,15 @@ import java.util.HashMap ;
import java.util.List ;
import java.util.Map ;
-import org.apache.http.protocol.HttpContext;
+import org.apache.http.protocol.HttpContext ;
import org.apache.jena.atlas.lib.Pair ;
import org.apache.jena.riot.web.HttpOp ;
import org.apache.jena.riot.web.HttpResponseHandler ;
import org.apache.jena.riot.web.HttpResponseLib ;
-import com.hp.hpl.jena.query.QuerySolution ;
import com.hp.hpl.jena.sparql.ARQException ;
import com.hp.hpl.jena.sparql.util.Context ;
-import com.hp.hpl.jena.sparql.util.Symbol;
+import com.hp.hpl.jena.sparql.util.Symbol ;
import com.hp.hpl.jena.update.GraphStore ;
import com.hp.hpl.jena.update.UpdateProcessor ;
import com.hp.hpl.jena.update.UpdateRequest ;
@@ -57,12 +56,6 @@ public class UpdateProcessRemoteForm imp
}
@Override
- public void setInitialBinding(QuerySolution binding)
- {
- throw new ARQException("Initial bindings for a remote update execution
request not supported") ;
- }
-
- @Override
public GraphStore getGraphStore()
{
return null ;
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateProcessorBase.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateProcessorBase.java?rev=1442804&r1=1442803&r2=1442804&view=diff
==============================================================================
---
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateProcessorBase.java
(original)
+++
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateProcessorBase.java
Wed Feb 6 00:05:53 2013
@@ -20,10 +20,6 @@ package com.hp.hpl.jena.sparql.modify;
import org.apache.jena.atlas.iterator.Iter ;
-import com.hp.hpl.jena.query.QuerySolution ;
-import com.hp.hpl.jena.sparql.engine.binding.Binding ;
-import com.hp.hpl.jena.sparql.engine.binding.BindingFactory ;
-import com.hp.hpl.jena.sparql.engine.binding.BindingUtils ;
import com.hp.hpl.jena.sparql.util.Context ;
import com.hp.hpl.jena.update.GraphStore ;
import com.hp.hpl.jena.update.UpdateProcessor ;
@@ -34,7 +30,6 @@ import com.hp.hpl.jena.update.UpdateRequ
*/
public class UpdateProcessorBase implements UpdateProcessor
{
- protected Binding initialBinding = BindingFactory.root() ;
protected final UpdateRequest request ;
protected final GraphStore graphStore ;
protected final UpdateEngineFactory factory ;
@@ -54,7 +49,7 @@ public class UpdateProcessorBase impleme
@Override
public void execute()
{
- UpdateEngine uProc = factory.create(graphStore, initialBinding,
context);
+ UpdateEngine uProc = factory.create(graphStore, context);
uProc.startRequest();
try
{
@@ -74,17 +69,6 @@ public class UpdateProcessorBase impleme
}
@Override
- public void setInitialBinding(QuerySolution binding)
- {
- setInitialBinding(BindingUtils.asBinding(binding)) ;
- }
-
- public void setInitialBinding(Binding binding)
- {
- initialBinding = binding ;
- }
-
- @Override
public Context getContext()
{
return context ;
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateProcessorStreamingBase.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateProcessorStreamingBase.java?rev=1442804&r1=1442803&r2=1442804&view=diff
==============================================================================
---
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateProcessorStreamingBase.java
(original)
+++
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateProcessorStreamingBase.java
Wed Feb 6 00:05:53 2013
@@ -18,10 +18,6 @@
package com.hp.hpl.jena.sparql.modify;
-import com.hp.hpl.jena.query.QuerySolution ;
-import com.hp.hpl.jena.sparql.engine.binding.Binding ;
-import com.hp.hpl.jena.sparql.engine.binding.BindingFactory ;
-import com.hp.hpl.jena.sparql.engine.binding.BindingUtils ;
import com.hp.hpl.jena.sparql.util.Context ;
import com.hp.hpl.jena.update.GraphStore ;
import com.hp.hpl.jena.update.UpdateProcessorStreaming ;
@@ -31,7 +27,6 @@ import com.hp.hpl.jena.update.UpdateProc
*/
public class UpdateProcessorStreamingBase implements UpdateProcessorStreaming
{
- protected Binding initialBinding = BindingFactory.root() ;
protected final GraphStore graphStore ;
protected final Context context ;
@@ -42,7 +37,7 @@ public class UpdateProcessorStreamingBas
this.graphStore = graphStore ;
this.context = Context.setupContext(context, graphStore) ;
- proc = factory.create(graphStore, initialBinding, context) ;
+ proc = factory.create(graphStore, context) ;
}
@Override
@@ -70,17 +65,6 @@ public class UpdateProcessorStreamingBas
}
@Override
- public void setInitialBinding(QuerySolution binding)
- {
- setInitialBinding(BindingUtils.asBinding(binding)) ;
- }
-
- public void setInitialBinding(Binding binding)
- {
- initialBinding = binding ;
- }
-
- @Override
public Context getContext()
{
return context ;
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/update/UpdateAction.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/update/UpdateAction.java?rev=1442804&r1=1442803&r2=1442804&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/update/UpdateAction.java
(original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/update/UpdateAction.java
Wed Feb 6 00:05:53 2013
@@ -24,13 +24,10 @@ import org.apache.jena.atlas.io.IO ;
import com.hp.hpl.jena.graph.Graph ;
import com.hp.hpl.jena.query.Dataset ;
-import com.hp.hpl.jena.query.QuerySolution ;
import com.hp.hpl.jena.query.Syntax ;
import com.hp.hpl.jena.rdf.model.Model ;
import com.hp.hpl.jena.sparql.ARQException ;
import com.hp.hpl.jena.sparql.core.DatasetGraph ;
-import com.hp.hpl.jena.sparql.engine.binding.Binding ;
-import com.hp.hpl.jena.sparql.engine.binding.BindingUtils ;
import com.hp.hpl.jena.sparql.lang.UpdateParser ;
import com.hp.hpl.jena.sparql.modify.UpdateSink ;
import com.hp.hpl.jena.sparql.modify.UsingList ;
@@ -49,8 +46,8 @@ public class UpdateAction
* @param model
*/
public static void readExecute(String filename, Model model)
- {
- readExecute(filename, model, null) ;
+ {
+ readExecute(filename, GraphStoreFactory.create(model)) ;
}
/** Read a file containing SPARQL Update operations, and execute the
operations.
@@ -59,7 +56,7 @@ public class UpdateAction
*/
public static void readExecute(String filename, Dataset dataset)
{
- readExecute(filename, dataset, null) ;
+ readExecute(filename, GraphStoreFactory.create(dataset)) ;
}
/** Read a file containing SPARQL Update operations, and execute the
operations.
@@ -68,7 +65,7 @@ public class UpdateAction
*/
public static void readExecute(String filename, DatasetGraph dataset)
{
- readExecute(filename, dataset, null) ;
+ readExecute(filename, GraphStoreFactory.create(dataset)) ;
}
/** Read a file containing SPARQL Update operations, and execute the
operations.
@@ -77,7 +74,7 @@ public class UpdateAction
*/
public static void readExecute(String filename, Graph graph)
{
- readExecute(filename, GraphStoreFactory.create(graph), null) ;
+ readExecute(filename, GraphStoreFactory.create(graph)) ;
}
/** Read a file containing SPARQL Update operations, and execute the
operations.
@@ -86,69 +83,18 @@ public class UpdateAction
*/
public static void readExecute(String filename, GraphStore graphStore)
{
- readExecute(filename, graphStore, null) ;
- }
-
-
- /** Read a file containing SPARQL Update operations, and execute the
operations.
- * @param filename
- * @param model
- * @param initialBinding Presets for variables.
- */
- public static void readExecute(String filename, Model model, QuerySolution
initialBinding)
- {
- readExecute(filename, GraphStoreFactory.create(model),
BindingUtils.asBinding(initialBinding)) ;
- }
-
- /** Read a file containing SPARQL Update operations, and execute the
operations.
- * @param filename
- * @param dataset
- * @param initialBinding Presets for variables.
- */
- public static void readExecute(String filename, Dataset dataset,
QuerySolution initialBinding)
- {
- readExecute(filename, GraphStoreFactory.create(dataset),
BindingUtils.asBinding(initialBinding)) ;
- }
-
- /** Read a file containing SPARQL Update operations, and execute the
operations.
- * @param filename
- * @param dataset
- * @param initialBinding Presets for variables.
- */
- public static void readExecute(String filename, DatasetGraph dataset,
Binding initialBinding)
- {
- readExecute(filename, GraphStoreFactory.create(dataset),
initialBinding) ;
- }
-
-
- /** Read a file containing SPARQL Update operations, and execute the
operations.
- * @param filename
- * @param graph
- * @param binding Presets for variables.
- */
- public static void readExecute(String filename, Graph graph, Binding
binding)
- {
- readExecute(filename, GraphStoreFactory.create(graph), binding) ;
- }
-
- /** Read a file containing SPARQL Update operations, and execute the
operations.
- * @param filename
- * @param graphStore
- * @param binding Presets for variables.
- */
- public static void readExecute(String filename, GraphStore graphStore,
Binding binding)
- {
UpdateRequest req = UpdateFactory.read(filename) ;
- execute(req, graphStore, binding) ;
+ execute(req, graphStore) ;
}
+
/** Parse a string containing SPARQL Update operations, and execute the
operations.
* @param updateString
* @param model
*/
public static void parseExecute(String updateString, Model model)
- {
- parseExecute(updateString, model, null) ;
+ {
+ parseExecute(updateString, GraphStoreFactory.create(model)) ;
}
/** Parse a string containing SPARQL Update operations, and execute the
operations.
@@ -157,7 +103,7 @@ public class UpdateAction
*/
public static void parseExecute(String updateString, Dataset dataset)
{
- parseExecute(updateString, dataset, null) ;
+ parseExecute(updateString, GraphStoreFactory.create(dataset)) ;
}
/** Parse a string containing SPARQL Update operations, and execute the
operations.
@@ -166,16 +112,17 @@ public class UpdateAction
*/
public static void parseExecute(String updateString, DatasetGraph dataset)
{
- parseExecute(updateString, dataset, null) ;
+ parseExecute(updateString, GraphStoreFactory.create(dataset)) ;
}
+
/** Parse a string containing SPARQL Update operations, and execute the
operations.
* @param updateString
* @param graph
*/
public static void parseExecute(String updateString, Graph graph)
{
- parseExecute(updateString, GraphStoreFactory.create(graph), null) ;
+ parseExecute(updateString, GraphStoreFactory.create(graph)) ;
}
/** Parse a string containing SPARQL Update operations, and execute the
operations.
@@ -184,70 +131,18 @@ public class UpdateAction
*/
public static void parseExecute(String updateString, GraphStore graphStore)
{
- parseExecute(updateString, graphStore, null) ;
- }
-
- /** Parse a string containing SPARQL Update operations, and execute the
operations.
- * @param updateString
- * @param model
- * @param initialBinding Presets for variables.
- */
- public static void parseExecute(String updateString, Model model,
QuerySolution initialBinding)
- {
- parseExecute(updateString, GraphStoreFactory.create(model),
BindingUtils.asBinding(initialBinding)) ;
- }
-
- /** Parse a string containing SPARQL Update operations, and execute the
operations.
- * @param updateString
- * @param dataset
- * @param initialBinding Presets for variables.
- */
- public static void parseExecute(String updateString, Dataset dataset,
QuerySolution initialBinding)
- {
- parseExecute(updateString, GraphStoreFactory.create(dataset),
BindingUtils.asBinding(initialBinding)) ;
- }
-
- /** Parse a string containing SPARQL Update operations, and execute the
operations.
- * @param updateString
- * @param dataset
- * @param initialBinding Presets for variables.
- */
- public static void parseExecute(String updateString, DatasetGraph dataset,
Binding initialBinding)
- {
- parseExecute(updateString, GraphStoreFactory.create(dataset),
initialBinding) ;
- }
-
-
- /** Parse a string containing SPARQL Update operations, and execute the
operations.
- * @param updateString
- * @param graph
- * @param binding Presets for variables.
- */
- public static void parseExecute(String updateString, Graph graph, Binding
binding)
- {
- parseExecute(updateString, GraphStoreFactory.create(graph), binding) ;
- }
-
- /** Parse a string containing SPARQL Update operations, and execute the
operations.
- * @param updateString
- * @param graphStore
- * @param binding Presets for variables.
- */
- public static void parseExecute(String updateString, GraphStore
graphStore, Binding binding)
- {
UpdateRequest req = UpdateFactory.create(updateString) ;
- execute(req, graphStore, binding) ;
+ execute(req, graphStore) ;
}
+
/** Execute SPARQL Update operations.
- * Warning - changes on named graphs not supported by this operation.
- * @see #execute(UpdateRequest, Dataset)
* @param request
* @param model
*/
public static void execute(UpdateRequest request, Model model)
- {
- execute(request, model, null) ;
+ {
+ execute(request, GraphStoreFactory.create(model)) ;
}
/** Execute SPARQL Update operations.
@@ -256,7 +151,7 @@ public class UpdateAction
*/
public static void execute(UpdateRequest request, Dataset dataset)
{
- execute(request, dataset, null) ;
+ execute(request, GraphStoreFactory.create(dataset)) ;
}
/** Execute SPARQL Update operations.
@@ -265,18 +160,16 @@ public class UpdateAction
*/
public static void execute(UpdateRequest request, DatasetGraph dataset)
{
- execute(request, dataset, null) ;
+ execute(request, GraphStoreFactory.create(dataset)) ;
}
/** Execute SPARQL Update operations.
- * Warning - changes on named graphs not supported by this operation.
- * @see #execute(UpdateRequest, DatasetGraph)
* @param request
* @param graph
*/
public static void execute(UpdateRequest request, Graph graph)
{
- execute(request, GraphStoreFactory.create(graph), null) ;
+ execute(request, GraphStoreFactory.create(graph)) ;
}
/** Execute SPARQL Update operations.
@@ -285,75 +178,26 @@ public class UpdateAction
*/
public static void execute(UpdateRequest request, GraphStore graphStore)
{
- execute(request, graphStore, null) ;
- }
-
- /** Execute SPARQL Update operations.
- * @param request
- * @param model
- * @param initialBinding Presets for variables.
- */
- public static void execute(UpdateRequest request, Model model,
QuerySolution initialBinding)
- {
- execute(request, GraphStoreFactory.create(model),
BindingUtils.asBinding(initialBinding)) ;
- }
-
- /** Execute SPARQL Update operations.
- * @param request
- * @param dataset
- * @param initialBinding Presets for variables.
- */
- public static void execute(UpdateRequest request, Dataset dataset,
QuerySolution initialBinding)
- {
- execute(request, GraphStoreFactory.create(dataset),
BindingUtils.asBinding(initialBinding)) ;
- }
-
- /** Execute SPARQL Update operations.
- * @param request
- * @param dataset
- * @param initialBinding Presets for variables.
- */
- public static void execute(UpdateRequest request, DatasetGraph dataset,
Binding initialBinding)
- {
- execute(request, GraphStoreFactory.create(dataset), initialBinding) ;
- }
-
- /** Execute SPARQL Update operations.
- * @param request
- * @param graph
- * @param binding Presets for variables.
- */
- public static void execute(UpdateRequest request, Graph graph, Binding
binding)
- {
- execute(request, GraphStoreFactory.create(graph), binding) ;
- }
-
- /** Execute SPARQL Update operations.
- * @param request
- * @param graphStore
- * @param binding Presets for variables.
- */
- public static void execute(UpdateRequest request, GraphStore graphStore,
Binding binding)
- {
- execute$(request, graphStore, binding) ;
+ execute$(request, graphStore) ;
}
// All non-streaming updates come through here.
- private static void execute$(UpdateRequest request, GraphStore graphStore,
Binding binding)
+ private static void execute$(UpdateRequest request, GraphStore graphStore)
{
- UpdateProcessor uProc = UpdateExecutionFactory.create(request,
graphStore, binding);
+ UpdateProcessor uProc = UpdateExecutionFactory.create(request,
graphStore);
if (uProc == null)
throw new ARQException("No suitable update procesors are
registered/able to execute your updates");
uProc.execute();
}
+
/** Execute a single SPARQL Update operation.
* @param update
* @param model
*/
public static void execute(Update update, Model model)
- {
- execute(update, model, null) ;
+ {
+ execute(update, GraphStoreFactory.create(model)) ;
}
/** Execute a single SPARQL Update operation.
@@ -362,7 +206,7 @@ public class UpdateAction
*/
public static void execute(Update update, Dataset dataset)
{
- execute(update, dataset, null) ;
+ execute(update, GraphStoreFactory.create(dataset)) ;
}
/** Execute a single SPARQL Update operation.
@@ -371,7 +215,7 @@ public class UpdateAction
*/
public static void execute(Update update, DatasetGraph dataset)
{
- execute(update, dataset, null) ;
+ execute(update, GraphStoreFactory.create(dataset)) ;
}
/** Execute a single SPARQL Update operation.
@@ -380,7 +224,7 @@ public class UpdateAction
*/
public static void execute(Update update, Graph graph)
{
- execute(update, GraphStoreFactory.create(graph), null) ;
+ execute(update, GraphStoreFactory.create(graph)) ;
}
/** Execute a single SPARQL Update operation.
@@ -389,64 +233,14 @@ public class UpdateAction
*/
public static void execute(Update update, GraphStore graphStore)
{
- execute(update, graphStore, null) ;
- }
-
- /** Execute a single SPARQL Update operation.
- * @param update
- * @param model
- * @param initialBinding Presets for variables.
- */
- public static void execute(Update update, Model model, QuerySolution
initialBinding)
- {
- execute(update, GraphStoreFactory.create(model),
BindingUtils.asBinding(initialBinding)) ;
- }
-
- /** Execute a single SPARQL Update operation.
- * @param update
- * @param dataset
- * @param initialBinding Presets for variables.
- */
- public static void execute(Update update, Dataset dataset, QuerySolution
initialBinding)
- {
- execute(update, GraphStoreFactory.create(dataset),
BindingUtils.asBinding(initialBinding)) ;
- }
-
- /** Execute a single SPARQL Update operation.
- * @param update
- * @param dataset
- * @param initialBinding Presets for variables.
- */
- public static void execute(Update update, DatasetGraph dataset, Binding
initialBinding)
- {
- execute(update, GraphStoreFactory.create(dataset), initialBinding) ;
- }
-
- /** Execute a single SPARQL Update operation.
- * @param update
- * @param graph
- * @param binding Presets for variables.
- */
- public static void execute(Update update, Graph graph, Binding binding)
- {
- execute(update, GraphStoreFactory.create(graph), binding) ;
- }
-
- /** Execute a single SPARQL Update operation.
- * @param update
- * @param graphStore
- * @param binding Presets for variables.
- */
- public static void execute(Update update, GraphStore graphStore, Binding
binding)
- {
- execute$(update, graphStore, binding) ;
+ execute$(update, graphStore) ;
}
- private static void execute$(Update update, GraphStore graphStore, Binding
binding)
+ private static void execute$(Update update, GraphStore graphStore)
{
UpdateRequest request = new UpdateRequest() ;
request.add(update) ;
- execute$(request, graphStore, binding) ;
+ execute$(request, graphStore) ;
}
@@ -477,7 +271,7 @@ public class UpdateAction
if ( in == null )
throw new UpdateException("File could not be opened:
"+fileName) ;
}
- parseExecute(usingList, dataset, in, null, baseURI, syntax) ;
+ parseExecute(usingList, dataset, in, baseURI, syntax) ;
}
/**
@@ -498,7 +292,7 @@ public class UpdateAction
*/
public static void parseExecute(UsingList usingList, DatasetGraph dataset,
InputStream input, Syntax syntax)
{
- parseExecute(usingList, dataset, input, null, null, syntax) ;
+ parseExecute(usingList, dataset, input, null, syntax) ;
}
/**
@@ -509,21 +303,22 @@ public class UpdateAction
*/
public static void parseExecute(UsingList usingList, DatasetGraph dataset,
InputStream input, String baseURI)
{
- parseExecute(usingList, dataset, input, null, baseURI,
Syntax.defaultUpdateSyntax) ;
+ parseExecute(usingList, dataset, input, baseURI,
Syntax.defaultUpdateSyntax) ;
}
/**
* Parse update operations into a GraphStore by parsing from an
InputStream.
* @param usingList A list of USING or USING NAMED statements that be
added to all {@link UpdateWithUsing} queries
+ * @param dataset The dataset to apply the changes to
* @param input The source of the update request (must be UTF-8).
* @param baseURI The base URI for resolving relative URIs.
* @param syntax The update language syntax
*/
- public static void parseExecute(UsingList usingList, DatasetGraph dataset,
InputStream input, Binding binding, String baseURI, Syntax syntax)
+ public static void parseExecute(UsingList usingList, DatasetGraph dataset,
InputStream input, String baseURI, Syntax syntax)
{
GraphStore graphStore = GraphStoreFactory.create(dataset);
- UpdateProcessorStreaming uProc =
UpdateExecutionFactory.createStreaming(graphStore, binding) ;
+ UpdateProcessorStreaming uProc =
UpdateExecutionFactory.createStreaming(graphStore) ;
if (uProc == null)
throw new ARQException("No suitable update procesors are
registered/able to execute your updates");
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/update/UpdateExecutionFactory.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/update/UpdateExecutionFactory.java?rev=1442804&r1=1442803&r2=1442804&view=diff
==============================================================================
---
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/update/UpdateExecutionFactory.java
(original)
+++
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/update/UpdateExecutionFactory.java
Wed Feb 6 00:05:53 2013
@@ -19,10 +19,12 @@
package com.hp.hpl.jena.update;
import com.hp.hpl.jena.query.ARQ ;
-import com.hp.hpl.jena.query.QuerySolution ;
-import com.hp.hpl.jena.sparql.engine.binding.Binding ;
-import com.hp.hpl.jena.sparql.engine.binding.BindingUtils ;
-import com.hp.hpl.jena.sparql.modify.* ;
+import com.hp.hpl.jena.sparql.modify.UpdateEngineFactory ;
+import com.hp.hpl.jena.sparql.modify.UpdateEngineRegistry ;
+import com.hp.hpl.jena.sparql.modify.UpdateProcessRemote ;
+import com.hp.hpl.jena.sparql.modify.UpdateProcessRemoteForm ;
+import com.hp.hpl.jena.sparql.modify.UpdateProcessorBase ;
+import com.hp.hpl.jena.sparql.modify.UpdateProcessorStreamingBase ;
import com.hp.hpl.jena.sparql.util.Context ;
/** Create UpdateProcessors (one-time executions of a SPARQL Update request) */
@@ -36,29 +38,7 @@ public class UpdateExecutionFactory
*/
public static UpdateProcessor create(Update update, GraphStore graphStore)
{
- return create(update, graphStore, (Binding)null) ;
- }
-
- /** Create an UpdateProcessor appropriate to the GraphStore, or null if no
available factory to make an UpdateProcessor
- * @param update
- * @param graphStore
- * @param initialSolution
- * @return UpdateProcessor or null
- */
- public static UpdateProcessor create(Update update, GraphStore graphStore,
QuerySolution initialSolution)
- {
- return create(new UpdateRequest(update), graphStore, initialSolution) ;
- }
-
- /** Create an UpdateProcessor appropriate to the GraphStore, or null if no
available factory to make an UpdateProcessor
- * @param update
- * @param graphStore
- * @param initialBinding
- * @return UpdateProcessor or null
- */
- public static UpdateProcessor create(Update update, GraphStore graphStore,
Binding initialBinding)
- {
- return create(new UpdateRequest(update), graphStore, initialBinding) ;
+ return create(new UpdateRequest(update), graphStore) ;
}
/** Create an UpdateProcessor appropriate to the GraphStore, or null if no
available factory to make an UpdateProcessor
@@ -67,30 +47,8 @@ public class UpdateExecutionFactory
* @return UpdateProcessor or null
*/
public static UpdateProcessor create(UpdateRequest updateRequest,
GraphStore graphStore)
- {
- return create(updateRequest, graphStore, (Binding)null) ;
- }
-
- /** Create an UpdateProcessor appropriate to the GraphStore, or null if no
available factory to make an UpdateProcessor
- * @param updateRequest
- * @param graphStore
- * @param initialSolution
- * @return UpdateProcessor or null
- */
- public static UpdateProcessor create(UpdateRequest updateRequest,
GraphStore graphStore, QuerySolution initialSolution)
- {
- return create(updateRequest, graphStore,
BindingUtils.asBinding(initialSolution)) ;
- }
-
- /** Create an UpdateProcessor appropriate to the GraphStore, or null if no
available factory to make an UpdateProcessor
- * @param updateRequest
- * @param graphStore
- * @param initialBinding
- * @return UpdateProcessor or null
- */
- public static UpdateProcessor create(UpdateRequest updateRequest,
GraphStore graphStore, Binding initialBinding)
{
- return make(updateRequest, graphStore, initialBinding, null) ;
+ return make(updateRequest, graphStore, null) ;
}
/** Create an UpdateProcessor appropriate to the GraphStore, or null if no
available factory to make an UpdateProcessor
@@ -99,44 +57,32 @@ public class UpdateExecutionFactory
*/
public static UpdateProcessorStreaming createStreaming(GraphStore
graphStore)
{
- return createStreaming(graphStore, null, null) ;
- }
-
- /** Create an UpdateProcessor appropriate to the GraphStore, or null if no
available factory to make an UpdateProcessor
- * @param graphStore
- * @param initialBinding (may be null for none)
- * @return UpdateProcessor or null
- */
- public static UpdateProcessorStreaming createStreaming(GraphStore
graphStore, Binding initialBinding)
- {
- return makeStreaming(graphStore, initialBinding, null) ;
+ return makeStreaming(graphStore, null) ;
}
/** Create an UpdateProcessor appropriate to the GraphStore, or null if no
available factory to make an UpdateProcessor
* @param graphStore
- * @param initialBinding (may be null for none)
* @param context (null means use merge of global and graph store
context))
* @return UpdateProcessor or null
*/
- public static UpdateProcessorStreaming createStreaming(GraphStore
graphStore, Binding initialBinding, Context context)
+ public static UpdateProcessorStreaming createStreaming(GraphStore
graphStore, Context context)
{
- return makeStreaming(graphStore, initialBinding, context) ;
+ return makeStreaming(graphStore, context) ;
}
/** Create an UpdateProcessor appropriate to the GraphStore, or null if no
available factory to make an UpdateProcessor
* @param updateRequest
* @param graphStore
- * @param initialBinding (may be null for none)
* @param context (null means use merge of global and graph store
context))
* @return UpdateProcessor or null
*/
- public static UpdateProcessor create(UpdateRequest updateRequest,
GraphStore graphStore, Binding initialBinding, Context context)
+ public static UpdateProcessor create(UpdateRequest updateRequest,
GraphStore graphStore, Context context)
{
- return make(updateRequest, graphStore, initialBinding, context) ;
+ return make(updateRequest, graphStore, context) ;
}
// Everything comes through one of these two make methods
- private static UpdateProcessor make(UpdateRequest updateRequest,
GraphStore graphStore, Binding initialBinding, Context context)
+ private static UpdateProcessor make(UpdateRequest updateRequest,
GraphStore graphStore, Context context)
{
if ( context == null )
{
@@ -149,13 +95,11 @@ public class UpdateExecutionFactory
return null ;
UpdateProcessorBase uProc = new UpdateProcessorBase(updateRequest,
graphStore, context, f) ;
- if ( initialBinding != null )
- uProc.setInitialBinding(initialBinding) ;
return uProc ;
}
// Everything comes through one of these two make methods
- private static UpdateProcessorStreaming makeStreaming(GraphStore
graphStore, Binding initialBinding, Context context)
+ private static UpdateProcessorStreaming makeStreaming(GraphStore
graphStore, Context context)
{
if ( context == null )
{
@@ -168,8 +112,6 @@ public class UpdateExecutionFactory
return null ;
UpdateProcessorStreamingBase uProc = new
UpdateProcessorStreamingBase(graphStore, context, f) ;
- if ( initialBinding != null )
- uProc.setInitialBinding(initialBinding) ;
return uProc;
}
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/update/UpdateProcessor.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/update/UpdateProcessor.java?rev=1442804&r1=1442803&r2=1442804&view=diff
==============================================================================
---
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/update/UpdateProcessor.java
(original)
+++
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/update/UpdateProcessor.java
Wed Feb 6 00:05:53 2013
@@ -18,7 +18,6 @@
package com.hp.hpl.jena.update;
-import com.hp.hpl.jena.query.QuerySolution ;
import com.hp.hpl.jena.sparql.util.Context ;
/** An instance of a execution of an UpdateRequest */
@@ -32,12 +31,6 @@ public interface UpdateProcessor
*/
public Context getContext() ;
- /** Set the initial association of variables and values.
- * May not be supported by all UpdateProcessor implementations.
- * @param binding
- */
- public void setInitialBinding(QuerySolution binding) ;
-
/**
* The dataset against which the query will execute.
* May be null, implying the there isn't a local GraphStore target for
this UpdateProcessor.
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/update/UpdateProcessorStreaming.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/update/UpdateProcessorStreaming.java?rev=1442804&r1=1442803&r2=1442804&view=diff
==============================================================================
---
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/update/UpdateProcessorStreaming.java
(original)
+++
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/update/UpdateProcessorStreaming.java
Wed Feb 6 00:05:53 2013
@@ -18,7 +18,6 @@
package com.hp.hpl.jena.update;
-import com.hp.hpl.jena.query.QuerySolution ;
import com.hp.hpl.jena.sparql.modify.UpdateSink ;
import com.hp.hpl.jena.sparql.util.Context ;
@@ -33,12 +32,6 @@ public interface UpdateProcessorStreamin
*/
public Context getContext() ;
- /** Set the initial association of variables and values.
- * May not be supported by all UpdateProcessor implementations.
- * @param binding
- */
- public void setInitialBinding(QuerySolution binding) ;
-
/**
* The dataset against which the query will execute.
* May be null, implying the there isn't a local GraphStore target for
this UpdateProcessor.
Modified:
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/AbstractTestUpdateGraph.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/AbstractTestUpdateGraph.java?rev=1442804&r1=1442803&r2=1442804&view=diff
==============================================================================
---
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/AbstractTestUpdateGraph.java
(original)
+++
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/AbstractTestUpdateGraph.java
Wed Feb 6 00:05:53 2013
@@ -349,61 +349,6 @@ public abstract class AbstractTestUpdate
private static long countQuads(DatasetGraph dsg) { return
Iter.count(dsg.find()); }
- // Jena 2.10.0 -- support for initial bindings in updates removed.
- // If you see this commented section post-JEna 2.10.0, please remove these
comments completely.
-// private Graph testUpdateInitialBindingWorker(Var v, Node n)
-// {
-// GraphStore gStore = getEmptyGraphStore() ;
-//
-// UpdateRequest req = UpdateFactory.create() ;
-//
-// {
-// QuadDataAcc acc = new QuadDataAcc() ;
-// acc.addTriple(triple1) ;
-// acc.addTriple(triple2) ;
-// UpdateDataInsert ins = new UpdateDataInsert(acc) ;
-// req.add(ins) ;
-// }
-// {
-// UpdateModify mod = new UpdateModify() ;
-// mod.getDeleteAcc().addTriple(new Triple(s,p, Var.alloc("o"))) ;
-// req.add(mod) ;
-// }
-// Binding b = BindingFactory.binding(null, v, n) ;
-// UpdateAction.execute(req, gStore, b) ;
-//
-// return gStore.getDefaultGraph() ;
-// }
-//
-// @Test public void testUpdateInitialBinding1()
-// {
-// Graph graph = testUpdateInitialBindingWorker(Var.alloc("o"), o1) ;
-// assertEquals(graph.size(), 1) ;
-// assertFalse(graphContains(graph, triple1)) ;
-// assertTrue(graphContains(graph, triple2)) ;
-// }
-//
-// @Test public void testUpdateInitialBinding2()
-// {
-// Graph graph = testUpdateInitialBindingWorker(Var.alloc("o"), o2) ;
-// assertEquals(graph.size(), 1) ;
-// assertTrue(graphContains(graph, triple1)) ;
-// assertFalse(graphContains(graph, triple2)) ;
-// }
-//
-// @Test public void testUpdateInitialBinding3()
-// {
-// GraphStore gStore = getEmptyGraphStore() ;
-// defaultGraphData(gStore, graph1) ;
-// String update = "DELETE WHERE { ?x <http://example/p> 2007 } ;
INSERT { ?x <http://example/p> 1999 } WHERE {}" ;
-// UpdateRequest req = UpdateFactory.create(update) ;
-//
-// Binding b = BindingFactory.binding(Var.alloc("x"), s) ;
-// UpdateAction.execute(req, gStore, b) ;
-// assertEquals(1, gStore.getDefaultGraph().size()) ;
-// assertTrue(gStore.getDefaultGraph().contains(s, p,
NodeFactory.parseNode("1999"))) ;
-// }
-
private static Graph data1()
{
Graph graph = Factory.createDefaultGraph() ;
Modified:
jena/trunk/jena-sdb/src/main/java/com/hp/hpl/jena/sdb/modify/UpdateEngineSDB.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-sdb/src/main/java/com/hp/hpl/jena/sdb/modify/UpdateEngineSDB.java?rev=1442804&r1=1442803&r2=1442804&view=diff
==============================================================================
---
jena/trunk/jena-sdb/src/main/java/com/hp/hpl/jena/sdb/modify/UpdateEngineSDB.java
(original)
+++
jena/trunk/jena-sdb/src/main/java/com/hp/hpl/jena/sdb/modify/UpdateEngineSDB.java
Wed Feb 6 00:05:53 2013
@@ -19,11 +19,10 @@
package com.hp.hpl.jena.sdb.modify;
import com.hp.hpl.jena.sdb.store.DatasetStoreGraph ;
-import com.hp.hpl.jena.sparql.engine.binding.Binding ;
+import com.hp.hpl.jena.sparql.modify.UpdateEngine ;
import com.hp.hpl.jena.sparql.modify.UpdateEngineFactory ;
import com.hp.hpl.jena.sparql.modify.UpdateEngineMain ;
import com.hp.hpl.jena.sparql.modify.UpdateEngineRegistry ;
-import com.hp.hpl.jena.sparql.modify.UpdateEngine ;
import com.hp.hpl.jena.sparql.util.Context ;
import com.hp.hpl.jena.update.GraphStore ;
@@ -31,8 +30,8 @@ public class UpdateEngineSDB extends Upd
{
// More of a placeholder currently.
- public UpdateEngineSDB(DatasetStoreGraph graphStore, Binding inputBinding,
Context context)
- { super(graphStore, inputBinding, context) ; }
+ public UpdateEngineSDB(DatasetStoreGraph graphStore, Context context)
+ { super(graphStore, context) ; }
// ---- Factory
@@ -46,9 +45,9 @@ public class UpdateEngineSDB extends Upd
}
@Override
- public UpdateEngine create(GraphStore graphStore, Binding
initialBinding, Context context)
+ public UpdateEngine create(GraphStore graphStore, Context context)
{
- return new UpdateEngineSDB((DatasetStoreGraph)graphStore,
initialBinding, context);
+ return new UpdateEngineSDB((DatasetStoreGraph)graphStore,
context);
}
} ;
}
Modified:
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/modify/UpdateEngineTDB.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/modify/UpdateEngineTDB.java?rev=1442804&r1=1442803&r2=1442804&view=diff
==============================================================================
---
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/modify/UpdateEngineTDB.java
(original)
+++
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/modify/UpdateEngineTDB.java
Wed Feb 6 00:05:53 2013
@@ -18,19 +18,18 @@
package com.hp.hpl.jena.tdb.modify;
-import com.hp.hpl.jena.sparql.engine.binding.Binding ;
+import com.hp.hpl.jena.sparql.modify.UpdateEngine ;
import com.hp.hpl.jena.sparql.modify.UpdateEngineFactory ;
import com.hp.hpl.jena.sparql.modify.UpdateEngineMain ;
import com.hp.hpl.jena.sparql.modify.UpdateEngineRegistry ;
-import com.hp.hpl.jena.sparql.modify.UpdateEngine ;
import com.hp.hpl.jena.sparql.util.Context ;
import com.hp.hpl.jena.tdb.store.DatasetGraphTDB ;
import com.hp.hpl.jena.update.GraphStore ;
public class UpdateEngineTDB extends UpdateEngineMain
{
- public UpdateEngineTDB(DatasetGraphTDB graphStore, Binding inputBinding,
Context context)
- { super(graphStore, inputBinding, context) ; }
+ public UpdateEngineTDB(DatasetGraphTDB graphStore, Context context)
+ { super(graphStore, context) ; }
// ---- Factory
@@ -44,9 +43,9 @@ public class UpdateEngineTDB extends Upd
}
@Override
- public UpdateEngine create(GraphStore graphStore, Binding
inputBinding, Context context)
+ public UpdateEngine create(GraphStore graphStore, Context context)
{
- return new UpdateEngineTDB((DatasetGraphTDB)graphStore,
inputBinding, context);
+ return new UpdateEngineTDB((DatasetGraphTDB)graphStore,
context);
}
} ;
}
