GH-3510: Sparql Adapter System

Author: Aklakan

jena-arq/src/main/java/org/apache/jena/http/sys/ExecHTTPBuilder.java

@@ -30,6 +30,7 @@
 import org.apache.jena.query.*;
 import org.apache.jena.riot.WebContent;
 import org.apache.jena.riot.web.HttpNames;
+import org.apache.jena.sparql.adapter.ParseCheckUtils;
 import org.apache.jena.sparql.core.Var;
 import org.apache.jena.sparql.engine.binding.Binding;
 import org.apache.jena.sparql.exec.http.Params;
@@ -49,16 +50,12 @@ public abstract class ExecHTTPBuilder<X, Y> {
     protected String serviceURL = null;
     private Query query = null;
     protected String queryString = null;
-    protected boolean parseCheck = true;
+    protected Boolean parseCheck = null;
     private HttpClient httpClient = null;
     protected Map<String, String> httpHeaders = new HashMap<>();
     protected Params params = Params.create();
     private ContextAccumulator contextAcc = ContextAccumulator.newBuilder(()->ARQ.getContext());
 
-    // Accept choice by the application. Deprecated - Superseded by acceptHeader(String) which sets all header fields explicitly.
-    @Deprecated(forRemoval = true)
-    protected String appAcceptHeader     = null;
-
     protected String selectAcceptHeader  = WebContent.defaultSparqlResultsHeader;
     protected String askAcceptHeader     = WebContent.defaultSparqlAskHeader;
     protected String graphAcceptHeader   = WebContent.defaultGraphAcceptHeader;
@@ -91,6 +88,10 @@ public Y parseCheck(boolean parseCheck) {
         return thisBuilder();
     }
 
+    protected boolean effectiveParseCheck() {
+        return ParseCheckUtils.effectiveParseCheck(parseCheck, contextAcc);
+    }
+
     /** Set the query - this also sets the query string to agree with the query argument. */
     public Y query(Query query) {
         Objects.requireNonNull(query);
@@ -105,14 +106,14 @@ public Y query(Query query) {
      */
     public Y query(String queryStr) {
         Objects.requireNonNull(queryStr);
-        Query query = parseCheck ? QueryFactory.create(queryStr) : null;
+        Query query = effectiveParseCheck() ? QueryFactory.create(queryStr) : null;
         setQuery(query, queryStr);
         return thisBuilder();
     }
 
     public Y query(String queryStr, Syntax syntax) {
         Objects.requireNonNull(queryStr);
-        Query query = QueryFactory.create(queryStr, syntax);
+        Query query = effectiveParseCheck() ? QueryFactory.create(queryStr, syntax) : null;
         setQuery(query, queryStr);
         return thisBuilder();
     }
@@ -266,10 +267,8 @@ public Y substitution(Var var, Node value) {
     }
 
     /** Setting this header overrides any other header. */
-    @SuppressWarnings("removal")
     public Y acceptHeader(String acceptHeader) {
         Objects.requireNonNull(acceptHeader);
-        this.appAcceptHeader = acceptHeader;
         this.selectAcceptHeader = acceptHeader;
         this.askAcceptHeader = acceptHeader;
         this.graphAcceptHeader = acceptHeader;

jena-arq/src/main/java/org/apache/jena/http/sys/ExecUpdateHTTPBuilder.java

@@ -22,15 +22,20 @@
 package org.apache.jena.http.sys;
 
 import java.net.http.HttpClient;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
 
 import org.apache.jena.graph.Node;
 import org.apache.jena.http.HttpEnv;
 import org.apache.jena.query.ARQ;
+import org.apache.jena.sparql.adapter.ParseCheckUtils;
 import org.apache.jena.sparql.core.Var;
 import org.apache.jena.sparql.engine.binding.Binding;
+import org.apache.jena.sparql.exec.UpdateEltAcc;
 import org.apache.jena.sparql.exec.http.Params;
 import org.apache.jena.sparql.exec.http.UpdateSendMode;
 import org.apache.jena.sparql.syntax.syntaxtransform.UpdateTransformOps;
@@ -40,110 +45,14 @@
 import org.apache.jena.sys.JenaSystem;
 import org.apache.jena.update.Update;
 import org.apache.jena.update.UpdateException;
-import org.apache.jena.update.UpdateFactory;
 import org.apache.jena.update.UpdateRequest;
 
 public abstract class ExecUpdateHTTPBuilder<X, Y> {
 
-    /** Update element. Either an Update object or a string. */
-    private record UpdateElt(Update update, String updateString) {
-        UpdateElt(Update update) { this(Objects.requireNonNull(update), null); }
-        UpdateElt(String updateString) { this(null, Objects.requireNonNull(updateString)); }
-        boolean isParsed() { return update != null; }
-
-        @Override
-        public String toString() {
-            return isParsed()
-                    ? new UpdateRequest(update()).toString() // Reuse UpdateRequest's serialization approach
-                    : updateString();
-        }
-    }
-
-    /** Accumulator for update elements. Can build an overall string or UpdateRequest from the elements. */
-    private class UpdateEltAcc implements Iterable<UpdateElt> {
-        /** Delimiter for joining multiple SPARQL update strings into a single one.
-          * The delimiter takes into account that the last line of a statement may be a single-line-comment. */
-        public static final String DELIMITER = "\n;\n";
-
-        private List<UpdateElt> updateOperations = new ArrayList<>();
-        private List<UpdateElt> updateOperationsView = Collections.unmodifiableList(updateOperations);
-        private boolean isParsed = true; // True iff there are no strings in updateOperations
-
-        public boolean isParsed() {
-            return isParsed;
-        }
-
-        public void add(UpdateElt updateElt) {
-            isParsed = isParsed && updateElt.isParsed();
-            updateOperations.add(updateElt);
-        }
-
-        public void add(Update update) {
-            add(new UpdateElt(update));
-        }
-
-        /** Add a string by parsing it. */
-        public void add(String updateRequestString) {
-            UpdateRequest updateRequest = UpdateFactory.create(updateRequestString);
-            add(updateRequest);
-        }
-
-        public void add(UpdateRequest updateRequest) {
-            updateRequest.getOperations().forEach(this::add);
-        }
-
-        /** Add a string without parsing it. */
-        public void addString(String updateRequestString) {
-            add(new UpdateElt(updateRequestString));
-        }
-
-        /** Attempt to build an UpdateRequest from the state of this accumulator. Attempts to parse any string elements. */
-        public UpdateRequest buildUpdateRequest() {
-            return addToUpdateRequest(new UpdateRequest());
-        }
-
-        public UpdateRequest addToUpdateRequest(UpdateRequest updateRequest) {
-            for (UpdateElt elt : updateOperations) {
-                if (elt.isParsed()) {
-                    updateRequest.add(elt.update());
-                } else {
-                    try {
-                        updateRequest.add(elt.updateString());
-                    } catch (Exception e) {
-                        // Expose the string that failed to parse
-                        e.addSuppressed(new RuntimeException("Failed to parse: " + elt.updateString()));
-                        throw e;
-                    }
-                }
-            }
-            return updateRequest;
-        }
-
-        public void clear() {
-            updateOperations.clear();
-            isParsed = true;
-        }
-
-        public boolean isEmpty() {
-            return updateOperations.isEmpty();
-        }
-
-        @Override
-        public Iterator<UpdateElt> iterator() {
-            return updateOperationsView.iterator();
-        }
-
-        public String buildString() {
-            return updateOperations.stream()
-                .map(UpdateElt::toString)
-                .collect(Collectors.joining(DELIMITER));
-        }
-    }
-
     static { JenaSystem.init(); }
 
     protected String serviceURL;
-    protected boolean parseCheck = true;
+    protected Boolean parseCheck = null;
     private UpdateEltAcc updateEltAcc = new UpdateEltAcc();
 
     protected Params params = Params.create();
@@ -176,7 +85,7 @@ public Y update(UpdateRequest updateRequest) {
 
     public Y update(String updateRequestString) {
         Objects.requireNonNull(updateRequestString);
-        if (parseCheck) {
+        if (effectiveParseCheck()) {
             updateEltAcc.add(updateRequestString);
         } else {
             updateEltAcc.addString(updateRequestString);
@@ -208,6 +117,10 @@ public Y parseCheck(boolean parseCheck) {
         return thisBuilder();
     }
 
+    protected boolean effectiveParseCheck() {
+        return ParseCheckUtils.effectiveParseCheck(parseCheck, contextAcc);
+    }
+
     public Y substitution(Binding binding) {
         binding.forEach(this.substitutionMap::put);
         return thisBuilder();

jena-arq/src/main/java/org/apache/jena/query/QueryExecutionDatasetBuilder.java

@@ -33,6 +33,7 @@
 import org.apache.jena.sparql.engine.binding.Binding;
 import org.apache.jena.sparql.engine.binding.BindingLib;
 import org.apache.jena.sparql.exec.QueryExecDatasetBuilder;
+import org.apache.jena.sparql.exec.QueryExecDatasetBuilderDeferred;
 import org.apache.jena.sparql.exec.QueryExecutionCompat;
 import org.apache.jena.sparql.util.Context;
 import org.apache.jena.sparql.util.Symbol;
@@ -49,7 +50,7 @@ public class QueryExecutionDatasetBuilder implements QueryExecutionBuilder {
     private Dataset dataset = null;
 
     public QueryExecutionDatasetBuilder() {
-        builder = QueryExecDatasetBuilder.create();
+        builder = QueryExecDatasetBuilderDeferred.create();
     }
 
     @Override

jena-arq/src/main/java/org/apache/jena/riot/system/StreamRDFOps.java

@@ -107,6 +107,11 @@ public static void sendGraphToStream(Graph graph, StreamRDF stream, String baseU
             stream.base(baseURI);
         if ( prefixMap != null )
             sendPrefixesToStream(prefixMap, stream) ;
+        sendGraphTriplesToStream(graph, stream);
+    }
+
+    /** Send only the triples of graph to a StreamRDF */
+    public static void sendGraphTriplesToStream(Graph graph, StreamRDF stream) {
         ExtendedIterator<Triple> iter = graph.find(null, null, null) ;
         try {
             StreamRDFOps.sendTriplesToStream(iter, stream) ;

jena-arq/src/main/java/org/apache/jena/sparql/ARQConstants.java

@@ -326,6 +326,14 @@ public class ARQConstants
     public static final Symbol registryExtensions =
         SystemARQ.allocSymbol("registryExtensions") ;
 
-    public static void init() {}
+    /** The registry of adapters that implement SPARQL operations
+     *  for different types of datasets. */
+    public static final Symbol registrySparqlAdapters =
+        SystemARQ.allocSymbol("registrySparqlAdapters") ;
+
+    /** Symbol for disabling parse checks of queries and updates when executing them against a dataset */
+    public static final Symbol parseCheck =
+        SystemARQ.allocSymbol("parseCheck") ;
 
+    public static void init() {}
 }

jena-arq/src/main/java/org/apache/jena/sparql/SystemARQ.java

@@ -31,6 +31,8 @@
 import org.apache.jena.reasoner.InfGraph ;
 import org.apache.jena.sparql.core.DatasetGraph ;
 import org.apache.jena.sparql.core.GraphView ;
+import org.apache.jena.sparql.exec.QueryExec ;
+import org.apache.jena.sparql.exec.UpdateExec ;
 import org.apache.jena.sparql.graph.GraphWrapper ;
 import org.apache.jena.sparql.util.Symbol ;
 
@@ -68,6 +70,11 @@ public class SystemARQ
      */
     public static boolean EnableCDTs   = true ;
 
+    /**
+     * Control for {@link QueryExec} and {@link UpdateExec} builders for {@link DatasetGraph} instances.
+     */
+    public static boolean DeferredExecBuilders = true;
+
     /**
      * Sync a Model if it provides the underlying graph provides sync . Do nothing
      * otherwise.