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 2013/07/24 21:38:31 UTC
svn commit: r1506670 - in /jena/trunk/jena-arq:
src-examples/arq/examples/propertyfunction/
src/main/java/com/hp/hpl/jena/sparql/algebra/table/
src/main/java/com/hp/hpl/jena/sparql/engine/iterator/
src/main/java/com/hp/hpl/jena/sparql/engine/main/ src/...
Author: andy
Date: Wed Jul 24 19:38:30 2013
New Revision: 1506670
URL: http://svn.apache.org/r1506670
Log:
Add static factory method for creating null QueryIterators.
Modified:
jena/trunk/jena-arq/src-examples/arq/examples/propertyfunction/labelSearch.java
jena/trunk/jena-arq/src-examples/arq/examples/propertyfunction/localname.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/table/Table1.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/table/TableEmpty.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/table/TableN.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/iterator/QueryIterNullIterator.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/main/OpExecutor.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/IterLib.java
Modified: jena/trunk/jena-arq/src-examples/arq/examples/propertyfunction/labelSearch.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src-examples/arq/examples/propertyfunction/labelSearch.java?rev=1506670&r1=1506669&r2=1506670&view=diff
==============================================================================
--- jena/trunk/jena-arq/src-examples/arq/examples/propertyfunction/labelSearch.java (original)
+++ jena/trunk/jena-arq/src-examples/arq/examples/propertyfunction/labelSearch.java Wed Jul 24 19:38:30 2013
@@ -114,7 +114,7 @@ public class labelSearch implements Prop
if ( pattern == null )
{
Log.warn(this, "Pattern must be a plain literal or xsd:string: "+argObject.getArg()) ;
- return new QueryIterNullIterator(execCxt) ;
+ return QueryIterNullIterator.create(execCxt) ;
}
if ( false )
Modified: jena/trunk/jena-arq/src-examples/arq/examples/propertyfunction/localname.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src-examples/arq/examples/propertyfunction/localname.java?rev=1506670&r1=1506669&r2=1506670&view=diff
==============================================================================
--- jena/trunk/jena-arq/src-examples/arq/examples/propertyfunction/localname.java (original)
+++ jena/trunk/jena-arq/src-examples/arq/examples/propertyfunction/localname.java Wed Jul 24 19:38:30 2013
@@ -79,7 +79,7 @@ public class localname extends PFuncSimp
{
if ( ! nodeURI.isURI() )
// Subject bound but not a URI
- return new QueryIterNullIterator(execCxt) ;
+ return QueryIterNullIterator.create(execCxt) ;
// Subject is bound and a URI - get the localname as a Node
Node localname = NodeFactory.createLiteral(nodeURI.getLocalName()) ;
@@ -92,7 +92,7 @@ public class localname extends PFuncSimp
// Same
return QueryIterSingleton.create(binding, execCxt) ;
// No - different - no match.
- return new QueryIterNullIterator(execCxt) ;
+ return QueryIterNullIterator.create(execCxt) ;
}
// Object unbound variable - assign the localname to it.
@@ -109,11 +109,11 @@ public class localname extends PFuncSimp
{
if ( ! nodeLocalname.isLiteral() )
// Not a variable, not a literal=> can't match
- return new QueryIterNullIterator(execCxt) ;
+ return QueryIterNullIterator.create(execCxt) ;
if( ! NodeUtils.isStringLiteral(nodeLocalname) )
// If a typed literal, must be XSD string.
- return new QueryIterNullIterator(execCxt) ;
+ return QueryIterNullIterator.create(execCxt) ;
}
//Set bindings = new HashSet() ; // Use a Set if you want unique results.
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/table/Table1.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/table/Table1.java?rev=1506670&r1=1506669&r2=1506670&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/table/Table1.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/table/Table1.java Wed Jul 24 19:38:30 2013
@@ -77,7 +77,7 @@ public class Table1 extends TableBase
}
if ( ! matches && ! includeOnNoMatch)
- return new QueryIterNullIterator(execContext) ;
+ return QueryIterNullIterator.create(execContext) ;
// Matches, or does not match and it's a left join - return the left binding.
return QueryIterSingleton.create(bindingLeft, execContext) ;
}
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/table/TableEmpty.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/table/TableEmpty.java?rev=1506670&r1=1506669&r2=1506670&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/table/TableEmpty.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/table/TableEmpty.java Wed Jul 24 19:38:30 2013
@@ -37,7 +37,7 @@ public class TableEmpty extends TableBas
@Override
public QueryIterator iterator(ExecutionContext execCxt)
{
- return new QueryIterNullIterator(execCxt) ;
+ return QueryIterNullIterator.create(execCxt) ;
}
@Override
@@ -49,7 +49,7 @@ public class TableEmpty extends TableBas
return QueryIterSingleton.create(bindingLeft, execContext) ;
else
// No rows - no match
- return new QueryIterNullIterator(execContext) ;
+ return QueryIterNullIterator.create(execContext) ;
}
@Override
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/table/TableN.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/table/TableN.java?rev=1506670&r1=1506669&r2=1506670&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/table/TableN.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/table/TableN.java Wed Jul 24 19:38:30 2013
@@ -106,7 +106,7 @@ public class TableN extends TableBase
out.add(bindingLeft) ;
if ( out.size() == 0 )
- return new QueryIterNullIterator(execContext) ;
+ return QueryIterNullIterator.create(execContext) ;
return new QueryIterPlainWrapper(out.iterator(), execContext) ;
}
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/iterator/QueryIterNullIterator.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/iterator/QueryIterNullIterator.java?rev=1506670&r1=1506669&r2=1506670&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/iterator/QueryIterNullIterator.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/iterator/QueryIterNullIterator.java Wed Jul 24 19:38:30 2013
@@ -23,6 +23,7 @@ import java.util.NoSuchElementException
import org.apache.jena.atlas.io.IndentedWriter ;
import com.hp.hpl.jena.sparql.engine.ExecutionContext ;
+import com.hp.hpl.jena.sparql.engine.QueryIterator ;
import com.hp.hpl.jena.sparql.engine.binding.Binding ;
import com.hp.hpl.jena.sparql.serializer.SerializationContext ;
import com.hp.hpl.jena.sparql.util.Utils ;
@@ -31,6 +32,8 @@ import com.hp.hpl.jena.sparql.util.Utils
public class QueryIterNullIterator extends QueryIter
{
+ public static QueryIterator create(ExecutionContext qCxt) { return new QueryIterNullIterator(qCxt) ; }
+
// Or QueryIterYeildN with N = 0 ;
// but sometimes it clearer just to w-r-i-t-e the code.
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/main/OpExecutor.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/main/OpExecutor.java?rev=1506670&r1=1506669&r2=1506670&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/main/OpExecutor.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/main/OpExecutor.java Wed Jul 24 19:38:30 2013
@@ -369,7 +369,7 @@ public class OpExecutor
protected QueryIterator execute(OpNull opNull, QueryIterator input) {
// Loose the input.
input.close() ;
- return new QueryIterNullIterator(execCxt) ;
+ return QueryIterNullIterator.create(execCxt) ;
}
protected QueryIterator execute(OpList opList, QueryIterator input) {
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/IterLib.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/IterLib.java?rev=1506670&r1=1506669&r2=1506670&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/IterLib.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/IterLib.java Wed Jul 24 19:38:30 2013
@@ -30,7 +30,7 @@ public class IterLib
{
public static QueryIterator noResults(ExecutionContext execCxt)
{
- return new QueryIterNullIterator(execCxt) ;
+ return QueryIterNullIterator.create(execCxt) ;
}
public static QueryIterator oneResult(Binding binding, Var var, Node value, ExecutionContext execCxt)