[Bigdata-commit] SF.net SVN: bigdata:[4014] branches/JOURNAL_HA_BRANCH/bigdata/src/java/com/ bigdata

[<tho...@us...>]

Revision: 4014
          http://bigdata.svn.sourceforge.net/bigdata/?rev=4014&view=rev
Author:   thompsonbry
Date:     2010-12-19 19:05:23 +0000 (Sun, 19 Dec 2010)

Log Message:
-----------
Disabled the session optimization in RWStore per https://sourceforge.net/apps/trac/bigdata/ticket/214.  Martyn is looking into this issue.

Modified TemporaryStore per https://sourceforge.net/apps/trac/bigdata/ticket/215 to support incremental truth maintenance in combination with the RWStore.

Modified Paths:
--------------
    branches/JOURNAL_HA_BRANCH/bigdata/src/java/com/bigdata/journal/TemporaryStore.java
    branches/JOURNAL_HA_BRANCH/bigdata/src/java/com/bigdata/rwstore/RWStore.java

Modified: branches/JOURNAL_HA_BRANCH/bigdata/src/java/com/bigdata/journal/TemporaryStore.java
===================================================================
--- branches/JOURNAL_HA_BRANCH/bigdata/src/java/com/bigdata/journal/TemporaryStore.java	2010-12-18 14:31:23 UTC (rev 4013)
+++ branches/JOURNAL_HA_BRANCH/bigdata/src/java/com/bigdata/journal/TemporaryStore.java	2010-12-19 19:05:23 UTC (rev 4014)
@@ -350,10 +350,21 @@
             
         }
 
-        throw new UnsupportedOperationException(
-                "Not supported: timestamp="
-                + TimestampUtility.toString(timestamp));
+        /*
+         * FIXME The RWStore uses a read-only transaction to protect against
+         * recycling of the B+Tree revisions associated with the commit point
+         * on which it is reading.  The temporary store only supports unisolated
+         * reads, so this is just ignoring the tx specified by the mutation rule
+         * for reading on the temporary store and going with the unisolated index
+         * anyway.  See https://sourceforge.net/apps/trac/bigdata/ticket/215.
+         */
         
+//        throw new UnsupportedOperationException(
+//                "Not supported: timestamp="
+//                + TimestampUtility.toString(timestamp));
+
+		return getIndex(name);
+
     }
 
     public SparseRowStore getGlobalRowStore() {

Modified: branches/JOURNAL_HA_BRANCH/bigdata/src/java/com/bigdata/rwstore/RWStore.java
===================================================================
--- branches/JOURNAL_HA_BRANCH/bigdata/src/java/com/bigdata/rwstore/RWStore.java	2010-12-18 14:31:23 UTC (rev 4013)
+++ branches/JOURNAL_HA_BRANCH/bigdata/src/java/com/bigdata/rwstore/RWStore.java	2010-12-19 19:05:23 UTC (rev 4014)
@@ -1589,7 +1589,7 @@
                  * FIXME We need unit test when MIN_RELEASE_AGE is ZERO AND
                  * there are open read-only transactions.
                  */
-				if (m_minReleaseAge == 0) {
+				if (false&&m_minReleaseAge == 0) {
 					/*
 					 * The session protection is complicated by the mix of
 					 * transaction protection and isolated AllocationContexts.


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.