Merge pull request #12 from blazegraph/BLAZEGRAPH_RELEASE_2_1_2

Blazegraph release 2 1 2

Author: beebs-systap

bigdata-blueprints/pom.xml

@@ -28,12 +28,12 @@ Copyright 2010 by TalkingTrends (Amsterdam, The Netherlands)
   <parent>
     <groupId>com.blazegraph</groupId>
     <artifactId>blazegraph-parent</artifactId>
-    <version>2.1.1</version>
+    <version>2.1.2</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <groupId>com.blazegraph</groupId>
   <artifactId>bigdata-blueprints</artifactId>
-  <version>2.1.1</version>
+  <version>2.1.2</version>
   <name>Blazegraph Blueprints API</name>
   <description>Blazegraph support for Tinkerpop 2.5</description>
   <packaging>jar</packaging>

bigdata-cache/pom.xml

@@ -28,12 +28,12 @@ Copyright 2010 by TalkingTrends (Amsterdam, The Netherlands)
   <parent>
     <groupId>com.blazegraph</groupId>
     <artifactId>blazegraph-parent</artifactId>
-    <version>2.1.1</version>
+    <version>2.1.2</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <groupId>com.blazegraph</groupId>
   <artifactId>bigdata-cache</artifactId>
-  <version>2.1.1</version>
+  <version>2.1.2</version>
   <name>Blazegraph Cache</name>
   <description>Blazegraph Cache utilities</description>
   <packaging>jar</packaging>

bigdata-client/pom.xml

@@ -28,12 +28,12 @@ Copyright 2010 by TalkingTrends (Amsterdam, The Netherlands)
   <parent>
     <groupId>com.blazegraph</groupId>
     <artifactId>blazegraph-parent</artifactId>
-    <version>2.1.1</version>
+    <version>2.1.2</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <groupId>com.blazegraph</groupId>
   <artifactId>bigdata-client</artifactId>
-  <version>2.1.1</version>
+  <version>2.1.2</version>
   <name>Blazegraph Client API</name>
   <description>Blazegraph Client API tools</description>
   <build>

bigdata-common-util/pom.xml

@@ -28,12 +28,12 @@ Copyright 2010 by TalkingTrends (Amsterdam, The Netherlands)
   <parent>
     <groupId>com.blazegraph</groupId>
     <artifactId>blazegraph-parent</artifactId>
-    <version>2.1.1</version>
+    <version>2.1.2</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <groupId>com.blazegraph</groupId>
   <artifactId>bigdata-common-util</artifactId>
-  <version>2.1.1</version>
+  <version>2.1.2</version>
   <name>Blazegraph Common Utilities</name>
   <description>Blazegraph utilities common across artifacts</description>
   <build>

bigdata-core-test/bigdata/src/test/com/bigdata/bop/engine/TestQueryEngine.java

@@ -36,7 +36,9 @@
 import java.util.concurrent.CancellationException;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
 import java.util.concurrent.FutureTask;
+import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
@@ -1982,4 +1984,39 @@ private IRunningQuery initQueryWithConditionalRoutingOp(IConstraint condition, i
         return runningQuery;
     }
 
+    /**
+     * Test the LatchExecutor to verify reliable progression with multiple threads contending
+     * to add tasks.
+     * 
+     * @throws InterruptedException
+     */
+	public void testLatchExecutorProgression() throws InterruptedException {
+		LatchedExecutor latched = new LatchedExecutor(
+				Executors.newCachedThreadPool(), 1);
+
+		final Semaphore sem = new Semaphore(1);
+
+		Runnable task = new Runnable() {
+
+			@Override
+			public void run() {
+
+				sem.release();
+
+			}
+
+		};
+
+		// Without the fix to the LatchedExecutor.scheduleNext this deadlocks in less than
+		//	10,000 iterations
+		for (int n = 0; n < (1 * 1024 * 1024); n++) { // try 1 million iterations
+			// System.err.println("Iteration: " + n);
+			
+			sem.acquire();
+
+			latched.execute(task);
+
+		}
+
+	}
 }

bigdata-core-test/pom.xml

@@ -29,12 +29,12 @@ Copyright 2010 by TalkingTrends (Amsterdam, The Netherlands)
   <parent>
     <groupId>com.blazegraph</groupId>
     <artifactId>blazegraph-parent</artifactId>
-    <version>2.1.1</version>
+    <version>2.1.2</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <groupId>com.blazegraph</groupId>
   <artifactId>bigdata-core-test</artifactId>
-  <version>2.1.1</version>
+  <version>2.1.2</version>
   <packaging>jar</packaging>
   <name>Blazegraph Core Tests</name>
   <description>Blazegraph Core Platform Test Suites</description>

bigdata-core/bigdata/src/java/com/bigdata/bop/join/PipelinedHashIndexAndSolutionSetJoinOp.java

