GH-1574 better target node support #2020
Conversation
core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/AST/ShaclProperties.java
Show resolved
Hide resolved
abrokenjester
changed the title
hmottestad
force-pushed
the
issues/1574_better_target_node_support
branch
from
4ecfb43
to
2750f53
Compare
Signed-off-by: Håvard Ottestad <hmottestad@gmail.com>
Signed-off-by: Håvard Ottestad <hmottestad@gmail.com>
…idationExecutionLogging is enabled as well as a fix where the wrong identity hash is used when printing plans Signed-off-by: Håvard Ottestad <hmottestad@gmail.com>
Signed-off-by: Håvard Ottestad <hmottestad@gmail.com>
hmottestad
force-pushed
the
issues/1574_better_target_node_support
branch
from
2750f53
to
0168b23
Compare
|
@hmottestad, could I ask you to use the revised branch naming conventions for future branches? Especially once we move back to merge commits this will be convenient, as it makes the merge commit's message easier to read. |
core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/planNodes/ValuesBackedNode.java
Outdated
Show resolved
Hide resolved
| @@ -0,0 +1,185 @@ | |||
| /******************************************************************************* | |||
| * Copyright (c) 2018 Eclipse RDF4J contributors. | |||
There was a problem hiding this comment.
This is just a renamed file.
| @@ -74,7 +75,8 @@ private void calculateNext() { | |||
|
|
|||
| } | |||
|
|
|||
| List<Value> line = Arrays.asList(subject, SimpleValueFactory.getInstance().createLiteral(count)); | |||
| List<Value> line = new ArrayList<>( | |||
| Arrays.asList(subject, SimpleValueFactory.getInstance().createLiteral(count))); | |||
There was a problem hiding this comment.
Why are you wrapping this in an Arraylist?
There was a problem hiding this comment.
Arrays.asList is immutable and I need mutability.
There was a problem hiding this comment.
I've added some comments.
| @@ -39,7 +39,7 @@ public Tuple(List<Value> list) { | |||
| } | |||
|
|
|||
| public Tuple(Value... list) { | |||
| line = Arrays.asList(list); | |||
| line = new ArrayList<>(Arrays.asList(list)); | |||
There was a problem hiding this comment.
Same here - why is this needed? It looks redundant.
|
|
||
| String expected = Arrays.toString(tuples.toArray()); | ||
|
|
||
| assertEquals(expected, actual); |
There was a problem hiding this comment.
While these tests (after reading back and forth a bit) seem sensible, I'm a bit lost on what this has to do with issue GH-1574. Did the fix you added change ordering behavior somehow?
There was a problem hiding this comment.
Ordering test is a renamed file where I’ve moved in some old tests and also added one that checks that the set used to store the target nodes is sorted. Which is an assumption used further down the line.
Signed-off-by: Håvard Ottestad <hmottestad@gmail.com>
GitHub issue resolved: #1574
Briefly describe the changes proposed in this PR: