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/12/10 18:25:16 UTC
svn commit: r1419595 [1/6] - in /jena/trunk: jena-arq/
jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/
jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/
jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/
jena-arq/src/main/java/org/openjena/ri...
Author: andy
Date: Mon Dec 10 17:25:00 2012
New Revision: 1419595
URL: http://svn.apache.org/viewvc?rev=1419595&view=rev
Log:
Jen core simplification (bulk update handlers, reification, graph query handler)
Added:
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/ReifierStd.java
- copied unchanged from r1418404, jena/branches/jena-core-simplified/src/main/java/com/hp/hpl/jena/rdf/model/impl/ReifierStd.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/mem/test/TestGraphMem2.java
- copied unchanged from r1418404, jena/branches/jena-core-simplified/src/test/java/com/hp/hpl/jena/mem/test/TestGraphMem2.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/test/Matcher.java
- copied unchanged from r1418404, jena/branches/jena-core-simplified/src/test/java/com/hp/hpl/jena/reasoner/test/Matcher.java
jena/trunk/jena-tdb/src/test/resources/etc/
jena/trunk/jena-tdb/src/test/resources/etc/rdfs-fb-tgc-noresource.rules
jena/trunk/jena-tdb/src/test/resources/vocabularies/
jena/trunk/jena-tdb/src/test/resources/vocabularies/assembler.n3
Removed:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/Reifier2.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/ReifierStd.java
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/TestReifier2.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/Reifier.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/FragmentTripleIterator.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/Fragments.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/ReificationWrapper.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/ReificationWrapperGraph.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/ReifierFragmentHandler.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/ReifierFragmentsMap.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/ReifierTripleMap.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/SimpleReifier.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/SimpleReifierFragmentHandler.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/SimpleReifierFragmentsMap.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/SimpleReifierTripleMap.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/WrappedReifier.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/query/
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/mem/GraphMemBaseQueryHandler.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/mem/GraphMemQueryHandler.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/mem/MatchOrBind.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/mem/PatternStageMem.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/mem/ProcessedTriple.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/mem/impl/
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/dig/
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/BasicFBReifier.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/ModelQueryUtil.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/QueryMapper.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/tuple/
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/assembler/test/ModelAssemblerTestBase.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/query/regexptrees/test/TestPerlyParser.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/query/regexptrees/test/TestRegexpTrees.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/query/test/AbstractTestQuery.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/query/test/QueryTest.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/query/test/QueryTestBase.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/query/test/TestBufferPipe.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/query/test/TestDomain.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/query/test/TestEarlyConstraints.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/query/test/TestExpressionConstraints.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/query/test/TestExpressions.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/query/test/TestGraphQueryPackage.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/query/test/TestMatchers.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/query/test/TestQuery.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/query/test/TestQueryNode.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/query/test/TestQueryNodeFactory.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/query/test/TestQueryReification.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/query/test/TestQueryTriple.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/query/test/TestSimpleTripleSorter.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/query/test/TestStageElements.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/test/AbstractTestReifierFragmentsMap.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/test/AbstractTestReifierTripleMap.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestReificationPredicates.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestReificationWrapper.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestReifierSearch.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestSimpleReifierFragmentsMap.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestSimpleReifierTripleMap.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/mem/test/AbstractTestGraphMem.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/mem/test/TestMemQuery.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestQuery.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/shared/TestReificationStyle.java
jena/trunk/jena-sdb/src/main/java/com/hp/hpl/jena/sdb/graph/GraphQueryHandlerSDB.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/graph/QueryHandlerTDB.java
Modified:
jena/trunk/jena-arq/pom.xml
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphCaching.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphBase2.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphDataBag.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphDefaultDataBag.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphDistinctDataBag.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphMemPlain.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphReadOnly.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphUnionRead.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphWrapper.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngineWorker.java
jena/trunk/jena-arq/src/main/java/org/openjena/riot/out/RDFJSONWriter.java
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/AbstractTestGraph2.java
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/TS_Graph.java
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/TestGraphsDataBag.java
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/AbstractTestUpdateBase.java
jena/trunk/jena-core/ (props changed)
jena/trunk/jena-core/pom.xml
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/assembler/assemblers/FileModelAssembler.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/assembler/assemblers/MemoryModelAssembler.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/assembler/assemblers/ModelAssembler.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/assembler/assemblers/ReasonerFactoryAssembler.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/BulkUpdateHandler.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/Factory.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/Graph.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/GraphListener.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/GraphMaker.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/GraphUtil.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/compose/MultiUnion.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/compose/Polyadic.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/BaseGraphMaker.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/FileGraph.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/FileGraphMaker.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/FileGraphTransactionHandler.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/GraphBase.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/SimpleBulkUpdateHandler.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/SimpleGraphMaker.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/WrappedBulkUpdateHandler.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/WrappedGraph.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/mem/ArrayBunch.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/mem/GraphMem.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/mem/GraphMemBase.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/mem/GraphMemBulkUpdateHandler.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/mem/GraphTripleStoreMem.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/mem/HashedTripleBunch.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/mem/NodeToTriplesMapMem.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/mem/SetBunch.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/mem/TripleBunch.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/ontology/OntModel.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/ontology/impl/OntClassImpl.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/ontology/impl/OntModelImpl.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/JenaHandler.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/JenaReader.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/SAX2Model.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/Model.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/ModelCon.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/ModelFactory.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/ModelGraphInterface.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/ModelCom.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/ModelReifier.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/ReifiedStatementImpl.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/BaseInfGraph.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/BasicForwardRuleInfGraph.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/FBRuleInfGraph.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/FBRuleReasoner.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/shared/ReificationStyle.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/assembler/test/AssemblerTestBase.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/assembler/test/TestFileModelAssembler.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/assembler/test/TestMemoryModelAssembler.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/assembler/test/TestModelAssembler.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/compose/test/TestIntersection.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/compose/test/TestMultiUnionReifier.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/test/AbstractTestGraph.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/test/AbstractTestReifier.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/test/GraphTestBase.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/test/MetaTestGraph.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestFileGraph.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestFileGraphMaker.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestGraph.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestGraphListener.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestPackage.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestReifier.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestTypedLiterals.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/mem/test/TestConcurrentModificationException.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/mem/test/TestGraphMem.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/mem/test/TestGraphMemPackage.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/AbstractTestReifiedStatements.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/ModelTestBase.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestModelBulkUpdate.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestModelMakerImpl.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestPackage.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestReifiedStatements.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/ConcurrencyTest.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/OWLWGTester.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestInferenceReification.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/WebOntTestHarness.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/test/TestInfGraph.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/test/TestRDFSReasoners.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/test/WGReasonerTester.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/shared/TestSharedPackage.java
jena/trunk/jena-fuseki/pom.xml
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/http/DatasetGraphAccessorBasic.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Upload.java
jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/http/TestDatasetGraphAccessorBase.java
jena/trunk/jena-sdb/pom.xml
jena/trunk/jena-sdb/src-dev/dev/TestStores2Connections1.java
jena/trunk/jena-sdb/src/main/java/com/hp/hpl/jena/sdb/graph/GraphSDB.java
jena/trunk/jena-sdb/src/main/java/com/hp/hpl/jena/sdb/graph/UpdateHandlerSDB.java
jena/trunk/jena-sdb/src/test/java/com/hp/hpl/jena/sdb/test/graph/AbstractTestGraphSDB.java
jena/trunk/jena-tdb/pom.xml
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/graph/BulkUpdateHandlerTDB.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/DatasetGraphTDB.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/GraphTDBBase.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/junit/AbstractTestGraphTDB.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestConcurrentAccess.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestDatasetTDBPersist.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestGraphTDB.java
Modified: jena/trunk/jena-arq/pom.xml
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/pom.xml?rev=1419595&r1=1419594&r2=1419595&view=diff
==============================================================================
--- jena/trunk/jena-arq/pom.xml (original)
+++ jena/trunk/jena-arq/pom.xml Mon Dec 10 17:25:00 2012
@@ -22,7 +22,7 @@
<artifactId>jena-arq</artifactId>
<packaging>jar</packaging>
<name>Apache Jena - ARQ (SPARQL 1.1 Query Engine)</name>
- <version>2.9.5-SNAPSHOT</version>
+ <version>2.10.0-SNAPSHOT</version>
<parent>
<groupId>org.apache.jena</groupId>
@@ -65,14 +65,14 @@
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-core</artifactId>
- <version>2.7.5-SNAPSHOT</version>
+ <version>2.10.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-core</artifactId>
<classifier>tests</classifier>
- <version>2.7.5-SNAPSHOT</version>
+ <version>2.10.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphCaching.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphCaching.java?rev=1419595&r1=1419594&r2=1419595&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphCaching.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphCaching.java Mon Dec 10 17:25:00 2012
@@ -26,6 +26,7 @@ import org.apache.jena.atlas.lib.Cache ;
import org.apache.jena.atlas.lib.CacheFactory ;
import com.hp.hpl.jena.graph.Graph ;
+import com.hp.hpl.jena.graph.GraphUtil ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.graph.Triple ;
@@ -107,7 +108,7 @@ abstract public class DatasetGraphCachin
public void addGraph(Node graphName, Graph graph)
{
removeGraph(graphName) ;
- getGraph(graphName).getBulkUpdateHandler().add(graph) ;
+ GraphUtil.addInto(getGraph(graphName), graph) ;
}
@Override
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphBase2.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphBase2.java?rev=1419595&r1=1419594&r2=1419595&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphBase2.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphBase2.java Mon Dec 10 17:25:00 2012
@@ -19,14 +19,7 @@
package com.hp.hpl.jena.sparql.graph;
import com.hp.hpl.jena.graph.* ;
-import com.hp.hpl.jena.graph.impl.AllCapabilities ;
-import com.hp.hpl.jena.graph.impl.GraphBase ;
-import com.hp.hpl.jena.graph.impl.GraphMatcher ;
-import com.hp.hpl.jena.graph.impl.GraphWithPerform ;
-import com.hp.hpl.jena.graph.impl.SimpleBulkUpdateHandler ;
-import com.hp.hpl.jena.graph.impl.SimpleEventManager ;
-import com.hp.hpl.jena.graph.impl.SimpleTransactionHandler ;
-import com.hp.hpl.jena.graph.query.QueryHandler ;
+import com.hp.hpl.jena.graph.impl.* ;
import com.hp.hpl.jena.shared.AddDeniedException ;
import com.hp.hpl.jena.shared.ClosedException ;
import com.hp.hpl.jena.shared.DeleteDeniedException ;
@@ -36,6 +29,8 @@ import com.hp.hpl.jena.util.iterator.Ext
public abstract class GraphBase2 implements GraphWithPerform
{
+ // *** BECOME GraphBase
+
// Like GraphBase but no reificiation handling in normal operations.
// AKA Hard coded ReificationStyle.Standard
@@ -63,7 +58,6 @@ public abstract class GraphBase2 impleme
public void close()
{
closed = true;
- if (reifier != null) reifier.close();
}
@Override
@@ -83,18 +77,6 @@ public abstract class GraphBase2 impleme
returns the same SimpleQueryHandler each time it is called; sub-classes
may override if they need specialised query handlers.
*/
- @Override
- public abstract QueryHandler queryHandler() ;
-// {
-// if (queryHandler == null) queryHandler = new SimpleQueryHandler(this);
-// return queryHandler;
-// }
-
- /**
- The query handler for this graph, or null if queryHandler() has not been
- called yet.
- */
- protected QueryHandler queryHandler;
@Override
public GraphStatisticsHandler getStatisticsHandler()
@@ -153,7 +135,9 @@ public abstract class GraphBase2 impleme
SimpleBulkUpdateHandler, which does bulk update by repeated simple
(add/delete) updates; the same handler is returned on each call. Subclasses
may override if they have specialised implementations.
+ * @deprecated
*/
+ @Deprecated
@Override
public BulkUpdateHandler getBulkUpdateHandler()
{
@@ -333,47 +317,27 @@ public abstract class GraphBase2 impleme
ClosableIterator<Triple> it = find( t );
try { return it.hasNext(); } finally { it.close(); }
}
-
-// /**
-// Answer an iterator over all the triples exposed in this graph's reifier that
-// match <code>m</code>. The default implementation delegates this to
-// the reifier; subclasses probably don't need to override this.
-// */
-// protected ExtendedIterator reifierTriples( TripleMatch m )
-// { return getReifier().findExposed( m ); }
-
+
/**
- Answer this graph's reifier. The reifier may be lazily constructed, and it
- must be the same reifier on each call. The default implementation is a
- SimpleReifier. Generally DO NOT override this method: override
- <code>constructReifier</code> instead.
+ Remove all the statements from this graph.
*/
@Override
- public Reifier getReifier()
+ public void clear()
{
- if (reifier == null) reifier = constructReifier();
- return reifier;
+ GraphUtil.remove(this, Node.ANY, Node.ANY, Node.ANY) ;
+ getEventManager().notifyEvent(this, GraphEvents.removeAll ) ;
}
/**
- Answer a reifier appropriate to this graph. Subclasses override if
- they need non-SimpleReifiers.
+ Remove all triples that match by find(s, p, o)
*/
-
- protected Reifier constructReifier()
- { return new Reifier2(this) ; }
-
- /**
- The cache variable for the allocated Reifier.
- */
- protected Reifier reifier = null;
+ @Override
+ public void remove( Node s, Node p, Node o )
+ {
+ GraphUtil.remove(this, s, p, o) ;
+ getEventManager().notifyEvent(this, GraphEvents.remove(s, p, o) ) ;
+ }
- /**
- Answer the size of this graph (ie the number of exposed triples). Defined as
- the size of the triple store plus the size of the reification store. Subclasses
- must override graphBaseSize() to reimplement (and reifierSize if they have
- some special reason for redefined that).
- */
@Override
public final int size()
{
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphDataBag.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphDataBag.java?rev=1419595&r1=1419594&r2=1419595&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphDataBag.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphDataBag.java Mon Dec 10 17:25:00 2012
@@ -25,10 +25,8 @@ import com.hp.hpl.jena.graph.Capabilitie
import com.hp.hpl.jena.graph.Triple ;
import com.hp.hpl.jena.graph.TripleMatch ;
import com.hp.hpl.jena.graph.TripleMatchIterator ;
-import com.hp.hpl.jena.graph.impl.SimpleReifier ;
import com.hp.hpl.jena.graph.impl.TripleStore ;
import com.hp.hpl.jena.mem.GraphMemBase ;
-import com.hp.hpl.jena.shared.ReificationStyle ;
import com.hp.hpl.jena.util.iterator.ExtendedIterator ;
/**
@@ -48,12 +46,7 @@ public abstract class GraphDataBag exten
public GraphDataBag(ThresholdPolicy<Triple> thresholdPolicy)
{
- this(thresholdPolicy, ReificationStyle.Minimal) ;
- }
-
- public GraphDataBag(ThresholdPolicy<Triple> thresholdPolicy, ReificationStyle style)
- {
- super(style) ;
+ super() ;
this.thresholdPolicy = thresholdPolicy;
@@ -99,10 +92,7 @@ public abstract class GraphDataBag exten
@Override
public void performAdd(Triple t)
{
- if ( !getReifier().handledAdd(t) )
- {
- db.add(t) ;
- }
+ db.add(t) ;
}
@Override
@@ -121,7 +111,6 @@ public abstract class GraphDataBag exten
public void clear()
{
db.close() ;
- ((SimpleReifier) getReifier()).clear() ;
db = createDataBag() ;
}
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphDefaultDataBag.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphDefaultDataBag.java?rev=1419595&r1=1419594&r2=1419595&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphDefaultDataBag.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphDefaultDataBag.java Mon Dec 10 17:25:00 2012
@@ -24,7 +24,6 @@ import org.apache.jena.atlas.data.Thresh
import org.openjena.riot.SerializationFactoryFinder ;
import com.hp.hpl.jena.graph.Triple ;
-import com.hp.hpl.jena.shared.ReificationStyle ;
/**
* An implementation of {@link GraphDataBag} that may return duplicate triples from the find() operation.
@@ -36,11 +35,6 @@ public class GraphDefaultDataBag extends
super(thresholdPolicy) ;
}
- public GraphDefaultDataBag(ThresholdPolicy<Triple> thresholdPolicy, ReificationStyle style)
- {
- super(thresholdPolicy, style) ;
- }
-
@Override
protected DataBag<Triple> createDataBag()
{
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphDistinctDataBag.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphDistinctDataBag.java?rev=1419595&r1=1419594&r2=1419595&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphDistinctDataBag.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphDistinctDataBag.java Mon Dec 10 17:25:00 2012
@@ -24,7 +24,6 @@ import org.apache.jena.atlas.data.Thresh
import org.openjena.riot.SerializationFactoryFinder ;
import com.hp.hpl.jena.graph.Triple ;
-import com.hp.hpl.jena.shared.ReificationStyle ;
import com.hp.hpl.jena.sparql.util.TripleComparator ;
/**
@@ -37,11 +36,6 @@ public class GraphDistinctDataBag extend
super(thresholdPolicy) ;
}
- public GraphDistinctDataBag(ThresholdPolicy<Triple> thresholdPolicy, ReificationStyle style)
- {
- super(thresholdPolicy, style) ;
- }
-
@Override
protected DataBag<Triple> createDataBag()
{
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphMemPlain.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphMemPlain.java?rev=1419595&r1=1419594&r2=1419595&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphMemPlain.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphMemPlain.java Mon Dec 10 17:25:00 2012
@@ -26,8 +26,6 @@ import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.graph.Triple ;
import com.hp.hpl.jena.graph.TripleMatch ;
import com.hp.hpl.jena.graph.impl.SimpleEventManager ;
-import com.hp.hpl.jena.graph.query.QueryHandler ;
-import com.hp.hpl.jena.graph.query.SimpleQueryHandler ;
import com.hp.hpl.jena.shared.PrefixMapping ;
import com.hp.hpl.jena.shared.impl.PrefixMappingImpl ;
import com.hp.hpl.jena.util.iterator.ClosableIterator ;
@@ -50,12 +48,6 @@ public class GraphMemPlain extends Graph
{ triples.remove(t) ; }
@Override
- public QueryHandler queryHandler()
- {
- return new SimpleQueryHandler(this) ;
- }
-
- @Override
protected PrefixMapping createPrefixMapping()
{
return new PrefixMappingImpl() ;
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphReadOnly.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphReadOnly.java?rev=1419595&r1=1419594&r2=1419595&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphReadOnly.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphReadOnly.java Mon Dec 10 17:25:00 2012
@@ -55,6 +55,7 @@ public class GraphReadOnly extends Wrapp
return new SimpleTransactionHandler() ;
}
+ @Deprecated
@Override
public BulkUpdateHandler getBulkUpdateHandler()
{
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphUnionRead.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphUnionRead.java?rev=1419595&r1=1419594&r2=1419595&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphUnionRead.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphUnionRead.java Mon Dec 10 17:25:00 2012
@@ -27,8 +27,6 @@ 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.graph.TripleMatch ;
-import com.hp.hpl.jena.graph.query.QueryHandler ;
-import com.hp.hpl.jena.graph.query.SimpleQueryHandler ;
import com.hp.hpl.jena.shared.PrefixMapping ;
import com.hp.hpl.jena.shared.impl.PrefixMappingImpl ;
import com.hp.hpl.jena.sparql.core.DatasetGraph ;
@@ -49,12 +47,6 @@ public class GraphUnionRead extends Grap
}
@Override
- public QueryHandler queryHandler()
- {
- return new SimpleQueryHandler(this) ;
- }
-
- @Override
protected PrefixMapping createPrefixMapping()
{
PrefixMapping pmap = new PrefixMappingImpl() ;
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphWrapper.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphWrapper.java?rev=1419595&r1=1419594&r2=1419595&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphWrapper.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphWrapper.java Mon Dec 10 17:25:00 2012
@@ -19,7 +19,6 @@
package com.hp.hpl.jena.sparql.graph;
import com.hp.hpl.jena.graph.* ;
-import com.hp.hpl.jena.graph.query.QueryHandler ;
import com.hp.hpl.jena.shared.AddDeniedException ;
import com.hp.hpl.jena.shared.DeleteDeniedException ;
import com.hp.hpl.jena.shared.PrefixMapping ;
@@ -28,6 +27,7 @@ import com.hp.hpl.jena.util.iterator.Ext
/** Graph wrapper */
public class GraphWrapper implements Graph
{
+ // Like WrappedGraph but pure wrapper - use this?
final private Graph graph ;
public GraphWrapper(Graph graph) { this.graph = graph ; }
@@ -45,17 +45,12 @@ public class GraphWrapper implements Gra
}
@Override
- public QueryHandler queryHandler()
- {
- return graph.queryHandler() ;
- }
-
- @Override
public TransactionHandler getTransactionHandler()
{
return graph.getTransactionHandler() ;
}
+ @Deprecated
@Override
public BulkUpdateHandler getBulkUpdateHandler()
{
@@ -81,12 +76,6 @@ public class GraphWrapper implements Gra
}
@Override
- public Reifier getReifier()
- {
- return graph.getReifier() ;
- }
-
- @Override
public PrefixMapping getPrefixMapping()
{
return graph.getPrefixMapping() ;
@@ -152,5 +141,13 @@ public class GraphWrapper implements Gra
return graph.isClosed() ;
}
+ @Override
+ public void clear()
+ { graph.clear() ; }
+
+ @Override
+ public void remove(Node s, Node p, Node o)
+ { graph.remove(s, p, o) ; }
+
}
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=1419595&r1=1419594&r2=1419595&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 Mon Dec 10 17:25:00 2012
@@ -31,6 +31,7 @@ import org.apache.jena.atlas.iterator.It
import org.openjena.riot.SerializationFactoryFinder ;
import com.hp.hpl.jena.graph.Graph ;
+import com.hp.hpl.jena.graph.GraphUtil ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.graph.Triple ;
import com.hp.hpl.jena.query.Query ;
@@ -109,7 +110,7 @@ public class UpdateEngineWorker implemen
if ( isClear )
{
if ( g == null || graphStore.containsGraph(g) )
- graph(graphStore, g).getBulkUpdateHandler().removeAll() ;
+ graph(graphStore, g).clear() ;
}
else
graphStore.removeGraph(g) ;
@@ -164,7 +165,7 @@ public class UpdateEngineWorker implemen
model = FileManager.get().loadModel(source) ;
} catch (RuntimeException ex) { throw new UpdateException("Failed to LOAD '"+source+"'", ex) ; }
Graph g = graph(graphStore, dest) ;
- g.getBulkUpdateHandler().add(model.getGraph()) ;
+ GraphUtil.addInto(g, model.getGraph()) ;
} catch (RuntimeException ex)
{
if ( ! update.getSilent() )
@@ -258,13 +259,13 @@ public class UpdateEngineWorker implemen
{
// No create - we tested earlier.
Graph g = graph(gStore, target) ;
- g.getBulkUpdateHandler().removeAll() ;
+ g.clear() ;
}
protected static void gsDrop(GraphStore gStore, Target target, boolean isSilent)
{
if ( target.isDefault() )
- gStore.getDefaultGraph().getBulkUpdateHandler().removeAll() ;
+ gStore.getDefaultGraph().clear() ;
else
gStore.removeGraph(target.getGraph()) ;
}
Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/out/RDFJSONWriter.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/out/RDFJSONWriter.java?rev=1419595&r1=1419594&r2=1419595&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/out/RDFJSONWriter.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/out/RDFJSONWriter.java Mon Dec 10 17:25:00 2012
@@ -31,9 +31,9 @@ import org.openjena.riot.system.Prologue
import org.openjena.riot.system.SyntaxLabels ;
import com.hp.hpl.jena.graph.Graph ;
+import com.hp.hpl.jena.graph.GraphUtil ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.graph.Triple ;
-import com.hp.hpl.jena.graph.query.QueryHandler ;
import com.hp.hpl.jena.util.iterator.ExtendedIterator ;
public class RDFJSONWriter {
@@ -53,8 +53,7 @@ public class RDFJSONWriter {
}
private static void write (Sink<Pair<Node, Map<Node, Set<Node>>>> sink, Graph graph) {
- QueryHandler queryHandler = graph.queryHandler() ;
- ExtendedIterator<Node> subjects = queryHandler.subjectsFor(Node.ANY, Node.ANY) ;
+ ExtendedIterator<Node> subjects = GraphUtil.listSubjects(graph, Node.ANY, Node.ANY) ;
try {
Map<Node, Set<Node>> predicates = new HashMap<Node, Set<Node>>() ;
while ( subjects.hasNext() ) {
Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/AbstractTestGraph2.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/AbstractTestGraph2.java?rev=1419595&r1=1419594&r2=1419595&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/AbstractTestGraph2.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/AbstractTestGraph2.java Mon Dec 10 17:25:00 2012
@@ -206,7 +206,7 @@ public abstract class AbstractTestGraph2
Graph g = emptyGraph() ;
Triple t1 = triple(s1, p1, o1) ;
g.add(t1) ;
- g.getBulkUpdateHandler().remove(any, any, any) ;
+ g.remove(any, any, any) ;
assertEquals(0, g.size()) ;
returnGraph(g) ;
}
@@ -216,7 +216,7 @@ public abstract class AbstractTestGraph2
Graph g = emptyGraph() ;
Triple t1 = triple(s1, p1, o1) ;
g.add(t1) ;
- g.getBulkUpdateHandler().remove(s2, any, any) ;
+ g.remove(s2, any, any) ;
assertEquals(1, g.size()) ;
assertTrue(g.contains(t1)) ;
returnGraph(g) ;
@@ -227,7 +227,7 @@ public abstract class AbstractTestGraph2
Graph g = emptyGraph() ;
Triple t1 = triple(s1, p1, o1) ;
g.add(t1) ;
- g.getBulkUpdateHandler().remove(s1, any, any) ;
+ g.remove(s1, any, any) ;
assertEquals(0, g.size()) ;
returnGraph(g) ;
}
@@ -243,7 +243,7 @@ public abstract class AbstractTestGraph2
g.add(t2) ;
g.add(t3) ;
g.add(t4) ;
- g.getBulkUpdateHandler().removeAll() ;
+ g.clear() ;
assertEquals(0, g.size()) ;
returnGraph(g) ;
}
Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/TS_Graph.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/TS_Graph.java?rev=1419595&r1=1419594&r2=1419595&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/TS_Graph.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/TS_Graph.java Mon Dec 10 17:25:00 2012
@@ -28,7 +28,6 @@ import org.junit.runners.Suite ;
, TestDatasetGraphMem.class
, TestGraphsDataBag.class
, TestGraphUnionRead.class
- , TestReifier2.class
})
public class TS_Graph
{
Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/TestGraphsDataBag.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/TestGraphsDataBag.java?rev=1419595&r1=1419594&r2=1419595&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/TestGraphsDataBag.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/TestGraphsDataBag.java Mon Dec 10 17:25:00 2012
@@ -27,13 +27,7 @@ import org.junit.Test ;
import com.hp.hpl.jena.graph.Graph ;
import com.hp.hpl.jena.graph.Triple ;
-import com.hp.hpl.jena.query.Query ;
-import com.hp.hpl.jena.query.QueryExecution ;
-import com.hp.hpl.jena.query.QueryExecutionFactory ;
-import com.hp.hpl.jena.query.QueryFactory ;
-import com.hp.hpl.jena.query.ResultSet ;
-import com.hp.hpl.jena.query.ResultSetFormatter ;
-import com.hp.hpl.jena.query.Syntax ;
+import com.hp.hpl.jena.query.* ;
import com.hp.hpl.jena.rdf.model.Model ;
import com.hp.hpl.jena.rdf.model.ModelFactory ;
import com.hp.hpl.jena.shared.DeleteDeniedException ;
@@ -104,8 +98,7 @@ public class TestGraphsDataBag extends B
{
distinct.add(SSE.parseTriple("(<x> <p> 'ZZZ')"));
assertEquals(1, count(distinct));
-
- distinct.getBulkUpdateHandler().removeAll();
+ distinct.clear();
assertEquals(0, count(distinct));
}
Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/AbstractTestUpdateBase.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/AbstractTestUpdateBase.java?rev=1419595&r1=1419594&r2=1419595&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/AbstractTestUpdateBase.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/AbstractTestUpdateBase.java Mon Dec 10 17:25:00 2012
@@ -21,6 +21,7 @@ package com.hp.hpl.jena.sparql.modify;
import org.apache.jena.atlas.junit.BaseTest ;
import com.hp.hpl.jena.graph.Graph ;
+import com.hp.hpl.jena.graph.GraphUtil ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.graph.Triple ;
import com.hp.hpl.jena.sparql.ARQTestSuite ;
@@ -35,8 +36,8 @@ public abstract class AbstractTestUpdate
protected void defaultGraphData(GraphStore gStore, Graph data)
{
Graph g = gStore.getDefaultGraph() ;
- g.getBulkUpdateHandler().removeAll() ;
- g.getBulkUpdateHandler().add(data) ;
+ g.clear() ;
+ GraphUtil.addInto(g, data) ;
}
protected void namedGraphData(GraphStore gStore, Node uri, Graph data)
@@ -48,8 +49,8 @@ public abstract class AbstractTestUpdate
g = gStore.getGraph(uri) ;
}
else
- g.getBulkUpdateHandler().removeAll() ;
- g.getBulkUpdateHandler().add(data) ;
+ g.clear() ;
+ GraphUtil.addInto(g,data) ;
}
protected static final String FileBase = ARQTestSuite.testDirUpdate ;
Propchange: jena/trunk/jena-core/
------------------------------------------------------------------------------
svn:mergeinfo = /jena/branches/jena-core-simplified:1413365-1418404
Modified: jena/trunk/jena-core/pom.xml
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/pom.xml?rev=1419595&r1=1419594&r2=1419595&view=diff
==============================================================================
--- jena/trunk/jena-core/pom.xml (original)
+++ jena/trunk/jena-core/pom.xml Mon Dec 10 17:25:00 2012
@@ -22,7 +22,7 @@
<artifactId>jena-core</artifactId>
<packaging>jar</packaging>
<name>Apache Jena - CORE API</name>
- <version>2.7.5-SNAPSHOT</version>
+ <version>2.10.0-SNAPSHOT</version>
<parent>
<groupId>org.apache.jena</groupId>
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/assembler/assemblers/FileModelAssembler.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/assembler/assemblers/FileModelAssembler.java?rev=1419595&r1=1419594&r2=1419595&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/assembler/assemblers/FileModelAssembler.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/assembler/assemblers/FileModelAssembler.java Mon Dec 10 17:25:00 2012
@@ -18,15 +18,17 @@
package com.hp.hpl.jena.assembler.assemblers;
-import java.io.File;
+import java.io.File ;
-import com.hp.hpl.jena.assembler.*;
-import com.hp.hpl.jena.graph.Graph;
-import com.hp.hpl.jena.graph.impl.*;
-import com.hp.hpl.jena.graph.impl.FileGraph.NotifyOnClose;
-import com.hp.hpl.jena.rdf.model.*;
-import com.hp.hpl.jena.shared.*;
-import com.hp.hpl.jena.util.FileUtils;
+import com.hp.hpl.jena.assembler.Assembler ;
+import com.hp.hpl.jena.assembler.JA ;
+import com.hp.hpl.jena.assembler.Mode ;
+import com.hp.hpl.jena.graph.Graph ;
+import com.hp.hpl.jena.graph.impl.FileGraph ;
+import com.hp.hpl.jena.graph.impl.FileGraph.NotifyOnClose ;
+import com.hp.hpl.jena.graph.impl.FileGraphMaker ;
+import com.hp.hpl.jena.rdf.model.* ;
+import com.hp.hpl.jena.util.FileUtils ;
public class FileModelAssembler extends NamedModelAssembler implements Assembler
{
@@ -40,14 +42,13 @@ public class FileModelAssembler extends
boolean create = getBoolean( root, JA.create, mayCreate );
boolean strict = getBoolean( root, JA.strict, mayCreate != mayReuse );
String lang = getLanguage( root, fullName );
- ReificationStyle style = getReificationStyle( root );
- return createFileModel( fullName, lang, create, strict, style );
+ return createFileModel( fullName, lang, create, strict );
}
- public Model createFileModel( File fullName, String lang, boolean create, boolean strict, ReificationStyle style )
+ public Model createFileModel( File fullName, String lang, boolean create, boolean strict )
{
NotifyOnClose notify = NotifyOnClose.ignore;
- Graph fileGraph = new FileGraph( notify, fullName, lang, create, strict, style );
+ Graph fileGraph = new FileGraph( notify, fullName, lang, create, strict );
return ModelFactory.createModelForGraph( fileGraph );
}
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/assembler/assemblers/MemoryModelAssembler.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/assembler/assemblers/MemoryModelAssembler.java?rev=1419595&r1=1419594&r2=1419595&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/assembler/assemblers/MemoryModelAssembler.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/assembler/assemblers/MemoryModelAssembler.java Mon Dec 10 17:25:00 2012
@@ -19,8 +19,12 @@
package com.hp.hpl.jena.assembler.assemblers;
-import com.hp.hpl.jena.assembler.*;
-import com.hp.hpl.jena.rdf.model.*;
+import com.hp.hpl.jena.assembler.Assembler ;
+import com.hp.hpl.jena.assembler.JA ;
+import com.hp.hpl.jena.assembler.Mode ;
+import com.hp.hpl.jena.rdf.model.Model ;
+import com.hp.hpl.jena.rdf.model.ModelFactory ;
+import com.hp.hpl.jena.rdf.model.Resource ;
public class MemoryModelAssembler extends ModelAssembler implements Assembler
{
@@ -33,5 +37,5 @@ public class MemoryModelAssembler extend
@Override
protected Model openEmptyModel( Assembler a, Resource root, Mode irrelevant )
- { return ModelFactory.createDefaultModel( getReificationStyle( root )); }
+ { return ModelFactory.createDefaultModel( ); }
}
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/assembler/assemblers/ModelAssembler.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/assembler/assemblers/ModelAssembler.java?rev=1419595&r1=1419594&r2=1419595&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/assembler/assemblers/ModelAssembler.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/assembler/assemblers/ModelAssembler.java Mon Dec 10 17:25:00 2012
@@ -58,20 +58,21 @@ public abstract class ModelAssembler ext
c.fill( m );
}
- public static ReificationStyle getReificationStyle( Resource root )
- {
- Resource r = getUniqueResource( root, JA.reificationMode );
- return r == null ? ReificationStyle.Standard : styleFor( root, r );
- }
-
- public static ReificationStyle styleFor( Resource root, Resource r )
- {
- if (r.equals( JA.minimal )) return ReificationStyle.Minimal;
- if (r.equals( JA.standard )) return ReificationStyle.Standard;
- if (r.equals( JA.convenient )) return ReificationStyle.Convenient;
- throw new UnknownStyleException( root, r );
- }
-
+// public static ReificationStyle xgetReificationStyle( Resource root )
+// {
+// Resource r = getUniqueResource( root, JA.reificationMode );
+// return r == null ? ReificationStyle.Standard : styleFor( root, r );
+// }
+//
+// @SuppressWarnings("deprecation")
+// public static ReificationStyle styleFor( Resource root, Resource r )
+// {
+// if (r.equals( JA.minimal )) return ReificationStyle.Minimal;
+// if (r.equals( JA.standard )) return ReificationStyle.Standard;
+// if (r.equals( JA.convenient )) return ReificationStyle.Convenient;
+// throw new UnknownStyleException( root, r );
+// }
+//
private PrefixMapping getPrefixMapping( Assembler a, Resource root )
{
return PrefixMappingAssembler.getPrefixes
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/assembler/assemblers/ReasonerFactoryAssembler.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/assembler/assemblers/ReasonerFactoryAssembler.java?rev=1419595&r1=1419594&r2=1419595&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/assembler/assemblers/ReasonerFactoryAssembler.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/assembler/assemblers/ReasonerFactoryAssembler.java Mon Dec 10 17:25:00 2012
@@ -89,7 +89,7 @@ public class ReasonerFactoryAssembler ex
private void loadSchema( Graph result, Assembler a, Resource root )
{
Model m = a.openModel( root );
- result.getBulkUpdateHandler().add( m.getGraph() );
+ GraphUtil.addInto(result, m.getGraph()) ;
}
private ReasonerFactory addRules( Resource root, Assembler a, final ReasonerFactory r )
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/BulkUpdateHandler.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/BulkUpdateHandler.java?rev=1419595&r1=1419594&r2=1419595&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/BulkUpdateHandler.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/BulkUpdateHandler.java Mon Dec 10 17:25:00 2012
@@ -28,13 +28,13 @@ import java.util.*;
However, if a bulk update does not fail (ie throw an exception) then the
addition or removal of triples must have been successfully completed
in accordance with the operation of the owning graph.
-
*/
public interface BulkUpdateHandler
{
/**
Add all the triples into the graph this is handler for.
@param triples an array of triples to add
+ @deprecated See GraphUtil for helper functions for migration.
*/
@Deprecated
void add( Triple [] triples );
@@ -43,6 +43,7 @@ public interface BulkUpdateHandler
Add all the triples in the list into the graph this is handler for.
Each element of the List must be a Triple.
@param triples a list of Triple objects to add
+ @deprecated See GraphUtil for helper functions for migration.
*/
@Deprecated
void add( List<Triple> triples );
@@ -53,6 +54,7 @@ public interface BulkUpdateHandler
have to expand the iterator into a data structure containing all the component
elements; hence long iterators may be expensive on store.
@param it an Iterator delivering Triples
+ @deprecated See GraphUtil for helper functions for migration.
*/
@Deprecated
void add( Iterator<Triple> it );
@@ -62,6 +64,7 @@ public interface BulkUpdateHandler
Optionally add g's reified triples.
@param g a Graph whose triples are to be added
@param withReifications if true, the reified triples of g are added as well
+ @deprecated See GraphUtil for helper functions for migration.
*/
@Deprecated
void add( Graph g, boolean withReifications );
@@ -70,66 +73,70 @@ public interface BulkUpdateHandler
Add all the triples of the given graph into the graph this is handler for.
Leave this graph's reifications unchanged.
@param g a Graph whose triples are to be added
+ @deprecated See GraphUtil for helper functions for migration.
*/
- // @Deprecated
- // Will move to Graph.add(Graph)
+ @Deprecated
void add( Graph g );
/**
- Remove all the triples from the graph this is handler for.
- @param triples an array of triples to remove
+ Delete all the triples from the graph this is handler for.
+ @param triples an array of triples to delete
+ @deprecated See GraphUtil for helper functions for migration.
*/
@Deprecated
void delete( Triple [] triples );
/**
- Remove all the triples in the list from the graph this is handler for.
+ Delete all the triples in the list from the graph this is handler for.
Each element of the List must be a Triple.
- @param triples a list of triples to remove
+ @param triples a list of triples to delete
+ @deprecated See GraphUtil for helper functions for migration.
*/
@Deprecated
void delete( List<Triple> triples );
/**
- Remove all the triples in the iterator from the graph this is handler for.
+ Delete all the triples in the iterator from the graph this is handler for.
Each element from the iterator must be a Triple. WARNING. An implementation may
have to expand the iterator into a data structure containing all the component
elements; hence long iterators may be expensive on store.
@param it an iterator over Triple
+ @deprecated See GraphUtil for helper functions for migration.
*/
@Deprecated
void delete( Iterator<Triple> it );
/**
- Remove all the triples of the given graph from the graph this is handler for.
+ Delete all the triples of the given graph from the graph this is handler for.
Do not change the reifications.
- @param g a graph whose triples are to be removed
+ @param g a graph whose triples are to be deleted
+ @deprecated See GraphUtil for helper functions for migration.
*/
- // @Deprecated
- // Will move to Graph.delete(Graph)
+ @Deprecated
void delete( Graph g );
/**
- Remove all the triples of the given graph from the graph this is handler for.
- Reified triples may optionally be removed.
- @param g a graph whose triples are to be removed
- @param withReifications if true, remove g's reifications from this graph
+ Delete all the triples of the given graph from the graph this is handler for.
+ Reified triples may optionally be deleted.
+ @param g a graph whose triples are to be deleted
+ @param withReifications if true, delete g's reifications from this graph
+ @deprecated See GraphUtil for helper functions for migration.
*/
@Deprecated
void delete( Graph g, boolean withReifications );
/**
Remove all the statements from a graph.
+ @deprecated Use Graph.clear()
*/
- // @Deprecated
- // Will move to Graph.removeAll() or .clear()
+ @Deprecated
void removeAll();
/**
Remove all triples that would be delivered by find(s, p, o)
+ @deprecated Use Graph.remove( Node s, Node p, Node o )
*/
- // @Deprecated
- // Will move to Graph.remove(s,p,o)
+ @Deprecated
void remove( Node s, Node p, Node o );
}
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/Factory.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/Factory.java?rev=1419595&r1=1419594&r2=1419595&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/Factory.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/Factory.java Mon Dec 10 17:25:00 2012
@@ -19,7 +19,6 @@
package com.hp.hpl.jena.graph;
import com.hp.hpl.jena.mem.GraphMem ;
-import com.hp.hpl.jena.shared.*;
/**
A factory class for creating Graphs.
@@ -35,20 +34,11 @@ public class Factory
Answer a memory-based Graph with the Standard reification style.
*/
public static Graph createDefaultGraph()
- { return createDefaultGraph( ReificationStyle.Standard ); }
-
- /**
- Answer a memory-based Graph with the given reification style.
- */
- public static Graph createDefaultGraph( ReificationStyle style )
- { return Factory.createGraphMem( style ); }
+ { return Factory.createGraphMem( ); }
public static Graph createGraphMem()
{ return new GraphMem(); }
- public static Graph createGraphMem( ReificationStyle style )
- { return new GraphMem( style ); }
-
public static Graph createGraphMemWithTransactionHandler( final TransactionHandler th )
{
Graph g = new GraphMem()
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/Graph.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/Graph.java?rev=1419595&r1=1419594&r2=1419595&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/Graph.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/Graph.java Mon Dec 10 17:25:00 2012
@@ -18,10 +18,11 @@
package com.hp.hpl.jena.graph;
-import com.hp.hpl.jena.graph.impl.GraphBase;
-import com.hp.hpl.jena.graph.query.*;
-import com.hp.hpl.jena.shared.*;
-import com.hp.hpl.jena.util.iterator.*;
+import com.hp.hpl.jena.graph.impl.GraphBase ;
+import com.hp.hpl.jena.shared.AddDeniedException ;
+import com.hp.hpl.jena.shared.DeleteDeniedException ;
+import com.hp.hpl.jena.shared.PrefixMapping ;
+import com.hp.hpl.jena.util.iterator.ExtendedIterator ;
/**
The interface to be satisfied by implementations maintaining collections
@@ -31,8 +32,6 @@ import com.hp.hpl.jena.util.iterator.*;
and transaction handling.
<p>
For <code>add(Triple)</code> see GraphAdd.
-
- @author Jeremy Carroll, Chris Dollin
*/
public interface Graph extends GraphAdd
{
@@ -53,13 +52,14 @@ public interface Graph extends GraphAdd
*/
boolean dependsOn( Graph other );
- /** returns this Graph's query handler */
- QueryHandler queryHandler();
-
/** returns this Graph's transaction handler */
TransactionHandler getTransactionHandler();
- /** returns this Graph's bulk-update handler */
+ /** returns this Graph's bulk-update handler
+ * @deprecated Bulk update operations are going to be removed.
+ * @see GraphUtil for convenience helpers.
+ */
+ @Deprecated
BulkUpdateHandler getBulkUpdateHandler();
/** returns this Graph's capabilities */
@@ -76,12 +76,6 @@ public interface Graph extends GraphAdd
*/
GraphStatisticsHandler getStatisticsHandler();
- /**
- returns this Graph's reifier. Each call on a given Graph gets the same
- Reifier object.
- */
- Reifier getReifier();
-
/**
returns this Graph's prefix mapping. Each call on a given Graph gets the
same PrefixMapping object, which is the one used by the Graph.
@@ -89,9 +83,17 @@ public interface Graph extends GraphAdd
PrefixMapping getPrefixMapping();
/**
- Remove the triple t (if possible) from the set belonging to this graph
+ Add the triple t (if possible) to the set belonging to this graph
+ @param t the triple to add to the graph
+ @throws AddDeniedException if the triple cannot be added
+ */
+ @Override
+ void add( Triple t ) throws AddDeniedException;
+
+ /**
+ Delete the triple t (if possible) from the set belonging to this graph
- @param t the triple to add to the graph
+ @param t the triple to delete to the graph
@throws DeleteDeniedException if the triple cannot be removed
*/
void delete(Triple t) throws DeleteDeniedException;
@@ -132,6 +134,16 @@ public interface Graph extends GraphAdd
*/
boolean contains( Triple t );
+ /**
+ Remove all the statements from this graph.
+ */
+ void clear();
+
+ /**
+ Remove all triples that match by find(s, p, o)
+ */
+ void remove( Node s, Node p, Node o );
+
/** Free all resources, any further use of this Graph is an error.
*/
void close();
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/GraphListener.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/GraphListener.java?rev=1419595&r1=1419594&r2=1419595&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/GraphListener.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/GraphListener.java Mon Dec 10 17:25:00 2012
@@ -51,10 +51,6 @@ import java.util.*;
<p>To track all changes to a graph it is necessary to consider all the methods
in this interface, including {@link #notifyEvent(Graph, Object)}.
</p>
-
-
-
- @author Jeremy Carroll, extensions by kers
*/
public interface GraphListener
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/GraphMaker.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/GraphMaker.java?rev=1419595&r1=1419594&r2=1419595&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/GraphMaker.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/GraphMaker.java Mon Dec 10 17:25:00 2012
@@ -34,7 +34,9 @@ public interface GraphMaker
/**
Answer the reification style of all the graphs that this GraphMaker constructs.
@return the reification style given to all created graphs
+ @deprecated Only style "Standard" is supported.
*/
+ @Deprecated
public ReificationStyle getReificationStyle();
/**
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/GraphUtil.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/GraphUtil.java?rev=1419595&r1=1419594&r2=1419595&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/GraphUtil.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/GraphUtil.java Mon Dec 10 17:25:00 2012
@@ -18,10 +18,18 @@
package com.hp.hpl.jena.graph;
+import java.util.Iterator ;
+import java.util.List ;
+import java.util.Set ;
+
+import com.hp.hpl.jena.graph.impl.GraphWithPerform ;
+import com.hp.hpl.jena.util.IteratorCollection ;
import com.hp.hpl.jena.util.iterator.ExtendedIterator ;
+import com.hp.hpl.jena.util.iterator.Map1 ;
+import com.hp.hpl.jena.util.iterator.WrappedIterator ;
/**
- An ad-hoc collection of useful code for graphs; starting with findAll.
+ An ad-hoc collection of useful code for graphs
*/
public class GraphUtil
{
@@ -30,7 +38,84 @@ public class GraphUtil
*/
private GraphUtil()
{}
+
+ private static Map1<Triple, Node> mapSubject = new Map1<Triple, Node>() {
+ @Override
+ public Node map1(Triple triple)
+ {
+ return triple.getSubject() ;
+ }
+ } ;
+ private static Map1<Triple, Node> mapPredicate = new Map1<Triple, Node>() {
+ @Override
+ public Node map1(Triple triple)
+ {
+ return triple.getPredicate() ;
+ }
+ } ;
+ private static Map1<Triple, Node> mapObject = new Map1<Triple, Node>() {
+ @Override
+ public Node map1(Triple triple)
+ {
+ return triple.getObject() ;
+ }
+ } ;
+ /** Return an iterator over the unique subjects with predciate p and object o.
+ * p and o can be wildcards (Node.ANY)
+ * @param g Graph
+ * @param p Predicate - may be Node.ANY
+ * @param o Object - may be Node.ANY
+ * @return ExtendedIterator
+ */
+ public static ExtendedIterator<Node> listSubjects(Graph g, Node p, Node o)
+ {
+ // Restore a minimal QueryHandler?
+ ExtendedIterator<Triple> iter = g.find(Node.ANY, p, o) ;
+ Set<Node> nodes = iter.mapWith(mapSubject).toSet() ;
+ return WrappedIterator.createNoRemove(nodes.iterator()) ;
+ }
+
+ /** Return an iterator over the unique predicate between s and o.
+ * s and o can be wildcards (Node.ANY)
+ * @param g Graph
+ * @param s Subject - may be Node.ANY
+ * @param o Object - may be Node.ANY
+ * @return ExtendedIterator
+ */
+ public static ExtendedIterator<Node> listPredicates(Graph g, Node s, Node o)
+ {
+ ExtendedIterator<Triple> iter = g.find(s,Node.ANY, o) ;
+ Set<Node> nodes = iter.mapWith(mapPredicate).toSet() ;
+ return WrappedIterator.createNoRemove(nodes.iterator()) ;
+ }
+
+ /** Return an iterator over the unique objects with a given subject and object.
+ * s and p can be wildcards (Node.ANY)
+ * @param g Graph
+ * @param s Subject - may be Node.ANY
+ * @param p Predicate - may be Node.ANY
+ * @return ExtendedIterator
+ */
+ public static ExtendedIterator<Node> listObjects(Graph g, Node s, Node p)
+ {
+ ExtendedIterator<Triple> iter = g.find(s, p, Node.ANY) ;
+ Set<Node> nodes = iter.mapWith(mapObject).toSet() ;
+ return WrappedIterator.createNoRemove(nodes.iterator()) ;
+ }
+
+ /** Does the graph use the node anywhere as a subject, predciate or object? */
+ public static boolean containsNode(Graph graph, Node node)
+ {
+ return
+ graph.contains(node, Node.ANY, Node.ANY) ||
+ graph.contains(Node.ANY, Node.ANY, node) ||
+ graph.contains(Node.ANY, node, Node.ANY) ;
+ }
+
+ /* Control how events are dealt with in bulk */
+ private static final boolean OldStyle = true ;
+
/**
* Answer an iterator covering all the triples in the specified graph.
*
@@ -42,4 +127,190 @@ public class GraphUtil
{
return g.find(Triple.ANY) ;
}
+
+ public static void add(Graph graph, Triple[] triples)
+ {
+ if ( OldStyle && graph instanceof GraphWithPerform )
+ {
+ GraphWithPerform g = (GraphWithPerform)graph ;
+ for (Triple t : triples )
+ g.performAdd(t) ;
+ graph.getEventManager().notifyAddArray(graph, triples) ;
+ }
+ else
+ {
+ for (Triple t : triples )
+ graph.add(t) ;
+ }
+ }
+
+ public static void add(Graph graph, List<Triple> triples)
+ {
+ if ( OldStyle && graph instanceof GraphWithPerform )
+ {
+ GraphWithPerform g = (GraphWithPerform)graph ;
+ for (Triple t : triples)
+ g.performAdd(t) ;
+ graph.getEventManager().notifyAddList(graph, triples) ;
+ } else
+ {
+ for (Triple t : triples)
+ graph.add(t) ;
+ }
+ }
+
+ public static void add(Graph graph, Iterator<Triple> it)
+ {
+ // Materialize to avoid ConcurrentModificationException.
+ List<Triple> s = IteratorCollection.iteratorToList(it) ;
+ if ( OldStyle && graph instanceof GraphWithPerform )
+ {
+ GraphWithPerform g = (GraphWithPerform)graph ;
+ for (Triple t : s)
+ g.performAdd(t) ;
+ graph.getEventManager().notifyAddIterator(graph, s) ;
+ }
+ else
+ {
+ for (Triple t : s)
+ graph.add(t) ;
+ }
+ }
+
+ /** Add triples into the destination (arg 1) from the source (arg 2)*/
+ public static void addInto(Graph dstGraph, Graph srcGraph )
+ {
+ addIteratorWorker(dstGraph, GraphUtil.findAll( srcGraph ));
+ dstGraph.getEventManager().notifyAddGraph( dstGraph, srcGraph );
+ }
+
+ private static void addIteratorWorker( Graph graph, Iterator<Triple> it )
+ {
+ List<Triple> s = IteratorCollection.iteratorToList( it );
+ if ( OldStyle && graph instanceof GraphWithPerform )
+ {
+ GraphWithPerform g = (GraphWithPerform)graph ;
+ for (Triple t : s )
+ g.performAdd(t) ;
+ }
+ else
+ {
+ for (Triple t : s )
+ graph.add(t) ;
+ }
+ }
+
+ public static void delete(Graph graph, Triple[] triples)
+ {
+ if ( OldStyle && graph instanceof GraphWithPerform )
+ {
+ GraphWithPerform g = (GraphWithPerform)graph ;
+ for (Triple t : triples )
+ g.performDelete(t) ;
+ graph.getEventManager().notifyDeleteArray(graph, triples) ;
+ }
+ else
+ {
+ for (Triple t : triples )
+ graph.delete(t) ;
+ }
+ }
+
+ public static void delete(Graph graph, List<Triple> triples)
+ {
+ if ( OldStyle && graph instanceof GraphWithPerform )
+ {
+ GraphWithPerform g = (GraphWithPerform)graph ;
+ for (Triple t : triples )
+ g.performDelete(t) ;
+ graph.getEventManager().notifyDeleteList(graph, triples) ;
+ }
+ else
+ {
+ for (Triple t : triples )
+ graph.delete(t) ;
+ }
+ }
+
+ public static void delete(Graph graph, Iterator<Triple> it)
+ {
+ // Materialize to avoid ConcurrentModificationException.
+ List<Triple> s = IteratorCollection.iteratorToList(it) ;
+ if ( OldStyle && graph instanceof GraphWithPerform )
+ {
+ GraphWithPerform g = (GraphWithPerform)graph ;
+ for (Triple t : s)
+ g.performDelete(t) ;
+ graph.getEventManager().notifyDeleteIterator(graph, s) ;
+ }
+ else
+ {
+ for (Triple t : s)
+ graph.delete(t) ;
+ }
+ }
+
+ /** Delete triples the destination (arg 1) as given in the source (arg 2) */
+ public static void deleteFrom(Graph dstGraph, Graph srcGraph)
+ {
+ deleteIteratorWorker(dstGraph, GraphUtil.findAll( srcGraph ));
+ dstGraph.getEventManager().notifyDeleteGraph( dstGraph, srcGraph );
+ }
+
+ private static void deleteIteratorWorker( Graph graph, Iterator<Triple> it )
+ {
+ List<Triple> s = IteratorCollection.iteratorToList( it );
+ if ( OldStyle && graph instanceof GraphWithPerform )
+ {
+ GraphWithPerform g = (GraphWithPerform)graph ;
+ for (Triple t : s )
+ g.performDelete(t) ;
+ }
+ else
+ {
+ for (Triple t : s )
+ graph.delete(t) ;
+ }
+ }
+
+ private static final int sliceSize = 1000 ;
+ /** A safe and cautious remve() function.
+ * To avoid any possible ConcurrentModificationExceptions,
+ * it finds batches of triples, deletes them and tries again until
+ * no change occurs.
+ */
+ public static void remove(Graph g, Node s, Node p, Node o)
+ {
+ // Beware of ConcurrentModificationExceptions.
+ // Delete in batches.
+ // That way, there is no active iterator when a delete
+ // from the indexes happens.
+
+ Triple[] array = new Triple[sliceSize] ;
+
+ while (true)
+ {
+ // Convert/cache s,p,o?
+ // The Node Cache will catch these so don't worry unduely.
+ ExtendedIterator<Triple> iter = g.find(s,p,o) ;
+
+ // Get a slice
+ int len = 0 ;
+ for ( ; len < sliceSize ; len++ )
+ {
+ if ( !iter.hasNext() ) break ;
+ array[len] = iter.next() ;
+ }
+
+ // Delete them.
+ for ( int i = 0 ; i < len ; i++ )
+ {
+ g.delete(array[i]) ;
+ array[i] = null ;
+ }
+ // Finished?
+ if ( len < sliceSize )
+ break ;
+ }
+ }
}
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/compose/MultiUnion.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/compose/MultiUnion.java?rev=1419595&r1=1419594&r2=1419595&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/compose/MultiUnion.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/compose/MultiUnion.java Mon Dec 10 17:25:00 2012
@@ -20,15 +20,16 @@
///////////////
package com.hp.hpl.jena.graph.compose;
-import com.hp.hpl.jena.JenaRuntime;
-import com.hp.hpl.jena.graph.*;
-import com.hp.hpl.jena.graph.impl.SimpleEventManager;
-import com.hp.hpl.jena.graph.query.QueryHandler;
-import com.hp.hpl.jena.shared.JenaException;
-import com.hp.hpl.jena.util.CollectionFactory;
-import com.hp.hpl.jena.util.iterator.*;
+import java.util.Iterator ;
+import java.util.Set ;
-import java.util.*;
+import com.hp.hpl.jena.JenaRuntime ;
+import com.hp.hpl.jena.graph.* ;
+import com.hp.hpl.jena.graph.impl.SimpleEventManager ;
+import com.hp.hpl.jena.shared.JenaException ;
+import com.hp.hpl.jena.util.CollectionFactory ;
+import com.hp.hpl.jena.util.iterator.ExtendedIterator ;
+import com.hp.hpl.jena.util.iterator.NullIterator ;
/**
* <p>
@@ -81,13 +82,6 @@ public class MultiUnion extends Polyadic
private boolean optimising = JenaRuntime.getSystemProperty( "jena.union.optimise", "yes" ).equals( "yes" );
- /**
- Unions share the reifiers of their base graphs. THIS WILL CHANGE.
- */
- @Override public Reifier getReifier()
- { Graph base = getBaseGraph();
- return base == null ? super.getReifier() : base.getReifier(); }
-
@Override protected GraphStatisticsHandler createStatisticsHandler()
{ return new MultiUnionStatisticsHandler( this ); }
@@ -133,12 +127,6 @@ public class MultiUnion extends Polyadic
return false;
}
- @Override public QueryHandler queryHandler()
- { return optimiseOne() ? singleGraphQueryHandler() : super.queryHandler(); }
-
- private QueryHandler singleGraphQueryHandler()
- { return (m_subGraphs.get( 0 )).queryHandler(); }
-
/**
* <p>
* Answer an iterator over the triples in the union of the graphs in this composition. <b>Note</b>
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/compose/Polyadic.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/compose/Polyadic.java?rev=1419595&r1=1419594&r2=1419595&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/compose/Polyadic.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/compose/Polyadic.java Mon Dec 10 17:25:00 2012
@@ -260,6 +260,7 @@ public abstract class Polyadic extends C
}
@Override
+ @Deprecated
public BulkUpdateHandler getBulkUpdateHandler() {
if (bulkHandler == null)
bulkHandler = new WrappedBulkUpdateHandler( this, getRequiredBaseGraph().getBulkUpdateHandler() );
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/BaseGraphMaker.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/BaseGraphMaker.java?rev=1419595&r1=1419594&r2=1419595&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/BaseGraphMaker.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/BaseGraphMaker.java Mon Dec 10 17:25:00 2012
@@ -29,20 +29,18 @@ public abstract class BaseGraphMaker imp
{
/**
Construct the base level of a graph maker.
- @param style the reification style for all the graphs it makes
*/
- public BaseGraphMaker( ReificationStyle style )
- { this.style = style; }
+ public BaseGraphMaker( ) { }
private int counter = 0;
- protected ReificationStyle style;
/**
Answer our reification style.
*/
@Override
+ @Deprecated
public ReificationStyle getReificationStyle()
- { return style; }
+ { return ReificationStyle.Standard ; }
/**
Answer the default graph for this maker. If we haven't already made it, make it
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/FileGraph.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/FileGraph.java?rev=1419595&r1=1419594&r2=1419595&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/FileGraph.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/FileGraph.java Mon Dec 10 17:25:00 2012
@@ -43,11 +43,8 @@ public class FileGraph extends GraphMem
public void notifyClosed( File f ) {} };
}
- /**
- See FileGraph( f, create, strict, Reifier.ReificationStyle ).
- */
public FileGraph( File f, boolean create, boolean strict )
- { this( NotifyOnClose.ignore, f, create, strict, ReificationStyle.Minimal ); }
+ { this( NotifyOnClose.ignore, f, create, strict ); }
/**
The File-name of this graph, used to name it in the filing system
@@ -79,8 +76,8 @@ public class FileGraph extends GraphMem
@param strict true to throw exceptions for create: existing, open: not found
@param style the reification style for the graph
*/
- public FileGraph( NotifyOnClose notify, File f, boolean create, boolean strict, ReificationStyle style )
- { this( notify, f, FileUtils.guessLang( f.toString() ), create, strict, style ); }
+ public FileGraph( NotifyOnClose notify, File f, boolean create, boolean strict )
+ { this( notify, f, FileUtils.guessLang( f.toString() ), create, strict ); }
/**
Construct a new FileGraph who's name is given by the specified File,
@@ -94,9 +91,8 @@ public class FileGraph extends GraphMem
@param strict true to throw exceptions for create: existing, open: not found
@param style the reification style for the graph
*/
- public FileGraph( NotifyOnClose notify, File f, String lang, boolean create, boolean strict, ReificationStyle style )
+ public FileGraph( NotifyOnClose notify, File f, String lang, boolean create, boolean strict )
{
- super( style );
this.name = f;
this.notify = notify;
this.model = new ModelCom( this );
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/FileGraphMaker.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/FileGraphMaker.java?rev=1419595&r1=1419594&r2=1419595&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/FileGraphMaker.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/FileGraphMaker.java Mon Dec 10 17:25:00 2012
@@ -49,17 +49,18 @@ public class FileGraphMaker
@param root the directory to keep the files in.
*/
public FileGraphMaker( String root )
- { this( root, ReificationStyle.Minimal ); }
-
- /**
- Construct a file graph factory whose files will appear in root. The files
- will be retained when the maker is closed.
-
- @param root the directory to keep the files in.
- @param style the reification style of the resulting graph
- */
- public FileGraphMaker( String root, ReificationStyle style )
- { this( root, style, false ); }
+ { this ( root, false ) ; }
+// { this( root, ReificationStyle.Minimal ); }
+//
+// /**
+// Construct a file graph factory whose files will appear in root. The files
+// will be retained when the maker is closed.
+//
+// @param root the directory to keep the files in.
+// @param style the reification style of the resulting graph
+// */
+// public FileGraphMaker( String root, ReificationStyle style )
+// { this( root, style, false ); }
/**
Construct a file graph factory whose files will appear in root.
@@ -70,9 +71,9 @@ public class FileGraphMaker
@param style the reification style of the graph
@param deleteOnClose iff true, delete created files on close
*/
- public FileGraphMaker( String root, ReificationStyle style, boolean deleteOnClose )
+ public FileGraphMaker( String root, boolean deleteOnClose )
{
- super( style );
+ super( );
this.fileBase = root;
this.deleteOnClose = deleteOnClose;
}
@@ -98,7 +99,7 @@ public class FileGraphMaker
File f = withRoot( name );
FileGraph already = created.get( f );
if (already == null)
- return remember( f, new FileGraph( this, f, true, strict, style ) );
+ return remember( f, new FileGraph( this, f, true, strict ) );
else
{
if (strict) throw new AlreadyExistsException( name );
@@ -112,7 +113,7 @@ public class FileGraphMaker
File f = withRoot( name );
return created.containsKey( f )
? created.get( f ).openAgain()
- : remember( f, new FileGraph( this, f, false, strict, style ) )
+ : remember( f, new FileGraph( this, f, false, strict ) )
;
}
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/FileGraphTransactionHandler.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/FileGraphTransactionHandler.java?rev=1419595&r1=1419594&r2=1419595&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/FileGraphTransactionHandler.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/FileGraphTransactionHandler.java Mon Dec 10 17:25:00 2012
@@ -67,7 +67,7 @@ public class FileGraphTransactionHandler
@Override
public void abort()
- { fileGraph.getBulkUpdateHandler().removeAll();
+ { fileGraph.clear();
fileGraph.readModelFrom( fileGraph.model, true, checkPointFile );
checkPointFile.delete();
inTransaction = false; }