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 2015/11/25 18:29:35 UTC
[1/4] jena git commit: JENA-624: Clean examples and use the
transactional in-memory dataset.
Repository: jena
Updated Branches:
refs/heads/master 90c04b1ac -> b65974f7c
JENA-624: Clean examples and use the transactional in-memory dataset.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/6dbdc0c8
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/6dbdc0c8
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/6dbdc0c8
Branch: refs/heads/master
Commit: 6dbdc0c8eaf30d74dc11860e9e62d1496184a082
Parents: 90c04b1
Author: Andy Seaborne <an...@apache.org>
Authored: Tue Nov 24 21:32:23 2015 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Wed Nov 25 17:28:11 2015 +0000
----------------------------------------------------------------------
.../arq/examples/riot/ExRIOT_3.java | 2 +-
.../update/UpdateExecuteOperations.java | 28 +++++++++++---------
.../arq/examples/update/UpdateProgrammatic.java | 10 ++++---
.../arq/examples/update/UpdateReadFromFile.java | 14 +++++-----
4 files changed, 30 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/6dbdc0c8/jena-arq/src-examples/arq/examples/riot/ExRIOT_3.java
----------------------------------------------------------------------
diff --git a/jena-arq/src-examples/arq/examples/riot/ExRIOT_3.java b/jena-arq/src-examples/arq/examples/riot/ExRIOT_3.java
index 97959c1..7289dfa 100644
--- a/jena-arq/src-examples/arq/examples/riot/ExRIOT_3.java
+++ b/jena-arq/src-examples/arq/examples/riot/ExRIOT_3.java
@@ -37,7 +37,7 @@ public class ExRIOT_3
RDFDataMgr.read(ds, "data2.trig") ;
// Create a dataset,
- Dataset ds2 = DatasetFactory.createMem() ;
+ Dataset ds2 = DatasetFactory.createTxnMem() ;
// read in data, indicating the syntax in case the remote end does not
// correctly provide the HTTP content type.
RDFDataMgr.read(ds2, "http://host/data2.unknown", TRIG) ;
http://git-wip-us.apache.org/repos/asf/jena/blob/6dbdc0c8/jena-arq/src-examples/arq/examples/update/UpdateExecuteOperations.java
----------------------------------------------------------------------
diff --git a/jena-arq/src-examples/arq/examples/update/UpdateExecuteOperations.java b/jena-arq/src-examples/arq/examples/update/UpdateExecuteOperations.java
index 63e530b..9da15ad 100644
--- a/jena-arq/src-examples/arq/examples/update/UpdateExecuteOperations.java
+++ b/jena-arq/src-examples/arq/examples/update/UpdateExecuteOperations.java
@@ -19,6 +19,7 @@
package arq.examples.update;
import org.apache.jena.atlas.lib.StrUtils ;
+import org.apache.jena.atlas.logging.LogCtl ;
import org.apache.jena.query.Dataset ;
import org.apache.jena.query.DatasetFactory ;
import org.apache.jena.riot.Lang ;
@@ -35,23 +36,24 @@ import org.apache.jena.update.UpdateRequest ;
public class UpdateExecuteOperations
{
+ static { LogCtl.setCmdLogging(); }
public static void main(String []args)
{
// Create an empty DatasetGraph (has an empty default graph and no named graphs)
- Dataset graphStore = DatasetFactory.createMem() ;
+ Dataset dataset = DatasetFactory.createTxnMem() ;
- ex1(graphStore) ;
- ex2(graphStore) ;
- ex3(graphStore) ;
+ ex1(dataset) ;
+ ex2(dataset) ;
+ ex3(dataset) ;
}
- public static void ex1(Dataset graphStore)
+ public static void ex1(Dataset dataset)
{
// Execute one operation.
- UpdateAction.parseExecute("LOAD <file:etc/update-data.ttl>", graphStore) ;
+ UpdateAction.parseExecute("LOAD <file:etc/update-data.ttl>", dataset) ;
}
- public static void ex2(Dataset graphStore)
+ public static void ex2(Dataset dataset)
{
// Execute a series of operations at once.
// See ex3 for a better way to build up a request
@@ -59,14 +61,14 @@ public class UpdateExecuteOperations
// The "\n" imporves readability and parser error messages.
String cmd = StrUtils.strjoin(" ;\n",
"DROP ALL",
- "CREATE GRAPH <http://example/g2>",
+ "CREATE GRAPH <http://example/g2>", // Not needed for most datasets
"LOAD <file:etc/update-data.ttl> INTO GRAPH <http://example/g2>") ;
// check string created
System.out.println(cmd) ;
- UpdateAction.parseExecute(cmd, graphStore) ;
+ UpdateAction.parseExecute(cmd, dataset) ;
}
- public static void ex3(Dataset graphStore)
+ public static void ex3(Dataset dataset)
{
// Build up the request then execute it.
// This is the preferred way for complex sequences of operations.
@@ -78,14 +80,14 @@ public class UpdateExecuteOperations
UpdateFactory.parse(request, "LOAD <file:etc/update-data.ttl> INTO GRAPH <http://example/g2>") ;
// And perform the operations.
- UpdateAction.execute(request, graphStore) ;
+ UpdateAction.execute(request, dataset) ;
System.out.println("# Debug format");
- SSE.write(graphStore) ;
+ SSE.write(dataset) ;
System.out.println();
System.out.println("# N-Quads: S P O G") ;
- RDFDataMgr.write(System.out, graphStore, Lang.NQUADS) ;
+ RDFDataMgr.write(System.out, dataset, Lang.NQUADS) ;
}
}
http://git-wip-us.apache.org/repos/asf/jena/blob/6dbdc0c8/jena-arq/src-examples/arq/examples/update/UpdateProgrammatic.java
----------------------------------------------------------------------
diff --git a/jena-arq/src-examples/arq/examples/update/UpdateProgrammatic.java b/jena-arq/src-examples/arq/examples/update/UpdateProgrammatic.java
index d354365..5e90485 100644
--- a/jena-arq/src-examples/arq/examples/update/UpdateProgrammatic.java
+++ b/jena-arq/src-examples/arq/examples/update/UpdateProgrammatic.java
@@ -18,6 +18,7 @@
package arq.examples.update;
+import org.apache.jena.atlas.logging.LogCtl ;
import org.apache.jena.query.Dataset ;
import org.apache.jena.query.DatasetFactory ;
import org.apache.jena.riot.Lang ;
@@ -37,23 +38,24 @@ import org.apache.jena.update.* ;
public class UpdateProgrammatic
{
+ static { LogCtl.setCmdLogging(); }
public static void main(String []args)
{
- Dataset graphStore = DatasetFactory.createMem() ;
+ Dataset dataset = DatasetFactory.createTxnMem() ;
UpdateRequest request = UpdateFactory.create() ;
request.add(new UpdateDrop(Target.ALL)) ;
request.add(new UpdateCreate("http://example/g2")) ;
request.add(new UpdateLoad("file:etc/update-data.ttl", "http://example/g2")) ;
- UpdateAction.execute(request, graphStore) ;
+ UpdateAction.execute(request, dataset) ;
System.out.println("# Debug format");
- SSE.write(graphStore) ;
+ SSE.write(dataset) ;
System.out.println();
System.out.println("# N-Quads: S P O G") ;
- RDFDataMgr.write(System.out, graphStore, Lang.NQUADS) ;
+ RDFDataMgr.write(System.out, dataset, Lang.NQUADS) ;
}
}
http://git-wip-us.apache.org/repos/asf/jena/blob/6dbdc0c8/jena-arq/src-examples/arq/examples/update/UpdateReadFromFile.java
----------------------------------------------------------------------
diff --git a/jena-arq/src-examples/arq/examples/update/UpdateReadFromFile.java b/jena-arq/src-examples/arq/examples/update/UpdateReadFromFile.java
index da1012d..3eea6b5 100644
--- a/jena-arq/src-examples/arq/examples/update/UpdateReadFromFile.java
+++ b/jena-arq/src-examples/arq/examples/update/UpdateReadFromFile.java
@@ -18,6 +18,7 @@
package arq.examples.update;
+import org.apache.jena.atlas.logging.LogCtl ;
import org.apache.jena.query.Dataset ;
import org.apache.jena.query.DatasetFactory ;
import org.apache.jena.riot.Lang ;
@@ -28,28 +29,29 @@ import org.apache.jena.update.* ;
/** Simple example of SPARQL/Update : read a update script from a file and execute it */
public class UpdateReadFromFile
{
+ static { LogCtl.setCmdLogging(); }
public static void main(String []args)
{
// Create an empty GraphStore (has an empty default graph and no named graphs)
- Dataset graphStore = DatasetFactory.createMem() ;
+ Dataset dataset = DatasetFactory.createTxnMem() ;
// ---- Read and update script in one step.
- UpdateAction.readExecute("update.ru", graphStore) ;
+ UpdateAction.readExecute("update.ru", dataset) ;
// ---- Reset.
- UpdateAction.parseExecute("DROP ALL", graphStore) ;
+ UpdateAction.parseExecute("DROP ALL", dataset) ;
// ---- Read the update script, then execute, in separate two steps
UpdateRequest request = UpdateFactory.read("update.ru") ;
- UpdateAction.execute(request, graphStore) ;
+ UpdateAction.execute(request, dataset) ;
// Write in debug format.
System.out.println("# Debug format");
- SSE.write(graphStore) ;
+ SSE.write(dataset) ;
System.out.println();
System.out.println("# N-Quads: S P O G") ;
- RDFDataMgr.write(System.out, graphStore, Lang.NQUADS) ;
+ RDFDataMgr.write(System.out, dataset, Lang.NQUADS) ;
}
}
[4/4] jena git commit: JENA-624: Parameterize and run on both
"general" and "txn mem" datasets.
Posted by an...@apache.org.
JENA-624: Parameterize and run on both "general" and "txn mem" datasets.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/b65974f7
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/b65974f7
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/b65974f7
Branch: refs/heads/master
Commit: b65974f7cff91712def03bfc3ea253b6ec20ff68
Parents: b208922
Author: Andy Seaborne <an...@apache.org>
Authored: Wed Nov 25 17:25:53 2015 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Wed Nov 25 17:29:15 2015 +0000
----------------------------------------------------------------------
.../apache/jena/sparql/graph/TestDatasets.java | 33 +++++++++++++++-----
1 file changed, 26 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/b65974f7/jena-arq/src/test/java/org/apache/jena/sparql/graph/TestDatasets.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/graph/TestDatasets.java b/jena-arq/src/test/java/org/apache/jena/sparql/graph/TestDatasets.java
index c8dc89e..3b224d7 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/graph/TestDatasets.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/graph/TestDatasets.java
@@ -19,7 +19,10 @@
package org.apache.jena.sparql.graph;
import java.util.ArrayList ;
+import java.util.Arrays ;
+import java.util.Collection ;
import java.util.List ;
+import java.util.function.Supplier ;
import org.apache.jena.query.* ;
import org.apache.jena.sparql.core.DatasetGraph ;
@@ -31,25 +34,41 @@ import org.apache.jena.update.UpdateRequest ;
import org.junit.Assert ;
import org.junit.Before ;
import org.junit.Test ;
+import org.junit.runner.RunWith ;
+import org.junit.runners.Parameterized ;
+import org.junit.runners.Parameterized.Parameters ;
+@RunWith(Parameterized.class)
public class TestDatasets {
-
+ @Parameters(name = "{index}: {0}")
+ public static Collection<Object[]> data() {
+ Supplier<Dataset> datasetGeneralMaker = ()-> DatasetFactory.createGeneral() ;
+ Supplier<Dataset> datasetTxnMemMaker = ()-> DatasetFactory.createTxnMem() ;
+ return Arrays.asList(new Object[][] { { "General", datasetGeneralMaker },
+ { "TxnMem", datasetTxnMemMaker} });
+ }
+
+
private static final String data = "INSERT DATA { <ex:default> <ex:default> <ex:default>.\n"
+ "GRAPH <ex:from> { <ex:from> <ex:from> <ex:from> }\n"
+ "GRAPH <ex:named> { <ex:named> <ex:named> <ex:named> }\n"
+ "GRAPH <ex:other> { <ex:other> <ex:other> <ex:other> }\n"
+ "}";
- private Dataset ds;
- private DatasetGraph gs;
+ private final Supplier<Dataset> maker;
+ private final Dataset ds;
+ private final DatasetGraph dsg;
+
+ public TestDatasets(String name, Supplier<Dataset> maker) {
+ this.maker = maker ;
+ this.ds = maker.get() ;
+ this.dsg = ds.asDatasetGraph() ;
+ }
@Before
public void setup() {
- this.ds = DatasetFactory.createMem();
- this.gs = ds.asDatasetGraph() ;
-
UpdateRequest up = UpdateFactory.create(TestDatasets.data);
- UpdateProcessor processor = UpdateExecutionFactory.create(up, this.gs);
+ UpdateProcessor processor = UpdateExecutionFactory.create(up, this.dsg);
processor.execute();
}
[2/4] jena git commit: JENA-624: Use Dataset.createGeneral() as
general filler/default.
Posted by an...@apache.org.
JENA-624: Use Dataset.createGeneral() as general filler/default.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/27f732c5
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/27f732c5
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/27f732c5
Branch: refs/heads/master
Commit: 27f732c5cf1995d70eba81b52c204cb42779f181
Parents: 6dbdc0c
Author: Andy Seaborne <an...@apache.org>
Authored: Wed Nov 25 17:24:24 2015 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Wed Nov 25 17:28:45 2015 +0000
----------------------------------------------------------------------
jena-arq/src/main/java/arq/qparse.java | 2 +-
jena-arq/src/main/java/arq/sse_query.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/27f732c5/jena-arq/src/main/java/arq/qparse.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/arq/qparse.java b/jena-arq/src/main/java/arq/qparse.java
index 25f7dac..749ab66 100644
--- a/jena-arq/src/main/java/arq/qparse.java
+++ b/jena-arq/src/main/java/arq/qparse.java
@@ -196,7 +196,7 @@ public class qparse extends CmdARQ
{
divider() ;
// This forces internal query initialization - must be after QueryUtils.checkQuery
- QueryExecution qExec = QueryExecutionFactory.create(query, DatasetFactory.createMem()) ;
+ QueryExecution qExec = QueryExecutionFactory.create(query, DatasetFactory.createGeneral()) ;
QueryOutputUtils.printPlan(query, qExec) ;
}
}
http://git-wip-us.apache.org/repos/asf/jena/blob/27f732c5/jena-arq/src/main/java/arq/sse_query.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/arq/sse_query.java b/jena-arq/src/main/java/arq/sse_query.java
index be4bd9a..c5d8c7f 100644
--- a/jena-arq/src/main/java/arq/sse_query.java
+++ b/jena-arq/src/main/java/arq/sse_query.java
@@ -124,7 +124,7 @@ public class sse_query extends CmdARQ
Dataset dataset = modDataset.getDataset() ;
// Check there is a dataset.
if ( dataset == null )
- dataset = DatasetFactory.createMem() ;
+ dataset = DatasetFactory.createGeneral() ;
modTime.startTimer() ;
DatasetGraph dsg = dataset.asDatasetGraph() ;
[3/4] jena git commit: JENA-624: Implement DatasetGraph.size().
Posted by an...@apache.org.
JENA-624: Implement DatasetGraph.size().
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/b2089224
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/b2089224
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/b2089224
Branch: refs/heads/master
Commit: b2089224c07d50b0b85d9c915cecff73bb809a4b
Parents: 27f732c
Author: Andy Seaborne <an...@apache.org>
Authored: Wed Nov 25 17:24:52 2015 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Wed Nov 25 17:29:03 2015 +0000
----------------------------------------------------------------------
.../org/apache/jena/sparql/core/mem/DatasetGraphInMemory.java | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/b2089224/jena-arq/src/main/java/org/apache/jena/sparql/core/mem/DatasetGraphInMemory.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/core/mem/DatasetGraphInMemory.java b/jena-arq/src/main/java/org/apache/jena/sparql/core/mem/DatasetGraphInMemory.java
index 8b44741..5ca7df4 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/core/mem/DatasetGraphInMemory.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/core/mem/DatasetGraphInMemory.java
@@ -268,6 +268,11 @@ public class DatasetGraphInMemory extends DatasetGraphTriplesQuads implements Tr
}
@Override
+ public long size() {
+ return quadsIndex().listGraphNodes().count() ;
+ }
+
+ @Override
public void clear() {
mutate(x -> {
defaultGraph().clear();