You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2013/07/20 18:40:33 UTC
svn commit: r1505169 - in /jena/Scratch/AFS/Jena-Dev/trunk/src/dev:
RunDev.java tdbreorder.java
Author: andy
Date: Sat Jul 20 16:40:32 2013
New Revision: 1505169
URL: http://svn.apache.org/r1505169
Log:
Better printing for TDB optimizer tool.
Modified:
jena/Scratch/AFS/Jena-Dev/trunk/src/dev/RunDev.java
jena/Scratch/AFS/Jena-Dev/trunk/src/dev/tdbreorder.java
Modified: jena/Scratch/AFS/Jena-Dev/trunk/src/dev/RunDev.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Jena-Dev/trunk/src/dev/RunDev.java?rev=1505169&r1=1505168&r2=1505169&view=diff
==============================================================================
--- jena/Scratch/AFS/Jena-Dev/trunk/src/dev/RunDev.java (original)
+++ jena/Scratch/AFS/Jena-Dev/trunk/src/dev/RunDev.java Sat Jul 20 16:40:32 2013
@@ -38,7 +38,7 @@ public class RunDev extends RunBase
public static void main(String[] argv) throws Exception
{
- mainExplain() ;
+ dev.tdbreorder.main("Q2.sse", "fixed.opt") ;
System.exit(0) ;
}
Modified: jena/Scratch/AFS/Jena-Dev/trunk/src/dev/tdbreorder.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Jena-Dev/trunk/src/dev/tdbreorder.java?rev=1505169&r1=1505168&r2=1505169&view=diff
==============================================================================
--- jena/Scratch/AFS/Jena-Dev/trunk/src/dev/tdbreorder.java (original)
+++ jena/Scratch/AFS/Jena-Dev/trunk/src/dev/tdbreorder.java Sat Jul 20 16:40:32 2013
@@ -18,9 +18,13 @@
package dev;
+import org.apache.jena.atlas.io.IndentedWriter ;
import org.apache.jena.atlas.lib.FileOps ;
import org.apache.jena.atlas.logging.Log ;
+import com.hp.hpl.jena.graph.Triple ;
+import com.hp.hpl.jena.shared.PrefixMapping ;
+import com.hp.hpl.jena.shared.impl.PrefixMappingImpl ;
import com.hp.hpl.jena.sparql.algebra.Op ;
import com.hp.hpl.jena.sparql.algebra.op.OpBGP ;
import com.hp.hpl.jena.sparql.algebra.op.OpQuadPattern ;
@@ -29,12 +33,14 @@ import com.hp.hpl.jena.sparql.engine.opt
import com.hp.hpl.jena.sparql.engine.optimizer.reorder.ReorderLib ;
import com.hp.hpl.jena.sparql.engine.optimizer.reorder.ReorderTransformation ;
import com.hp.hpl.jena.sparql.engine.optimizer.reorder.ReorderTransformationBase ;
+import com.hp.hpl.jena.sparql.serializer.SerializationContext ;
import com.hp.hpl.jena.sparql.sse.SSE ;
+import com.hp.hpl.jena.sparql.sse.writers.WriterNode ;
import com.hp.hpl.jena.tdb.sys.Names ;
public class tdbreorder
{
- public static void main(String[] args) {
+ public static void main(String... args) {
if ( args.length != 2 ) {
System.err.println("Usage: PATTERN STATS") ;
System.exit(1) ;
@@ -70,11 +76,40 @@ public class tdbreorder
BasicPattern bgp2 = reorder.reorder(bgp) ;
System.out.println() ;
- System.out.println(bgp) ;
+
+ print(bgp) ;
+ System.out.println() ;
System.out.println(" ======== >>>>>>>>") ;
- System.out.println(bgp2) ;
+ print(bgp2) ;
+ System.out.println() ;
}
+ private static void print(BasicPattern bgp) {
+ IndentedWriter out = IndentedWriter.stdout;
+
+ PrefixMapping pmap = new PrefixMappingImpl() ;
+ pmap.setNsPrefixes(SSE.defaultPrefixMapWrite) ;
+// pmap.setNsPrefix("ppi", "http://landregistry.data.gov.uk/def/ppi/") ;
+// pmap.setNsPrefix("common", "http://landregistry.data.gov.uk/def/common/") ;
+
+ SerializationContext sCxt = SSE.sCxt(pmap) ;
+
+ boolean first = true ;
+ for ( Triple t : bgp )
+ {
+ if ( !first )
+ out.print("\n") ;
+ else
+ first = false ;
+ // Adds (triple ...)
+ // SSE.write(buff.getIndentedWriter(), t) ;
+ out.print("(") ;
+ WriterNode.outputPlain(out, t, sCxt) ;
+ out.print(")") ;
+ }
+ out.flush();
+
+ }
private static ReorderTransformation chooseReorder(String filename)
{
if ( filename.equals(Names.optFixed) )