litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use the dataset directly for isomorphism with Jena backend

Browse source
This commit is contained in:
Graham Triggs 2017-03-19 22:01:31 +00:00
parent 6d44d052f7
commit f45847842c
1 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

24
api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/RDFServiceJena.java
View file

@ -7,6 +7,8 @@ import java.io.ByteArrayOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.OutputStream; import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.StringWriter;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
@ -19,6 +21,7 @@ import org.apache.commons.logging.LogFactory;
import org.apache.jena.query.QuerySolutionMap; import org.apache.jena.query.QuerySolutionMap;
import org.apache.jena.query.Syntax; import org.apache.jena.query.Syntax;
import org.apache.jena.rdf.model.Literal; import org.apache.jena.rdf.model.Literal;
import org.apache.jena.riot.Lang;
import org.apache.jena.riot.RDFDataMgr; import org.apache.jena.riot.RDFDataMgr;
import org.apache.log4j.lf5.util.StreamUtils; import org.apache.log4j.lf5.util.StreamUtils;
@ -594,10 +597,14 @@ public abstract class RDFServiceJena extends RDFServiceImpl implements RDFServic
@Override @Override
public boolean isEquivalentGraph(String graphURI, InputStream serializedGraph, public boolean isEquivalentGraph(String graphURI, InputStream serializedGraph,
ModelSerializationFormat serializationFormat) throws RDFServiceException { ModelSerializationFormat serializationFormat) throws RDFServiceException {
Model fileModel = RDFServiceUtils.parseModel(serializedGraph, serializationFormat);
Model tripleStoreModel = new RDFServiceDataset(this).getNamedModel(graphURI); Model fileModel = RDFServiceUtils.parseModel(serializedGraph, serializationFormat);
Model fromTripleStoreModel = ModelFactory.createDefaultModel().add(tripleStoreModel);
return fileModel.isIsomorphicWith(fromTripleStoreModel); DatasetWrapper dw = getDatasetWrapper();
Dataset d = dw.getDataset();
Model tripleStoreModel = d.getNamedModel(graphURI);
return fileModel.isIsomorphicWith(tripleStoreModel);
} }
/** /**
@ -607,12 +614,11 @@ public abstract class RDFServiceJena extends RDFServiceImpl implements RDFServic
@Override @Override
public boolean isEquivalentGraph(String graphURI, Model graph) throws RDFServiceException { public boolean isEquivalentGraph(String graphURI, Model graph) throws RDFServiceException {
// Retrieve the graph to compare // Retrieve the graph to compare
Model tripleStoreModel = new RDFServiceDataset(this).getNamedModel(graphURI); DatasetWrapper dw = getDatasetWrapper();
Dataset d = dw.getDataset();
Model tripleStoreModel = d.getNamedModel(graphURI);
// Load the entire graph into memory (faster comparison) return graph.isIsomorphicWith(tripleStoreModel);
Model fromTripleStoreModel = ModelFactory.createDefaultModel().add(tripleStoreModel);
return graph.isIsomorphicWith(fromTripleStoreModel);
} }
@Override @Override