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 2012/10/28 18:20:02 UTC
svn commit: r1403046 - in /jena/trunk/jena-arq/src/main/java:
com/hp/hpl/jena/sparql/algebra/ com/hp/hpl/jena/sparql/algebra/optimize/
com/hp/hpl/jena/sparql/expr/ org/openjena/riot/lang/
Author: andy
Date: Sun Oct 28 17:20:01 2012
New Revision: 1403046
URL: http://svn.apache.org/viewvc?rev=1403046&view=rev
Log:
Tidying up and notes.
Removed:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/AlgebraGenerator_LC3.java
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/AlgebraQuad.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/OpVisitorByType.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/ExprTransformApplyTransform.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/ExprTransformer.java
jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangTurtleBase.java
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/AlgebraQuad.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/AlgebraQuad.java?rev=1403046&r1=1403045&r2=1403046&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/AlgebraQuad.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/AlgebraQuad.java Sun Oct 28 17:20:01 2012
@@ -28,7 +28,7 @@ import com.hp.hpl.jena.sparql.algebra.op
import com.hp.hpl.jena.sparql.core.Quad ;
import com.hp.hpl.jena.sparql.core.Var ;
import com.hp.hpl.jena.sparql.core.VarAlloc ;
-import com.hp.hpl.jena.sparql.expr.ExprVar ;
+import com.hp.hpl.jena.sparql.expr.* ;
/** Convert an algebra expression into a quad form */
public class AlgebraQuad extends TransformCopy
@@ -72,6 +72,7 @@ public class AlgebraQuad extends Transfo
this.actualGraphName = actualGraphName ;
this.rewriteGraphName = rewriteGraphName ;
}
+ @Override public String toString() { return "actualGraphName="+actualGraphName+" rewriteGraphName="+rewriteGraphName ; }
}
private static class Pusher extends OpVisitorBase
@@ -194,5 +195,15 @@ public class AlgebraQuad extends Transfo
{
return new OpQuadPattern(getNode(), opBGP.getPattern()) ;
}
+
+// static class X extends ExprTransformBase
+// {
+// @Override public Expr transform(ExprFunctionOp funcOp, ExprList args, Op opArg)
+// {
+// System.out.println("****") ;
+//
+// return funcOp ; }
+// }
+
}
}
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/OpVisitorByType.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/OpVisitorByType.java?rev=1403046&r1=1403045&r2=1403046&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/OpVisitorByType.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/OpVisitorByType.java Sun Oct 28 17:20:01 2012
@@ -29,6 +29,9 @@ public abstract class OpVisitorByType im
protected abstract void visit1(Op1 op) ;
+ // This may be needed - Filters can have a EXISTS/NOT EXISTS expression in them.
+ //protected abstract void visitF(OpFilter op) ;
+
protected abstract void visit0(Op0 op) ;
protected abstract void visitExt(OpExt op) ;
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/ExprTransformApplyTransform.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/ExprTransformApplyTransform.java?rev=1403046&r1=1403045&r2=1403046&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/ExprTransformApplyTransform.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/ExprTransformApplyTransform.java Sun Oct 28 17:20:01 2012
@@ -32,6 +32,7 @@ import com.hp.hpl.jena.sparql.expr.ExprT
/** A copying transform that applies a Transform to the algebra operator of E_Exist and E_NoExists */
public class ExprTransformApplyTransform extends ExprTransformCopy
{
+ // See also ExprTransformer.transform(ExprFunctionOp func, ..) and ExprTransformOp
private final Transform transform ;
public ExprTransformApplyTransform(Transform transform)
{
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/ExprTransformer.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/ExprTransformer.java?rev=1403046&r1=1403045&r2=1403046&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/ExprTransformer.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/ExprTransformer.java Sun Oct 28 17:20:01 2012
@@ -149,6 +149,8 @@ public class ExprTransformer
if ( funcOp.getArgs() != null )
x = process(funcOp.getArgs()) ;
Op op = funcOp.getGraphPattern() ;
+ // Caution: the experssion can have a pattern inside it.
+ // See also: ExprTransformApplyTransform which does much the same in a different way.
if ( transform instanceof ExprTransformOp )
{
ExprTransformOp t = (ExprTransformOp)transform ;
Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangTurtleBase.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangTurtleBase.java?rev=1403046&r1=1403045&r2=1403046&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangTurtleBase.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangTurtleBase.java Sun Oct 28 17:20:01 2012
@@ -83,7 +83,7 @@ public abstract class LangTurtleBase<X>
[43] lcharacter ::= echaracter | '\"' | #x9 | #xA | #xD
*/
- // Predicates
+ // Some predicates (if accepted)
protected final static String KW_A = "a" ;
protected final static String KW_SAME_AS = "=" ;
protected final static String KW_LOG_IMPLIES = "=>" ;
@@ -97,7 +97,6 @@ public abstract class LangTurtleBase<X>
// Current graph - null for default graph
private Node currentGraph = null ;
-
public final Node getCurrentGraph()
{
return currentGraph ;