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/02/11 23:09:28 UTC

svn commit: r1243162 - in /incubator/jena/Scratch/AFS: Dev/trunk/src-dev/dev/ Dev/trunk/src/main/java/riot/reader/ Dev/trunk/src/main/java/riot/reader/fm2/ Jena-Dev/trunk/src/dev/

Author: andy
Date: Sat Feb 11 22:09:27 2012
New Revision: 1243162

URL: http://svn.apache.org/viewvc?rev=1243162&view=rev
Log: (empty)

Removed:
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/dev/TransformPropertyPathFlatten.java
Modified:
    incubator/jena/Scratch/AFS/Dev/trunk/src-dev/dev/RunAFS.java
    incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/reader/Langs.java
    incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/reader/fm2/JenaIOEnvironment.java
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/dev/Run.java

Modified: incubator/jena/Scratch/AFS/Dev/trunk/src-dev/dev/RunAFS.java
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Dev/trunk/src-dev/dev/RunAFS.java?rev=1243162&r1=1243161&r2=1243162&view=diff
==============================================================================
--- incubator/jena/Scratch/AFS/Dev/trunk/src-dev/dev/RunAFS.java (original)
+++ incubator/jena/Scratch/AFS/Dev/trunk/src-dev/dev/RunAFS.java Sat Feb 11 22:09:27 2012
@@ -26,6 +26,12 @@ import com.hp.hpl.jena.iri.IRI ;
 import com.hp.hpl.jena.iri.IRIFactory ;
 import com.hp.hpl.jena.iri.Violation ;
 import com.hp.hpl.jena.iri.ViolationCodes ;
