You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2016/04/17 14:15:02 UTC
[1/5] jena git commit: Add tests for CollectionUtils.
Repository: jena
Updated Branches:
refs/heads/master 5b2e31f1e -> c917e892b
Add tests for CollectionUtils.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/62ff5cac
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/62ff5cac
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/62ff5cac
Branch: refs/heads/master
Commit: 62ff5cac1d20e5c7f569c1993732a4e025196512
Parents: 5b2e31f
Author: Andy Seaborne <an...@apache.org>
Authored: Sun Apr 17 10:00:29 2016 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sun Apr 17 10:02:04 2016 +0100
----------------------------------------------------------------------
.../java/org/apache/jena/atlas/lib/TS_Lib.java | 1 +
.../jena/atlas/lib/TestCollectionUtils.java | 76 ++++++++++++++++++++
2 files changed, 77 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/62ff5cac/jena-base/src/test/java/org/apache/jena/atlas/lib/TS_Lib.java
----------------------------------------------------------------------
diff --git a/jena-base/src/test/java/org/apache/jena/atlas/lib/TS_Lib.java b/jena-base/src/test/java/org/apache/jena/atlas/lib/TS_Lib.java
index 98a4bc5..f0e0f3c 100644
--- a/jena-base/src/test/java/org/apache/jena/atlas/lib/TS_Lib.java
+++ b/jena-base/src/test/java/org/apache/jena/atlas/lib/TS_Lib.java
@@ -36,6 +36,7 @@ import org.junit.runners.Suite ;
, TestHex.class
, TestListUtils.class
, TestSetUtils.class
+ , TestCollectionUtils.class
, TestCache.class
, TestCache2.class
, TestFileOps.class
http://git-wip-us.apache.org/repos/asf/jena/blob/62ff5cac/jena-base/src/test/java/org/apache/jena/atlas/lib/TestCollectionUtils.java
----------------------------------------------------------------------
diff --git a/jena-base/src/test/java/org/apache/jena/atlas/lib/TestCollectionUtils.java b/jena-base/src/test/java/org/apache/jena/atlas/lib/TestCollectionUtils.java
new file mode 100644
index 0000000..543eb62
--- /dev/null
+++ b/jena-base/src/test/java/org/apache/jena/atlas/lib/TestCollectionUtils.java
@@ -0,0 +1,76 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jena.atlas.lib;
+
+import static org.apache.jena.atlas.lib.CollectionUtils.sameElts ;
+import static org.junit.Assert.assertFalse ;
+import static org.junit.Assert.assertTrue ;
+
+import java.util.Arrays ;
+import java.util.HashSet ;
+import java.util.List ;
+import java.util.Set ;
+
+import org.junit.Test ;
+
+public class TestCollectionUtils {
+ @Test
+ public void sameElst_01() {
+ List<String> x1 = Arrays.asList("a", "b", "c") ;
+ List<String> x2 = Arrays.asList("a", "c", "b") ;
+ assertTrue(sameElts(x1, x2)) ;
+ }
+
+ @Test
+ public void sameElst_02() {
+ List<String> x1 = Arrays.asList("a", "b", "c", "a") ;
+ List<String> x2 = Arrays.asList("a", "c", "b") ;
+ assertTrue(sameElts(x1, x2)) ;
+ }
+
+ @Test
+ public void sameElst_03() {
+ List<String> x1 = Arrays.asList("a", "b", "c") ;
+ List<String> x2 = Arrays.asList("a", "c", "b") ;
+ Set<String> z1 = new HashSet<>(x2) ;
+ assertTrue(sameElts(x1, z1)) ;
+ }
+
+ @Test
+ public void sameElst_04() {
+ List<String> x1 = Arrays.asList("a", "b", "X") ;
+ List<String> x2 = Arrays.asList("a", "c", "b") ;
+ assertFalse(sameElts(x1, x2)) ;
+ }
+
+ @Test
+ public void sameElst_05() {
+ List<String> x1 = Arrays.asList("a", "b", "c") ;
+ List<String> x2 = Arrays.asList("a", "b") ;
+ assertFalse(sameElts(x1, x2)) ;
+ }
+
+ @Test
+ public void sameElst_06() {
+ List<String> x1 = Arrays.asList("a", "b", "X") ;
+ List<String> x2 = Arrays.asList("a", "c", "b") ;
+ Set<String> z1 = new HashSet<>(x2) ;
+ assertFalse(sameElts(x1, z1)) ;
+ }
+}
[2/5] jena git commit: Specific debugging code.
Posted by an...@apache.org.
Specific debugging code.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/d29f93d0
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/d29f93d0
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/d29f93d0
Branch: refs/heads/master
Commit: d29f93d0b8be23d5d344ec8f7da0cdb7ffb487e2
Parents: 62ff5ca
Author: Andy Seaborne <an...@apache.org>
Authored: Sun Apr 17 13:05:57 2016 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sun Apr 17 13:05:57 2016 +0100
----------------------------------------------------------------------
.../algebra/optimize/AbstractTestTransform.java | 15 +++++++++++++++
1 file changed, 15 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/d29f93d0/jena-arq/src/test/java/org/apache/jena/sparql/algebra/optimize/AbstractTestTransform.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/algebra/optimize/AbstractTestTransform.java b/jena-arq/src/test/java/org/apache/jena/sparql/algebra/optimize/AbstractTestTransform.java
index fcc58fa..4f63abc 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/algebra/optimize/AbstractTestTransform.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/algebra/optimize/AbstractTestTransform.java
@@ -18,6 +18,8 @@
package org.apache.jena.sparql.algebra.optimize ;
+import java.util.Objects ;
+
import org.apache.jena.atlas.junit.BaseTest ;
import org.apache.jena.atlas.lib.StrUtils ;
import org.apache.jena.query.Query ;
@@ -73,6 +75,19 @@ public abstract class AbstractTestTransform extends BaseTest {
private static void check(Op opToOptimize, String opExpectedString) {
Op opOptimize = Algebra.optimize(opToOptimize) ;
Op opExpected = SSE.parseOp(opExpectedString) ;
+ if ( false ) {
+ // Hook for more detail during development.
+ boolean b = Objects.equals(opExpected, opOptimize) ;
+ if ( ! b ) {
+ System.err.println("** Input:");
+ System.err.print(opToOptimize) ;
+ System.err.println("** Expected:");
+ System.err.print(opExpected) ;
+ System.err.println("** Actual:");
+ System.err.print(opOptimize) ;
+ System.err.println("-------------------") ;
+ }
+ }
assertEquals(opExpected, opOptimize) ;
}
[3/5] jena git commit: JENA-1184: Workaround disables this test.
Posted by an...@apache.org.
JENA-1184: Workaround disables this test.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/a05ac187
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/a05ac187
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/a05ac187
Branch: refs/heads/master
Commit: a05ac18790935ae241caac6a182d379750c62fad
Parents: d29f93d
Author: Andy Seaborne <an...@apache.org>
Authored: Sun Apr 17 13:06:22 2016 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sun Apr 17 13:06:22 2016 +0100
----------------------------------------------------------------------
.../sparql/algebra/optimize/TestTransformFilters.java | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/a05ac187/jena-arq/src/test/java/org/apache/jena/sparql/algebra/optimize/TestTransformFilters.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/algebra/optimize/TestTransformFilters.java b/jena-arq/src/test/java/org/apache/jena/sparql/algebra/optimize/TestTransformFilters.java
index a68d62d..545c63e 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/algebra/optimize/TestTransformFilters.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/algebra/optimize/TestTransformFilters.java
@@ -74,12 +74,13 @@ public class TestTransformFilters extends AbstractTestTransform
(String[])null) ;
}
- @Test public void equality04() {
- // Eliminate unused
- testOp("(filter (= ?UNUSED <x>) (bgp ( ?s ?p ?x)) )",
- t_equality,
- "(table empty)") ;
- }
+// // JENA-1184 workaround - this optimization is current not active.
+// @Test public void equality04() {
+// // Eliminate unused
+// testOp("(filter (= ?UNUSED <x>) (bgp ( ?s ?p ?x)) )",
+// t_equality,
+// "(table empty)") ;
+// }
@Test public void equality05() {
// Can't optimize if filter does not cover vars in LHS
[5/5] jena git commit: JENA-1184: Workround - disable the elimination
of redundant subOp.
Posted by an...@apache.org.
JENA-1184: Workround - disable the elimination of redundant subOp.
This optimization is best run after join-strategy but that make
scoping different, invalidating the elimination.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/c917e892
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/c917e892
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/c917e892
Branch: refs/heads/master
Commit: c917e892ba934947d0ae0da21ab2e54d35ba9bc1
Parents: 14df3ce
Author: Andy Seaborne <an...@apache.org>
Authored: Sun Apr 17 13:08:54 2016 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sun Apr 17 13:08:54 2016 +0100
----------------------------------------------------------------------
.../sparql/algebra/optimize/TransformFilterEquality.java | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/c917e892/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/TransformFilterEquality.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/TransformFilterEquality.java b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/TransformFilterEquality.java
index a3450a5..45a9167 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/TransformFilterEquality.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/TransformFilterEquality.java
@@ -116,7 +116,15 @@ public class TransformFilterEquality extends TransformCopy {
// Special case : deduce that the filter will always "eval unbound"
// hence eliminate all rows. Return the empty table.
if (testSpecialCaseUnused(subOp, equalities, remaining))
- return OpTable.empty();
+ // JENA-1184
+ // If this is run after join-strategy, then scope is not a simple matter
+ // of looking at the subOp. But running before join-strategy
+ // causes other code to not optimize (presumablty because it was developed
+ // to run after join-strategy probably by conincidence)
+ // @Test TestTransformFilters.equality04
+ //return OpTable.empty();
+ // JENA-1184 woraround. Return unchanged.
+ return null ;
// Special case: the deep left op of a OpConditional/OpLeftJoin is the unit table.
// This is the case of:
[4/5] jena git commit: Note for the future.
Posted by an...@apache.org.
Note for the future.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/14df3ceb
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/14df3ceb
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/14df3ceb
Branch: refs/heads/master
Commit: 14df3ceb25c47ad3a257627efaf04dde839a172d
Parents: a05ac18
Author: Andy Seaborne <an...@apache.org>
Authored: Sun Apr 17 13:07:04 2016 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sun Apr 17 13:07:04 2016 +0100
----------------------------------------------------------------------
.../algebra/optimize/TransformFilterPlacement.java | 13 +++++++++++++
1 file changed, 13 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/14df3ceb/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/TransformFilterPlacement.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/TransformFilterPlacement.java b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/TransformFilterPlacement.java
index 3056503..973c758 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/TransformFilterPlacement.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/TransformFilterPlacement.java
@@ -500,6 +500,19 @@ public class TransformFilterPlacement extends TransformCopy {
Op right = opJoin.getRight() ;
Collection<Var> leftVars = fixedVars(left) ;
Collection<Var> rightVars = fixedVars(right) ;
+
+ // More sophisticated - consider optionl variables as well.
+ // This code check the two ways to get fixed vars yields the same
+ // and it does for the test suite.
+// //---
+// VarFinder vfLeft = VarFinder.process(left) ;
+// VarFinder vfRight = VarFinder.process(right) ;
+// if ( ! CollectionUtils.sameElts(leftVars, vfLeft.getFixed() ) )
+// System.err.println("Left: "+leftVars+" : "+vfLeft.getFixed() ) ;
+// if ( ! CollectionUtils.sameElts(rightVars, vfRight.getFixed() ) )
+// System.err.println("Right: "+rightVars+" : "+vfRight.getFixed() ) ;
+// //---
+
ExprList unpushed = new ExprList() ;
ExprList pushLeft = new ExprList() ;
ExprList pushRight = new ExprList() ;