bigdata-commit Mailing List for Blazegraph (powered by bigdata) (Page 9)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 8534
          http://sourceforge.net/p/bigdata/code/8534
Author:   thompsonbry
Date:     2014-07-10 18:35:39 +0000 (Thu, 10 Jul 2014)
Log Message:
-----------
Generalized the stored query service to allow arbitrary task logic while holding a connection that reads on the KB.

See #989 (Support stored query service).

Modified Paths:
--------------
    branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/service/storedquery/TestStoredQueryService.java

Added Paths:
-----------
    branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/storedquery/SimpleStoredQueryService.java
    branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/storedquery/StoredQueryService.java
    branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/stored-query-003.rq

Removed Paths:
-------------
    branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/storedquery/StoredQueryService.java

Added: branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/storedquery/SimpleStoredQueryService.java
===================================================================

--- branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/storedquery/SimpleStoredQueryService.java	                        (rev 0)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/storedquery/SimpleStoredQueryService.java	2014-07-10 18:35:39 UTC (rev 8534)
@@ -0,0 +1,71 @@
+/*
+
+ Copyright (C) SYSTAP, LLC 2006-2008.  All rights reserved.
+
+ Contact:
+ SYSTAP, LLC
+ 4501 Tower Road
+ Greensboro, NC 27410
+ lic...@bi...
+
+ 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.sparql.ast.service.storedquery;
+
+import org.openrdf.query.QueryLanguage;
+import org.openrdf.query.TupleQueryResult;
+
+import com.bigdata.rdf.sail.BigdataSailRepositoryConnection;
+import com.bigdata.rdf.sail.BigdataSailTupleQuery;
+import com.bigdata.rdf.sparql.ast.eval.ServiceParams;
+import com.bigdata.rdf.sparql.ast.service.ServiceCallCreateParams;
+
+/**
+ * Simple stored query consisting of a parameterized SPARQL query.
+ * 
+ * @author <a href="mailto:tho...@us...">Bryan
+ *         Thompson</a>
+ */
+abstract public class SimpleStoredQueryService extends StoredQueryService {
+
+    /**
+     * Return the SPARQL query to be evaluated.
+     */
+    abstract protected String getQuery(
+            final ServiceCallCreateParams createParams,
+            final ServiceParams serviceParams);
+
+    /**
+     * Executes the SPARQL query returned by
+     * {@link #getQuery(ServiceCallCreateParams, ServiceParams)}
+     */
+    @Override
+    protected TupleQueryResult doQuery(
+            final BigdataSailRepositoryConnection cxn,
+            final ServiceCallCreateParams createParams,
+            final ServiceParams serviceParams) throws Exception {
+
+        final String queryStr = getQuery(createParams, serviceParams);
+
+        final String baseURI = createParams.getServiceURI().stringValue();
+
+        final BigdataSailTupleQuery query = (BigdataSailTupleQuery) cxn
+                .prepareTupleQuery(QueryLanguage.SPARQL, queryStr, baseURI);
+
+        return query.evaluate();
+
+    }
+
+} // SimpleStoredQueryService
\ No newline at end of file

