Merge pull request #4 from blazegraph/BLAZEGRAPH_RELEASE_2_1_0

Blazegraph release 2 1 0

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.0.1</version>
+    <version>2.1.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <groupId>com.blazegraph</groupId>
   <artifactId>bigdata-blueprints</artifactId>
-  <version>2.0.1</version>
+  <version>2.1.0</version>
   <name>Blazegraph Blueprints API</name>
   <description>Blazegraph support for Tinkerpop 2.5</description>
   <packaging>jar</packaging>

bigdata-blueprints/src/main/java/com/bigdata/blueprints/BigdataGraph.java

@@ -167,14 +167,14 @@ public interface Options {
     private final boolean laxEdges;
 
     /**
-     * If true, read from the write connection.  Necessary for the test suites.
+     * If true, use pure append mode (don't check old property values).
      */
-    private final boolean readFromWriteConnection;
+    protected final boolean laxProperties;
 
     /**
-     * If true, use pure append mode (don't check old property values).
+     * If true, read from the write connection.  Necessary for the test suites.
      */
-    protected final boolean laxProperties;
+    protected transient boolean readFromWriteConnection;
 
     public BigdataGraph(final BlueprintsValueFactory factory) {
         this(factory, new Properties());
@@ -230,6 +230,15 @@ public BlueprintsValueFactory getValueFactory() {
      * or being blocked by writers.
      */
     public abstract RepositoryConnection getReadConnection() throws Exception;
+
+    /**
+     * Clients can read from the write connection if they choose.
+     * 
+     * @param readFromWriteConnection
+     */
+    public void setReadFromWriteConnection(boolean readFromWriteConnection) {
+        this.readFromWriteConnection = readFromWriteConnection;
+    }
 
     /**
      * Return a single-valued property for an edge or vertex.

bigdata-blueprints/src/main/java/com/bigdata/blueprints/BigdataGraphEmbedded.java

@@ -35,8 +35,6 @@
 import org.apache.log4j.Logger;
 import org.openrdf.model.BNode;
 import org.openrdf.repository.RepositoryConnection;
-import org.openrdf.repository.sail.SailRepository;
-import org.openrdf.sail.Sail;
 
 import com.bigdata.blueprints.BigdataGraphEdit.Action;
 import com.bigdata.bop.engine.IRunningQuery;
@@ -242,8 +240,21 @@ public void shutdown() {
 	public void stopTransaction(Conclusion arg0) {
 	}
 
-	public StringBuilder dumpStore() {
-	    return ((BigdataSailRepository)repo).getDatabase().dumpStore();
+	public StringBuilder dumpStore() throws Exception {
+	    final BigdataSailRepositoryConnection cxn =
+	            super.readFromWriteConnection ? 
+	                    getWriteConnection() : getReadConnection();
+	                    
+        try {
+            if (super.readFromWriteConnection) {
+                cxn.flush();
+            }
+            return cxn.getTripleStore().dumpStore();
+        } finally {
+            if (!super.readFromWriteConnection) {
+                cxn.close();
+            }
+        }
 	}
 
 

bigdata-blueprints/src/test/resources/log4j.properties

@@ -25,7 +25,7 @@ log4j.logger.com.bigdata.rdf.load=INFO
 log4j.logger.com.bigdata.rdf.store.DataLoader=INFO
 log4j.logger.com.bigdata.resources.AsynchronousOverflowTask=INFO
 
-log4j.logger.com.bigdata.rdf.sail.webapp=INFO
+#log4j.logger.com.bigdata.rdf.sail.webapp=INFO
 
 #log4j.logger.com.bigdata.rdf.ServiceProviderHook=INFO
 

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.0.1</version>
+    <version>2.1.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <groupId>com.blazegraph</groupId>
   <artifactId>bigdata-cache</artifactId>
-  <version>2.0.1</version>
+  <version>2.1.0</version>
   <name>Blazegraph Cache</name>
   <description>Blazegraph Cache utilities</description>
   <packaging>jar</packaging>
@@ -113,16 +113,12 @@ ga('send', 'pageview');
       <artifactId>bigdata-statics</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <!--dependency>
-      <groupId>com.blazegraph</groupId>
-      <artifactId>bigdata-util</artifactId>
-      <version>${project.version}</version>
-    </dependency-->
     <dependency>
       <groupId>com.blazegraph</groupId>
       <artifactId>bigdata-util</artifactId>
       <version>${project.version}</version>
       <type>test-jar</type>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <!-- log4j is the primary logger for bigdata. -->

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.0.1</version>
+    <version>2.1.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <groupId>com.blazegraph</groupId>
   <artifactId>bigdata-client</artifactId>
-  <version>2.0.1</version>
+  <version>2.1.0</version>
   <name>Blazegraph Client API</name>
   <description>Blazegraph Client API tools</description>
   <build>

bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/NoGPUAccelerationAvailable.java

@@ -0,0 +1,45 @@
+/**
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+
+Contact:
+     SYSTAP, LLC DBA Blazegraph
+     2501 Calvert ST NW #106
+     Washington, DC 20008
+     licenses@blazegraph.com
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; version 2 of the License.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+package com.bigdata.rdf.sail.webapp.client;
+
+
+/**
+ * Exception indicating that GPU acceleration is not available.
+ * 
+ * @author <a href="mailto:ms@metaphacts.com">Michael Schmidt</a>
+ */
+public class NoGPUAccelerationAvailable extends RuntimeException {
+
+    private static final long serialVersionUID = 1L;
+
+    public NoGPUAccelerationAvailable() {
+        
+    }
+    
+    public NoGPUAccelerationAvailable(final String message) {
+
+        super(message);
+
+    }
+
+}

bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/RemoteRepositoryDecls.java

@@ -180,4 +180,9 @@ public class RemoteRepositoryDecls {
     * @see com.bigdata.rdf.sail.webapp.QueryServlet.BINDING_PREFIX
     */
    public static final String BINDING_PREFIX = "$";
+   
+   /**
+    * URL query parameter that contains boolean flag to create full text index if not exists.
+    */
+   public static final String FORCE_INDEX_CREATE = "force-index-create";
 }