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/11/20 18:23:33 UTC
svn commit: r1204195 - in /incubator/jena/Jena2/ARQ/trunk/src:
main/java/com/hp/hpl/jena/sparql/algebra/
main/java/com/hp/hpl/jena/sparql/function/library/
test/java/com/hp/hpl/jena/sparql/api/
Author: andy
Date: Sun Nov 20 17:23:33 2011
New Revision: 1204195
URL: http://svn.apache.org/viewvc?rev=1204195&view=rev
Log: (empty)
Added:
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/function/library/wait.java
- copied, changed from r1202089, incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/api/wait.java
Removed:
incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/api/wait.java
Modified:
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/OpAsQuery.java
incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/api/TestQueryExecutionCancel.java
incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/api/TestQueryExecutionTimeout.java
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/OpAsQuery.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/OpAsQuery.java?rev=1204195&r1=1204194&r2=1204195&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/OpAsQuery.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/OpAsQuery.java Sun Nov 20 17:23:33 2011
@@ -390,11 +390,13 @@ public class OpAsQuery
*/
if (opAssign.getSubOp() instanceof OpGroup) {
Map<Var, Var> subs = new HashMap<Var, Var>();
- Expr exp;
- for (Var v: opAssign.getVarExprList().getVars()) {
- exp = opAssign.getVarExprList().getExpr(v);
- if (exp.isVariable()) subs.put(exp.asVar(), v);
- else throw new ARQNotImplemented("Expected simple assignment for group");
+ for (Var v: opAssign.getVarExprList().getVars())
+ {
+ Expr exp = opAssign.getVarExprList().getExpr(v);
+ if (exp.isVariable())
+ subs.put(exp.asVar(), v) ;
+ else
+ throw new ARQNotImplemented("Expected simple assignment for group (OpAssign): "+exp) ;
}
visit((OpGroup) opAssign.getSubOp(), subs);
return;
@@ -419,11 +421,13 @@ public class OpAsQuery
*/
if (opExtend.getSubOp() instanceof OpGroup) {
Map<Var, Var> subs = new HashMap<Var, Var>();
- Expr exp;
- for (Var v: opExtend.getVarExprList().getVars()) {
- exp = opExtend.getVarExprList().getExpr(v);
- if (exp.isVariable()) subs.put(exp.asVar(), v);
- else throw new ARQNotImplemented("Expected simple assignment for group");
+ for (Var v: opExtend.getVarExprList().getVars())
+ {
+ Expr exp = opExtend.getVarExprList().getExpr(v);
+ if (exp.isVariable())
+ subs.put(exp.asVar(), v) ;
+ else
+ throw new ARQNotImplemented("Expected simple assignment for group (OpExtend): "+exp) ;
}
visit((OpGroup) opExtend.getSubOp(), subs);
return;
@@ -432,7 +436,7 @@ public class OpAsQuery
opExtend.getSubOp().visit(this) ;
for ( Var v : opExtend.getVarExprList().getVars() )
{
- Element elt = new ElementAssign(v, opExtend.getVarExprList().getExpr(v)) ;
+ Element elt = new ElementBind(v, opExtend.getVarExprList().getExpr(v)) ;
ElementGroup g = currentGroup() ;
g.addElement(elt) ;
}
@@ -492,7 +496,7 @@ public class OpAsQuery
}
// Specialised to cope with the preceeding assigns
- public void visit(OpGroup opGroup, Map<Var, Var> subs) {
+ private void visit(OpGroup opGroup, Map<Var, Var> subs) {
List<ExprAggregator> a = opGroup.getAggregators();
for (ExprAggregator ea : a) {
Copied: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/function/library/wait.java (from r1202089, incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/api/wait.java)
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/function/library/wait.java?p2=incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/function/library/wait.java&p1=incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/api/wait.java&r1=1202089&r2=1204195&rev=1204195&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/api/wait.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/function/library/wait.java Sun Nov 20 17:23:33 2011
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.sparql.api;
+package com.hp.hpl.jena.sparql.function.library;
import org.openjena.atlas.lib.Lib ;
@@ -24,6 +24,7 @@ import com.hp.hpl.jena.sparql.expr.ExprE
import com.hp.hpl.jena.sparql.expr.NodeValue ;
import com.hp.hpl.jena.sparql.function.FunctionBase1 ;
+/** Function that pauses for N milliseconds whenever it is called (for testing) */
public class wait extends FunctionBase1 {
@Override
Modified: incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/api/TestQueryExecutionCancel.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/api/TestQueryExecutionCancel.java?rev=1204195&r1=1204194&r2=1204195&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/api/TestQueryExecutionCancel.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/api/TestQueryExecutionCancel.java Sun Nov 20 17:23:33 2011
@@ -33,6 +33,7 @@ import com.hp.hpl.jena.rdf.model.Model ;
import com.hp.hpl.jena.rdf.model.Property ;
import com.hp.hpl.jena.rdf.model.Resource ;
import com.hp.hpl.jena.sparql.function.FunctionRegistry ;
+import com.hp.hpl.jena.sparql.function.library.wait ;
import com.hp.hpl.jena.sparql.graph.GraphFactory ;
public class TestQueryExecutionCancel extends BaseTest {
Modified: incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/api/TestQueryExecutionTimeout.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/api/TestQueryExecutionTimeout.java?rev=1204195&r1=1204194&r2=1204195&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/api/TestQueryExecutionTimeout.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/api/TestQueryExecutionTimeout.java Sun Nov 20 17:23:33 2011
@@ -39,6 +39,7 @@ import com.hp.hpl.jena.query.ResultSetFo
import com.hp.hpl.jena.sparql.core.DatasetGraph ;
import com.hp.hpl.jena.sparql.core.DatasetGraphFactory ;
import com.hp.hpl.jena.sparql.function.FunctionRegistry ;
+import com.hp.hpl.jena.sparql.function.library.wait ;
import com.hp.hpl.jena.sparql.sse.SSE ;
public class TestQueryExecutionTimeout extends BaseTest