bigdata-commit

[Bigdata-commit] SF.net SVN: bigdata:[3624] branches/QUADS_QUERY_BRANCH/bigdata-sails/src/ java/com/bigdata/rdf/sail/BigdataSail.java

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

Revision: 3624
          http://bigdata.svn.sourceforge.net/bigdata/?rev=3624&view=rev
Author:   thompsonbry
Date:     2010-09-24 16:49:51 +0000 (Fri, 24 Sep 2010)

Log Message:
-----------
Added shutdown of the query engine.

Modified Paths:
--------------
    branches/QUADS_QUERY_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataSail.java

Modified: branches/QUADS_QUERY_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataSail.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataSail.java	2010-09-24 14:36:50 UTC (rev 3623)
+++ branches/QUADS_QUERY_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataSail.java	2010-09-24 16:49:51 UTC (rev 3624)
@@ -996,6 +996,8 @@
         
         assertOpen();
         
+        queryEngine.shutdown();
+        
         super.shutDown();
         
     }


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

[Bigdata-commit] SF.net SVN: bigdata:[4136] branches/QUADS_QUERY_BRANCH/bigdata-sails/src/ java/com/bigdata/rdf/sail/BigdataSail.java

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

Revision: 4136
          http://bigdata.svn.sourceforge.net/bigdata/?rev=4136&view=rev
Author:   thompsonbry
Date:     2011-01-20 13:38:30 +0000 (Thu, 20 Jan 2011)

Log Message:
-----------
Turned off the new evaluation strategy by default again.

Modified Paths:
--------------
    branches/QUADS_QUERY_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataSail.java

Modified: branches/QUADS_QUERY_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataSail.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataSail.java	2011-01-20 02:05:21 UTC (rev 4135)
+++ branches/QUADS_QUERY_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataSail.java	2011-01-20 13:38:30 UTC (rev 4136)
@@ -382,7 +382,7 @@
         public static final String NEW_EVAL_STRATEGY = BigdataSail.class.getPackage()
                 .getName()+ ".newEvalStrategy";
 
-        public static final String DEFAULT_NEW_EVAL_STRATEGY = "true";
+        public static final String DEFAULT_NEW_EVAL_STRATEGY = "false";
         
         /**
          * Option as to whether or not to allow Sesame evaluation of queries


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

[Bigdata-commit] SF.net SVN: bigdata:[4458] branches/QUADS_QUERY_BRANCH/bigdata-sails/src/ java/com/bigdata/rdf/sail/BigdataSail.java

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

Revision: 4458
          http://bigdata.svn.sourceforge.net/bigdata/?rev=4458&view=rev
Author:   thompsonbry
Date:     2011-05-06 12:59:07 +0000 (Fri, 06 May 2011)

Log Message:
-----------
Added check to BigdataSail#getUnisolatedConnection(). If the caller already holds the unisolated connection, this method will now throw an IllegalStateException.  This provides an early warning of the most common means by which an application had been able to obtain multiple "unisolated" connections.

Modified Paths:
--------------
    branches/QUADS_QUERY_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataSail.java

Modified: branches/QUADS_QUERY_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataSail.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataSail.java	2011-05-06 12:58:25 UTC (rev 4457)
+++ branches/QUADS_QUERY_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataSail.java	2011-05-06 12:59:07 UTC (rev 4458)
@@ -1301,7 +1301,17 @@
     public BigdataSailConnection getUnisolatedConnection() 
             throws InterruptedException {
         
-		if (getDatabase().getIndexManager() instanceof Journal) {
+    	if(lock.writeLock().isHeldByCurrentThread()) {
+    		/*
+    		 * A thread which already holds this lock already has the open
+    		 * unisolated connection and will deadlock when it attempts to
+    		 * obtain the permit for that connection from the Journal.
+    		 */
+			throw new IllegalStateException(
+					"UNISOLATED connection is not reentrant.");
+    	}
+
+    	if (getDatabase().getIndexManager() instanceof Journal) {
 			// acquire permit from Journal.
 			((Journal) getDatabase().getIndexManager())
 					.acquireUnisolatedConnection();


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

[Bigdata-commit] SF.net SVN: bigdata:[4603] branches/QUADS_QUERY_BRANCH/bigdata-sails/src/ java/com/bigdata/rdf/sail/BigdataSail.java

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

Revision: 4603
          http://bigdata.svn.sourceforge.net/bigdata/?rev=4603&view=rev
Author:   thompsonbry
Date:     2011-06-02 13:36:59 +0000 (Thu, 02 Jun 2011)

Log Message:
-----------
javadoc

Modified Paths:
--------------
    branches/QUADS_QUERY_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataSail.java

Modified: branches/QUADS_QUERY_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataSail.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataSail.java	2011-06-02 13:19:58 UTC (rev 4602)
+++ branches/QUADS_QUERY_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataSail.java	2011-06-02 13:36:59 UTC (rev 4603)
@@ -1450,14 +1450,20 @@
         return queryEngine;
         
     }
-    
+
     /**
      * Inner class implements the {@link SailConnection}. Some additional
      * functionality is available on this class, including
      * {@link #computeClosure()}.
      * 
-     * @author <a href="mailto:tho...@us...">Bryan Thompson</a>
-     * @version $Id$
+     * @author <a href="mailto:tho...@us...">Bryan
+     *         Thompson</a>
+     * 
+     *         TODO This should be made into a static class. As it is, there is
+     *         a possibility for subtle errors introduced by inheritence of
+     *         variables from the {@link BigdataSail}. For example, this was
+     *         causing a problem with the {@link #close()} method on this class
+     *         and on the classes derived from this class.
      */
     public class BigdataSailConnection implements NotifyingSailConnection {
 


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