370 [SPARQL 1.1 Update] - Parser and AST : LOAD Query

src/main/antlr/SparqlParser.g4

@@ -45,16 +45,17 @@ options {
     tokenVocab = SparqlLexer;
 }
 
-queryUnit
-    : query EOF
+query
+    : queryUnit EOF
+    | updateUnit EOF
     ;
 
-query
+queryUnit
     : prologue (selectQuery | constructQuery | describeQuery | askQuery) valuesClause
     ;
 
 updateUnit
-    : update EOF
+    : update
     ;
 
 prologue

src/main/java/fr/inria/corese/core/next/query/impl/parser/SparqlListener.java

@@ -69,6 +69,16 @@ public void exitConstructTemplate(SparqlParser.ConstructTemplateContext ctx) {
         for (var d : delegates) d.exitConstructTemplate(ctx);
     }
 
+    @Override
+    public void enterLoad(SparqlParser.LoadContext ctx) {
+        for (var d : delegates) d.enterLoad(ctx);
+    }
+
+    @Override
+    public void exitLoad(SparqlParser.LoadContext ctx) {
+        for (var d : delegates) d.exitLoad(ctx);
+    }
+
     @Override
     public void enterWhereClause(SparqlParser.WhereClauseContext ctx) {
         for (var d : delegates) d.enterWhereClause(ctx);

src/main/java/fr/inria/corese/core/next/query/impl/parser/SparqlQueryAnalyzer.java

@@ -127,7 +127,8 @@ private QueryAst buildAst(ParseTree tree, SparqlParserOptions options) {
                 new PrologueFeature(builder),
                 new BindFeature(builder),
                 new ServiceFeature(builder),
-                new ValuesFeature(builder)
+                new ValuesFeature(builder),
+                new LoadQueryFeature(builder)
         ));
 
         ParseTreeWalker walker = new ParseTreeWalker();

src/main/java/fr/inria/corese/core/next/query/impl/parser/listener/LoadQueryFeature.java

@@ -0,0 +1,23 @@
+package fr.inria.corese.core.next.query.impl.parser.listener;
+
+import fr.inria.corese.core.next.impl.parser.antlr.SparqlParser;
+import fr.inria.corese.core.next.query.impl.parser.SparqlAstBuilder;
+import fr.inria.corese.core.next.query.impl.sparql.ast.IriAst;
+
+public class LoadQueryFeature extends AbstractSparqlFeature {
+
+    public LoadQueryFeature(SparqlAstBuilder builder) {
+        super(builder);
+    }
+
+    public void exitLoad(SparqlParser.LoadContext ctx) {
+        this.builder().enterLoadQuery();
+        this.builder().setSilentFlag(ctx.SILENT() != null);
+        if(ctx.iriRef() != null) {
+            this.builder().addSourceGraphIri((IriAst) this.builder().termFromIriRef(ctx.iriRef()));
+        }
+        if(ctx.graphRef() != null) {
+            this.builder().addTargetGraphIri((IriAst) this.builder().termFromGraphRef(ctx.graphRef()));
+        }
+    }
+}

src/main/java/fr/inria/corese/core/next/query/impl/parser/semantic/rule/OrderByScopeValidationRule.java

@@ -2,16 +2,7 @@
 
 import fr.inria.corese.core.next.query.api.validation.QueryDiagnostic;
 import fr.inria.corese.core.next.query.impl.parser.semantic.support.VariableScopeAnalyzer;
