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 2014/01/06 15:05:48 UTC
svn commit: r1555781 - in /jena/trunk/jena-arq/src:
main/java/com/hp/hpl/jena/sparql/core/
test/java/com/hp/hpl/jena/sparql/transaction/
Author: andy
Date: Mon Jan 6 14:05:47 2014
New Revision: 1555781
URL: http://svn.apache.org/r1555781
Log:
Allow DatasetGraphWithLock to support subclasses that do provide a valid abort.\nClean the transaction test cases.
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphWithLock.java
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/transaction/AbstractTestTransaction.java
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/transaction/TestTransactionMem.java
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphWithLock.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphWithLock.java?rev=1555781&r1=1555780&r2=1555781&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphWithLock.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphWithLock.java Mon Jan 6 14:05:47 2014
@@ -28,8 +28,9 @@ import com.hp.hpl.jena.sparql.util.Conte
/**
* A DatasetGraph that uses the dataset lock to give weak transactional
- * behaviour. Only supports multiple-reader OR single-writer, and no write-transction
- * abort. Transactions are not durable.
+ * behaviour, that is the application see transaction but they are not durable.
+ * Only provides multiple-reader OR single-writer, and no write-transction
+ * abort.
*/
public class DatasetGraphWithLock extends DatasetGraphTrackActive implements Sync {
static class ThreadLocalBoolean extends ThreadLocal<Boolean> {
@@ -92,27 +93,31 @@ public class DatasetGraphWithLock extend
protected void _commit() {
if ( isTransactionType(ReadWrite.WRITE) )
sync() ;
- get().getLock().leaveCriticalSection() ;
- this.readWrite.set(null) ;
- inTransaction.set(false) ;
+ _end() ;
}
@Override
protected void _abort() {
- // OK for read, not for write.
- if ( isTransactionType(ReadWrite.WRITE) ) {
+ if ( isTransactionType(ReadWrite.WRITE) && ! abortImplemented() ) {
// Still clean up.
- _end() ;
+ _end() ; // This clears the transaction type.
throw new JenaTransactionException("Can't abort a write lock-transaction") ;
}
_end() ;
}
+ /** Return whether abort is provided.
+ * Just by locking, a transaction can not write-abort (the chnages have been made and not recorded).
+ * Subclasses may do better and still rely on this locking class.
+ */
+ protected boolean abortImplemented() { return false ; }
+
@Override
protected void _end() {
- if ( isInTransaction() )
+ if ( isInTransaction() ) {
get().getLock().leaveCriticalSection() ;
- inTransaction.set(false) ;
+ clearState() ;
+ }
}
@Override
@@ -120,6 +125,11 @@ public class DatasetGraphWithLock extend
if ( get() != null )
get().close() ;
}
+
+ private void clearState() {
+ inTransaction.set(false) ;
+ readWrite.set(null) ;
+ }
@Override
public Context getContext() {
Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/transaction/AbstractTestTransaction.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/transaction/AbstractTestTransaction.java?rev=1555781&r1=1555780&r2=1555781&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/transaction/AbstractTestTransaction.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/transaction/AbstractTestTransaction.java Mon Jan 6 14:05:47 2014
@@ -29,103 +29,102 @@ import com.hp.hpl.jena.sparql.JenaTransa
public abstract class AbstractTestTransaction extends BaseTest
{
- //MIGRATE
protected abstract Dataset create() ;
- @Test public void transaction_err_00()
- {
+ @Test
+ public void transaction_err_00() {
Dataset ds = create() ;
assertTrue(ds.supportsTransactions()) ;
}
-
- @Test public void transaction_01()
- {
+
+ @Test
+ public void transaction_01() {
Dataset ds = create() ;
ds.begin(ReadWrite.READ) ;
- assertTrue(ds.isInTransaction()) ;
+ assertTrue(ds.isInTransaction()) ;
ds.end() ;
- assertFalse(ds.isInTransaction()) ;
+ assertFalse(ds.isInTransaction()) ;
}
- @Test public void transaction_02()
- {
+ @Test
+ public void transaction_02() {
Dataset ds = create() ;
ds.begin(ReadWrite.WRITE) ;
- assertTrue(ds.isInTransaction()) ;
+ assertTrue(ds.isInTransaction()) ;
ds.commit() ;
- assertFalse(ds.isInTransaction()) ;
+ assertFalse(ds.isInTransaction()) ;
}
- @Test public void transaction_03()
- {
+ @Test
+ public void transaction_03() {
Dataset ds = create() ;
ds.begin(ReadWrite.WRITE) ;
- assertTrue(ds.isInTransaction()) ;
+ assertTrue(ds.isInTransaction()) ;
ds.abort() ;
- assertFalse(ds.isInTransaction()) ;
+ assertFalse(ds.isInTransaction()) ;
}
- @Test public void transaction_04()
- {
+ @Test
+ public void transaction_04() {
Dataset ds = create() ;
ds.begin(ReadWrite.WRITE) ;
- assertTrue(ds.isInTransaction()) ;
+ assertTrue(ds.isInTransaction()) ;
ds.commit() ;
- assertFalse(ds.isInTransaction()) ;
+ assertFalse(ds.isInTransaction()) ;
ds.end() ;
- assertFalse(ds.isInTransaction()) ;
+ assertFalse(ds.isInTransaction()) ;
}
- @Test public void transaction_05()
- {
+ @Test
+ public void transaction_05() {
Dataset ds = create() ;
ds.begin(ReadWrite.WRITE) ;
- assertTrue(ds.isInTransaction()) ;
+ assertTrue(ds.isInTransaction()) ;
ds.abort() ;
- assertFalse(ds.isInTransaction()) ;
+ assertFalse(ds.isInTransaction()) ;
ds.end() ;
- assertFalse(ds.isInTransaction()) ;
+ assertFalse(ds.isInTransaction()) ;
}
- @Test public void transaction_06()
- {
+ @Test
+ public void transaction_06() {
// .end is not necessary
Dataset ds = create() ;
ds.begin(ReadWrite.WRITE) ;
- assertTrue(ds.isInTransaction()) ;
+ assertTrue(ds.isInTransaction()) ;
ds.abort() ;
assertFalse(ds.isInTransaction()) ;
ds.begin(ReadWrite.WRITE) ;
- assertTrue(ds.isInTransaction()) ;
+ assertTrue(ds.isInTransaction()) ;
ds.abort() ;
assertFalse(ds.isInTransaction()) ;
}
-
+
// Patterns.
- @Test public void transaction_07()
- {
+ @Test
+ public void transaction_07() {
Dataset ds = create() ;
read1(ds) ;
read1(ds) ;
}
-
- @Test public void transaction_08()
- {
+
+ @Test
+ public void transaction_08() {
Dataset ds = create() ;
read2(ds) ;
read2(ds) ;
}
-
- @Test public void transaction_09()
- {
+
+ @Test
+ public void transaction_09() {
Dataset ds = create() ;
write(ds) ;
write(ds) ;
}
-
- @Test public void transaction_10()
- {
+
+ @Test
+ public void transaction_10() {
Dataset ds = create() ;
write(ds) ;
read2(ds) ;
@@ -170,95 +169,93 @@ public abstract class AbstractTestTransa
@Test
public void transaction_err_12() { testAbortCommit(WRITE) ; }
- private void read1(Dataset ds)
- {
+ private void read1(Dataset ds) {
ds.begin(ReadWrite.READ) ;
- assertTrue(ds.isInTransaction()) ;
+ assertTrue(ds.isInTransaction()) ;
ds.commit() ;
assertFalse(ds.isInTransaction()) ;
ds.end() ;
}
-
- private void read2(Dataset ds)
- {
+
+ private void read2(Dataset ds) {
ds.begin(ReadWrite.READ) ;
- assertTrue(ds.isInTransaction()) ;
+ assertTrue(ds.isInTransaction()) ;
ds.end() ;
assertFalse(ds.isInTransaction()) ;
}
- private void write(Dataset ds)
- {
+ private void write(Dataset ds) {
ds.begin(ReadWrite.WRITE) ;
- assertTrue(ds.isInTransaction()) ;
+ assertTrue(ds.isInTransaction()) ;
ds.commit() ;
assertFalse(ds.isInTransaction()) ;
ds.end() ;
}
-
// Error conditions that should be detected.
-
- private void testBeginBegin(ReadWrite mode1, ReadWrite mode2)
- {
+
+ private void testBeginBegin(ReadWrite mode1, ReadWrite mode2) {
Dataset ds = create() ;
ds.begin(mode1) ;
try {
ds.begin(mode2) ;
- fail("Expected transaction exception - begin-begin ("+mode1+", "+mode2+")") ;
- } catch (JenaTransactionException ex)
- { ds.end() ; }
+ fail("Expected transaction exception - begin-begin (" + mode1 + ", " + mode2 + ")") ;
+ }
+ catch (JenaTransactionException ex) {
+ ds.end() ;
+ }
}
- private void testCommitCommit(ReadWrite mode)
- {
+ private void testCommitCommit(ReadWrite mode) {
Dataset ds = create() ;
ds.begin(mode) ;
ds.commit() ;
try {
ds.commit() ;
- fail("Expected transaction exception - commit-commit("+mode+")") ;
- } catch (JenaTransactionException ex)
- { ds.end() ; }
+ fail("Expected transaction exception - commit-commit(" + mode + ")") ;
+ }
+ catch (JenaTransactionException ex) {
+ ds.end() ;
+ }
}
-
- private void testCommitAbort(ReadWrite mode)
- {
+
+ private void testCommitAbort(ReadWrite mode) {
Dataset ds = create() ;
ds.begin(mode) ;
ds.commit() ;
try {
ds.abort() ;
- fail("Expected transaction exception - commit-commit("+mode+")") ;
- } catch (JenaTransactionException ex)
- { ds.end() ; }
+ fail("Expected transaction exception - commit-abort(" + mode + ")") ;
+ }
+ catch (JenaTransactionException ex) {
+ ds.end() ;
+ }
}
- private void testAbortAbort(ReadWrite mode)
- {
+ private void testAbortAbort(ReadWrite mode) {
Dataset ds = create() ;
ds.begin(mode) ;
ds.abort() ;
try {
ds.abort() ;
- fail("Expected transaction exception - commit-commit("+mode+")") ;
- } catch (JenaTransactionException ex)
- { ds.end() ; }
+ fail("Expected transaction exception - abort-abort(" + mode + ")") ;
+ }
+ catch (JenaTransactionException ex) {
+ ds.end() ;
+ }
}
-
- private void testAbortCommit(ReadWrite mode)
- {
+ private void testAbortCommit(ReadWrite mode) {
Dataset ds = create() ;
ds.begin(mode) ;
ds.abort() ;
try {
ds.commit() ;
- fail("Expected transaction exception - commit-commit("+mode+")") ;
- } catch (JenaTransactionException ex)
- { ds.end() ; }
- }
-
-
+ fail("Expected transaction exception - abort-commit(" + mode + ")") ;
+ }
+ catch (JenaTransactionException ex) {
+ ds.end() ;
+ }
+ }
}
Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/transaction/TestTransactionMem.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/transaction/TestTransactionMem.java?rev=1555781&r1=1555780&r2=1555781&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/transaction/TestTransactionMem.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/transaction/TestTransactionMem.java Mon Jan 6 14:05:47 2014
@@ -18,6 +18,7 @@
package com.hp.hpl.jena.sparql.transaction;
+import org.junit.Ignore ;
import org.junit.Test ;
import com.hp.hpl.jena.query.Dataset ;
@@ -37,11 +38,12 @@ public class TestTransactionMem extends
}
// Tests that don't make sense because they abort a write transaction.
- @Test @Override public void transaction_err_10() {}
- @Test @Override public void transaction_err_12() {}
- @Test @Override public void transaction_03() {}
- @Test @Override public void transaction_05() {}
- @Test @Override public void transaction_06() {}
+ // (Using org.junit.Assume would be better?)
+ @Test @Override @Ignore public void transaction_err_10() {}
+ @Test @Override @Ignore public void transaction_err_12() {}
+ @Test @Override @Ignore public void transaction_03() {}
+ @Test @Override @Ignore public void transaction_05() {}
+ @Test @Override @Ignore public void transaction_06() {}
}