Menu
▾
▴
[Bigdata-commit] SF.net SVN: bigdata:[4466] branches/QUADS_QUERY_BRANCH
|
From: <tho...@us...> - 2011-05-09 13:30:31
|
Revision: 4466
http://bigdata.svn.sourceforge.net/bigdata/?rev=4466&view=rev
Author: thompsonbry
Date: 2011-05-09 13:30:21 +0000 (Mon, 09 May 2011)
Log Message:
-----------
Derived a transactional and non-transactional version of TestRollbacks and incorporated both test classes into each of the proxy test suites (triples, sids, quads).
Javadoc comment in LexiconRelation.
Modified Paths:
--------------
branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/LexiconRelation.java
branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/TestBigdataSailWithQuads.java
branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/TestBigdataSailWithSids.java
branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/TestBigdataSailWithoutSids.java
branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/contrib/TestRollbacks.java
Added Paths:
-----------
branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/contrib/TestRollbacksTx.java
Modified: branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/LexiconRelation.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/LexiconRelation.java 2011-05-09 12:47:59 UTC (rev 4465)
+++ branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/LexiconRelation.java 2011-05-09 13:30:21 UTC (rev 4466)
@@ -741,6 +741,11 @@
* full tx isolation. This is because we use an
* eventually consistent strategy to write on the
* lexicon indices.
+ *
+ * Note: It appears that we have already ensured that
+ * we will be using the unisolated view of the lexicon
+ * relation in AbstractTripleStore#getLexiconRelation()
+ * so this code path should not be evaluated.
*/
term2id = AbstractRelation
.getIndex(getIndexManager(),
@@ -781,6 +786,11 @@
* full tx isolation. This is because we use an
* eventually consistent strategy to write on the
* lexicon indices.
+ *
+ * Note: It appears that we have already ensured that
+ * we will be using the unisolated view of the lexicon
+ * relation in AbstractTripleStore#getLexiconRelation()
+ * so this code path should not be evaluated.
*/
id2term = AbstractRelation
.getIndex(getIndexManager(),
Modified: branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/TestBigdataSailWithQuads.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/TestBigdataSailWithQuads.java 2011-05-09 12:47:59 UTC (rev 4465)
+++ branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/TestBigdataSailWithQuads.java 2011-05-09 13:30:21 UTC (rev 4466)
@@ -112,6 +112,7 @@
suite.addTestSuite(TestTxCreate.class);
suite.addTestSuite(com.bigdata.rdf.sail.contrib.TestRollbacks.class);
+ suite.addTestSuite(com.bigdata.rdf.sail.contrib.TestRollbacksTx.class);
// The Sesame TCK, including the SPARQL test suite.
{
Modified: branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/TestBigdataSailWithSids.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/TestBigdataSailWithSids.java 2011-05-09 12:47:59 UTC (rev 4465)
+++ branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/TestBigdataSailWithSids.java 2011-05-09 13:30:21 UTC (rev 4466)
@@ -90,7 +90,10 @@
suite.addTestSuite(TestTxCreate.class);
- return suite;
+ suite.addTestSuite(com.bigdata.rdf.sail.contrib.TestRollbacks.class);
+ suite.addTestSuite(com.bigdata.rdf.sail.contrib.TestRollbacksTx.class);
+
+ return suite;
}
Modified: branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/TestBigdataSailWithoutSids.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/TestBigdataSailWithoutSids.java 2011-05-09 12:47:59 UTC (rev 4465)
+++ branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/TestBigdataSailWithoutSids.java 2011-05-09 13:30:21 UTC (rev 4466)
@@ -86,6 +86,9 @@
suite.addTestSuite(TestTxCreate.class);
+ suite.addTestSuite(com.bigdata.rdf.sail.contrib.TestRollbacks.class);
+ suite.addTestSuite(com.bigdata.rdf.sail.contrib.TestRollbacksTx.class);
+
return suite;
}
Modified: branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/contrib/TestRollbacks.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/contrib/TestRollbacks.java 2011-05-09 12:47:59 UTC (rev 4465)
+++ branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/contrib/TestRollbacks.java 2011-05-09 13:30:21 UTC (rev 4466)
@@ -103,8 +103,10 @@
NoVocabulary.class.getName());
props.setProperty(BigdataSail.Options.TRUTH_MAINTENANCE, "false");
props.setProperty(BigdataSail.Options.JUSTIFY, "false");
- props.setProperty(BigdataSail.Options.ISOLATABLE_INDICES, "true");
+ // transactions are off in the base version of this class.
+ props.setProperty(BigdataSail.Options.ISOLATABLE_INDICES, "false");
+
// props.setProperty(BigdataSail.Options.CREATE_TEMP_FILE, "true");
// props.setProperty(BigdataSail.Options.BUFFER_MODE, BufferMode.DiskRW
// .toString());
Added: branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/contrib/TestRollbacksTx.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/contrib/TestRollbacksTx.java (rev 0)
+++ branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/contrib/TestRollbacksTx.java 2011-05-09 13:30:21 UTC (rev 4466)
@@ -0,0 +1,29 @@
+package com.bigdata.rdf.sail.contrib;
+
+import java.util.Properties;
+
+import com.bigdata.rdf.sail.BigdataSail;
+
+public class TestRollbacksTx extends TestRollbacks {
+
+ public TestRollbacksTx() {
+ super();
+ }
+
+ public TestRollbacksTx(String name) {
+ super(name);
+ }
+
+ @Override
+ public Properties getProperties() {
+
+ final Properties props = super.getProperties();
+
+ // transactions are ON in this version of this class.
+ props.setProperty(BigdataSail.Options.ISOLATABLE_INDICES, "true");
+
+ return props;
+
+ }
+
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