Deleted: branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/storedquery/StoredQueryService.java
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/storedquery/StoredQueryService.java	2014-07-10 15:47:26 UTC (rev 8533)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/storedquery/StoredQueryService.java	2014-07-10 18:35:39 UTC (rev 8534)
@@ -1,393 +0,0 @@
-/**
-
-Copyright (C) SYSTAP, LLC 2006-2011.  All rights reserved.
-
-Contact:
-     SYSTAP, LLC
-     4501 Tower Road
-     Greensboro, NC 27410
-     lic...@bi...
-
-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.sparql.ast.service.storedquery;
-
-import java.util.Arrays;
-import java.util.concurrent.Future;
-
-import org.apache.log4j.Logger;
-import org.openrdf.query.BindingSet;
-import org.openrdf.query.QueryEvaluationException;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.TupleQueryResult;
-
-import com.bigdata.rdf.internal.IV;
-import com.bigdata.rdf.sail.BigdataSailRepositoryConnection;
-import com.bigdata.rdf.sail.BigdataSailTupleQuery;
-import com.bigdata.rdf.sail.Sesame2BigdataIterator;
-import com.bigdata.rdf.sparql.ast.eval.ASTEvalHelper;
-import com.bigdata.rdf.sparql.ast.eval.ServiceParams;
-import com.bigdata.rdf.sparql.ast.service.ExternalServiceCall;
-import com.bigdata.rdf.sparql.ast.service.IServiceOptions;
-import com.bigdata.rdf.sparql.ast.service.OpenrdfNativeServiceOptions;
-import com.bigdata.rdf.sparql.ast.service.ServiceCallCreateParams;
-import com.bigdata.rdf.sparql.ast.service.ServiceFactory;
-import com.bigdata.rdf.sparql.ast.service.ServiceNode;
-import com.bigdata.rdf.sparql.ast.service.ServiceRegistry;
-import com.bigdata.rdf.store.AbstractTripleStore;
-import com.bigdata.rdf.task.AbstractApiTask;
-
-import cutthecrap.utils.striterators.ICloseableIterator;
-
-/**
- * A SERVICE that exposes a stored query for execution. The stored query may be
- * a SPARQL query or arbitrary procedural application logic, but it must
- * evaluate to a solution multi-set. The service interface is written to the
- * openrdf interfaces in order to remove the burden of dealing with bigdata
- * {@link IV}s from the application.
- * <p>
- * In order to use a stored query, a concrete instance of this class must be
- * registered against the {@link ServiceRegistry}:
- * 
- * <pre>
- * final URI serviceURI = new URIImpl(StoredQueryService.Options.NAMESPACE
- *         + &quot;my-service&quot;);
- * 
- * ServiceRegistry.getInstance().add(serviceURI, new MyStoredQueryService());
- * </pre>
- * 
- * Thereafter, the stored query may be referenced from SPARQL using its assigned
- * service URI:
- * 
- * <pre>
- * SELECT * {
- *    SERVICE <http://www.bigdata.com/rdf/stored-query#my-service> { }
- * }
- * </pre>
- * 
- * The SERVICE invocation may include a group graph pattern that will be parsed
- * and made accessible to the stored query service as a {@link ServiceParams}
- * object. For example:
- * 
- * <pre>
- * SELECT * {
- *    SERVICE <http://www.bigdata.com/rdf/stored-query#my-service> {
- *       bd:serviceParam :color :"blue" .
- *       bd:serviceParam :color :"green" .
- *       bd:serviceParam :size  :"large" .
- *    }
- * }
- * </pre>
- * 
- * will provide the stored query with two bindings for the
- * <code>:color = {"blue", "green"}</code> and one binding for
- * <code>:size = {"large"}</code>. The value key names, the allowed value types
- * for each key name, and the interpretation of those values are all specific to
- * a given stored query service implementation class. They will be provided to
- * that class as a {@link ServiceParams} object.
- * 
- * @author <a href="mailto:tho...@us...">Bryan Thompson</a>
- * 
- * @see <a href="http://trac.bigdata.com/ticket/989">Stored Query Service</a>
- * 
- *      TODO Wiki page.
- * 
- *      TODO Implicit prefix declaration for bsq.
- * 
- *      TODO Reconcile with the REST API (group commit task pattern).
- * 
- *      TODO Why does this work?
- * 
- *      <pre>
- * SELECT ?book ?title ?price
- * {
- *    SERVICE <http://www.bigdata.com/rdf/stored-query#test_stored_query_001> {
- *    }
- * }
- * </pre>
- * 
- *      while this does not work
- * 
- *      <pre>
- * PREFIX bsq:  <http://www.bigdata.com/rdf/stored-query#>
- * 
- * SELECT ?book ?title ?price
- * {
- *    SERVICE <bsq#test_stored_query_001> {
- *    }
- * }
- * </pre>
- * 
- *      TODO Example
- * 
- *      <pre>
- * PREFIX bsq: <http://www.bigdata.com/rdf/stored-query#>
- * #...
- * SERVICE &lt;bsq#my-service&gt; {
- *    bsq:queryParam bsq:gasClass "com.bigdata.rdf.graph.analytics.BFS" .
- *    gas:program gas:in &lt;IRI&gt; . # one or more times, specifies the initial frontier.
- *    gas:program gas:out ?out . # exactly once - will be bound to the visited vertices.
- *    gas:program gas:maxIterations 4 . # optional limit on breadth first expansion.
- *    gas:program gas:maxVisited 2000 . # optional limit on the #of visited vertices.
- *    gas:program gas:nthreads 4 . # specify the #of threads to use (optional)
- * }
- * </pre>
- * 
- */
-abstract public class StoredQueryService implements ServiceFactory {
-
-    public interface Options {
-        
-        /**
-         * The namespace used for stored query service.
-         */
-        String NAMESPACE = "http://www.bigdata.com/rdf/stored-query#";
-
-    }
-
-    static private transient final Logger log = Logger
-            .getLogger(StoredQueryService.class);
-
-    private final OpenrdfNativeServiceOptions serviceOptions;
-
-    public StoredQueryService() {
-
-        serviceOptions = new OpenrdfNativeServiceOptions();
-        
-//        /*
-//         * TODO This should probably be metadata set for each specific
-//         * stored query.
-//         */
-//        serviceOptions.setRunFirst(true);
-        
-    }
-
-    @Override
-    public IServiceOptions getServiceOptions() {
-
-        return serviceOptions;
-        
-    }
-
-    @Override
-    final public ExternalServiceCall create(final ServiceCallCreateParams params) {
-
-        if (params == null)
-            throw new IllegalArgumentException();
-
-        final AbstractTripleStore store = params.getTripleStore();
-
-        if (store == null)
-            throw new IllegalArgumentException();
-
-        final ServiceNode serviceNode = params.getServiceNode();
-
-        if (serviceNode == null)
-            throw new IllegalArgumentException();
-
-        final ServiceParams serviceParams = ServiceParams.gatherServiceParams(params);
-        
-        return create(params, serviceParams);
-        
-    }
-
-    public ExternalServiceCall create(
-            final ServiceCallCreateParams createParams,
-            final ServiceParams serviceParams) {
-
-        /*
-         * Create and return the ServiceCall object which will execute this
-         * query.
-         */
-
-        return new StoredQueryServiceCall(createParams, serviceParams);
-
-    }
-    
-    /**
-     * Return the SPARQL query to be evaluated.
-     */
-    abstract protected String getQuery(
-            final ServiceCallCreateParams createParams,
-            final ServiceParams serviceParams);
-
-    private class StoredQueryServiceCall implements ExternalServiceCall {
-
-        private final ServiceCallCreateParams createParams;
-        private final ServiceParams serviceParams;
-
-        public StoredQueryServiceCall(
-                final ServiceCallCreateParams createParams,
-                final ServiceParams serviceParams) {
-
-            if (createParams == null)
-                throw new IllegalArgumentException();
-
-            if (serviceParams == null)
-                throw new IllegalArgumentException();
-
-            this.createParams = createParams;
-            this.serviceParams = serviceParams;
-
-        }
-
-        @Override
-        public IServiceOptions getServiceOptions() {
-            
-            return createParams.getServiceOptions();
-            
-        }
-
-        /**
-         * TODO We could use {@link ASTEvalHelper} to evaluate at the bigdata
-         * level without forcing the materialization of any variable bindings
-         * from the lexicon indices. This would be faster for some purposes,
-         * especially if the stored procedure is only used to JOIN into an outer
-         * query as in <code>SELECT * { SERVICE bsq:my-service {} }</code>
-         * 
-         * FIXME Generalize to allow arbitrary application logic that has easy
-         * methods permitting it to invoke multiple queries and operate on the
-         * results.
-         * 
-         * FIXME Generalize to support groovy scripting.
-         */
-        @Override
-        public ICloseableIterator<BindingSet> call(final BindingSet[] bindingSets)
-                throws Exception {
-
-            if (log.isInfoEnabled()) {
-                log.info(bindingSets.length);
-                log.info(Arrays.toString(bindingSets));
-                log.info(serviceParams);
-            }
-
-            final String queryStr = getQuery(createParams, serviceParams);
-            
-            // TODO Should the baseURI be the SERVICE URI?  Decide and document.
-            final String baseURI = createParams.getServiceURI().stringValue();
-            
-            final AbstractTripleStore tripleStore = createParams.getTripleStore();
-            
-            final Future<TupleQueryResult> ft = AbstractApiTask.submitApiTask(
-                    tripleStore.getIndexManager(),
-                    new SparqlApiTask(tripleStore.getNamespace(), tripleStore
-                            .getTimestamp(), queryStr, baseURI, bindingSets));
-
-            try {
-
-                final TupleQueryResult tupleQueryResult = ft.get();
-                
-                return new Sesame2BigdataIterator<BindingSet, QueryEvaluationException>(
-                        tupleQueryResult);
-                
-            } finally {
-            
-                ft.cancel(true/* mayInterruptIfRunning */);
-                
-            }
-
-        }
-
-    } // StoredQueryServiceCall
-
-    /**
-     * Task to execute a SPARQL query.
-     * 
-     * @author <a href="mailto:tho...@us...">Bryan
-     *         Thompson</a>
-     */
-    private static class SparqlApiTask extends
-            AbstractApiTask<TupleQueryResult> {
-
-        private final String queryStr;
-        private final String baseURI;
-
-        /**
-         * 
-         * FIXME This is ignoring the exogenous bindings. This is more or less
-         * equivalent to bottom-up evaluation. It would be more efficient if we
-         * could flow in the exogenous bindings but this is not supported before
-         * openrdf 2.7 (we hack this in {@link BigdataSailTupleQuery}).
-         */
-        private final BindingSet[] bindingSets;
-
-        public SparqlApiTask(final String namespace, final long timestamp,
-                final String queryStr, final String baseURI,
-                final BindingSet[] bindingSets) {
-
-            super(namespace, timestamp);
-
-            this.queryStr = queryStr;
-            this.baseURI = baseURI;
-            this.bindingSets = bindingSets;
-
-        }
-
-        @Override
-        public TupleQueryResult call() throws Exception {
-            BigdataSailRepositoryConnection cxn = null;
-            boolean success = false;
-            try {
-                // Note: Will be UPDATE connection if UPDATE request!!!
-                cxn = getQueryConnection();
-                if (log.isTraceEnabled())
-                    log.trace("Query running...");
-                final TupleQueryResult ret = doQuery(cxn);
-                success = true;
-                if (log.isTraceEnabled())
-                    log.trace("Query done.");
-                return ret;
-            } finally {
-                if (cxn != null) {
-                    if (!success && !cxn.isReadOnly()) {
-                        /*
-                         * Force rollback of the connection.
-                         * 
-                         * Note: It is possible that the commit has already
-                         * been processed, in which case this rollback()
-                         * will be a NOP. This can happen when there is an
-                         * IO error when communicating with the client, but
-                         * the database has already gone through a commit.
-                         */
-                        try {
-                            // Force rollback of the connection.
-                            cxn.rollback();
-                        } catch (Throwable t) {
-                            log.error(t, t);
-                        }
-                    }
-                    try {
-                        // Force close of the connection.
-                        cxn.close();
-                    } catch (Throwable t) {
-                        log.error(t, t);
-                    }
-                }
-            }
-        }
-
-        protected TupleQueryResult doQuery(
-                final BigdataSailRepositoryConnection cxn) throws Exception {
-
-            final BigdataSailTupleQuery query = (BigdataSailTupleQuery) cxn
-                    .prepareTupleQuery(QueryLanguage.SPARQL, queryStr,
-                            baseURI);
-
-            return query.evaluate();
-
-        }
-
-    } // SparqlApiTask
-
-}