-import fr.inria.corese.core.next.query.impl.sparql.ast.AskQueryAst;
-import fr.inria.corese.core.next.query.impl.sparql.ast.ConstructQueryAst;
-import fr.inria.corese.core.next.query.impl.sparql.ast.DescribeQueryAst;
-import fr.inria.corese.core.next.query.impl.sparql.ast.GroupGraphPatternAst;
-import fr.inria.corese.core.next.query.impl.sparql.ast.OrderConditionAst;
-import fr.inria.corese.core.next.query.impl.sparql.ast.ProjectionAst;
-import fr.inria.corese.core.next.query.impl.sparql.ast.QueryAst;
-import fr.inria.corese.core.next.query.impl.sparql.ast.SelectQueryAst;
-import fr.inria.corese.core.next.query.impl.sparql.ast.SolutionModifierAst;
-import fr.inria.corese.core.next.query.impl.sparql.ast.VarAst;
+import fr.inria.corese.core.next.query.impl.sparql.ast.*;
 
 import java.util.ArrayList;
 import java.util.LinkedHashSet;
@@ -45,6 +36,7 @@ public List<QueryDiagnostic> validate(QueryAst queryAst) {
                     describeQueryAst.solutionModifier());
             // TODO: handle ASK solution modifiers with SPARQL 1.1 support.
             case AskQueryAst ignored -> List.of();
+            case LoadQueryAst ignored -> List.of();
         };
     }
 

src/main/java/fr/inria/corese/core/next/query/impl/parser/semantic/support/VariableScopeAnalyzer.java

@@ -5,10 +5,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.HashSet;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
 /**
  * Collects visible and referenced variables from the next SPARQL AST.
@@ -26,8 +23,13 @@ public final class VariableScopeAnalyzer {
      * @return the set of visible variable names, without {@code ?} or {@code $} in the patterns used for the resolution of the query
      */
     public Set<String> collectVisibleVariables(QueryAst query) {
-        Set<String> visibleVariables = collectVisibleVariables(query.whereClause());
-        visibleVariables.addAll(collectVisibleVariables(query.valuesClause()));
+        Set<String> visibleVariables = new TreeSet<>();
+        if(query instanceof WhereClauseQueryAst whereClauseQueryAst) {
+            visibleVariables.addAll(collectVisibleVariables(whereClauseQueryAst.whereClause()));
+        }
+        if(query instanceof SparqlQueryAst sparqlQueryAst) {
+            visibleVariables.addAll(collectVisibleVariables(sparqlQueryAst.valuesClause()));
+        }
         return visibleVariables;
     }
 

src/main/java/fr/inria/corese/core/next/query/impl/sparql/ast/ASTConstants.java

@@ -11,6 +11,8 @@ public enum QUERY_TYPE {
         DESCRIBE,
         SELECT,
 
+        LOAD,
+
         UNDEFINED
     }
 

src/main/java/fr/inria/corese/core/next/query/impl/sparql/ast/AskQueryAst.java

