From: <tho...@us...> - 2011-06-22 21:14:09
|
Revision: 4774 http://bigdata.svn.sourceforge.net/bigdata/?rev=4774&view=rev Author: thompsonbry Date: 2011-06-22 21:14:02 +0000 (Wed, 22 Jun 2011) Log Message: ----------- Bug fix for scale-out to the sparse row store's timestamp chooser. It needs to use the IJournal interface rather than casting to AbstractJournal. Modified Paths: -------------- branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/sparse/TimestampChooser.java branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/sparse/TestAll.java Modified: branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/sparse/TimestampChooser.java =================================================================== --- branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/sparse/TimestampChooser.java 2011-06-22 20:02:14 UTC (rev 4773) +++ branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/sparse/TimestampChooser.java 2011-06-22 21:14:02 UTC (rev 4774) @@ -31,7 +31,7 @@ import com.bigdata.btree.BTree; import com.bigdata.btree.IIndex; import com.bigdata.btree.ILocalBTreeView; -import com.bigdata.journal.AbstractJournal; +import com.bigdata.journal.IJournal; import com.bigdata.journal.ITimestampService; import com.bigdata.journal.TemporaryRawStore; import com.bigdata.sparse.TPS.TPV; @@ -96,14 +96,13 @@ return MillisecondTimestampFactory.nextMillis(); } - + /* - * The backing store will be some kind of AbstractJournal - either - * a Journal or a ManagedJournal. + * The backing store will be some kind of IJournal - a Journal, a + * ManagedJournal, an IsolatedActionJournal, etc. */ - final AbstractJournal journal = (AbstractJournal) mutableBTree - .getStore(); + final IJournal journal = (IJournal) mutableBTree.getStore(); /* * This will be locally unique for a Journal and federation-wide Modified: branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/sparse/TestAll.java =================================================================== --- branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/sparse/TestAll.java 2011-06-22 20:02:14 UTC (rev 4773) +++ branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/sparse/TestAll.java 2011-06-22 21:14:02 UTC (rev 4774) @@ -68,7 +68,7 @@ public static Test suite() { - TestSuite suite = new TestSuite("Sparse Row Store"); + final TestSuite suite = new TestSuite("Sparse Row Store"); // value encoding and decoding. suite.addTestSuite(TestValueType.class); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |