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/09/05 12:29:46 UTC
[10/10] jena git commit: JENA-1229: Integrate into ARQ tests.
JENA-1229: Integrate into ARQ tests.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/9d5f675a
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/9d5f675a
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/9d5f675a
Branch: refs/heads/master
Commit: 9d5f675a87f522067f0a4ec92f50dfb187824715
Parents: 0aff0e6
Author: Andy Seaborne <an...@apache.org>
Authored: Mon Sep 5 13:22:28 2016 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Mon Sep 5 13:22:28 2016 +0100
----------------------------------------------------------------------
.../org/apache/jena/sparql/engine/iterator/QueryIter2.java | 1 +
.../jena/sparql/engine/iterator/QueryIterDistinct.java | 2 +-
.../org/apache/jena/sparql/engine/iterator/QueryIterSub.java | 2 +-
.../jena/sparql/engine/iterator/TS_QueryIterators.java | 1 +
.../jena/sparql/engine/iterator/TestCancelDistinct.java | 8 ++++----
5 files changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/9d5f675a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIter2.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIter2.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIter2.java
index ba5118e..a3cb674 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIter2.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIter2.java
@@ -57,6 +57,7 @@ public abstract class QueryIter2 extends QueryIter
protected final
void requestCancel()
{
+ requestSubCancel() ;
performRequestCancel(leftInput) ;
performRequestCancel(rightInput) ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/9d5f675a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterDistinct.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterDistinct.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterDistinct.java
index 1860226..4b7d82d 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterDistinct.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterDistinct.java
@@ -43,7 +43,7 @@ import org.apache.jena.sparql.engine.binding.BindingProjectNamed ;
public class QueryIterDistinct extends QueryIter1
{
private long memThreshold = Long.MAX_VALUE ; // Default "off" value.
- protected DistinctDataBag<Binding> db = null ;
+ /*package*/ DistinctDataBag<Binding> db = null ;
private Iterator<Binding> iterator = null ;
private Set<Binding> seen = new HashSet<>() ;
private Binding slot = null ;
http://git-wip-us.apache.org/repos/asf/jena/blob/9d5f675a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterSub.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterSub.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterSub.java
index e6d74e7..cfc9913 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterSub.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterSub.java
@@ -23,7 +23,7 @@ import org.apache.jena.sparql.engine.QueryIterator ;
/**
* This class supports a QueryIter that uses a single sub iterator.
- * Unlike QueryIter1, it's assumes the subiterator will be reset and manipulated.
+ * Unlike QueryIter1, it assumes the subiterator will be reset and manipulated.
*/
public abstract class QueryIterSub extends QueryIter
{
http://git-wip-us.apache.org/repos/asf/jena/blob/9d5f675a/jena-arq/src/test/java/org/apache/jena/sparql/engine/iterator/TS_QueryIterators.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/engine/iterator/TS_QueryIterators.java b/jena-arq/src/test/java/org/apache/jena/sparql/engine/iterator/TS_QueryIterators.java
index d0eb2ac..3a3cd35 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/engine/iterator/TS_QueryIterators.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/engine/iterator/TS_QueryIterators.java
@@ -27,6 +27,7 @@ import org.junit.runners.Suite ;
, TestDistinctMem.class
, TestDistinctDataBag.class
, TestDistinctDataBagLimited.class
+ , TestCancelDistinct.class
})
public class TS_QueryIterators {
http://git-wip-us.apache.org/repos/asf/jena/blob/9d5f675a/jena-arq/src/test/java/org/apache/jena/sparql/engine/iterator/TestCancelDistinct.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/engine/iterator/TestCancelDistinct.java b/jena-arq/src/test/java/org/apache/jena/sparql/engine/iterator/TestCancelDistinct.java
index 4ade0ea..2300197 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/engine/iterator/TestCancelDistinct.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/engine/iterator/TestCancelDistinct.java
@@ -92,9 +92,9 @@ public class TestCancelDistinct {
QueryIteratorBase base = new MockQueryIterator();
QueryIterDistinct d = new QueryIterDistinct(base, c);
- assertFalse(base.requestingCancel);
+ assertFalse(base.getRequestingCancel());
d.cancel();
- assertTrue(base.requestingCancel);
+ assertTrue(base.getRequestingCancel());
}
final Context params = new Context();
@@ -122,9 +122,9 @@ public class TestCancelDistinct {
assertNotNull(d.db);
DistinctDataBag<Binding> db = d.db;
- assertFalse(base.requestingCancel);
+ assertFalse(base.getRequestingCancel());
d.cancel();
- assertTrue(base.requestingCancel);
+ assertTrue(base.getRequestingCancel());
}