@@ -16,7 +16,7 @@
  * }</pre>
  */
 public record AskQueryAst(DatasetClauseAst datasetClause, GroupGraphPatternAst whereClause,
-                          SolutionModifierAst solutionModifier, QueryPrologueAst prologue, ValuesAst valuesClause) implements QueryAst {
+                          SolutionModifierAst solutionModifier, QueryPrologueAst prologue, ValuesAst valuesClause) implements SparqlQueryAst {
 
     public AskQueryAst(DatasetClauseAst datasetClause, GroupGraphPatternAst whereClause) {
         this(datasetClause, whereClause, null, null, null);

src/main/java/fr/inria/corese/core/next/query/impl/sparql/ast/ConstructQueryAst.java

@@ -37,7 +37,7 @@ public record ConstructQueryAst(
         SolutionModifierAst solutionModifier,
         QueryPrologueAst prologue,
         ValuesAst valuesClause
-            ) implements QueryAst {
+            ) implements SparqlQueryAst {
     public ConstructQueryAst {
         if (constructTemplate == null) {
             constructTemplate = new ConstructTemplateAst(List.of());

src/main/java/fr/inria/corese/core/next/query/impl/sparql/ast/DescribeQueryAst.java

@@ -28,7 +28,7 @@ public record DescribeQueryAst(
         SolutionModifierAst solutionModifier,
         QueryPrologueAst prologue,
         ValuesAst valuesClause
-) implements QueryAst {
+) implements SparqlQueryAst {
     public DescribeQueryAst {
         described = described != null ? List.copyOf(described) : List.of();
         if (whereClause == null) {

src/main/java/fr/inria/corese/core/next/query/impl/sparql/ast/LoadQueryAst.java

@@ -0,0 +1,25 @@
+package fr.inria.corese.core.next.query.impl.sparql.ast;
+
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * Represents the LOAD queries as defined in the <a href="https://www.w3.org/TR/2013/REC-sparql11-update-20130321/#load">SPARQL 1.1 recommendation<a/>.
+ * @param fromClause From clause, set of graphs IRIs
+ * @param toClause To clause. Set of Graph IRIs
+ * @param silent Determine if the resolution of the query must be resolved silently or not.
+ */
+public record LoadQueryAst(Set<IriAst> fromClause, Set<IriAst> toClause, boolean silent) implements UpdateQueryAst {
+    public LoadQueryAst {
+        if(fromClause == null) {
+            fromClause = new HashSet<>();
+        }
+        if(toClause == null) {
+            toClause = new HashSet<>();
+        }
+    }
+
+    public LoadQueryAst(Set<IriAst> fromClause, Set<IriAst> toClause) {
+        this(fromClause, toClause, false);
+    }
+}

src/main/java/fr/inria/corese/core/next/query/impl/sparql/ast/PrologueQueryAst.java

@@ -0,0 +1,8 @@
+package fr.inria.corese.core.next.query.impl.sparql.ast;
+
+/**
+ * Represents queries that can be prefixed with a prologue declaration (i.e. Select, Insert, etc.)
+ */
+public sealed interface PrologueQueryAst permits SparqlQueryAst {
+    QueryPrologueAst prologue();
+}

src/main/java/fr/inria/corese/core/next/query/impl/sparql/ast/QueryAst.java

@@ -1,12 +1,4 @@
 package fr.inria.corese.core.next.query.impl.sparql.ast;
 
-/**
- * Minimal SPARQL query AST (SELECT, ASK, CONSTRUCT, DESCRIBE).
- * Holds the WHERE clause as a group graph pattern; query-specific projection/template can be added later.
- */
-public sealed interface QueryAst permits AskQueryAst, ConstructQueryAst, DescribeQueryAst, SelectQueryAst {
-    DatasetClauseAst datasetClause();
-    GroupGraphPatternAst whereClause();
-    QueryPrologueAst prologue();
-    ValuesAst valuesClause();
-}
+public sealed interface QueryAst permits SparqlQueryAst, UpdateQueryAst {
+}

src/main/java/fr/inria/corese/core/next/query/impl/sparql/ast/SelectQueryAst.java

@@ -9,7 +9,7 @@
  * {@link #prologue()} captures PREFIX/BASE for SELECT;
  * for {@link QueryAst} compatibility.
  */
-public record SelectQueryAst(ProjectionAst projection, DatasetClauseAst datasetClause, GroupGraphPatternAst whereClause, SolutionModifierAst solutionModifier, QueryPrologueAst prologue, ValuesAst valuesClause) implements QueryAst {
+public record SelectQueryAst(ProjectionAst projection, DatasetClauseAst datasetClause, GroupGraphPatternAst whereClause, SolutionModifierAst solutionModifier, QueryPrologueAst prologue, ValuesAst valuesClause) implements SparqlQueryAst {
 
     /** Constructor with default projection SELECT *. */
     public SelectQueryAst(GroupGraphPatternAst whereClause) {

src/main/java/fr/inria/corese/core/next/query/impl/sparql/ast/SparqlQueryAst.java

@@ -0,0 +1,10 @@
+package fr.inria.corese.core.next.query.impl.sparql.ast;
+
+/**
+ * Minimal SPARQL query AST (SELECT, ASK, CONSTRUCT, DESCRIBE).
+ * Holds the WHERE clause as a group graph pattern; query-specific projection/template can be added later.
+ */
+public sealed interface SparqlQueryAst extends QueryAst, PrologueQueryAst, WhereClauseQueryAst permits AskQueryAst, ConstructQueryAst, DescribeQueryAst, SelectQueryAst {
+    DatasetClauseAst datasetClause();
+    ValuesAst valuesClause();
+}

src/main/java/fr/inria/corese/core/next/query/impl/sparql/ast/UpdateQueryAst.java

@@ -0,0 +1,7 @@
+package fr.inria.corese.core.next.query.impl.sparql.ast;
+
+/**
+ * Root interface for all queries related to the SPARQL Update queries listed in <a href="https://www.w3.org/TR/sparql11-update/">SPARQL 1.1 Update</>.
+ */
+public sealed interface UpdateQueryAst extends QueryAst permits LoadQueryAst {
+}

src/main/java/fr/inria/corese/core/next/query/impl/sparql/ast/WhereClauseQueryAst.java

@@ -0,0 +1,8 @@
+package fr.inria.corese.core.next.query.impl.sparql.ast;
+
+/**
+ * Represents the AST elements of a query that has a WHERE clause (SELECT, CONSTRUCT, INSERT, DELETE, etc.)
+ */
+public sealed interface WhereClauseQueryAst permits SparqlQueryAst {
+    GroupGraphPatternAst whereClause();
+}

src/test/java/fr/inria/corese/core/next/query/api/sparql/ast/SparqlAstTest.java

@@ -385,7 +385,7 @@ void whereClauseAccessor() {
             GroupGraphPatternAst where = new GroupGraphPatternAst(List.of(
                     new BgpAst(List.of(new TriplePatternAst(
                             new VarAst("s"), new VarAst("p"), new VarAst("o"))))));
-            QueryAst q = new SelectQueryAst(where);
+            SparqlQueryAst q = new SelectQueryAst(where);
             assertSame(where, q.whereClause());
         }
 
@@ -426,7 +426,7 @@ void whereClauseAccessor() {
             GroupGraphPatternAst where = new GroupGraphPatternAst(List.of(
                     new BgpAst(List.of(new TriplePatternAst(
                             new VarAst("s"), new VarAst("p"), new VarAst("o"))))));
-            QueryAst q = new AskQueryAst(DatasetClauseAst.none(), where);
+            SparqlQueryAst q = new AskQueryAst(DatasetClauseAst.none(), where);
             assertSame(where, q.whereClause());
         }
 
@@ -503,7 +503,7 @@ void queryAstWithNestedStructures() {
             BgpAst bgp = new BgpAst(List.of(
                     new TriplePatternAst(new VarAst("s"), new IriAst("a"), new VarAst("o"))));
             GroupGraphPatternAst where = new GroupGraphPatternAst(List.of(bgp));
-            QueryAst q = new SelectQueryAst(where);
+            SparqlQueryAst q = new SelectQueryAst(where);
             assertEquals(1, q.whereClause().patterns().size());
             assertEquals(1, ((BgpAst) q.whereClause().patterns().get(0)).triples().size());
         }

src/test/java/fr/inria/corese/core/next/query/impl/parser/SparqlAstBuilderTest.java

@@ -36,7 +36,7 @@ void shouldBuildEmptyWhereGroupWhenNoTriples() {
         b.exitGroup();
         b.exitSelectQuery();
 
-        QueryAst ast = b.getResult();
+        SparqlQueryAst ast = (SparqlQueryAst) b.getResult();
         assertNotNull(ast);
         assertNotNull(ast.whereClause());
         assertEquals(0, ast.whereClause().patterns().size());
@@ -81,7 +81,7 @@ void shouldBuildSingleBgpWithMultipleTriples() {
         b.exitGroup();
         b.exitSelectQuery();
 
-        QueryAst ast = b.getResult();
+        SparqlQueryAst ast = (SparqlQueryAst) b.getResult();
         BgpAst bgp = singleBgp(ast);
 
         assertEquals(2, bgp.triples().size());
@@ -141,7 +141,7 @@ void shouldAllowMultipleBgpsInSameGroup() {
         b.exitGroup();
         b.exitSelectQuery();
 
-        QueryAst ast = b.getResult();
+        SparqlQueryAst ast = (SparqlQueryAst) b.getResult();
         GroupGraphPatternAst where = ast.whereClause();
 
         assertEquals(2, where.patterns().size());
@@ -166,7 +166,7 @@ void shouldNotAddEmptyBgpToGroup() {
         b.exitGroup();
         b.exitSelectQuery();
 
-        QueryAst ast = b.getResult();
+        SparqlQueryAst ast = (SparqlQueryAst) b.getResult();
         assertEquals(0, ast.whereClause().patterns().size(), "Empty TriplesBlock should not create a BGP pattern");
     }
 
@@ -191,7 +191,7 @@ void shouldBuildLiteralTerms() {
         b.exitGroup();
         b.exitSelectQuery();
 
-        BgpAst bgp = singleBgp(b.getResult());
+        BgpAst bgp = singleBgp((SparqlQueryAst) b.getResult());
         assertEquals(2, bgp.triples().size());
 
         LiteralAst l1 = (LiteralAst) bgp.triples().get(0).object();
@@ -305,7 +305,7 @@ void groupGraphPatternAstShouldDefensivelyCopyPatternsList() {
 
     // ---------- Helpers ----------
 
-    private static BgpAst singleBgp(QueryAst ast) {
+    private static BgpAst singleBgp(SparqlQueryAst ast) {
         GroupGraphPatternAst where = ast.whereClause();
         assertEquals(1, where.patterns().size(), "Expected exactly 1 pattern in WHERE");
         assertInstanceOf(BgpAst.class, where.patterns().getFirst(), "Expected first pattern to be a BGP");

src/test/java/fr/inria/corese/core/next/query/impl/parser/SparqlAstBuilderUnionTest.java

@@ -44,7 +44,7 @@ private GroupGraphPatternAst buildTwoEmptyBranchUnion() {
         builder.exitUnion();
         builder.exitGroup();           // }
         builder.exitSelectQuery();
-        return Objects.requireNonNull(builder.getResult()).whereClause();
+        return Objects.requireNonNull((SelectQueryAst)builder.getResult()).whereClause();
     }
 
     /**

src/test/java/fr/inria/corese/core/next/query/impl/parser/SparqlListenerTest.java

@@ -2,11 +2,8 @@
 
 import fr.inria.corese.core.next.impl.parser.antlr.SparqlLexer;
 import fr.inria.corese.core.next.query.impl.parser.listener.SelectQueryFeature;
-import fr.inria.corese.core.next.query.impl.sparql.ast.BgpAst;
-import fr.inria.corese.core.next.query.impl.sparql.ast.QueryAst;
+import fr.inria.corese.core.next.query.impl.sparql.ast.*;
 import fr.inria.corese.core.next.query.impl.parser.listener.BgpFeature;
-import fr.inria.corese.core.next.query.impl.sparql.ast.TriplePatternAst;
-import fr.inria.corese.core.next.query.impl.sparql.ast.VarAst;
 import org.antlr.v4.runtime.CharStreams;
 import org.antlr.v4.runtime.CommonTokenStream;
 import org.antlr.v4.runtime.tree.ParseTreeWalker;
@@ -61,7 +58,7 @@ void withSingleBgpDelegateWalkProducesAst() {
         fr.inria.corese.core.next.impl.parser.antlr.SparqlParser antlrParser = createAntlrParser("SELECT * WHERE { ?s ?p ?o }");
         new ParseTreeWalker().walk(listener, antlrParser.query());
 
-        QueryAst ast = builder.getResult();
+        SparqlQueryAst ast = (SparqlQueryAst) builder.getResult();
         assertNotNull(ast);
         assertNotNull(ast.whereClause());
         assertEquals(1, ast.whereClause().patterns().size());