@@ -37,7 +37,6 @@
 import com.bigdata.bop.IVariable;
 import com.bigdata.bop.NV;
 import com.bigdata.bop.PipelineOp;
-import com.bigdata.bop.PipelineOp.Annotations;
 import com.bigdata.bop.controller.INamedSolutionSetRef;
 import com.bigdata.bop.controller.SubqueryAnnotations;
 import com.bigdata.rdf.sparql.ast.QueryHints;
@@ -392,37 +391,13 @@ public Void call() throws Exception {
 
             try {
 
-                if (sourceIsPipeline) {
+                // Buffer all source solutions.
+                acceptAndOutputSolutions();
 
-                    // Buffer all source solutions.
-                    acceptAndOutputSolutions();
+                if (context.isLastInvocation()) {
 
-                    if (context.isLastInvocation()) {
-
-                        // Done. Release the allocation context.
-                        state.release();
-
-                    }
-
-                } else {
-                    
-                    if(first) {
-                    
-                        // Accept ALL solutions.
-                        acceptAndOutputSolutions();
-                        
-                        // Done. Release the allocation context.
-                        state.release();
-                        
-                    }
-
-                    // Copy all solutions from the pipeline to the sink.
-                    BOpUtility.copy(context.getSource(), context.getSink(),
-                            null/* sink2 */, null/* mergeSolution */,
-                            null/* selectVars */, null/* constraints */, stats);
-
-                    // Flush solutions to the sink.
-                    context.getSink().flush();
+                    // Done. Release the allocation context.
+                    state.release();
 
                 }
 

bigdata-core/bigdata/src/java/com/bigdata/rwstore/RWStore.java

@@ -62,6 +62,7 @@
 import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
 
 import org.apache.log4j.Logger;
+import org.apache.system.SystemUtil;
 
 import com.bigdata.btree.BTree.Counter;
 import com.bigdata.btree.IIndex;
@@ -365,8 +366,18 @@ public interface Options {
          */
         String READ_BLOBS_ASYNC = RWStore.class.getName() + ".readBlobsAsync";
 
-        String DEFAULT_READ_BLOBS_ASYNC = "true";
-        
+        /**
+         * Note: Windows does not handle async IO channel reopens in the same
+         * fashion as Linux, leading to "overlapping file exceptions" and other
+         * weirdness. Therefore this option is explicitly disabled by default 
+         * on Windows.
+         * 
+         * @see https://jira.blazegraph.com/browse/BLZG-1911 (Blazegraph 2.1
+         *      version does not work on Windows (async IO causes file lock
+         *      errors))
+         */
+        String DEFAULT_READ_BLOBS_ASYNC = SystemUtil.isWindows() ? "false" : "true";
+
         /**
          * Defines the number of bits that must be free in a FixedAllocator for
          * it to be added to the free list.  This is used to ensure a level

bigdata-core/bigdata/src/java/com/bigdata/util/concurrent/LatchedExecutor.java

@@ -138,23 +138,28 @@ public void run() {
      * <p>
      * Pre-condition: The caller has a permit.
      */
-    private void scheduleNext() {
-        while (true) {
-            Runnable next = null;
-            if ((next = queue.poll()) != null) {
-                try {
-                    executor.execute(next);
-                    return;
-                } catch (RejectedExecutionException ex) {
-                    // log error and poll the queue again.
-                    log.error(ex, ex);
+	private void scheduleNext() {
+		while (true) {
+			Runnable next = null;
+			if ((next = queue.poll()) != null) {
+				try {
+					executor.execute(next);
+					return;
+				} catch (RejectedExecutionException ex) {
+					// log error and poll the queue again.
+					log.error(ex, ex);
+					continue;
+				}
+			} else {
+				semaphore.release();
+
+				// check for a missed enqueue
+                if (!queue.isEmpty() && semaphore.tryAcquire()) {
                     continue;
                 }
-            } else {
-                semaphore.release();
-                return;
-            }
-        }
-    }
 
+                return;
+			}
+		}
+	}
 }

bigdata-core/pom.xml

@@ -29,12 +29,12 @@ Copyright 2010 by TalkingTrends (Amsterdam, The Netherlands)
   <parent>
     <groupId>com.blazegraph</groupId>
     <artifactId>blazegraph-parent</artifactId>
-    <version>2.1.1</version>
+    <version>2.1.2</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <groupId>com.blazegraph</groupId>
   <artifactId>bigdata-core</artifactId>
-  <version>2.1.1</version>
+  <version>2.1.2</version>
   <packaging>jar</packaging>
   <name>Blazegraph Core</name>
   <description>Blazegraph(TM) DB Core Platform.  It contains all Blazegraph DB dependencies other than Blueprints.</description>