You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2012/05/31 11:25:14 UTC
svn commit: r1344615 - in /jena/trunk:
jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/
jena-arq/src/main/java/com/hp/hpl/jena/update/
jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/
Author: andy
Date: Thu May 31 09:25:14 2012
New Revision: 1344615
URL: http://svn.apache.org/viewvc?rev=1344615&view=rev
Log:
Add request object to start/finish of SPARQL updates
Added:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/GraphStoreWrapper.java
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/GraphStoreBasic.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/update/GraphStore.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/DatasetGraphTDB.java
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/GraphStoreBasic.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/GraphStoreBasic.java?rev=1344615&r1=1344614&r2=1344615&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/GraphStoreBasic.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/GraphStoreBasic.java Thu May 31 09:25:14 2012
@@ -24,6 +24,7 @@ import com.hp.hpl.jena.query.DatasetFact
import com.hp.hpl.jena.sparql.core.DatasetGraph ;
import com.hp.hpl.jena.sparql.core.DatasetGraphWrapper ;
import com.hp.hpl.jena.update.GraphStore ;
+import com.hp.hpl.jena.update.UpdateRequest ;
public class GraphStoreBasic extends DatasetGraphWrapper implements GraphStore
{
@@ -43,15 +44,24 @@ public class GraphStoreBasic extends Dat
return DatasetFactory.create(getWrapped()) ;
}
+ @Deprecated
@Override
- public void startRequest()
+ public void startRequest() { GraphStoreUtils.sendToAll(this, GraphStoreEvents.RequestStartEvent) ; }
+
+ @Override
+ public void startRequest(UpdateRequest request)
{ GraphStoreUtils.sendToAll(this, GraphStoreEvents.RequestStartEvent) ; }
+ @Deprecated
@Override
public void finishRequest()
{ GraphStoreUtils.sendToAll(this, GraphStoreEvents.RequestFinishEvent) ; }
@Override
+ public void finishRequest(UpdateRequest request)
+ { GraphStoreUtils.sendToAll(this, GraphStoreEvents.RequestFinishEvent) ; }
+
+ @Override
public void close()
{
GraphStoreUtils.actionAll(this,
Added: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/GraphStoreWrapper.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/GraphStoreWrapper.java?rev=1344615&view=auto
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/GraphStoreWrapper.java (added)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/GraphStoreWrapper.java Thu May 31 09:25:14 2012
@@ -0,0 +1,56 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.hp.hpl.jena.sparql.modify;
+
+import com.hp.hpl.jena.query.Dataset ;
+import com.hp.hpl.jena.sparql.core.DatasetGraphWrapper ;
+import com.hp.hpl.jena.update.GraphStore ;
+import com.hp.hpl.jena.update.UpdateRequest ;
+
+public class GraphStoreWrapper extends DatasetGraphWrapper implements GraphStore
+{
+ protected final GraphStore graphStore ;
+
+ public GraphStoreWrapper(GraphStore graphStore)
+ {
+ super(graphStore) ;
+ this.graphStore = graphStore ;
+ }
+
+ @Override
+ public Dataset toDataset()
+ { return graphStore.toDataset() ; }
+
+ @Override @Deprecated
+ public void startRequest()
+ { graphStore.startRequest() ; }
+
+ @Override @Deprecated
+ public void finishRequest()
+ { graphStore.finishRequest() ; }
+
+ @Override
+ public void startRequest(UpdateRequest request)
+ { graphStore.startRequest(request) ; }
+
+ @Override
+ public void finishRequest(UpdateRequest request)
+ { graphStore.finishRequest(request) ; }
+}
+
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=1344615&r1=1344614&r2=1344615&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 Thu May 31 09:25:14 2012
@@ -34,11 +34,11 @@ public class UpdateEngineMain extends Up
@Override
public void execute()
{
- graphStore.startRequest() ;
+ graphStore.startRequest(request) ;
UpdateEngineWorker worker = new UpdateEngineWorker(graphStore, startBinding, context) ;
for ( Update up : request )
up.visit(worker) ;
- graphStore.finishRequest() ;
+ graphStore.finishRequest(request) ;
}
private static UpdateEngineFactory factory = new UpdateEngineFactory()
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/update/GraphStore.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/update/GraphStore.java?rev=1344615&r1=1344614&r2=1344615&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/update/GraphStore.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/update/GraphStore.java Thu May 31 09:25:14 2012
@@ -28,11 +28,23 @@ public interface GraphStore extends Data
{
/** Convert to a dataset (for query) */
public Dataset toDataset() ;
+
+ /** Signal start of a request being executed.
+ * @deprecated Use {@link #startRequest(UpdateRequest)}
+ */
+ @Deprecated
+ public void startRequest() ;
+ /** Signal end of a request being executed.
+ * @deprecated Use {@link #finishRequest(UpdateRequest)}
+ */
+ @Deprecated
+ public void finishRequest() ;
+
/** Signal start of a request being executed */
- public void startRequest() ;
+ public void startRequest(UpdateRequest request) ;
/** Signal end of a request being executed */
- public void finishRequest() ;
+ public void finishRequest(UpdateRequest request) ;
// public void sync() ;
// public void close() ;
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/DatasetGraphTDB.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/DatasetGraphTDB.java?rev=1344615&r1=1344614&r2=1344615&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/DatasetGraphTDB.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/DatasetGraphTDB.java Thu May 31 09:25:14 2012
@@ -35,6 +35,8 @@ import com.hp.hpl.jena.sparql.core.Datas
import com.hp.hpl.jena.sparql.core.DatasetImpl ;
import com.hp.hpl.jena.sparql.core.Quad ;
import com.hp.hpl.jena.sparql.engine.optimizer.reorder.ReorderTransformation ;
+import com.hp.hpl.jena.sparql.modify.GraphStoreEvents ;
+import com.hp.hpl.jena.sparql.modify.GraphStoreUtils ;
import com.hp.hpl.jena.tdb.base.file.Location ;
import com.hp.hpl.jena.tdb.lib.NodeLib ;
import com.hp.hpl.jena.tdb.sys.Session ;
@@ -42,6 +44,7 @@ import com.hp.hpl.jena.tdb.sys.TDBMaker
import com.hp.hpl.jena.tdb.transaction.DatasetGraphTransaction ;
import com.hp.hpl.jena.tdb.transaction.DatasetGraphTxn ;
import com.hp.hpl.jena.update.GraphStore ;
+import com.hp.hpl.jena.update.UpdateRequest ;
/** TDB Dataset - this is the class that creates a dataset over the storage via
* TripleTable, QuadTable and prefixes. Any transactions
@@ -283,11 +286,19 @@ public class DatasetGraphTDB extends Dat
// Done by superclass that then call _close. public void close()
// --- GraphStore
+ @Override @Deprecated
+ public void startRequest() { GraphStoreUtils.sendToAll(this, GraphStoreEvents.RequestStartEvent) ; }
+
+ @Override @Deprecated
+ public void finishRequest() { this.sync() ; GraphStoreUtils.sendToAll(this, GraphStoreEvents.RequestFinishEvent) ; }
+
@Override
- public void startRequest() {}
+ public void startRequest(UpdateRequest request)
+ { GraphStoreUtils.sendToAll(this, GraphStoreEvents.RequestStartEvent) ; }
@Override
- public void finishRequest() { this.sync() ; }
+ public void finishRequest(UpdateRequest request)
+ { this.sync() ; GraphStoreUtils.sendToAll(this, GraphStoreEvents.RequestFinishEvent) ; }
@Override
public Dataset toDataset() { return DatasetImpl.wrap(this) ; }