+import com.hp.hpl.jena.query.Query ;
+import com.hp.hpl.jena.query.QueryFactory ;
+import com.hp.hpl.jena.sparql.algebra.Algebra ;
+import com.hp.hpl.jena.sparql.algebra.Op ;
+import com.hp.hpl.jena.sparql.algebra.Transformer ;
+import com.hp.hpl.jena.sparql.algebra.optimize.TransformPathFlatternStd ;
 
 public class RunAFS
 {
@@ -39,8 +45,24 @@ public class RunAFS
     
     
     static public void main(String ... args){
-        exit(0) ;
-     
+        
+        arq.rsparql.main("--service=http://localhost:3030/ds/sparql", "SELECT * {?s ?p ?o}") ;
+        System.out.println("DONE") ;
+        System.exit(0) ;
+        
+        Query q = QueryFactory.create("PREFIX : <http://example/> SELECT * {?x :p{2,3} ?y } ") ;
+        Op op = Algebra.compile(q.getQueryPattern()) ;
+        System.out.println(op) ;
+        System.out.println() ;
+        Op op2 = Transformer.transform(new TransformPathFlatternStd() , op) ;
+        System.out.println(op2) ;
+        System.out.println() ;
+        
+        Op op3 = Algebra.optimize(op2) ;
+        System.out.println(op3) ;
+        
+        System.out.println("DONE") ;
+        System.exit(0) ;
     }
     
     static IRIFactory iriFactory = new IRIFactory();

Modified: incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/reader/Langs.java
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/reader/Langs.java?rev=1243162&r1=1243161&r2=1243162&view=diff
==============================================================================
--- incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/reader/Langs.java (original)
+++ incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/reader/Langs.java Sat Feb 11 22:09:27 2012
@@ -87,7 +87,8 @@ public class Langs
 //    private Symbol RESULTSET = Symbol.create(BASE+"table") ;
 //  private Symbol OTHER = Symbol.create(BASE+"unknown") ;
     
-    enum DataClass { TRIPLES, QUADS, RESULTSET } ;
+    enum DataClass { TRIPLES, QUADS, RESULTSET }
+    
     static Map<Lang2, DataClass> langToDataClass = new HashMap<Lang2, DataClass>() ;
     static {
         // See WebContent.mapContentTypeToLang

Modified: incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/reader/fm2/JenaIOEnvironment.java
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/reader/fm2/JenaIOEnvironment.java?rev=1243162&r1=1243161&r2=1243162&view=diff
==============================================================================
--- incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/reader/fm2/JenaIOEnvironment.java (original)
+++ incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/reader/fm2/JenaIOEnvironment.java Sat Feb 11 22:09:27 2012
@@ -18,7 +18,6 @@
 
 package riot.reader.fm2;
 
-import java.io.InputStream ;
 import java.util.StringTokenizer ;
 
 import org.slf4j.Logger ;
@@ -26,12 +25,7 @@ import org.slf4j.LoggerFactory ;
 import riot.reader.TypedInputStream2 ;
 
 import com.hp.hpl.jena.JenaRuntime ;
-import com.hp.hpl.jena.rdf.model.Model ;
-import com.hp.hpl.jena.rdf.model.ModelFactory ;
-import com.hp.hpl.jena.rdf.model.RDFNode ;
-import com.hp.hpl.jena.rdf.model.Resource ;
-import com.hp.hpl.jena.rdf.model.Statement ;
-import com.hp.hpl.jena.rdf.model.StmtIterator ;
+import com.hp.hpl.jena.rdf.model.* ;
 import com.hp.hpl.jena.shared.JenaException ;
 import com.hp.hpl.jena.util.FileUtils ;
 import com.hp.hpl.jena.vocabulary.LocationMappingVocab ;

Modified: incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/dev/Run.java
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/dev/Run.java?rev=1243162&r1=1243161&r2=1243162&view=diff
==============================================================================
--- incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/dev/Run.java (original)
+++ incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/dev/Run.java Sat Feb 11 22:09:27 2012
@@ -22,19 +22,27 @@ import java.io.File ;
 import java.io.FileInputStream ;
 import java.io.InputStream ;
 import java.nio.ByteBuffer ;
+import java.util.Iterator ;
 import java.util.UUID ;
 
+import org.openjena.atlas.iterator.Iter ;
 import org.openjena.atlas.lib.Bytes ;
 import org.openjena.atlas.lib.Lib ;
 import org.openjena.atlas.logging.Log ;
 
+import com.hp.hpl.jena.graph.Node ;
 import com.hp.hpl.jena.query.* ;
 import com.hp.hpl.jena.rdf.model.Model ;
 import com.hp.hpl.jena.rdf.model.RDFReader ;
 import com.hp.hpl.jena.sparql.mgt.Explain.InfoLevel ;
+import com.hp.hpl.jena.sparql.path.Path ;
+import com.hp.hpl.jena.sparql.path.PathEval ;
+import com.hp.hpl.jena.sparql.path.PathFactory ;
+import com.hp.hpl.jena.sparql.sse.writers.WriterPath ;
 import com.hp.hpl.jena.sparql.util.Timer ;
 import com.hp.hpl.jena.tdb.TDBFactory ;
 import com.hp.hpl.jena.tdb.transaction.DatasetGraphTxn ;
+import com.hp.hpl.jena.util.FileManager ;
 
 public class Run extends RunBase
 {
@@ -44,8 +52,29 @@ public class Run extends RunBase
     
     public static void main(String[] argv) throws Exception
     {
+        Model m = FileManager.get().loadModel("D.ttl") ;
+        Node n = Node.createURI("http://example/x1") ;
+        Path p1 = PathFactory.pathLink(Node.createURI("http://example/p")) ;
+        Path p2 = PathFactory.pathFixedLength(p1, 3) ;
+        Path p = PathFactory.pathDistinct(p2) ;
+        
+        System.out.println(p) ;
+        System.out.println() ;
+        System.out.println(WriterPath.asString(p)) ;
+        System.out.println() ;
+        
+        Iterator<Node> iter = PathEval.eval(m.getGraph(), n, p) ;
+        System.out.println(Iter.asString(iter, "\n")) ;
+        System.out.println() ;
+        
+        iter = PathEval.eval(m.getGraph(), n, p2) ;
+        System.out.println(Iter.asString(iter, "\n")) ;
+        System.out.println() ;
+
+        
+        exit(0) ;
         
-        arq.update.main("--desc=tdb.ttl", "--file=U.ru", "--dump") ; 
+        arq.query.main("--data=D.ttl", "--file=Q.rq") ; 
         exit(0) ;
         
         ARQ.setExecutionLogging(InfoLevel.ALL) ;