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/03 17:38:27 UTC
svn commit: r1197209 - in /incubator/jena/Scratch/AFS/Jena-Dev/trunk:
log4j.properties src/dev/ReportJena154_GraphVarScope.java
Author: andy
Date: Thu Nov 3 16:38:27 2011
New Revision: 1197209
URL: http://svn.apache.org/viewvc?rev=1197209&view=rev
Log: (empty)
Added:
incubator/jena/Scratch/AFS/Jena-Dev/trunk/log4j.properties (with props)
Modified:
incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/dev/ReportJena154_GraphVarScope.java
Added: incubator/jena/Scratch/AFS/Jena-Dev/trunk/log4j.properties
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Jena-Dev/trunk/log4j.properties?rev=1197209&view=auto
==============================================================================
--- incubator/jena/Scratch/AFS/Jena-Dev/trunk/log4j.properties (added)
+++ incubator/jena/Scratch/AFS/Jena-Dev/trunk/log4j.properties Thu Nov 3 16:38:27 2011
@@ -0,0 +1,18 @@
+log4j.rootLogger=INFO, stdlog
+
+log4j.appender.stdlog=org.apache.log4j.ConsoleAppender
+## log4j.appender.stdlog.target=System.err
+log4j.appender.stdlog.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdlog.layout.ConversionPattern=%d{HH:mm:ss} %-5p %-25c{1} :: %m%n
+
+# Execution logging
+log4j.logger.com.hp.hpl.jena.arq.info=INFO
+log4j.logger.com.hp.hpl.jena.arq.exec=INFO
+
+# Everything else in Jena
+log4j.logger.com.hp.hpl.jena=WARN
+log4j.logger.org.openjena=WARN
+log4j.logger.org.openjena.riot=INFO
+
+# Joseki server
+log4j.logger.org.joseki=INFO
Propchange: incubator/jena/Scratch/AFS/Jena-Dev/trunk/log4j.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/dev/ReportJena154_GraphVarScope.java
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/dev/ReportJena154_GraphVarScope.java?rev=1197209&r1=1197208&r2=1197209&view=diff
==============================================================================
--- incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/dev/ReportJena154_GraphVarScope.java (original)
+++ incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/dev/ReportJena154_GraphVarScope.java Thu Nov 3 16:38:27 2011
@@ -18,6 +18,10 @@
package dev;
+import java.util.List ;
+
+import org.openjena.atlas.logging.Log ;
+
import com.hp.hpl.jena.query.ARQ ;
import com.hp.hpl.jena.query.DatasetFactory ;
import com.hp.hpl.jena.query.Query ;
@@ -25,16 +29,20 @@ import com.hp.hpl.jena.query.QueryExecut
import com.hp.hpl.jena.query.QueryExecutionFactory ;
import com.hp.hpl.jena.query.QueryFactory ;
import com.hp.hpl.jena.query.ResultSet ;
+import com.hp.hpl.jena.query.ResultSetFactory ;
import com.hp.hpl.jena.query.ResultSetFormatter ;
import com.hp.hpl.jena.sparql.algebra.Algebra ;
import com.hp.hpl.jena.sparql.algebra.Op ;
+import com.hp.hpl.jena.sparql.algebra.OpVars ;
+import com.hp.hpl.jena.sparql.algebra.optimize.Optimize ;
+import com.hp.hpl.jena.sparql.algebra.optimize.TransformFilterPlacement ;
import com.hp.hpl.jena.sparql.core.DatasetGraph ;
import com.hp.hpl.jena.sparql.core.DatasetGraphFactory ;
import com.hp.hpl.jena.sparql.core.Quad ;
+import com.hp.hpl.jena.sparql.core.Var ;
+import com.hp.hpl.jena.sparql.engine.QueryIterator ;
import com.hp.hpl.jena.sparql.mgt.Explain ;
-import com.hp.hpl.jena.sparql.resultset.ResultsFormat ;
import com.hp.hpl.jena.sparql.sse.SSE ;
-import com.hp.hpl.jena.sparql.util.QueryExecUtils ;
import com.hp.hpl.jena.tdb.DatasetGraphTxn ;
import com.hp.hpl.jena.tdb.ReadWrite ;
import com.hp.hpl.jena.tdb.StoreConnection ;
@@ -43,32 +51,43 @@ import com.hp.hpl.jena.tdb.base.file.Loc
public class ReportJena154_GraphVarScope
{
+ static { Log.setLog4j() ; }
+
static String queryStr =
- "SELECT ?g WHERE { GRAPH ?g { ?s ?p ?o } FILTER (str(?g) = 'graphURI') }";
+ "SELECT ?g WHERE { GRAPH ?g { ?s ?p ?o FILTER (str(?g) = 'graphURI') } }";
//"SELECT ?g WHERE { GRAPH ?g { ?s ?p ?o . } }";
public static void main(String[] args) {
- //if ( false )
+ if ( false )
ARQ.setExecutionLogging(Explain.InfoLevel.ALL) ;
- System.out.println("Test query: "+queryStr) ;
+// System.out.println("Test query") ;
+// System.out.println(queryStr) ;
+// System.out.println() ;
if ( true )
{
+ // See AlgebraQuad.TransformQuadGraph.transform(OpGraph, Op)
+
Query q = QueryFactory.create(queryStr) ;
+ System.out.println(q) ;
Op op1 = Algebra.compile(q) ;
- Op op1a = Algebra.optimize(op1) ;
+
+ //Op op1a = Algebra.optimize(op1) ;
//System.out.println(op1a) ;
+ //Op op2a = Algebra.toQuadForm(op1a) ;
Op op2 = Algebra.toQuadForm(op1) ;
- Op op2a = Algebra.toQuadForm(op1a) ;
-
- DatasetGraph dsg = DatasetGraphFactory.createMem() ;
- setup(dsg) ;
System.out.println(op2) ;
- QueryExecUtils.executeAlgebra(op2, dsg, ResultsFormat.FMT_TEXT) ;
- System.out.println(op2a) ;
- QueryExecUtils.executeAlgebra(op2a, dsg, ResultsFormat.FMT_TEXT) ;
+ System.exit(0) ;
+
+
+ Op op3 = Optimize.apply(new TransformFilterPlacement(), op2) ;
+
+ execute(op2) ;
+ System.out.println() ;
+ execute(op3) ;
+
System.exit(0) ;
}
@@ -139,6 +158,17 @@ public class ReportJena154_GraphVarScope
}
}
+ public static void execute(Op op)
+ {
+ DatasetGraph dsg = DatasetGraphFactory.createMem() ;
+ setup(dsg) ;
+ List<String> vars = Var.varNames(OpVars.patternVars(op)) ;
+ System.out.println(op) ;
+ QueryIterator qIter = Algebra.execRef(op, dsg) ;
+ ResultSet results = ResultSetFactory.create(qIter, vars) ;
+ ResultSetFormatter.out(results) ;
+ }
+
public static void query(DatasetGraph dsg)
{
if ( dsg.isEmpty() )