Added: branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/storedquery/StoredQueryService.java
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/storedquery/StoredQueryService.java	                        (rev 0)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/storedquery/StoredQueryService.java	2014-07-10 18:35:39 UTC (rev 8534)
@@ -0,0 +1,359 @@
+/**
+
+Copyright (C) SYSTAP, LLC 2006-2011.  All rights reserved.
+
+Contact:
+     SYSTAP, LLC
+     4501 Tower Road
+     Greensboro, NC 27410
+     lic...@bi...
+
+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.sparql.ast.service.storedquery;
+
+import java.util.Arrays;
+import java.util.concurrent.Future;
+
+import org.apache.log4j.Logger;
+import org.openrdf.query.BindingSet;
+import org.openrdf.query.QueryEvaluationException;
+import org.openrdf.query.TupleQueryResult;
+
+import com.bigdata.rdf.internal.IV;
+import com.bigdata.rdf.sail.BigdataSailRepositoryConnection;
+import com.bigdata.rdf.sail.BigdataSailTupleQuery;
+import com.bigdata.rdf.sail.Sesame2BigdataIterator;
+import com.bigdata.rdf.sparql.ast.eval.ASTEvalHelper;
+import com.bigdata.rdf.sparql.ast.eval.ServiceParams;
+import com.bigdata.rdf.sparql.ast.service.ExternalServiceCall;
+import com.bigdata.rdf.sparql.ast.service.IServiceOptions;
+import com.bigdata.rdf.sparql.ast.service.OpenrdfNativeServiceOptions;
+import com.bigdata.rdf.sparql.ast.service.ServiceCallCreateParams;
+import com.bigdata.rdf.sparql.ast.service.ServiceFactory;
+import com.bigdata.rdf.sparql.ast.service.ServiceNode;
+import com.bigdata.rdf.sparql.ast.service.ServiceRegistry;
+import com.bigdata.rdf.store.AbstractTripleStore;
+import com.bigdata.rdf.task.AbstractApiTask;
+
+import cutthecrap.utils.striterators.ICloseableIterator;
+
+/**
+ * A SERVICE that exposes a stored query for execution. The stored query may be
+ * a SPARQL query or arbitrary procedural application logic, but it must
+ * evaluate to a solution multi-set. The service interface is written to the
+ * openrdf interfaces in order to remove the burden of dealing with bigdata
+ * {@link IV}s from the application. The effective value of the baseURI during
+ * query evaluation will be the SERVICE URI.
+ * <p>
+ * In order to use a stored query, a concrete instance of this class must be
+ * registered against the {@link ServiceRegistry}:
+ * 
+ * <pre>
+ * final URI serviceURI = new URIImpl(StoredQueryService.Options.NAMESPACE
+ *         + &quot;my-service&quot;);
+ * 
+ * ServiceRegistry.getInstance().add(serviceURI, new MyStoredQueryService());
+ * </pre>
+ * 
+ * Thereafter, the stored query may be referenced from SPARQL using its assigned
+ * service URI:
+ * 
+ * <pre>
+ * SELECT * {
+ *    SERVICE <http://www.bigdata.com/rdf/stored-query#my-service> { }
+ * }
+ * </pre>
+ * 
+ * The SERVICE invocation may include a group graph pattern that will be parsed
+ * and made accessible to the stored query service as a {@link ServiceParams}
+ * object. For example:
+ * 
+ * <pre>
+ * SELECT * {
+ *    SERVICE <http://www.bigdata.com/rdf/stored-query#my-service> {
+ *       bd:serviceParam :color :"blue" .
+ *       bd:serviceParam :color :"green" .
+ *       bd:serviceParam :size  :"large" .
+ *    }
+ * }
+ * </pre>
+ * 
+ * will provide the stored query with two bindings for the
+ * <code>:color = {"blue", "green"}</code> and one binding for
+ * <code>:size = {"large"}</code>. The value key names, the allowed value types
+ * for each key name, and the interpretation of those values are all specific to
+ * a given stored query service implementation class. They will be provided to
+ * that class as a {@link ServiceParams} object.
+ * 
+ * @author <a href="mailto:tho...@us...">Bryan Thompson</a>
+ * 
+ * @see <a href="http://trac.bigdata.com/ticket/989">Stored Query Service</a>
+ * 
+ *      TODO Wiki page.
+ * 
+ *      TODO Implicit prefix declaration for bsq.
+ * 
+ *      TODO Why does this work?
+ * 
+ *      <pre>
+ * SELECT ?book ?title ?price
+ * {
+ *    SERVICE <http://www.bigdata.com/rdf/stored-query#test_stored_query_001> {
+ *    }
+ * }
+ * </pre>
+ * 
+ *      while this does not work
+ * 
+ *      <pre>
+ * PREFIX bsq:  <http://www.bigdata.com/rdf/stored-query#>
+ * 
+ * SELECT ?book ?title ?price
+ * {
+ *    SERVICE <bsq#test_stored_query_001> {
+ *    }
+ * }
+ * </pre>
+ * 
+ *      TODO We could use {@link ASTEvalHelper} to evaluate at the bigdata level
+ *      without forcing the materialization of any variable bindings from the
+ *      lexicon indices. This would be faster for some purposes, especially if
+ *      the stored procedure is only used to JOIN into an outer query as in
+ *      <code>SELECT * { SERVICE bsq:my-service {} }</code>
+ * 
+ *      FIXME Generalize to support groovy scripting.
+ */
+abstract public class StoredQueryService implements ServiceFactory {
+
+    public interface Options {
+        
+        /**
+         * The namespace used for stored query service.
+         */
+        String NAMESPACE = "http://www.bigdata.com/rdf/stored-query#";
+
+    }
+
+    static private transient final Logger log = Logger
+            .getLogger(StoredQueryService.class);
+
+    private final OpenrdfNativeServiceOptions serviceOptions;
+
+    public StoredQueryService() {
+
+        serviceOptions = new OpenrdfNativeServiceOptions();
+        
+    }
+
+    @Override
+    public IServiceOptions getServiceOptions() {
+
+        return serviceOptions;
+        
+    }
+
+    @Override
+    final public ExternalServiceCall create(final ServiceCallCreateParams params) {
+
+        if (params == null)
+            throw new IllegalArgumentException();
+
+        final AbstractTripleStore store = params.getTripleStore();
+
+        if (store == null)
+            throw new IllegalArgumentException();
+
+        final ServiceNode serviceNode = params.getServiceNode();
+
+        if (serviceNode == null)
+            throw new IllegalArgumentException();
+
+        final ServiceParams serviceParams = ServiceParams
+                .gatherServiceParams(params);
+
+        return create(params, serviceParams);
+
+    }
+
+    public ExternalServiceCall create(
+            final ServiceCallCreateParams createParams,
+            final ServiceParams serviceParams) {
+
+        /*
+         * Create and return the ServiceCall object which will execute this
+         * query.
+         */
+
+        return new StoredQueryServiceCall(createParams, serviceParams);
+
+    }
+
+    /**
+     * Abstract method for core application logic. The implementation may
+     * execute a SPARQL query, or a series or SPARQL or other operations under
+     * application control.
+     * 
+     * @param cxn
+     *            The connection that should be used to read on the SPARQL
+     *            database.
+     * @param createParams
+     *            The SERVICE creation parameters.
+     * @param serviceParams
+     *            The SERVICE invocation parameters.
+     * @return The solution multi-set.
+     * 
+     * @throws Exception
+     */
+    abstract protected TupleQueryResult doQuery(
+            final BigdataSailRepositoryConnection cxn,
+            final ServiceCallCreateParams createParams,
+            final ServiceParams serviceParams) throws Exception;
+    
+    private class StoredQueryServiceCall implements ExternalServiceCall {
+
+        private final ServiceCallCreateParams createParams;
+        private final ServiceParams serviceParams;
+
+        public StoredQueryServiceCall(
+                final ServiceCallCreateParams createParams,
+                final ServiceParams serviceParams) {
+
+            if (createParams == null)
+                throw new IllegalArgumentException();
+
+            if (serviceParams == null)
+                throw new IllegalArgumentException();
+
+            this.createParams = createParams;
+            this.serviceParams = serviceParams;
+
+        }
+
+        @Override
+        public IServiceOptions getServiceOptions() {
+
+            return createParams.getServiceOptions();
+
+        }
+
+        @Override
+        public ICloseableIterator<BindingSet> call(
+                final BindingSet[] bindingSets) throws Exception {
+
+            if (log.isInfoEnabled()) {
+                log.info(bindingSets.length);
+                log.info(Arrays.toString(bindingSets));
+                log.info(serviceParams);
+            }
+
+            final AbstractTripleStore tripleStore = createParams
+                    .getTripleStore();
+
+            final Future<TupleQueryResult> ft = AbstractApiTask.submitApiTask(
+                    tripleStore.getIndexManager(),
+                    new StoredQueryTask(tripleStore.getNamespace(), tripleStore
+                            .getTimestamp(), bindingSets));
+
+            try {
+
+                final TupleQueryResult tupleQueryResult = ft.get();
+
+                return new Sesame2BigdataIterator<BindingSet, QueryEvaluationException>(
+                        tupleQueryResult);
+
+            } finally {
+
+                ft.cancel(true/* mayInterruptIfRunning */);
+
+            }
+
+        }
+
+        /**
+         * Task to execute the stored query.
+         * 
+         * @author <a href="mailto:tho...@us...">Bryan
+         *         Thompson</a>
+         */
+        private class StoredQueryTask extends AbstractApiTask<TupleQueryResult> {
+
+            /**
+             * 
+             * FIXME This is ignoring the exogenous bindings. This is more or
+             * less equivalent to bottom-up evaluation. It would be more
+             * efficient if we could flow in the exogenous bindings but this is
+             * not supported before openrdf 2.7 (we hack this in
+             * {@link BigdataSailTupleQuery}).
+             */
+            private final BindingSet[] bindingSets;
+
+            public StoredQueryTask(final String namespace,
+                    final long timestamp, final BindingSet[] bindingSets) {
+
+                super(namespace, timestamp);
+
+                this.bindingSets = bindingSets;
+
+            }
+
+            @Override
+            public TupleQueryResult call() throws Exception {
+                BigdataSailRepositoryConnection cxn = null;
+                boolean success = false;
+                try {
+                    // Note: Will be UPDATE connection if UPDATE request!!!
+                    cxn = getQueryConnection();
+                    if (log.isTraceEnabled())
+                        log.trace("Query running...");
+                    final TupleQueryResult ret = doQuery(cxn, createParams,
+                            serviceParams);
+                    success = true;
+                    if (log.isTraceEnabled())
+                        log.trace("Query done.");
+                    return ret;
+                } finally {
+                    if (cxn != null) {
+                        if (!success && !cxn.isReadOnly()) {
+                            /*
+                             * Force rollback of the connection.
+                             * 
+                             * Note: It is possible that the commit has already
+                             * been processed, in which case this rollback()
+                             * will be a NOP. This can happen when there is an
+                             * IO error when communicating with the client, but
+                             * the database has already gone through a commit.
+                             */
+                            try {
+                                // Force rollback of the connection.
+                                cxn.rollback();
+                            } catch (Throwable t) {
+                                log.error(t, t);
+                            }
+                        }
+                        try {
+                            // Force close of the connection.
+                            cxn.close();
+                        } catch (Throwable t) {
+                            log.error(t, t);
+                        }
+                    }
+                }
+            }
+
+        } // StoredQueryApiTask
+
+    } // StoredQueryServiceCall
+
+} // StoredQueryService

