bigdata-commit

[Bigdata-commit] SF.net SVN: bigdata:[3832] branches/QUADS_QUERY_BRANCH/bigdata/src/java/com /bigdata/journal/AbstractJournal.java

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

Revision: 3832
          http://bigdata.svn.sourceforge.net/bigdata/?rev=3832&view=rev
Author:   thompsonbry
Date:     2010-10-20 18:31:10 +0000 (Wed, 20 Oct 2010)

Log Message:
-----------
Cleaner message in AbstractJournal when a journal backed by a transient resource has been asynchronously closed.

Modified Paths:
--------------
    branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/journal/AbstractJournal.java

Modified: branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/journal/AbstractJournal.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/journal/AbstractJournal.java	2010-10-20 18:30:43 UTC (rev 3831)
+++ branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/journal/AbstractJournal.java	2010-10-20 18:31:10 UTC (rev 3832)
@@ -1801,7 +1801,7 @@
 
         if (!_bufferStrategy.isOpen()) {
 
-            throw new IllegalStateException("file=" + getFile());
+            throw new IllegalStateException((getFile()==null?"transient":"file=" + getFile()));
 
         }
 


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

[Bigdata-commit] SF.net SVN: bigdata:[4535] branches/QUADS_QUERY_BRANCH/bigdata/src/java/com /bigdata/journal/AbstractJournal.java

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

Revision: 4535
          http://bigdata.svn.sourceforge.net/bigdata/?rev=4535&view=rev
Author:   thompsonbry
Date:     2011-05-20 18:24:33 +0000 (Fri, 20 May 2011)

Log Message:
-----------
Bug fix to the performance counters for the journal.  An NPE could be thrown if the Journal was not associated with a backing file, e.g., for the transient journal.

Modified Paths:
--------------
    branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/journal/AbstractJournal.java

Modified: branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/journal/AbstractJournal.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/journal/AbstractJournal.java	2011-05-20 18:06:11 UTC (rev 4534)
+++ branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/journal/AbstractJournal.java	2011-05-20 18:24:33 UTC (rev 4535)
@@ -1213,8 +1213,10 @@
 				public void sample() {
 					final AbstractJournal jnl = ref.get();
 					if (jnl != null) {
-						setValue(jnl.getFile().toString());
-					}
+                        final File file = jnl.getFile();
+                        if (file != null)
+                            setValue(file.toString());
+                    }
 				}
 			});
 			// counters.addCounter("file", new OneShotInstrument<String>(""


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

[Bigdata-commit] SF.net SVN: bigdata:[4649] branches/QUADS_QUERY_BRANCH/bigdata/src/java/com /bigdata/journal/AbstractJournal.java

[<mar...@us...>]

Revision: 4649
          http://bigdata.svn.sourceforge.net/bigdata/?rev=4649&view=rev
Author:   martyncutcher
Date:     2011-06-09 12:07:44 +0000 (Thu, 09 Jun 2011)

Log Message:
-----------
remove check of count of open/close and leave to TestCase classes

Modified Paths:
--------------
    branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/journal/AbstractJournal.java

Modified: branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/journal/AbstractJournal.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/journal/AbstractJournal.java	2011-06-09 09:35:47 UTC (rev 4648)
+++ branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/journal/AbstractJournal.java	2011-06-09 12:07:44 UTC (rev 4649)
@@ -1362,11 +1362,6 @@
 			deleteResources();
 
 		}
-
-        int cl = nclose.incrementAndGet();
-        if (cl > nopen.get()) {
-        	throw new IllegalStateException("More calls to close than open!");
-        }
         
 	}
 


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

[Bigdata-commit] SF.net SVN: bigdata:[4650] branches/QUADS_QUERY_BRANCH/bigdata/src/java/com /bigdata/journal/AbstractJournal.java

[<mar...@us...>]

Revision: 4650
          http://bigdata.svn.sourceforge.net/bigdata/?rev=4650&view=rev
Author:   martyncutcher
Date:     2011-06-09 12:40:39 +0000 (Thu, 09 Jun 2011)

Log Message:
-----------
Correct over enthusiastic edit of Journal open/close counters and synchornize shutdown()

Modified Paths:
--------------
    branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/journal/AbstractJournal.java

Modified: branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/journal/AbstractJournal.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/journal/AbstractJournal.java	2011-06-09 12:07:44 UTC (rev 4649)
+++ branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/journal/AbstractJournal.java	2011-06-09 12:40:39 UTC (rev 4650)
@@ -1123,7 +1123,7 @@
 	 * 
 	 * @see #shutdownNow()
 	 */
-	public void shutdown() {
+	synchronized public void shutdown() {
 
 		// Note: per contract for shutdown.
 		if (!isOpen())
@@ -1363,6 +1363,7 @@
 
 		}
         
+        nclose.incrementAndGet();
 	}
 
 	/**


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

[Bigdata-commit] SF.net SVN: bigdata:[4720] branches/QUADS_QUERY_BRANCH/bigdata/src/java/com /bigdata/journal/AbstractJournal.java

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

Revision: 4720
          http://bigdata.svn.sourceforge.net/bigdata/?rev=4720&view=rev
Author:   thompsonbry
Date:     2011-06-17 15:00:15 +0000 (Fri, 17 Jun 2011)

Log Message:
-----------
Modified to write out the last root block if an exception is thrown out of commitNow().  

Modified Paths:
--------------
    branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/journal/AbstractJournal.java

Modified: branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/journal/AbstractJournal.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/journal/AbstractJournal.java	2011-06-17 12:30:51 UTC (rev 4719)
+++ branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/journal/AbstractJournal.java	2011-06-17 15:00:15 UTC (rev 4720)
@@ -2243,8 +2243,15 @@
 		 */
 		final long commitTime = transactionManager.nextTimestamp();
 
-		// do the commit.
-		final long commitTime2 = commitNow(commitTime);
+        // do the commit.
+        final IRootBlockView lastRootBlock = _rootBlock;
+        final long commitTime2;
+        try {
+            commitTime2 = commitNow(commitTime);
+        } catch (Throwable t) {
+            throw new RuntimeException(t.getLocalizedMessage()
+                    + ": lastRootBlock=" + lastRootBlock, t);
+        }
 
 		if (commitTime2 == 0L) {
 


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