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 2011/10/19 14:15:16 UTC
svn commit: r1186146 [3/9] - in /incubator/jena/Jena2/ARQ/trunk: ./
.settings/ src-examples/arq/examples/bgpmatching/
src-examples/arq/examples/engine/ src-examples/arq/examples/filter/
src-examples/arq/examples/propertyfunction/ src/main/java/arq/ src...
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/QueryCompare.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/QueryCompare.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/QueryCompare.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/QueryCompare.java Wed Oct 19 12:15:05 2011
@@ -54,12 +54,15 @@ public class QueryCompare implements Que
}
+ @Override
public void startVisit(Query query1)
{ }
+ @Override
public void visitResultForm(Query query1)
{ check("Query result form", query1.getQueryType() == query2.getQueryType()) ; }
+ @Override
public void visitPrologue(Prologue query1)
{
// This is after parsing so all IRIs in the query have been made absolute.
@@ -75,6 +78,7 @@ public class QueryCompare implements Que
check("Prefixes", query1.getPrefixMapping().samePrefixMappingAs(query2.getPrefixMapping())) ;
}
+ @Override
public void visitSelectResultForm(Query query1)
{
check("Not both SELECT queries", query2.isSelectType()) ;
@@ -84,6 +88,7 @@ public class QueryCompare implements Que
check("Result variables", query1.getProject(), query2.getProject() ) ;
}
+ @Override
public void visitConstructResultForm(Query query1)
{
check("Not both CONSTRUCT queries", query2.isConstructType()) ;
@@ -91,6 +96,7 @@ public class QueryCompare implements Que
query1.getConstructTemplate().equalIso(query2.getConstructTemplate(), new NodeIsomorphismMap()) ) ;
}
+ @Override
public void visitDescribeResultForm(Query query1)
{
check("Not both DESCRIBE queries", query2.isDescribeType()) ;
@@ -101,11 +107,13 @@ public class QueryCompare implements Que
}
+ @Override
public void visitAskResultForm(Query query1)
{
check("Not both ASK queries", query2.isAskType()) ;
}
+ @Override
public void visitDatasetDecl(Query query1)
{
boolean b1 = Lib.equalsListAsSet(query1.getGraphURIs(), query2.getGraphURIs()) ;
@@ -114,6 +122,7 @@ public class QueryCompare implements Que
check("Named graph URIs", b2 ) ;
}
+ @Override
public void visitQueryPattern(Query query1)
{
if ( query1.getQueryPattern() == null &&
@@ -129,31 +138,37 @@ public class QueryCompare implements Que
check("Pattern", query1.getQueryPattern().equalTo(query2.getQueryPattern(), new NodeIsomorphismMap())) ;
}
+ @Override
public void visitGroupBy(Query query1)
{
check("GROUP BY", query1.getGroupBy(), query2.getGroupBy()) ;
}
+ @Override
public void visitHaving(Query query1)
{
check("HAVING", query1.getHavingExprs(), query2.getHavingExprs()) ;
}
+ @Override
public void visitLimit(Query query1)
{
check("LIMIT", query1.getLimit() == query2.getLimit() ) ;
}
- public void visitOrderBy(Query query1)
+ @Override
+ public void visitOrderBy(Query query1)
{
check("ORDER BY", query1.getOrderBy(), query2.getOrderBy() ) ;
}
- public void visitOffset(Query query1)
+ @Override
+ public void visitOffset(Query query1)
{
check("OFFSET", query1.getOffset() == query2.getOffset() ) ;
}
+ @Override
public void visitBindings(Query query1)
{
// Must be same order for now.
@@ -161,6 +176,7 @@ public class QueryCompare implements Que
check("BINDINGS/values", query1.getBindingValues(), query2.getBindingValues()) ;
}
+ @Override
public void finishVisit(Query query1)
{}
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/QueryHashCode.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/QueryHashCode.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/QueryHashCode.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/QueryHashCode.java Wed Oct 19 12:15:05 2011
@@ -41,12 +41,15 @@ public class QueryHashCode
public QueryHashCodeWorker()
{}
+ @Override
public void startVisit(Query query)
{ }
+ @Override
public void visitResultForm(Query query)
{ }
+ @Override
public void visitPrologue(Prologue query)
{
if ( query.explicitlySetBaseURI() )
@@ -54,6 +57,7 @@ public class QueryHashCode
x ^= query.getPrefixMapping().getNsPrefixMap().hashCode() ;
}
+ @Override
public void visitSelectResultForm(Query query)
{
//query.setResultVars() ;
@@ -61,59 +65,70 @@ public class QueryHashCode
x^= query.getProject().hashCode() ;
}
+ @Override
public void visitConstructResultForm(Query query)
{
x ^= query.getConstructTemplate().hashCode() ;
}
+ @Override
public void visitDescribeResultForm(Query query)
{
x ^= query.getResultVars().hashCode() ;
x ^= query.getResultURIs().hashCode() ;
}
+ @Override
public void visitAskResultForm(Query query)
{ }
+ @Override
public void visitDatasetDecl(Query query)
{
x ^= query.getNamedGraphURIs().hashCode() ;
}
+ @Override
public void visitQueryPattern(Query query)
{
if ( query.getQueryPattern() != null )
x ^= query.getQueryPattern().hashCode() ;
}
+ @Override
public void visitGroupBy(Query query)
{
if ( query.hasGroupBy() )
x ^= query.getGroupBy().hashCode() ;
}
+ @Override
public void visitHaving(Query query)
{
if ( query.hasHaving() )
x ^= query.getHavingExprs().hashCode() ;
}
+ @Override
public void visitOrderBy(Query query)
{
if ( query.getOrderBy() != null )
x ^= query.getOrderBy().hashCode() ;
}
+ @Override
public void visitLimit(Query query)
{
x ^= query.getLimit() ;
}
+ @Override
public void visitOffset(Query query)
{
x ^= query.getOffset() ;
}
+ @Override
public void visitBindings(Query query)
{
if ( query.hasBindings() )
@@ -123,6 +138,7 @@ public class QueryHashCode
}
}
+ @Override
public void finishVisit(Query query)
{}
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/QuerySolutionBase.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/QuerySolutionBase.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/QuerySolutionBase.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/QuerySolutionBase.java Wed Oct 19 12:15:05 2011
@@ -29,17 +29,22 @@ import com.hp.hpl.jena.rdf.model.Resourc
public abstract class QuerySolutionBase implements QuerySolution
{
+ @Override
public RDFNode get(String varName) { return _get(Var.canonical(varName)) ; }
protected abstract RDFNode _get(String varName) ;
+ @Override
public Resource getResource(String varName) { return (Resource)get(varName) ; }
+ @Override
public Literal getLiteral(String varName) { return (Literal)get(varName) ; }
+ @Override
public boolean contains(String varName) { return _contains(Var.canonical(varName)) ; }
protected abstract boolean _contains(String varName) ;
+ @Override
public abstract Iterator<String> varNames() ;
}
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/describe/DescribeBNodeClosure.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/describe/DescribeBNodeClosure.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/describe/DescribeBNodeClosure.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/describe/DescribeBNodeClosure.java Wed Oct 19 12:15:05 2011
@@ -36,6 +36,7 @@ public class DescribeBNodeClosure implem
public DescribeBNodeClosure() {}
+ @Override
public void start(Model accumulateResultModel, Context cxt)
{
acc = accumulateResultModel ;
@@ -46,6 +47,7 @@ public class DescribeBNodeClosure implem
private static Query query = QueryFactory.create("SELECT DISTINCT ?g { GRAPH ?g { ?s ?p ?o } }") ;
// Check all named graphs
+ @Override
public void describe(Resource r)
{
// Default model.
@@ -92,6 +94,7 @@ public class DescribeBNodeClosure implem
return r ;
}
+ @Override
public void finish()
{ }
}
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/describe/DescribeBNodeClosureFactory.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/describe/DescribeBNodeClosureFactory.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/describe/DescribeBNodeClosureFactory.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/describe/DescribeBNodeClosureFactory.java Wed Oct 19 12:15:05 2011
@@ -20,6 +20,7 @@ package com.hp.hpl.jena.sparql.core.desc
public class DescribeBNodeClosureFactory implements DescribeHandlerFactory
{
+ @Override
public DescribeHandler create()
{
return new DescribeBNodeClosure() ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/ExecutionContext.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/ExecutionContext.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/ExecutionContext.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/ExecutionContext.java Wed Oct 19 12:15:05 2011
@@ -71,6 +71,7 @@ public class ExecutionContext implements
this.executor = factory ;
}
+ @Override
public Context getContext() { return context ; }
// public ExecutionContext getExecutionContext() { return this ; }
@@ -106,6 +107,7 @@ public class ExecutionContext implements
this.executor = executor ;
}
+ @Override
public DatasetGraph getDataset() { return dataset ; }
// /** Setter for the dataset - use with care */
@@ -118,6 +120,7 @@ public class ExecutionContext implements
* May be null if unknown or not applicable - for example, doing quad store access or
* when sorting
*/
+ @Override
public Graph getActiveGraph() { return activeGraph ; }
// /** Setter for the active graph - use with care */
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/PlanBase.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/PlanBase.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/PlanBase.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/PlanBase.java Wed Oct 19 12:15:05 2011
@@ -38,8 +38,10 @@ public abstract class PlanBase extends P
protected PlanBase(Op op, Closeable closeable) { this.op = op ; this.closeable = closeable ; }
+ @Override
public Op getOp() { return op ; }
+ @Override
final
public QueryIterator iterator()
{
@@ -58,11 +60,13 @@ public abstract class PlanBase extends P
output(out, sCxt) ;
}
+ @Override
public void output(IndentedWriter out, SerializationContext sCxt)
{
op.output(out, sCxt) ;
}
+ @Override
public void close()
{
if ( closed )
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/QueryEngineBase.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/QueryEngineBase.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/QueryEngineBase.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/QueryEngineBase.java Wed Oct 19 12:15:05 2011
@@ -114,6 +114,7 @@ public abstract class QueryEngineBase im
}
// Record the query operation as it goes pass and call the actual worker
+ @Override
final
public QueryIterator evaluate(Op op, DatasetGraph dsg, Binding binding, Context context)
{
@@ -141,6 +142,7 @@ public abstract class QueryEngineBase im
protected Binding getStartBinding() { return startBinding ; }
+ @Override
public void close()
{ }
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/QueryExecutionBase.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/QueryExecutionBase.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/QueryExecutionBase.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/QueryExecutionBase.java Wed Oct 19 12:15:05 2011
@@ -173,6 +173,7 @@ public class QueryExecutionBase implemen
// cancel = true ;
// }
+ @Override
public void close()
{
if ( queryIterator != null )
@@ -185,6 +186,7 @@ public class QueryExecutionBase implemen
@Deprecated
public static boolean cancelAllowDrain = false ;
//public synchronized void cancel()
+ @Override
public synchronized void abort()
{
// This is called asynchronously to the execution.
@@ -206,6 +208,7 @@ public class QueryExecutionBase implemen
cancel = true ;
}
+ @Override
public ResultSet execSelect()
{
if ( ! query.isSelectType() )
@@ -214,9 +217,11 @@ public class QueryExecutionBase implemen
}
// Construct
+ @Override
public Model execConstruct()
{ return execConstruct(GraphFactory.makeJenaDefaultModel()) ; }
+ @Override
public Model execConstruct(Model model)
{
if ( ! query.isConstructType() )
@@ -252,10 +257,12 @@ public class QueryExecutionBase implemen
return model ;
}
+ @Override
public Model execDescribe()
{ return execDescribe(GraphFactory.makeJenaDefaultModel()) ; }
+ @Override
public Model execDescribe(Model model)
{
if ( ! query.isDescribeType() )
@@ -328,6 +335,7 @@ public class QueryExecutionBase implemen
return model ;
}
+ @Override
public boolean execAsk()
{
if ( ! query.isAskType() )
@@ -339,7 +347,7 @@ public class QueryExecutionBase implemen
return r ;
}
- //@Override
+ @Override
public void setTimeout(long timeout, TimeUnit timeUnit)
{
long x = asMillis(timeout, timeUnit) ;
@@ -347,13 +355,13 @@ public class QueryExecutionBase implemen
this.timeout2 = TIMEOUT_UNSET ;
}
- //@Override
+ @Override
public void setTimeout(long timeout)
{
setTimeout(timeout, TimeUnit.MILLISECONDS) ;
}
- //@Override
+ @Override
public void setTimeout(long timeout1, TimeUnit timeUnit1, long timeout2, TimeUnit timeUnit2)
{
long x1 = asMillis(timeout1, timeUnit1) ;
@@ -365,7 +373,7 @@ public class QueryExecutionBase implemen
this.timeout2 = x2 ;
}
- //@Override
+ @Override
public void setTimeout(long timeout1, long timeout2)
{
setTimeout(timeout1, TimeUnit.MILLISECONDS, timeout2, TimeUnit.MILLISECONDS) ;
@@ -384,6 +392,7 @@ public class QueryExecutionBase implemen
private static AlarmClock alarmClock = AlarmClock.get() ;
private static final Callback<QueryExecution> callback =
new Callback<QueryExecution>() {
+ @Override
public void proc(QueryExecution qExec)
{
qExec.abort() ;
@@ -393,7 +402,6 @@ public class QueryExecutionBase implemen
private Pingback<QueryExecution> pingback = null ;
- //@Override
private void initTimeout1()
{
if ( timeout1 == TIMEOUT_UNSET ) return ;
@@ -530,8 +538,10 @@ public class QueryExecutionBase implemen
return "<<unknown>>" ;
}
+ @Override
public Context getContext() { return context ; }
+ @Override
public Dataset getDataset() { return dataset ; }
// Call after setFM called.
@@ -556,8 +566,10 @@ public class QueryExecutionBase implemen
}
+ @Override
public void setFileManager(FileManager fm) { fileManager = fm ; }
+ @Override
public void setInitialBinding(QuerySolution startSolution)
{
initialBinding = startSolution ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/RenameVars.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/RenameVars.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/RenameVars.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/RenameVars.java Wed Oct 19 12:15:05 2011
@@ -38,6 +38,7 @@ public class RenameVars implements NodeT
this.varPrefix = varPrefix ;
}
+ @Override
public final Node convert(Node node)
{
if ( ! Var.isVar(node) ) return node ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/ResultSetStream.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/ResultSetStream.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/ResultSetStream.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/ResultSetStream.java Wed Oct 19 12:15:05 2011
@@ -55,6 +55,7 @@ public class ResultSetStream implements
* @throws UnsupportedOperationException Always thrown.
*/
+ @Override
public void remove() throws java.lang.UnsupportedOperationException
{
throw new UnsupportedOperationException(this.getClass().getName()+".remove") ;
@@ -63,6 +64,7 @@ public class ResultSetStream implements
/**
* Is there another possibility?
*/
+ @Override
public boolean hasNext()
{
if ( queryExecutionIter == null )
@@ -71,6 +73,7 @@ public class ResultSetStream implements
return r;
}
+ @Override
public Binding nextBinding()
{
if ( queryExecutionIter == null )
@@ -88,6 +91,7 @@ public class ResultSetStream implements
* The returned object is actual the binding for this
* result.
*/
+ @Override
public QuerySolution nextSolution()
{
if ( queryExecutionIter == null )
@@ -103,12 +107,14 @@ public class ResultSetStream implements
/** Moves onto the next result possibility.*/
+ @Override
public QuerySolution next() { return nextSolution() ; }
/** Return the "row number" - a count of the number of possibilities returned so far.
* Remains valid (as the total number of possibilities) after the iterator ends.
*/
+ @Override
public int getRowNumber()
{
return rowNumber ;
@@ -117,10 +123,12 @@ public class ResultSetStream implements
/** Get the variable names for the projection
*/
+ @Override
public List<String> getResultVars() { return resultVars ; }
public Model getModel() { return model ; }
+ @Override
public Model getResourceModel() { return model ; }
}
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/UnrenameVars.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/UnrenameVars.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/UnrenameVars.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/UnrenameVars.java Wed Oct 19 12:15:05 2011
@@ -34,6 +34,7 @@ public class UnrenameVars implements Nod
this.repeatedly = repeatedly ;
}
+ @Override
public Node convert(Node node)
{
if ( ! Var.isVar(node) ) return node ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/binding/BindingBase.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/binding/BindingBase.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/binding/BindingBase.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/binding/BindingBase.java Wed Oct 19 12:15:05 2011
@@ -69,6 +69,7 @@ abstract public class BindingBase implem
public Binding getParent() { return parent ; }
/** Iterate over all the names of variables. */
+ @Override
final public Iterator<Var> vars()
{
Iterator<Var> iter = vars1() ;
@@ -78,6 +79,7 @@ abstract public class BindingBase implem
}
protected abstract Iterator<Var> vars1() ;
+ @Override
final public int size()
{
int x = size1() ;
@@ -88,6 +90,7 @@ abstract public class BindingBase implem
protected abstract int size1() ;
+ @Override
public boolean isEmpty()
{
if ( ! isEmpty1() )
@@ -101,6 +104,7 @@ abstract public class BindingBase implem
protected abstract boolean isEmpty1() ;
/** Test whether a name is bound to some object */
+ @Override
public boolean contains(Var var)
{
if ( contains1(var) )
@@ -113,6 +117,7 @@ abstract public class BindingBase implem
protected abstract boolean contains1(Var var) ;
/** Return the object bound to a name, or null */
+ @Override
final public Node get(Var var)
{
Node node = get1(var) ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/binding/BindingComparator.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/binding/BindingComparator.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/binding/BindingComparator.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/binding/BindingComparator.java Wed Oct 19 12:15:05 2011
@@ -45,6 +45,7 @@ public class BindingComparator implement
{
private static Comparator<Var> varComparator = new Comparator<Var>()
{
+ @Override
public int compare(Var o1, Var o2)
{
return o1.getName().compareTo(o2.getName());
@@ -72,6 +73,7 @@ public class BindingComparator implement
// Node comparsion is:
// Compare by
+ @Override
public int compare(Binding bind1, Binding bind2)
{
for ( Iterator<SortCondition> iter = conditions.iterator() ; iter.hasNext() ; )
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/binding/BindingHashMap.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/binding/BindingHashMap.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/binding/BindingHashMap.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/binding/BindingHashMap.java Wed Oct 19 12:15:05 2011
@@ -46,7 +46,6 @@ public class BindingHashMap extends Bind
/** Add a (name,value) */
- //@Override
protected void add1(Var var, Node node)
{
if ( ! Var.isAnonVar(var) )
@@ -82,7 +81,7 @@ public class BindingHashMap extends Bind
}
/** Add a (var,value) - the node value is never null */
- //@Override
+ @Override
final public void add(Var var, Node node)
{
if ( node == null )
@@ -94,7 +93,7 @@ public class BindingHashMap extends Bind
add1(var, node) ;
}
- //@Override
+ @Override
final public void addAll(Binding other)
{
BindingUtils.addAll(this, other) ;
@@ -116,7 +115,5 @@ public class BindingHashMap extends Bind
checkAdd1(var, node) ;
}
-
- //@Override
protected void checkAdd1(Var v, Node node) { }
}
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/binding/BindingIndex.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/binding/BindingIndex.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/binding/BindingIndex.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/binding/BindingIndex.java Wed Oct 19 12:15:05 2011
@@ -49,6 +49,7 @@ public class BindingIndex implements Var
/*
* @see com.hp.hpl.jena.graph.query.VariableIndexes#indexOf(java.lang.String)
*/
+ @Override
public int indexOf(String varname)
{
for ( int i = 0 ; i < indexes.size() ; i++ )
@@ -63,6 +64,7 @@ public class BindingIndex implements Var
/*
* @see com.hp.hpl.jena.graph.query.IndexValues#get(int)
*/
+ @Override
public Object get(int index)
{
if ( index < 0 || index > indexes.size() )
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/binding/BindingInputStream.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/binding/BindingInputStream.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/binding/BindingInputStream.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/binding/BindingInputStream.java Wed Oct 19 12:15:05 2011
@@ -117,19 +117,19 @@ public class BindingInputStream extends
}
- //@Override
+ @Override
public boolean hasNext()
{
return iter.hasNext() ;
}
- //@Override
+ @Override
public Binding next()
{
return iter.next() ;
}
- //@Override
+ @Override
public void remove()
{ iter.remove() ; }
@@ -248,5 +248,6 @@ public class BindingInputStream extends
}
}
+ @Override
public void close() { super.tokens.close() ; }
}
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/binding/BindingOutputStream.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/binding/BindingOutputStream.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/binding/BindingOutputStream.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/binding/BindingOutputStream.java Wed Oct 19 12:15:05 2011
@@ -77,6 +77,7 @@ public class BindingOutputStream impleme
}
public final void write(Binding binding) { send(binding) ; }
+ @Override
public void send(Binding binding)
{
try {
@@ -156,11 +157,13 @@ public class BindingOutputStream impleme
}
+ @Override
public void flush()
{
bw.flush() ;
}
+ @Override
public void close()
{
bw.close() ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/binding/BindingWrapped.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/binding/BindingWrapped.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/binding/BindingWrapped.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/binding/BindingWrapped.java Wed Oct 19 12:15:05 2011
@@ -33,16 +33,19 @@ public class BindingWrapped implements B
public Binding getWrapped() { return binding ; }
+ @Override
public boolean contains(Var var)
{
return binding.contains(var) ;
}
+ @Override
public Node get(Var var)
{
return binding.get(var) ;
}
+ @Override
public Iterator<Var> vars()
{
return binding.vars() ;
@@ -51,8 +54,10 @@ public class BindingWrapped implements B
@Override
public String toString() { return binding.toString(); }
+ @Override
public int size() { return binding.size() ; }
+ @Override
public boolean isEmpty() { return binding.isEmpty() ; }
@Override
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/http/QueryEngineHTTP.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/http/QueryEngineHTTP.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/http/QueryEngineHTTP.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/http/QueryEngineHTTP.java Wed Oct 19 12:15:05 2011
@@ -86,9 +86,11 @@ public class QueryEngineHTTP implements
// { this.params = params ; }
// Meaning-less
+ @Override
public void setFileManager(FileManager fm)
{ throw new UnsupportedOperationException("FileManagers do not apply to remote query execution") ; }
+ @Override
public void setInitialBinding(QuerySolution binding)
{ throw new UnsupportedOperationException("Initial bindings not supported for remote queries") ; }
@@ -142,6 +144,7 @@ public class QueryEngineHTTP implements
this.password = password ;
}
+ @Override
public ResultSet execSelect()
{
HttpQuery httpQuery = makeHttpQuery() ;
@@ -162,12 +165,16 @@ public class QueryEngineHTTP implements
return rs ;
}
+ @Override
public Model execConstruct() { return execConstruct(GraphFactory.makeJenaDefaultModel()) ; }
+ @Override
public Model execConstruct(Model model) { return execModel(model) ; }
+ @Override
public Model execDescribe() { return execDescribe(GraphFactory.makeJenaDefaultModel()) ; }
+ @Override
public Model execDescribe(Model model) { return execModel(model) ; }
private Model execModel(Model model)
@@ -179,6 +186,7 @@ public class QueryEngineHTTP implements
return model ;
}
+ @Override
public boolean execAsk()
{
HttpQuery httpQuery = makeHttpQuery() ;
@@ -191,24 +199,29 @@ public class QueryEngineHTTP implements
return result;
}
+ @Override
public Context getContext() { return context ; }
+ @Override
public void setTimeout(long timeout)
{
throw new NotImplemented("Not implemented yet - please send a patch to the Apache Jena project : https://issues.apache.org/jira/browse/JENA-56") ;
}
+ @Override
public void setTimeout(long timeout1, long timeout2)
{
throw new NotImplemented("Not implemented yet - please send a patch to the Apache Jena project : https://issues.apache.org/jira/browse/JENA-56") ;
}
+ @Override
public void setTimeout(long timeout, TimeUnit timeoutUnits)
{
throw new NotImplemented("Not implemented yet - please send a patch to the Apache Jena project : https://issues.apache.org/jira/browse/JENA-56") ;
}
+ @Override
public void setTimeout(long timeout1, TimeUnit timeUnit1, long timeout2, TimeUnit timeUnit2)
{
throw new NotImplemented("Not implemented yet - please send a patch to the Apache Jena project : https://issues.apache.org/jira/browse/JENA-56") ;
@@ -245,8 +258,10 @@ public class QueryEngineHTTP implements
public void cancel() { finished = true ; }
+ @Override
public void abort() { try { close() ; } catch (Exception ex) {} }
+ @Override
public void close() {
finished = false ;
if (retainedConnection != null) {
@@ -265,6 +280,7 @@ public class QueryEngineHTTP implements
return "GET "+httpQuery.toString() ;
}
+ @Override
public Dataset getDataset()
{
return null ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/iterator/QueryIter.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/iterator/QueryIter.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/iterator/QueryIter.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/iterator/QueryIter.java Wed Oct 19 12:15:05 2011
@@ -65,6 +65,7 @@ public abstract class QueryIter extends
public int getIteratorNumber() { return iteratorNumber ; }
+ @Override
public void output(IndentedWriter out, SerializationContext sCxt)
{ out.println(getIteratorNumber()+"/"+debug()) ; }
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/iterator/QueryIterCommonParent.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/iterator/QueryIterCommonParent.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/iterator/QueryIterCommonParent.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/iterator/QueryIterCommonParent.java Wed Oct 19 12:15:05 2011
@@ -48,6 +48,7 @@ public class QueryIterCommonParent exten
ConverterExtend(Binding parent) { parentBinding = parent ; }
+ @Override
public Binding convert(Binding b)
{
if ( parentBinding == null || parentBinding.isEmpty() )
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/iterator/QueryIterDistinguishedVars.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/iterator/QueryIterDistinguishedVars.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/iterator/QueryIterDistinguishedVars.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/iterator/QueryIterDistinguishedVars.java Wed Oct 19 12:15:05 2011
@@ -38,6 +38,7 @@ public class QueryIterDistinguishedVars
static class ProjectWrap implements Converter
{
+ @Override
public Binding convert(Binding binding)
{
return new BindingProjectNamed(binding) ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/iterator/QueryIterProject.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/iterator/QueryIterProject.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/iterator/QueryIterProject.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/iterator/QueryIterProject.java Wed Oct 19 12:15:05 2011
@@ -67,6 +67,7 @@ public class QueryIterProject extends Qu
this.projectionVars = vars ;
}
+ @Override
public Binding convert(Binding bind)
{
return new BindingProject(projectionVars, bind) ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/iterator/QueryIterProject2.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/iterator/QueryIterProject2.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/iterator/QueryIterProject2.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/iterator/QueryIterProject2.java Wed Oct 19 12:15:05 2011
@@ -75,6 +75,7 @@ public class QueryIterProject2 extends Q
this.projectionVars = vars ;
}
+ @Override
public Binding convert(Binding bind)
{
Binding b = new BindingProject(projectionVars, bind, outerBinding) ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/iterator/QueryIterSort.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/iterator/QueryIterSort.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/iterator/QueryIterSort.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/iterator/QueryIterSort.java Wed Oct 19 12:15:05 2011
@@ -104,7 +104,7 @@ public class QueryIterSort extends Query
return db.iterator();
}
- //@Override
+ @Override
public void close()
{
db.close();
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/iterator/QueryIteratorBase.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/iterator/QueryIteratorBase.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/iterator/QueryIteratorBase.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/iterator/QueryIteratorBase.java Wed Oct 19 12:15:05 2011
@@ -89,6 +89,7 @@ public abstract class QueryIteratorBase
protected boolean isFinished() { return finished ; }
/** final - subclasses implement hasNextBinding() */
+ @Override
public final boolean hasNext()
{
if ( finished )
@@ -119,12 +120,14 @@ public abstract class QueryIteratorBase
}
/** final - autoclose and registration relies on it - implement moveToNextBinding() */
+ @Override
public final Binding next()
{
return nextBinding() ;
}
/** final - subclasses implement moveToNextBinding() */
+ @Override
public final Binding nextBinding()
{
try {
@@ -166,12 +169,14 @@ public abstract class QueryIteratorBase
}
}
+ @Override
public final void remove()
{
Log.warn(this, "Call to QueryIterator.remove() : "+Utils.className(this)+".remove") ;
throw new UnsupportedOperationException(Utils.className(this)+".remove") ;
}
+ @Override
public void close()
{
if ( finished )
@@ -182,6 +187,7 @@ public abstract class QueryIteratorBase
finished = true ;
}
+ @Override
@Deprecated
public void abort()
{
@@ -194,6 +200,7 @@ public abstract class QueryIteratorBase
}
/** Cancel this iterator */
+ @Override
public final void cancel()
{
// Call requestCancel() once.
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/iterator/QueryIteratorCopy.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/iterator/QueryIteratorCopy.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/iterator/QueryIteratorCopy.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/iterator/QueryIteratorCopy.java Wed Oct 19 12:15:05 2011
@@ -55,6 +55,7 @@ class QueryIteratorCopy extends QueryIte
return iterator.nextBinding() ;
}
+ @Override
public void output(IndentedWriter out, SerializationContext sCxt)
{
out.print("QueryIteratorCopy") ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/iterator/QueryIteratorResultSet.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/iterator/QueryIteratorResultSet.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/iterator/QueryIteratorResultSet.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/iterator/QueryIteratorResultSet.java Wed Oct 19 12:15:05 2011
@@ -39,6 +39,7 @@ public class QueryIteratorResultSet exte
@Override
protected Binding moveToNextBinding() { return resultSet.nextBinding() ; }
+ @Override
public void output(IndentedWriter out, SerializationContext cxt)
{
out.print(Utils.className(this)) ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/iterator/QueryIteratorWrapper.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/iterator/QueryIteratorWrapper.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/iterator/QueryIteratorWrapper.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/iterator/QueryIteratorWrapper.java Wed Oct 19 12:15:05 2011
@@ -61,6 +61,7 @@ public class QueryIteratorWrapper extend
}
}
+ @Override
public void output(IndentedWriter out, SerializationContext sCxt)
{
out.println(Utils.className(this)+"/"+Utils.className(iterator)) ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/main/ExecutionDispatch.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/main/ExecutionDispatch.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/main/ExecutionDispatch.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/main/ExecutionDispatch.java Wed Oct 19 12:15:05 2011
@@ -50,6 +50,7 @@ class ExecutionDispatch implements OpVis
return qIter ;
}
+ @Override
public void visit(OpBGP opBGP)
{
QueryIterator input = pop() ;
@@ -57,6 +58,7 @@ class ExecutionDispatch implements OpVis
push(qIter) ;
}
+ @Override
public void visit(OpQuadPattern quadPattern)
{
QueryIterator input = pop() ;
@@ -64,6 +66,7 @@ class ExecutionDispatch implements OpVis
push(qIter) ;
}
+ @Override
public void visit(OpTriple opTriple)
{
QueryIterator input = pop() ;
@@ -71,6 +74,7 @@ class ExecutionDispatch implements OpVis
push(qIter) ;
}
+ @Override
public void visit(OpPath opPath)
{
QueryIterator input = pop() ;
@@ -78,6 +82,7 @@ class ExecutionDispatch implements OpVis
push(qIter) ;
}
+ @Override
public void visit(OpProcedure opProc)
{
QueryIterator input = pop() ;
@@ -85,6 +90,7 @@ class ExecutionDispatch implements OpVis
push(qIter) ;
}
+ @Override
public void visit(OpPropFunc opPropFunc)
{
QueryIterator input = pop() ;
@@ -92,6 +98,7 @@ class ExecutionDispatch implements OpVis
push(qIter) ;
}
+ @Override
public void visit(OpJoin opJoin)
{
QueryIterator input = pop() ;
@@ -99,6 +106,7 @@ class ExecutionDispatch implements OpVis
push(qIter) ;
}
+ @Override
public void visit(OpSequence opSequence)
{
QueryIterator input = pop() ;
@@ -106,6 +114,7 @@ class ExecutionDispatch implements OpVis
push(qIter) ;
}
+ @Override
public void visit(OpDisjunction opDisjunction)
{
QueryIterator input = pop() ;
@@ -114,6 +123,7 @@ class ExecutionDispatch implements OpVis
}
+ @Override
public void visit(OpLeftJoin opLeftJoin)
{
QueryIterator input = pop() ;
@@ -121,6 +131,7 @@ class ExecutionDispatch implements OpVis
push(qIter) ;
}
+ @Override
public void visit(OpDiff opDiff)
{
QueryIterator input = pop() ;
@@ -128,6 +139,7 @@ class ExecutionDispatch implements OpVis
push(qIter) ;
}
+ @Override
public void visit(OpMinus opMinus)
{
QueryIterator input = pop() ;
@@ -135,6 +147,7 @@ class ExecutionDispatch implements OpVis
push(qIter) ;
}
+ @Override
public void visit(OpUnion opUnion)
{
QueryIterator input = pop() ;
@@ -142,6 +155,7 @@ class ExecutionDispatch implements OpVis
push(qIter) ;
}
+ @Override
public void visit(OpConditional opCondition)
{
QueryIterator input = pop() ;
@@ -149,6 +163,7 @@ class ExecutionDispatch implements OpVis
push(qIter) ;
}
+ @Override
public void visit(OpFilter opFilter)
{
QueryIterator input = pop() ;
@@ -156,6 +171,7 @@ class ExecutionDispatch implements OpVis
push(qIter) ;
}
+ @Override
public void visit(OpGraph opGraph)
{
QueryIterator input = pop() ;
@@ -163,6 +179,7 @@ class ExecutionDispatch implements OpVis
push(qIter) ;
}
+ @Override
public void visit(OpService opService)
{
QueryIterator input = pop() ;
@@ -170,6 +187,7 @@ class ExecutionDispatch implements OpVis
push(qIter) ;
}
+ @Override
public void visit(OpDatasetNames dsNames)
{
QueryIterator input = pop() ;
@@ -177,6 +195,7 @@ class ExecutionDispatch implements OpVis
push(qIter) ;
}
+ @Override
public void visit(OpTable opTable)
{
QueryIterator input = pop() ;
@@ -184,6 +203,7 @@ class ExecutionDispatch implements OpVis
push(qIter) ;
}
+ @Override
public void visit(OpExt opExt)
{
QueryIterator input = pop() ;
@@ -191,6 +211,7 @@ class ExecutionDispatch implements OpVis
push(qIter) ;
}
+ @Override
public void visit(OpNull opNull)
{
QueryIterator input = pop() ;
@@ -198,6 +219,7 @@ class ExecutionDispatch implements OpVis
push(qIter) ;
}
+ @Override
public void visit(OpLabel opLabel)
{
QueryIterator input = pop() ;
@@ -205,6 +227,7 @@ class ExecutionDispatch implements OpVis
push(qIter) ;
}
+ @Override
public void visit(OpList opList)
{
QueryIterator input = pop() ;
@@ -212,6 +235,7 @@ class ExecutionDispatch implements OpVis
push(qIter) ;
}
+ @Override
public void visit(OpOrder opOrder)
{
QueryIterator input = pop() ;
@@ -219,6 +243,7 @@ class ExecutionDispatch implements OpVis
push(qIter) ;
}
+ @Override
public void visit(OpProject opProject)
{
QueryIterator input = pop() ;
@@ -226,6 +251,7 @@ class ExecutionDispatch implements OpVis
push(qIter) ;
}
+ @Override
public void visit(OpDistinct opDistinct)
{
QueryIterator input = pop() ;
@@ -233,6 +259,7 @@ class ExecutionDispatch implements OpVis
push(qIter) ;
}
+ @Override
public void visit(OpReduced opReduced)
{
QueryIterator input = pop() ;
@@ -240,6 +267,7 @@ class ExecutionDispatch implements OpVis
push(qIter) ;
}
+ @Override
public void visit(OpAssign opAssign)
{
QueryIterator input = pop() ;
@@ -247,6 +275,7 @@ class ExecutionDispatch implements OpVis
push(qIter) ;
}
+ @Override
public void visit(OpExtend opExtend)
{
QueryIterator input = pop() ;
@@ -254,6 +283,7 @@ class ExecutionDispatch implements OpVis
push(qIter) ;
}
+ @Override
public void visit(OpSlice opSlice)
{
QueryIterator input = pop() ;
@@ -261,6 +291,7 @@ class ExecutionDispatch implements OpVis
push(qIter) ;
}
+ @Override
public void visit(OpGroup opGroup)
{
QueryIterator input = pop() ;
@@ -268,6 +299,7 @@ class ExecutionDispatch implements OpVis
push(qIter) ;
}
+ @Override
public void visit(OpTopN opTop)
{
QueryIterator input = pop() ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/main/OpExecutor.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/main/OpExecutor.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/main/OpExecutor.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/main/OpExecutor.java Wed Oct 19 12:15:05 2011
@@ -61,6 +61,7 @@ public class OpExecutor
{
// Set this to a different factory implementation to have a different OpExecutor.
protected static final OpExecutorFactory stdFactory = new OpExecutorFactory(){
+ @Override
public OpExecutor create(ExecutionContext execCxt)
{
return new OpExecutor(execCxt) ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/main/QueryEngineMain.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/main/QueryEngineMain.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/main/QueryEngineMain.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/main/QueryEngineMain.java Wed Oct 19 12:15:05 2011
@@ -102,18 +102,22 @@ public class QueryEngineMain extends Que
private static QueryEngineFactory factory = new QueryEngineFactory()
{
+ @Override
public boolean accept(Query query, DatasetGraph dataset, Context context)
{ return true ; }
+ @Override
public Plan create(Query query, DatasetGraph dataset, Binding input, Context context)
{
QueryEngineMain engine = new QueryEngineMain(query, dataset, input, context) ;
return engine.getPlan() ;
}
+ @Override
public boolean accept(Op op, DatasetGraph dataset, Context context)
{ return true ; }
+ @Override
public Plan create(Op op, DatasetGraph dataset, Binding binding, Context context)
{
QueryEngineMain engine = new QueryEngineMain(op, dataset, binding, context) ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/main/QueryEngineMainQuad.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/main/QueryEngineMainQuad.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/main/QueryEngineMainQuad.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/main/QueryEngineMainQuad.java Wed Oct 19 12:15:05 2011
@@ -53,18 +53,22 @@ public class QueryEngineMainQuad extends
private static QueryEngineFactory factory = new QueryEngineFactory()
{
+ @Override
public boolean accept(Query query, DatasetGraph dataset, Context context)
{ return true ; }
+ @Override
public Plan create(Query query, DatasetGraph dataset, Binding input, Context context)
{
QueryEngineMainQuad engine = new QueryEngineMainQuad(query, dataset, input, context) ;
return engine.getPlan() ;
}
+ @Override
public boolean accept(Op op, DatasetGraph dataset, Context context)
{ return true ; }
+ @Override
public Plan create(Op op, DatasetGraph dataset, Binding binding, Context context)
{
QueryEngineMainQuad engine = new QueryEngineMainQuad(op, dataset, binding, context) ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/main/StageGeneratorGeneric.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/main/StageGeneratorGeneric.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/main/StageGeneratorGeneric.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/main/StageGeneratorGeneric.java Wed Oct 19 12:15:05 2011
@@ -49,6 +49,7 @@ public class StageGeneratorGeneric imple
public StageGeneratorGeneric() {}
+ @Override
public QueryIterator execute(BasicPattern pattern,
QueryIterator input,
ExecutionContext execCxt)
@@ -109,14 +110,14 @@ public class StageGeneratorGeneric imple
// ---- Execution policies
private static StageGenerator executeQueryHandler = new StageGenerator() {
- //@Override
+ @Override
public QueryIterator execute(BasicPattern pattern, QueryIterator input, ExecutionContext execCxt)
{
return QueryIterBlockTriplesQH.create(input, pattern, execCxt) ;
}} ;
private static StageGenerator executeInline = new StageGenerator() {
- //@Override
+ @Override
public QueryIterator execute(BasicPattern pattern, QueryIterator input, ExecutionContext execCxt)
{
return QueryIterBlockTriples.create(input, pattern, execCxt) ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/optimizer/Pattern.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/optimizer/Pattern.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/optimizer/Pattern.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/optimizer/Pattern.java Wed Oct 19 12:15:05 2011
@@ -46,6 +46,7 @@ public class Pattern implements Printabl
return PrintUtils.toString(this) ;
}
+ @Override
public void output(IndentedWriter out)
{
out.print("(") ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/optimizer/reorder/ReorderLib.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/optimizer/reorder/ReorderLib.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/optimizer/reorder/ReorderLib.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/optimizer/reorder/ReorderLib.java Wed Oct 19 12:15:05 2011
@@ -25,7 +25,7 @@ public class ReorderLib
{
private static class ReorderProcIdentity implements ReorderProc
{
- //@Override
+ @Override
public BasicPattern reorder(BasicPattern pattern)
{
return pattern ;
@@ -40,13 +40,13 @@ public class ReorderLib
private static class ReorderTransformationIdentity implements ReorderTransformation
{
- //@Override
+ @Override
public BasicPattern reorder(BasicPattern pattern)
{
return pattern ;
}
- //@Override
+ @Override
public ReorderProc reorderIndexes(BasicPattern pattern)
{
return _identityProc ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/optimizer/reorder/ReorderProcIndexes.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/optimizer/reorder/ReorderProcIndexes.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/optimizer/reorder/ReorderProcIndexes.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/optimizer/reorder/ReorderProcIndexes.java Wed Oct 19 12:15:05 2011
@@ -35,7 +35,7 @@ public class ReorderProcIndexes implemen
/** Return a new basic pattern with the same triples as the input,
* but ordered as per the index list of this reorder processor.
*/
- //@Override
+ @Override
public BasicPattern reorder(BasicPattern bgp)
{
if ( indexes.length != bgp.size() )
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/optimizer/reorder/ReorderTransformationBase.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/optimizer/reorder/ReorderTransformationBase.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/optimizer/reorder/ReorderTransformationBase.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/optimizer/reorder/ReorderTransformationBase.java Wed Oct 19 12:15:05 2011
@@ -43,13 +43,13 @@ public abstract class ReorderTransformat
protected static final boolean DEBUG = false ;
static public final Logger log = LoggerFactory.getLogger(ReorderTransformationBase.class) ;
- //@Override // Java5-ism
+ @Override // Java5-ism
public BasicPattern reorder(BasicPattern pattern)
{
return reorderIndexes(pattern).reorder(pattern) ;
}
- //@Override
+ @Override
public final ReorderProc reorderIndexes(BasicPattern pattern)
{
if (pattern.size() <= 1 )
@@ -298,7 +298,7 @@ public abstract class ReorderTransformat
// Triples to TriplePatterns.
private static Transform<Triple, PatternTriple> convert = new Transform<Triple, PatternTriple>(){
- //@Override
+ @Override
public PatternTriple convert(Triple triple)
{
return new PatternTriple(triple) ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/ref/EvaluatorDispatch.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/ref/EvaluatorDispatch.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/ref/EvaluatorDispatch.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/ref/EvaluatorDispatch.java Wed Oct 19 12:15:05 2011
@@ -61,28 +61,33 @@ public class EvaluatorDispatch implement
return table ;
}
+ @Override
public void visit(OpBGP opBGP)
{
Table table = evaluator.basicPattern(opBGP.getPattern()) ;
push(table) ;
}
+ @Override
public void visit(OpQuadPattern quadPattern)
{
push(Eval.evalQuadPattern(quadPattern, evaluator)) ;
}
+ @Override
public void visit(OpTriple opTriple)
{
visit(opTriple.asBGP()) ;
}
+ @Override
public void visit(OpPath opPath)
{
Table table = evaluator.pathPattern(opPath.getTriplePath()) ;
push(table) ;
}
+ @Override
public void visit(OpProcedure opProc)
{
Table table = eval(opProc.getSubOp()) ;
@@ -90,6 +95,7 @@ public class EvaluatorDispatch implement
push(table) ;
}
+ @Override
public void visit(OpPropFunc opPropFunc)
{
Table table = eval(opPropFunc.getSubOp()) ;
@@ -97,6 +103,7 @@ public class EvaluatorDispatch implement
push(table) ;
}
+ @Override
public void visit(OpJoin opJoin)
{
Table left = eval(opJoin.getLeft()) ;
@@ -105,6 +112,7 @@ public class EvaluatorDispatch implement
push(table) ;
}
+ @Override
public void visit(OpSequence opSequence)
{
// Evaluation is as a sequence of joins.
@@ -119,6 +127,7 @@ public class EvaluatorDispatch implement
push(table) ;
}
+ @Override
public void visit(OpDisjunction opDisjunction)
{
// Evaluation is as a concatentation of alternatives
@@ -133,6 +142,7 @@ public class EvaluatorDispatch implement
push(table) ;
}
+ @Override
public void visit(OpLeftJoin opLeftJoin)
{
Table left = eval(opLeftJoin.getLeft()) ;
@@ -141,6 +151,7 @@ public class EvaluatorDispatch implement
push(table) ;
}
+ @Override
public void visit(OpDiff opDiff)
{
Table left = eval(opDiff.getLeft()) ;
@@ -149,6 +160,7 @@ public class EvaluatorDispatch implement
push(table) ;
}
+ @Override
public void visit(OpMinus opMinus)
{
Table left = eval(opMinus.getLeft()) ;
@@ -157,6 +169,7 @@ public class EvaluatorDispatch implement
push(table) ;
}
+ @Override
public void visit(OpUnion opUnion)
{
Table left = eval(opUnion.getLeft()) ;
@@ -165,6 +178,7 @@ public class EvaluatorDispatch implement
push(table) ;
}
+ @Override
public void visit(OpConditional opCond)
{
Table left = eval(opCond.getLeft()) ;
@@ -174,6 +188,7 @@ public class EvaluatorDispatch implement
push(table) ;
}
+ @Override
public void visit(OpFilter opFilter)
{
Table table = eval(opFilter.getSubOp()) ;
@@ -181,11 +196,13 @@ public class EvaluatorDispatch implement
push(table) ;
}
+ @Override
public void visit(OpGraph opGraph)
{
push(Eval.evalGraph(opGraph, evaluator)) ;
}
+ @Override
public void visit(OpService opService)
{
QueryIterator qIter = Service.exec(opService, ARQ.getContext()) ;
@@ -193,24 +210,29 @@ public class EvaluatorDispatch implement
push(table) ;
}
+ @Override
public void visit(OpDatasetNames dsNames)
{
push(Eval.evalDS(dsNames, evaluator)) ;
}
+ @Override
public void visit(OpTable opTable)
{
push(opTable.getTable()) ;
}
+ @Override
public void visit(OpExt opExt)
{ throw new QueryExecException("Encountered OpExt during execution of reference engine") ; }
+ @Override
public void visit(OpNull opNull)
{
push(TableFactory.createEmpty()) ;
}
+ @Override
public void visit(OpLabel opLabel)
{
if ( opLabel.hasSubOp() )
@@ -220,6 +242,7 @@ public class EvaluatorDispatch implement
push(TableFactory.createUnit()) ;
}
+ @Override
public void visit(OpList opList)
{
Table table = eval(opList.getSubOp()) ;
@@ -227,6 +250,7 @@ public class EvaluatorDispatch implement
push(table) ;
}
+ @Override
public void visit(OpOrder opOrder)
{
Table table = eval(opOrder.getSubOp()) ;
@@ -234,6 +258,7 @@ public class EvaluatorDispatch implement
push(table) ;
}
+ @Override
public void visit(OpTopN opTop)
{
Table table = eval(opTop.getSubOp()) ;
@@ -243,6 +268,7 @@ public class EvaluatorDispatch implement
push(table) ;
}
+ @Override
public void visit(OpProject opProject)
{
Table table = eval(opProject.getSubOp()) ;
@@ -250,6 +276,7 @@ public class EvaluatorDispatch implement
push(table) ;
}
+ @Override
public void visit(OpDistinct opDistinct)
{
Table table = eval(opDistinct.getSubOp()) ;
@@ -257,6 +284,7 @@ public class EvaluatorDispatch implement
push(table) ;
}
+ @Override
public void visit(OpReduced opReduced)
{
Table table = eval(opReduced.getSubOp()) ;
@@ -264,6 +292,7 @@ public class EvaluatorDispatch implement
push(table) ;
}
+ @Override
public void visit(OpSlice opSlice)
{
Table table = eval(opSlice.getSubOp()) ;
@@ -271,6 +300,7 @@ public class EvaluatorDispatch implement
push(table) ;
}
+ @Override
public void visit(OpAssign opAssign)
{
Table table = eval(opAssign.getSubOp()) ;
@@ -278,6 +308,7 @@ public class EvaluatorDispatch implement
push(table) ;
}
+ @Override
public void visit(OpExtend opExtend)
{
Table table = eval(opExtend.getSubOp()) ;
@@ -285,6 +316,7 @@ public class EvaluatorDispatch implement
push(table) ;
}
+ @Override
public void visit(OpGroup opGroup)
{
Table table = eval(opGroup.getSubOp()) ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/ref/EvaluatorSimple.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/ref/EvaluatorSimple.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/ref/EvaluatorSimple.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/ref/EvaluatorSimple.java Wed Oct 19 12:15:05 2011
@@ -58,15 +58,18 @@ public class EvaluatorSimple implements
this.execCxt = context ;
}
+ @Override
public ExecutionContext getExecContext()
{ return execCxt ; }
+ @Override
public Table basicPattern(BasicPattern pattern)
{
QueryIterator qIter = QC.executeDirect(pattern, QueryIterRoot.create(execCxt), execCxt) ;
return TableFactory.create(qIter) ;
}
+ @Override
public Table pathPattern(TriplePath triplePath)
{
// Shudder - this may well be expensive, but this is the simple evaluator, written for correctness.
@@ -76,6 +79,7 @@ public class EvaluatorSimple implements
return TableFactory.create(qIter) ;
}
+ @Override
public Table procedure(Table table, Node procId, ExprList args)
{
Procedure proc = ProcEval.build(procId, args, execCxt) ;
@@ -83,6 +87,7 @@ public class EvaluatorSimple implements
return TableFactory.create(qIter) ;
}
+ @Override
public Table propertyFunction(Table table, Node procId, PropFuncArg subjArgs, PropFuncArg objArgs)
{
Procedure proc = ProcEval.build(procId, subjArgs, objArgs, execCxt) ;
@@ -90,6 +95,7 @@ public class EvaluatorSimple implements
return TableFactory.create(qIter) ;
}
+ @Override
public Table join(Table tableLeft, Table tableRight)
{
if ( debug )
@@ -101,6 +107,7 @@ public class EvaluatorSimple implements
return joinWorker(tableLeft, tableRight, false, null) ;
}
+ @Override
public Table leftJoin(Table tableLeft, Table tableRight, ExprList exprs)
{
if ( debug )
@@ -115,6 +122,7 @@ public class EvaluatorSimple implements
return joinWorker(tableLeft, tableRight, true, exprs) ;
}
+ @Override
public Table diff(Table tableLeft, Table tableRight)
{
if ( debug )
@@ -126,6 +134,7 @@ public class EvaluatorSimple implements
return diffWorker(tableLeft, tableRight) ;
}
+ @Override
public Table minus(Table tableLeft, Table tableRight)
{
if ( debug )
@@ -138,6 +147,7 @@ public class EvaluatorSimple implements
return minusWorker(tableLeft, tableRight) ;
}
+ @Override
public Table filter(ExprList expressions, Table table)
{
if ( debug )
@@ -159,6 +169,7 @@ public class EvaluatorSimple implements
+ @Override
public Table union(Table tableLeft, Table tableRight)
{
if ( debug )
@@ -173,6 +184,7 @@ public class EvaluatorSimple implements
return new TableN(output) ;
}
+ @Override
public Table condition(Table left, Table right)
{
if ( left.isEmpty() )
@@ -184,8 +196,10 @@ public class EvaluatorSimple implements
return left ;
}
+ @Override
public Table list(Table table) { return table ; }
+ @Override
public Table order(Table table, List<SortCondition> conditions)
{
QueryIterator qIter = table.iterator(getExecContext()) ;
@@ -193,6 +207,7 @@ public class EvaluatorSimple implements
return new TableN(qIter) ;
}
+ @Override
public Table groupBy(Table table, VarExprList groupVars, List<ExprAggregator> aggregators)
{
QueryIterator qIter = table.iterator(getExecContext()) ;
@@ -200,6 +215,7 @@ public class EvaluatorSimple implements
return new TableN(qIter) ;
}
+ @Override
public Table project(Table table, List<Var> projectVars)
{
QueryIterator qIter = table.iterator(getExecContext()) ;
@@ -207,6 +223,7 @@ public class EvaluatorSimple implements
return new TableN(qIter) ;
}
+ @Override
public Table reduced(Table table)
{
QueryIterator qIter = table.iterator(getExecContext()) ;
@@ -214,6 +231,7 @@ public class EvaluatorSimple implements
return new TableN(qIter) ;
}
+ @Override
public Table distinct(Table table)
{
QueryIterator qIter = table.iterator(getExecContext()) ;
@@ -221,6 +239,7 @@ public class EvaluatorSimple implements
return new TableN(qIter) ;
}
+ @Override
public Table slice(Table table, long start, long length)
{
QueryIterator qIter = table.iterator(getExecContext()) ;
@@ -228,6 +247,7 @@ public class EvaluatorSimple implements
return new TableN(qIter) ;
}
+ @Override
public Table assign(Table table, VarExprList exprs)
{
QueryIterator qIter = table.iterator(getExecContext()) ;
@@ -235,6 +255,7 @@ public class EvaluatorSimple implements
return new TableN(qIter) ;
}
+ @Override
public Table extend(Table table, VarExprList exprs)
{
QueryIterator qIter = table.iterator(getExecContext()) ;
@@ -242,6 +263,7 @@ public class EvaluatorSimple implements
return new TableN(qIter) ;
}
+ @Override
public Table unit()
{
return TableFactory.createUnit() ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/ref/QueryEngineRef.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/ref/QueryEngineRef.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/ref/QueryEngineRef.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/ref/QueryEngineRef.java Wed Oct 19 12:15:05 2011
@@ -80,18 +80,22 @@ public class QueryEngineRef extends Quer
private static QueryEngineFactory factory = new QueryEngineFactory()
{
+ @Override
public boolean accept(Query query, DatasetGraph dataset, Context context)
{ return true ; }
+ @Override
public Plan create(Query query, DatasetGraph dataset, Binding binding, Context context)
{
QueryEngineRef engine = new QueryEngineRef(query, dataset, binding, context) ;
return engine.getPlan() ;
}
+ @Override
public boolean accept(Op op, DatasetGraph dataset, Context context)
{ return true ; }
+ @Override
public Plan create(Op op, DatasetGraph dataset, Binding binding, Context context)
{
QueryEngineRef engine = new QueryEngineRef(op, dataset, binding, context) ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/ref/QueryEngineRefQuad.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/ref/QueryEngineRefQuad.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/ref/QueryEngineRefQuad.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/ref/QueryEngineRefQuad.java Wed Oct 19 12:15:05 2011
@@ -56,18 +56,22 @@ public class QueryEngineRefQuad extends
private static QueryEngineFactory factory = new QueryEngineFactory()
{
+ @Override
public boolean accept(Query query, DatasetGraph dataset, Context context)
{ return true ; }
+ @Override
public Plan create(Query query, DatasetGraph dataset, Binding binding, Context context)
{
QueryEngineRefQuad engine = new QueryEngineRefQuad(query, dataset, binding, context) ;
return engine.getPlan() ;
}
+ @Override
public boolean accept(Op op, DatasetGraph dataset, Context context)
{ return true ; }
+ @Override
public Plan create(Op op, DatasetGraph dataset, Binding binding, Context context)
{
QueryEngineRefQuad engine = new QueryEngineRefQuad(op, dataset, binding, context) ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/ExprAggregator.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/ExprAggregator.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/ExprAggregator.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/ExprAggregator.java Wed Oct 19 12:15:05 2011
@@ -95,7 +95,6 @@ public class ExprAggregator extends Expr
public ExprVar getAggVar() { return exprVar ; }
// As an expression suitable for outputting the calculation.
- //@Override
public String asSparqlExpr()
{ return aggregator.toString() ; }
@@ -140,6 +139,7 @@ public class ExprAggregator extends Expr
public Expr apply(ExprTransform transform) { return transform.transform(this) ; }
+ @Override
public void visit(ExprVisitor visitor)
{ visitor.visit(this) ; }
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/ExprFunction0.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/ExprFunction0.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/ExprFunction0.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/ExprFunction0.java Wed Oct 19 12:15:05 2011
@@ -68,6 +68,7 @@ public abstract class ExprFunction0 exte
return copy() ;
}
+ @Override
public void visit(ExprVisitor visitor) { visitor.visit(this) ; }
public Expr apply(ExprTransform transform) { return transform.transform(this) ; }
}
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/ExprFunction1.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/ExprFunction1.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/ExprFunction1.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/ExprFunction1.java Wed Oct 19 12:15:05 2011
@@ -102,6 +102,7 @@ public abstract class ExprFunction1 exte
public abstract Expr copy(Expr expr) ;
+ @Override
public void visit(ExprVisitor visitor) { visitor.visit(this) ; }
public Expr apply(ExprTransform transform, Expr sub) { return transform.transform(this, sub) ; }
}
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/ExprFunction2.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/ExprFunction2.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/ExprFunction2.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/ExprFunction2.java Wed Oct 19 12:15:05 2011
@@ -116,6 +116,7 @@ public abstract class ExprFunction2 exte
public abstract Expr copy(Expr arg1, Expr arg2) ;
+ @Override
public void visit(ExprVisitor visitor) { visitor.visit(this) ; }
public Expr apply(ExprTransform transform, Expr arg1, Expr arg2) { return transform.transform(this, arg1, arg2) ; }
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/ExprFunction3.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/ExprFunction3.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/ExprFunction3.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/ExprFunction3.java Wed Oct 19 12:15:05 2011
@@ -125,6 +125,7 @@ public abstract class ExprFunction3 exte
public abstract Expr copy(Expr arg1, Expr arg2, Expr arg3) ;
+ @Override
public void visit(ExprVisitor visitor) { visitor.visit(this) ; }
public Expr apply(ExprTransform transform, Expr arg1, Expr arg2, Expr arg3) { return transform.transform(this, arg1, arg2, arg3) ; }
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/ExprFunctionN.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/ExprFunctionN.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/ExprFunctionN.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/ExprFunctionN.java Wed Oct 19 12:15:05 2011
@@ -118,6 +118,7 @@ public abstract class ExprFunctionN exte
protected abstract Expr copy(ExprList newArgs) ;
+ @Override
public void visit(ExprVisitor visitor) { visitor.visit(this) ; }
public Expr apply(ExprTransform transform, ExprList exprList) { return transform.transform(this, exprList) ; }
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/ExprFunctionOp.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/ExprFunctionOp.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/ExprFunctionOp.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/ExprFunctionOp.java Wed Oct 19 12:15:05 2011
@@ -92,6 +92,7 @@ public abstract class ExprFunctionOp ext
protected abstract NodeValue eval(Binding binding, QueryIterator iter, FunctionEnv env) ;
public abstract ExprFunctionOp copy(ExprList args, Op x) ;
+ @Override
public void visit(ExprVisitor visitor) { visitor.visit(this) ; }
public Expr apply(ExprTransform transform, ExprList args, Op x) { return transform.transform(this, args, x) ; }
}
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/ExprList.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/ExprList.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/ExprList.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/ExprList.java Wed Oct 19 12:15:05 2011
@@ -88,6 +88,7 @@ public class ExprList implements Iterabl
public void addAll(ExprList exprs) { expressions.addAll(exprs.getList()) ; }
public void add(Expr expr) { expressions.add(expr) ; }
public List<Expr> getList() { return expressions ; }
+ @Override
public Iterator<Expr> iterator() { return expressions.iterator() ; }
public void prepareExprs(Context context)