Added: branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/stored-query-003.rq
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/stored-query-003.rq	                        (rev 0)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/stored-query-003.rq	2014-07-10 18:35:39 UTC (rev 8534)
@@ -0,0 +1,9 @@
+PREFIX bsq:  <http://www.bigdata.com/rdf/stored-query#>
+PREFIX : <http://example.org/book/>
+
+SELECT ?book ?title ?price
+{
+   SERVICE <http://www.bigdata.com/rdf/stored-query#test_stored_query_003> {
+       bd:serviceParam :book :book1
+   }
+} 

Modified: branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/service/storedquery/TestStoredQueryService.java
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/service/storedquery/TestStoredQueryService.java	2014-07-10 15:47:26 UTC (rev 8533)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/service/storedquery/TestStoredQueryService.java	2014-07-10 18:35:39 UTC (rev 8534)
@@ -28,7 +28,11 @@
 
 import org.openrdf.model.URI;
 import org.openrdf.model.impl.URIImpl;
+import org.openrdf.query.QueryLanguage;
+import org.openrdf.query.TupleQueryResult;
 
+import com.bigdata.rdf.sail.BigdataSailRepositoryConnection;
+import com.bigdata.rdf.sail.BigdataSailTupleQuery;
 import com.bigdata.rdf.sparql.ast.eval.AbstractDataDrivenSPARQLTestCase;
 import com.bigdata.rdf.sparql.ast.eval.ServiceParams;
 import com.bigdata.rdf.sparql.ast.service.ServiceCallCreateParams;
