Github user kchilton2 commented on a diff in the pull request:
https://github.com/apache/incubator-rya/pull/36#discussion_r59208887
--- Diff:
extras/rya.pcj.fluo/pcj.fluo.app/src/test/java/org/apache/rya/indexing/pcj/fluo/app/NaturalJoinTest.java
---
@@ -46,120 +48,132 @@
@Test
public void newLeftResult_noRightMatches() {
- IterativeJoin naturalJoin = new NaturalJoin();
+ final IterativeJoin naturalJoin = new NaturalJoin();
// There is a new left result.
- MapBindingSet newLeftResult = new MapBindingSet();
+ final MapBindingSet newLeftResult = new MapBindingSet();
newLeftResult.addBinding("name", vf.createLiteral("Bob"));
// There are no right results that join with the left result.
- Iterator<BindingSet> rightResults= new
ArrayList<BindingSet>().iterator();
+ final Iterator<BindingSet> rightResults= new
ArrayList<BindingSet>().iterator();
// Therefore, the left result is a new join result.
- Iterator<BindingSet> newJoinResultsIt =
naturalJoin.newLeftResult(newLeftResult, rightResults);
+ final Iterator<BindingSet> newJoinResultsIt =
naturalJoin.newLeftResult(newLeftResult, rightResults);
assertFalse( newJoinResultsIt.hasNext() );
}
@Test
public void newLeftResult_joinsWithRightResults() {
- IterativeJoin naturalJoin = new NaturalJoin();
+ final IterativeJoin naturalJoin = new NaturalJoin();
// There is a new left result.
- MapBindingSet newLeftResult = new MapBindingSet();
+ final MapBindingSet newLeftResult = new MapBindingSet();
newLeftResult.addBinding("name", vf.createLiteral("Bob"));
newLeftResult.addBinding("height", vf.createLiteral("5'9\""));
// There are a few right results that join with the left result.
- MapBindingSet nameAge = new MapBindingSet();
+ final MapBindingSet nameAge = new MapBindingSet();
nameAge.addBinding("name", vf.createLiteral("Bob"));
nameAge.addBinding("age", vf.createLiteral(56));
- MapBindingSet nameHair = new MapBindingSet();
+ final MapBindingSet nameHair = new MapBindingSet();
nameHair.addBinding("name", vf.createLiteral("Bob"));
nameHair.addBinding("hairColor", vf.createLiteral("Brown"));
- Iterator<BindingSet> rightResults =
Lists.<BindingSet>newArrayList(nameAge, nameHair).iterator();
+ final Iterator<BindingSet> rightResults =
Lists.<BindingSet>newArrayList(nameAge, nameHair).iterator();
// Therefore, there are a few new join results that mix the two
together.
- Iterator<BindingSet> newJoinResultsIt =
naturalJoin.newLeftResult(newLeftResult, rightResults);
+ final Iterator<BindingSet> newJoinResultsIt =
naturalJoin.newLeftResult(newLeftResult, rightResults);
- Set<BindingSet> newJoinResults = new HashSet<>();
+ final Set<BindingSet> newJoinResults = new HashSet<>();
while(newJoinResultsIt.hasNext()) {
newJoinResults.add( newJoinResultsIt.next() );
}
- Set<BindingSet> expected = Sets.<BindingSet>newHashSet();
- MapBindingSet nameHeightAge = new MapBindingSet();
+ final Set<BindingSet> expected = Sets.<BindingSet>newHashSet();
+ final MapBindingSet nameHeightAge = new MapBindingSet();
nameHeightAge.addBinding("name", vf.createLiteral("Bob"));
nameHeightAge.addBinding("height", vf.createLiteral("5'9\""));
nameHeightAge.addBinding("age", vf.createLiteral(56));
- expected.add(nameHeightAge);
+ expected.add(new VisibilityBindingSet(nameHeightAge));
- MapBindingSet nameHeightHair = new MapBindingSet();
+ final MapBindingSet nameHeightHair = new MapBindingSet();
nameHeightHair.addBinding("name", vf.createLiteral("Bob"));
nameHeightHair.addBinding("height", vf.createLiteral("5'9\""));
nameHeightHair.addBinding("hairColor", vf.createLiteral("Brown"));
- expected.add(nameHeightHair);
+ expected.add(new VisibilityBindingSet(nameHeightHair));
assertEquals(expected, newJoinResults);
}
@Test
public void newRightResult_noLeftMatches() {
- IterativeJoin naturalJoin = new NaturalJoin();
+ final IterativeJoin naturalJoin = new NaturalJoin();
// There are no left results.
- Iterator<BindingSet> leftResults= new
ArrayList<BindingSet>().iterator();
+ final Iterator<BindingSet> leftResults= new
ArrayList<BindingSet>().iterator();
// There is a new right result.
- MapBindingSet newRightResult = new MapBindingSet();
+ final MapBindingSet newRightResult = new MapBindingSet();
newRightResult.addBinding("name", vf.createLiteral("Bob"));
// Therefore, there are no new join results.
- Iterator<BindingSet> newJoinResultsIt =
naturalJoin.newRightResult(leftResults, newRightResult);
+ final Iterator<BindingSet> newJoinResultsIt =
naturalJoin.newRightResult(leftResults, newRightResult);
assertFalse( newJoinResultsIt.hasNext() );
}
@Test
public void newRightResult_joinsWithLeftResults() {
- IterativeJoin naturalJoin = new NaturalJoin();
+ final IterativeJoin naturalJoin = new NaturalJoin();
// There are a few left results that join with the new right
result.
- MapBindingSet nameAge = new MapBindingSet();
+ final MapBindingSet nameAge = new MapBindingSet();
nameAge.addBinding("name", vf.createLiteral("Bob"));
nameAge.addBinding("age", vf.createLiteral(56));
- MapBindingSet nameHair = new MapBindingSet();
+ final MapBindingSet nameHair = new MapBindingSet();
nameHair.addBinding("name", vf.createLiteral("Bob"));
nameHair.addBinding("hairColor", vf.createLiteral("Brown"));
- Iterator<BindingSet> leftResults =
Lists.<BindingSet>newArrayList(nameAge, nameHair).iterator();
+ final Iterator<BindingSet> leftResults =
Lists.<BindingSet>newArrayList(nameAge, nameHair).iterator();
// There is a new right result.
- MapBindingSet newRightResult = new MapBindingSet();
+ final MapBindingSet newRightResult = new MapBindingSet();
newRightResult.addBinding("name", vf.createLiteral("Bob"));
newRightResult.addBinding("height", vf.createLiteral("5'9\""));
// Therefore, there are a few new join results that mix the two
together.
- Iterator<BindingSet> newJoinResultsIt =
naturalJoin.newRightResult(leftResults, newRightResult);
+ final Iterator<BindingSet> newJoinResultsIt =
naturalJoin.newRightResult(leftResults, newRightResult);
- Set<BindingSet> newJoinResults = new HashSet<>();
+ final Set<BindingSet> newJoinResults = new HashSet<>();
while(newJoinResultsIt.hasNext()) {
newJoinResults.add( newJoinResultsIt.next() );
}
- Set<BindingSet> expected = Sets.<BindingSet>newHashSet();
- MapBindingSet nameHeightAge = new MapBindingSet();
+ final Set<BindingSet> expected = Sets.<BindingSet>newHashSet();
+ final MapBindingSet nameHeightAge = new MapBindingSet();
nameHeightAge.addBinding("name", vf.createLiteral("Bob"));
nameHeightAge.addBinding("height", vf.createLiteral("5'9\""));
nameHeightAge.addBinding("age", vf.createLiteral(56));
- expected.add(nameHeightAge);
+ expected.add(new VisibilityBindingSet(nameHeightAge));
- MapBindingSet nameHeightHair = new MapBindingSet();
+ final MapBindingSet nameHeightHair = new MapBindingSet();
nameHeightHair.addBinding("name", vf.createLiteral("Bob"));
nameHeightHair.addBinding("height", vf.createLiteral("5'9\""));
nameHeightHair.addBinding("hairColor", vf.createLiteral("Brown"));
- expected.add(nameHeightHair);
+ expected.add(new VisibilityBindingSet(nameHeightHair));
+
+ for(final BindingSet bs : newJoinResults) {
--- End diff --
This debug code should be removed.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
