JENA-2065: RDF-star #951

afs · 2021-03-09T11:55:17Z

This update RDF-star handling to the current state of the RDF-star group work.

afs · 2021-03-09T13:11:20Z

Key points:

If the query does not have any RDF-star related syntax, processing is the normal path. Each of the three RDF-star point (in-memory, TDB1, TDB2) starts with an "if" that sees whether RDF-star processing is needed.
The test suite does run for general, TIM, TDB1, and TDB2 datasets if the redirection to RDF-star processing is off.
Some processing interfaces have changed: additional to ExprVisitor, removals from algebra visit and transform (due to taking out the old RDF* mode behaviour). This partially accounts for the large number of files.

kinow · 2021-03-09T20:29:19Z

A good chance to try to read the latest w3c draft, go through some points, and see if I can get my Jena project to build and run from main locally. No worry if it's merged before 👍

afs · 2021-03-09T21:02:03Z

The spec (WIP - live editors draft) is https://w3c.github.io/rdf-star/cg-spec/editors_draft.html

I'm sure detail will change.
Hopefully not too much because there is a reasonable sized and growing test suite.

kinow · 2021-03-09T21:34:29Z

The spec (WIP - live editors draft) is https://w3c.github.io/rdf-star/cg-spec/editors_draft.html

I'm sure detail will change.
Hopefully not too much because there is a reasonable sized and growing test suite.

I'm watching the w3c repository and trying to at least read each PR/issue while lurking. But it's moving quite fast, have some issue/PR to read pretty much every day in my notifications.

kinow

Few comments, but no blockers. I will try to start Fuseki now, and see if I manage to load some data and try a few queries, but I might have to stop and do something else, and then would have time again to play with new code only in 2 days. So no problem if it's merged right now 👍

Thanks @afs!

kinow · 2021-03-10T01:06:35Z

jena-arq/src/main/java/org/apache/jena/riot/lang/extra/javacc/TurtleJavacc.java

+    case PNAME_NS:
+    case PNAME_LN:{
+      iri = iri();
+o = createNode(iri, token.beginLine, token.beginColumn) ;


Is this auto-generated? If not maybe we can fix the indentation here

I remember we had a javacc grammar file somewhere I think, used to produce these files, but I didn't see the grammar file when I was sifting through the changes (I skip a few files that are not *.java, or that are tests, so I may have missed it).

kinow · 2021-03-10T01:06:46Z

jena-arq/src/main/java/org/apache/jena/riot/lang/extra/javacc/TurtleJavacc.java

+      jj_consume_token(-1);
+      throw new ParseException();
+    }
+{if ("" != null) return o;}


kinow · 2021-03-10T01:11:40Z

jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/RX.java

-    }
+    // Normally true.
+    public // For integration testing only
+    static final boolean DATAPATH = true;


👍 or should we make it into a Javadoc code so users don't use it? I remember someone asking about some code recently-ish in the mailing list that changed… I think the code was not supposed to be used externally, or maybe there was an alternative but it wasn't clear to the user.

kinow · 2021-03-10T01:12:39Z

jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/RX.java

+            return true;
+
+        // Deep substitute. This happens anyway as we walk structures.
+        //   nPattern = Substitute.substitute(nPattern, input);


Extra space here, but not important.

kinow · 2021-03-10T01:13:19Z

jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/RX_PG.java

+import org.apache.jena.sparql.util.Context;
+
+/**
+ * For reference only: this code uses the triple index for matchign and it is PG mode..


s/matchign/matching (also extra period at the end of sentence?)

kinow · 2021-03-10T01:18:00Z

jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprTripleTerm.java

+import org.apache.jena.sparql.graph.NodeTransform ;
+
+/**
+ * RDF-start triple term in an expression.


s/RDF-start/star (worth looking for RDF-start in the IDE if using one; that's one error that spell/grammar checkers would miss I guess)

kinow · 2021-03-10T01:53:10Z

jena-arq/src/main/java/org/apache/jena/sparql/sse/builders/BuilderExpr.java

+        dispatch.put(Tags.tagAdd,  buildPlus);
+        dispatch.put(Tags.symMinus, buildMinus);
+        dispatch.put(Tags.tagSubtract, buildMinus);
+        dispatch.put(Tags.tagMinus, buildMinus);    // Not to be confused with Op for SPARQL MINUS


Looked up at the Tags class to see if there was an Tags.tagPlus… just because I thought that as symMinus is for symPlus, and tagSubtract is for tagAdd, then tagMinus would be for tagPlus (there's even an unary plus) 😆

kinow · 2021-03-10T04:13:04Z

jena-arq/src/main/java/org/apache/jena/sparql/util/FmtUtils.java

 */

 public class FmtUtils
 {
-    // OLD CODE - being replaced by riot.NodeFmtLib
+    // See alsoriot.NodeFmtLib


space? Not really important

kinow · 2021-03-10T04:17:04Z

jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/solver/Solver.java

+        return execute(ntt, graph.getGraphName(), pattern, input, filter, execCxt);
+    }
+
+    /** Non-reordering execution of a quad pattern, given a iterator of bindings as input.


a/a iterator/an iterator

Another global search done ...

kinow · 2021-03-10T04:41:31Z

jena-tdb/src/main/java/org/apache/jena/tdb/solver/SolverRX.java

            default:
-                throw new TDBException("Index is not recognized: "+idx);
+                throw new InternalErrorException("Tuple of unknow length");


s/unknow/unknown

It's "uck" that there is code copy on but unifying TDB1 into DBOE/TDB2 framework risks destablizing the code.

Copying the code, so it is just import changes, is slightly nudging them together. But in nearby classes the code is appreciably different.

"Sometime".

afs · 2021-03-10T10:21:03Z

Thank for the comments!

afs added 3 commits March 8, 2021 22:22

JENA-2065: RDF-star : Track community work

fad8d82

Robust SERVICE

7fc86da

Promote Node_Triple and Node_Graph to full Nodes

111efd8

afs force-pushed the rdfx branch from 9966912 to 7639ead Compare March 9, 2021 11:57

afs marked this pull request as ready for review March 9, 2021 12:07

afs force-pushed the rdfx branch from 7639ead to c95f6a4 Compare March 9, 2021 13:43

kinow approved these changes Mar 10, 2021

View reviewed changes

JENA-2065: RDF-star for TDB

ac99a71

afs force-pushed the rdfx branch from c95f6a4 to ac99a71 Compare March 10, 2021 10:20

afs merged commit 686a200 into apache:main Mar 10, 2021

afs deleted the rdfx branch March 10, 2021 10:21

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

JENA-2065: RDF-star #951

JENA-2065: RDF-star #951

afs commented Mar 9, 2021

afs commented Mar 9, 2021

kinow commented Mar 9, 2021

afs commented Mar 9, 2021

kinow commented Mar 9, 2021

kinow left a comment

kinow Mar 10, 2021

kinow Mar 10, 2021

kinow Mar 10, 2021

kinow Mar 10, 2021

kinow Mar 10, 2021

kinow Mar 10, 2021

kinow Mar 10, 2021

kinow Mar 10, 2021

kinow Mar 10, 2021

kinow Mar 10, 2021

afs Mar 10, 2021

kinow Mar 10, 2021

afs Mar 10, 2021

afs commented Mar 10, 2021

JENA-2065: RDF-star #951

JENA-2065: RDF-star #951

Conversation

afs commented Mar 9, 2021

afs commented Mar 9, 2021

kinow commented Mar 9, 2021

afs commented Mar 9, 2021

kinow commented Mar 9, 2021

kinow left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

afs commented Mar 10, 2021