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/05/15 14:00:18 UTC
[1/3] jena git commit: JENA-943: Enable interface Transactional
Repository: jena
Updated Branches:
refs/heads/master 2dcb68b5f -> 8d53fedc0
JENA-943: Enable interface Transactional
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/e5ded6dc
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/e5ded6dc
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/e5ded6dc
Branch: refs/heads/master
Commit: e5ded6dc00a1145b30bd43234b1741bdbedf5be6
Parents: 2dcb68b
Author: Andy Seaborne <an...@apache.org>
Authored: Fri May 15 11:45:16 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri May 15 11:45:16 2015 +0100
----------------------------------------------------------------------
jena-arq/src/main/java/org/apache/jena/query/Dataset.java | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/e5ded6dc/jena-arq/src/main/java/org/apache/jena/query/Dataset.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/query/Dataset.java b/jena-arq/src/main/java/org/apache/jena/query/Dataset.java
index 84273bb..02e1885 100644
--- a/jena-arq/src/main/java/org/apache/jena/query/Dataset.java
+++ b/jena-arq/src/main/java/org/apache/jena/query/Dataset.java
@@ -23,13 +23,14 @@ import java.util.Iterator ;
import org.apache.jena.rdf.model.Model ;
import org.apache.jena.shared.Lock ;
import org.apache.jena.sparql.core.DatasetGraph ;
+import org.apache.jena.sparql.core.Transactional ;
import org.apache.jena.sparql.util.Context ;
/** Query is over a Dataset, a collection of named graphs
* and a background graph (also called the default
* graph or unnamed graph). */
-public interface Dataset // extends Transactional
+public interface Dataset extends Transactional
{
// Rather than pull in the internal "Tranactional" interface, we duplicate it here.
/** Get the default graph as a Jena Model */
@@ -70,18 +71,23 @@ public interface Dataset // extends Transactional
public boolean supportsTransactions() ;
/** Start either a READ or WRITE transaction */
+ @Override
public void begin(ReadWrite readWrite) ;
/** Commit a transaction - finish the transaction and make any changes permanent (if a "write" transaction) */
+ @Override
public void commit() ;
/** Abort a transaction - finish the transaction and undo any changes (if a "write" transaction) */
+ @Override
public void abort() ;
/** Say whether a transaction is active */
+ @Override
public boolean isInTransaction() ;
/** Finish the transaction - if a write transaction and commit() has not been called, then abort */
+ @Override
public void end() ;
/** Get the dataset in graph form */
[3/3] jena git commit: Expose test lifecycle (fileDataset)
Posted by an...@apache.org.
Expose test lifecycle (fileDataset)
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/8d53fedc
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/8d53fedc
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/8d53fedc
Branch: refs/heads/master
Commit: 8d53fedc0f45c39725054251a9b4cceee57941d9
Parents: 8fd7226
Author: Andy Seaborne <an...@apache.org>
Authored: Fri May 15 13:00:09 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri May 15 13:00:09 2015 +0100
----------------------------------------------------------------------
.../apache/jena/sparql/graph/GraphsTests.java | 33 +++++++++++---------
1 file changed, 18 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/8d53fedc/jena-arq/src/test/java/org/apache/jena/sparql/graph/GraphsTests.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/graph/GraphsTests.java b/jena-arq/src/test/java/org/apache/jena/sparql/graph/GraphsTests.java
index 69cb15c..1060295 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/graph/GraphsTests.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/graph/GraphsTests.java
@@ -50,25 +50,28 @@ public abstract class GraphsTests extends BaseTest
if ( dataset == null )
{
dataset = createDataset() ;
- // Load default model.
- // Load graph 1
- // Load graph 2.
- dataset.getDefaultModel().getGraph().add(SSE.parseTriple("(<x> <p> 'Default graph')")) ;
-
- Model m1 = dataset.getNamedModel(graph1) ;
- m1.getGraph().add(SSE.parseTriple("(<x> <p> 'Graph 1')")) ;
- m1.getGraph().add(SSE.parseTriple("(<x> <p> 'ZZZ')")) ;
-
- Model m2 = dataset.getNamedModel(graph2) ;
- m2.getGraph().add(SSE.parseTriple("(<x> <p> 'Graph 2')")) ;
- m2.getGraph().add(SSE.parseTriple("(<x> <p> 'ZZZ')")) ;
-
- calcUnion.add(m1) ;
- calcUnion.add(m2) ;
+ fillDataset(dataset) ;
}
return dataset ;
}
+ protected void fillDataset(Dataset dataset) {
+ // Load default model.
+ // Load graph 1
+ // Load graph 2.
+ dataset.getDefaultModel().getGraph().add(SSE.parseTriple("(<x> <p> 'Default graph')")) ;
+
+ Model m1 = dataset.getNamedModel(graph1) ;
+ m1.getGraph().add(SSE.parseTriple("(<x> <p> 'Graph 1')")) ;
+ m1.getGraph().add(SSE.parseTriple("(<x> <p> 'ZZZ')")) ;
+
+ Model m2 = dataset.getNamedModel(graph2) ;
+ m2.getGraph().add(SSE.parseTriple("(<x> <p> 'Graph 2')")) ;
+ m2.getGraph().add(SSE.parseTriple("(<x> <p> 'ZZZ')")) ;
+ calcUnion.add(m1) ;
+ calcUnion.add(m2) ;
+ }
+
String queryString = "SELECT * {?s ?p ?o}" ;
@Test public void graph1()
[2/3] jena git commit: Add relaseDataset to complete the lifecycle
Posted by an...@apache.org.
Add relaseDataset to complete the lifecycle
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/8fd7226e
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/8fd7226e
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/8fd7226e
Branch: refs/heads/master
Commit: 8fd7226efc27b864e61ce888fe62cddd353e881c
Parents: e5ded6d
Author: Andy Seaborne <an...@apache.org>
Authored: Fri May 15 11:45:36 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri May 15 11:45:36 2015 +0100
----------------------------------------------------------------------
.../apache/jena/sparql/core/AbstractTestDynamicDataset.java | 5 ++++-
.../org/apache/jena/sparql/core/TestDynamicDatasetMem.java | 8 ++------
.../org/apache/jena/tdb/store/TestDynamicDatasetTDB.java | 3 +++
3 files changed, 9 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/8fd7226e/jena-arq/src/test/java/org/apache/jena/sparql/core/AbstractTestDynamicDataset.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/core/AbstractTestDynamicDataset.java b/jena-arq/src/test/java/org/apache/jena/sparql/core/AbstractTestDynamicDataset.java
index c2c6357..4713055 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/core/AbstractTestDynamicDataset.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/core/AbstractTestDynamicDataset.java
@@ -30,9 +30,12 @@ import org.junit.Test ;
public abstract class AbstractTestDynamicDataset extends BaseTest
{
protected abstract Dataset createDataset() ;
+ protected abstract void releaseDataset(Dataset ds) ;
Dataset dataset ;
- @After public void after() {}
+ @After public void after() {
+ releaseDataset(dataset) ;
+ }
@Before public void before()
{
http://git-wip-us.apache.org/repos/asf/jena/blob/8fd7226e/jena-arq/src/test/java/org/apache/jena/sparql/core/TestDynamicDatasetMem.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/core/TestDynamicDatasetMem.java b/jena-arq/src/test/java/org/apache/jena/sparql/core/TestDynamicDatasetMem.java
index 58afb60..5377d4c 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/core/TestDynamicDatasetMem.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/core/TestDynamicDatasetMem.java
@@ -20,20 +20,16 @@ package org.apache.jena.sparql.core;
import org.apache.jena.query.Dataset ;
import org.apache.jena.query.DatasetFactory ;
-import org.junit.After ;
-import org.junit.Before ;
public class TestDynamicDatasetMem extends AbstractTestDynamicDataset
{
-
- @Before public void before1() {}
- @After public void after1() {}
-
@Override
protected Dataset createDataset()
{
return DatasetFactory.createMem() ;
}
+ @Override
+ protected void releaseDataset(Dataset ds) {}
}
http://git-wip-us.apache.org/repos/asf/jena/blob/8fd7226e/jena-tdb/src/test/java/org/apache/jena/tdb/store/TestDynamicDatasetTDB.java
----------------------------------------------------------------------
diff --git a/jena-tdb/src/test/java/org/apache/jena/tdb/store/TestDynamicDatasetTDB.java b/jena-tdb/src/test/java/org/apache/jena/tdb/store/TestDynamicDatasetTDB.java
index 54aed0c..1a684f6 100644
--- a/jena-tdb/src/test/java/org/apache/jena/tdb/store/TestDynamicDatasetTDB.java
+++ b/jena-tdb/src/test/java/org/apache/jena/tdb/store/TestDynamicDatasetTDB.java
@@ -31,6 +31,9 @@ public class TestDynamicDatasetTDB extends AbstractTestDynamicDataset
return TDBFactory.createDataset() ;
}
+ @Override
+ protected void releaseDataset(Dataset ds) {}
+
protected void startDynamicAndUnionTest() { TDB.getContext().setTrue(TDB.symUnionDefaultGraph) ; }
protected void finishDynamicAndUnionTest() { TDB.getContext().unset(TDB.symUnionDefaultGraph) ; }