@@ -78,7 +82,7 @@
      */
     public void test_stored_query_001() throws Exception {
         
-        class MyStoredQueryService extends StoredQueryService {
+        class MyStoredQueryService extends SimpleStoredQueryService {
 
             @Override
             public String getQuery(final ServiceCallCreateParams createParams,
@@ -140,7 +144,7 @@
      */
     public void test_stored_query_002() throws Exception {
         
-        class MyStoredQueryService extends StoredQueryService {
+        class MyStoredQueryService extends SimpleStoredQueryService {
 
             @Override
             public String getQuery(final ServiceCallCreateParams createParams,
@@ -187,4 +191,81 @@
 
     }
 
+    /**
+     * Complex stored query test like the above, but does not extend
+     * {@link SimpleStoredQueryService}.
+     * 
+     * <pre>
+     * PREFIX bsq:  <http://www.bigdata.com/rdf/stored-query#>
+     * PREFIX : <http://example.org/book/>
+     * 
+     * SELECT ?book ?title ?price
+     * {
+     *    SERVICE <http://www.bigdata.com/rdf/stored-query#test_stored_query_003> {
+     *        bd:serviceParam :book :book1
+     *    }
+     * }
+     * </pre>
+     * 
+     * @throws Exception
+     */
+    public void test_stored_query_003() throws Exception {
+        
+        class MyStoredQueryService extends StoredQueryService {
+
+            @Override
+            protected TupleQueryResult doQuery(
+                    BigdataSailRepositoryConnection cxn,
+                    ServiceCallCreateParams createParams,
+                    ServiceParams serviceParams) throws Exception {
+
+                final URI val = serviceParams.getAsURI(new URIImpl(
+                        "http://example.org/book/book"));
+
+                final StringBuilder sb = new StringBuilder();
+                sb.append("PREFIX dc:   <http://purl.org/dc/elements/1.1/> \n");
+                sb.append("PREFIX :     <http://example.org/book/> \n");
+                sb.append("PREFIX ns:   <http://example.org/ns#> \n");
+                sb.append("SELECT ?book ?title ?price { \n");
+                sb.append("  BIND( <"+val.stringValue()+"> as ?book ) . \n");
+                sb.append("  ?book dc:title ?title ; \n");
+                sb.append("  ns:price ?price . \n");
+                sb.append("} \n");
+
+                final String queryStr = sb.toString();
+
+                final String baseURI = createParams.getServiceURI().stringValue();
+
+                final BigdataSailTupleQuery query = (BigdataSailTupleQuery) cxn
+                        .prepareTupleQuery(QueryLanguage.SPARQL, queryStr, baseURI);
+
+                return query.evaluate();
+            }
+            
+        }
+        
+        final URI serviceURI = new URIImpl(StoredQueryService.Options.NAMESPACE + getName());
+        try {
+
+            // register the service.
+            ServiceRegistry.getInstance().add(serviceURI,
+                    new MyStoredQueryService());
+
+            final TestHelper h = new TestHelper("stored-query-003", // testURI,
+                    "stored-query-003.rq",// queryFileURL
+                    "stored-query-001.ttl",// dataFileURL
+                    "stored-query-001.srx" // resultFileURL,
+                    // false, // laxCardinality
+                    // true // checkOrder
+            );
+
+            h.runTest();
+
+        } finally {
+            // unregister the service.
+            ServiceRegistry.getInstance().remove(serviceURI);
+        }
+
+    }
+
 }

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





2010	Jan	Feb	Mar	Apr	May	Jun	Jul (139)	Aug (94)	Sep (232)	Oct (143)	Nov (138)	Dec (55)
2011	Jan (127)	Feb (90)	Mar (101)	Apr (74)	May (148)	Jun (241)	Jul (169)	Aug (121)	Sep (157)	Oct (199)	Nov (281)	Dec (75)
2012	Jan (107)	Feb (122)	Mar (184)	Apr (73)	May (14)	Jun (49)	Jul (26)	Aug (103)	Sep (133)	Oct (61)	Nov (51)	Dec (55)
2013	Jan (59)	Feb (72)	Mar (99)	Apr (62)	May (92)	Jun (19)	Jul (31)	Aug (138)	Sep (47)	Oct (83)	Nov (95)	Dec (111)
2014	Jan (125)	Feb (60)	Mar (119)	Apr (136)	May (270)	Jun (83)	Jul (88)	Aug (30)	Sep (47)	Oct (27)	Nov (23)	Dec
2015	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep (3)	Oct	Nov	Dec
2016	Jan	Feb	Mar (4)	Apr (1)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec

bigdata-commit Mailing List for Blazegraph (powered by bigdata) (Page 9)

Fast, scalable, robust graph database platform

bigdata-commit — Commit traffic.