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 2017/12/07 14:27:22 UTC
[6/9] jena git commit: Put in compatibility for ja:DatasetTxnMem.
Put in compatibility for ja:DatasetTxnMem.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/a49e997c
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/a49e997c
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/a49e997c
Branch: refs/heads/master
Commit: a49e997c6b3b2fd699d588b2ec0114337a2a0ae8
Parents: 74cbc63
Author: Andy Seaborne <an...@apache.org>
Authored: Thu Dec 7 13:55:11 2017 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Thu Dec 7 13:55:11 2017 +0000
----------------------------------------------------------------------
.../sparql/core/assembler/AssemblerUtils.java | 8 ++--
.../core/assembler/DatasetAssemblerVocab.java | 3 ++
.../core/assembler/InMemDatasetAssembler.java | 43 ++++++++++----------
3 files changed, 30 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/a49e997c/jena-arq/src/main/java/org/apache/jena/sparql/core/assembler/AssemblerUtils.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/core/assembler/AssemblerUtils.java b/jena-arq/src/main/java/org/apache/jena/sparql/core/assembler/AssemblerUtils.java
index 5d77a36..c003500 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/core/assembler/AssemblerUtils.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/core/assembler/AssemblerUtils.java
@@ -51,14 +51,16 @@ public class AssemblerUtils
static { JenaSystem.init() ; }
+ @SuppressWarnings("deprecation")
static public void init()
{
if ( initialized )
return ;
initialized = true ;
- // Wire in the extension assemblers (extensions relative to the Jena assembler framework)
- registerDataset(DatasetAssembler.getType(), new DatasetAssembler()) ;
- registerDataset(InMemDatasetAssembler.getType(), new InMemDatasetAssembler()) ;
+ // Wire in the datasets assemblers
+ registerDataset(DatasetAssembler.getType(), new DatasetAssembler()) ;
+ registerDataset(InMemDatasetAssembler.getType(), new InMemDatasetAssembler()) ;
+ registerDataset(DatasetAssemblerVocab.tDatasetTxnMem, new InMemDatasetAssembler()) ;
}
private static Model modelExtras = ModelFactory.createDefaultModel() ;
http://git-wip-us.apache.org/repos/asf/jena/blob/a49e997c/jena-arq/src/main/java/org/apache/jena/sparql/core/assembler/DatasetAssemblerVocab.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/core/assembler/DatasetAssemblerVocab.java b/jena-arq/src/main/java/org/apache/jena/sparql/core/assembler/DatasetAssemblerVocab.java
index 1a2bc0c..6122eb9 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/core/assembler/DatasetAssemblerVocab.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/core/assembler/DatasetAssemblerVocab.java
@@ -31,7 +31,10 @@ public class DatasetAssemblerVocab
// General dataset
public static final Resource tDataset = ResourceFactory.createResource(NS+"RDFDataset") ;
// In-memory dataset
+
public static final Resource tMemoryDataset = ResourceFactory.createResource(NS+"MemoryDataset") ;
+ /** @deprecated use {@link #tMemoryDataset} */
+ public static final Resource tDatasetTxnMem = ResourceFactory.createResource(NS+"") ;
public static final Resource tDatasetNull = ResourceFactory.createResource(NS+"DatasetNull") ;
public static final Property pDefaultGraph = ResourceFactory.createProperty(NS, "defaultGraph") ;
http://git-wip-us.apache.org/repos/asf/jena/blob/a49e997c/jena-arq/src/main/java/org/apache/jena/sparql/core/assembler/InMemDatasetAssembler.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/core/assembler/InMemDatasetAssembler.java b/jena-arq/src/main/java/org/apache/jena/sparql/core/assembler/InMemDatasetAssembler.java
index 83a8017..9e3717d 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/core/assembler/InMemDatasetAssembler.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/core/assembler/InMemDatasetAssembler.java
@@ -39,26 +39,27 @@ public class InMemDatasetAssembler extends DatasetAssembler {
public static Resource getType() {
return DatasetAssemblerVocab.tMemoryDataset ;
}
-
- @Override
- public Dataset open(final Assembler assembler, final Resource root, final Mode mode) {
- checkType(root, getType(), tDataset);
- final Dataset dataset = createTxnMem();
- setContext(root, dataset.getContext());
- Txn.executeWrite(dataset, ()->{
- // Load data into the default graph or quads into the dataset.
- multiValueAsString(root, data)
- .forEach(dataURI -> read(dataset, dataURI));
-
- // load data into named graphs
- multiValueResource(root, pNamedGraph).forEach(namedGraphResource -> {
- final String graphName = getAsStringValue(namedGraphResource, pGraphName);
- if (namedGraphResource.hasProperty(data))
- multiValueAsString(namedGraphResource, data)
- .forEach(namedGraphData -> read(dataset.getNamedModel(graphName), namedGraphData));
- });
- });
- return dataset;
- }
+ @SuppressWarnings("deprecation")
+ @Override
+ public Dataset open(final Assembler assembler, final Resource root, final Mode mode) {
+ checkType(root, getType(), tDataset, DatasetAssemblerVocab.tDatasetTxnMem);
+ final Dataset dataset = createTxnMem();
+ setContext(root, dataset.getContext());
+
+ Txn.executeWrite(dataset, ()->{
+ // Load data into the default graph or quads into the dataset.
+ multiValueAsString(root, data)
+ .forEach(dataURI -> read(dataset, dataURI));
+
+ // load data into named graphs
+ multiValueResource(root, pNamedGraph).forEach(namedGraphResource -> {
+ final String graphName = getAsStringValue(namedGraphResource, pGraphName);
+ if (namedGraphResource.hasProperty(data))
+ multiValueAsString(namedGraphResource, data)
+ .forEach(namedGraphData -> read(dataset.getNamedModel(graphName), namedGraphData));
+ });
+ });
+ return dataset;
+ }
}