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/09/15 17:45:34 UTC
svn commit: r1385093 - in /jena/trunk: jena-arq/
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/graph/
jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/
Author: andy
Date: Sat Sep 15 15:45:33 2012
New Revision: 1385093
URL: http://svn.apache.org/viewvc?rev=1385093&view=rev
Log:
JENA-312 : Remove every-graph notification when a SPARQL Update is performed.
Removed:
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/graph/UpdateListener.java
Modified:
jena/trunk/jena-arq/ReleaseNotes.txt
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/GraphStoreEvents.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/GraphStoreUtils.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/GraphStoreWrapper.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/ReleaseNotes.txt
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/ReleaseNotes.txt?rev=1385093&r1=1385092&r2=1385093&view=diff
==============================================================================
--- jena/trunk/jena-arq/ReleaseNotes.txt (original)
+++ jena/trunk/jena-arq/ReleaseNotes.txt Sat Sep 15 15:45:33 2012
@@ -4,6 +4,7 @@ ChangeLog for ARQ
==== ARQ 2.9.4
++ Remove GraphStore.(start|finish)Request(0 (was prviosuly deprecated)
+ Remove deprecated QueryExecutionBase.cancelAllowDrain
+ Implement WG decision on BIND - use original semantics.
+ improved optimization of sequeneces of OPTIONALs where the grouois only OPTIONAL and an equality filter (JENA-294)
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=1385093&r1=1385092&r2=1385093&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 Sat Sep 15 15:45:33 2012
@@ -18,7 +18,6 @@
package com.hp.hpl.jena.sparql.modify;
-import com.hp.hpl.jena.graph.Graph ;
import com.hp.hpl.jena.query.Dataset ;
import com.hp.hpl.jena.query.DatasetFactory ;
import com.hp.hpl.jena.sparql.core.DatasetGraph ;
@@ -44,31 +43,15 @@ public class GraphStoreBasic extends Dat
return DatasetFactory.create(getWrapped()) ;
}
- @Deprecated
- @Override
- 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,
- new GraphStoreAction()
- {
- @Override
- public void exec(Graph graph){ graph.close() ; }
- }) ;
- }
+ {}
}
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/GraphStoreEvents.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/GraphStoreEvents.java?rev=1385093&r1=1385092&r2=1385093&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/GraphStoreEvents.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/GraphStoreEvents.java Sat Sep 15 15:45:33 2012
@@ -18,8 +18,11 @@
package com.hp.hpl.jena.sparql.modify;
+@Deprecated
public class GraphStoreEvents
{
+ @Deprecated
public static final Object RequestStartEvent = new Object() ;
+ @Deprecated
public static final Object RequestFinishEvent = new Object() ;
}
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/GraphStoreUtils.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/GraphStoreUtils.java?rev=1385093&r1=1385092&r2=1385093&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/GraphStoreUtils.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/GraphStoreUtils.java Sat Sep 15 15:45:33 2012
@@ -28,6 +28,11 @@ import com.hp.hpl.jena.update.UpdateExce
public class GraphStoreUtils
{
+ /*
+ * All the "actionAll" operations
+ */
+
+ @Deprecated
public static void sendToAll(GraphStore graphStore, final Object object)
{
actionAll(graphStore, new GraphStoreAction()
@@ -37,6 +42,7 @@ public class GraphStoreUtils
}) ;
}
+ @Deprecated
public static void actionAll(GraphStore graphStore, GraphStoreAction action)
{
action.exec(graphStore.getDefaultGraph()) ;
@@ -51,6 +57,7 @@ public class GraphStoreUtils
}
// Choose graph and dispatch.
+ @Deprecated
public static void action(GraphStore graphStore, Node graphName, GraphStoreAction action)
{
Graph g = null ;
@@ -65,6 +72,7 @@ public class GraphStoreUtils
action.exec(g) ;
}
+ @Deprecated
public static void action(GraphStore graphStore, List<Node> graphNodes, GraphStoreAction action)
{
if ( graphNodes.isEmpty() )
Modified: 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=1385093&r1=1385092&r2=1385093&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/GraphStoreWrapper.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/GraphStoreWrapper.java Sat Sep 15 15:45:33 2012
@@ -37,14 +37,6 @@ public class GraphStoreWrapper extends D
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) ; }
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=1385093&r1=1385092&r2=1385093&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 Sat Sep 15 15:45:33 2012
@@ -29,18 +29,6 @@ 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(UpdateRequest request) ;
/** Signal end of a request being executed */
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=1385093&r1=1385092&r2=1385093&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 Sat Sep 15 15:45:33 2012
@@ -35,8 +35,6 @@ 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 ;
@@ -292,22 +290,14 @@ public class DatasetGraphTDB extends Dat
prefixes.sync() ;
}
- // 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(UpdateRequest request)
- { GraphStoreUtils.sendToAll(this, GraphStoreEvents.RequestStartEvent) ; }
+ { }
@Override
public void finishRequest(UpdateRequest request)
- { this.sync() ; GraphStoreUtils.sendToAll(this, GraphStoreEvents.RequestFinishEvent) ; }
+ { }
@Override
public Dataset toDataset() { return DatasetImpl.wrap(this) ; }