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 14:10:25 UTC

svn commit: r1197095 - in /incubator/jena/Scratch/AFS/Jena-Dev/trunk: ./ src/dev/ReportGraphVarScope.java src/dev/ReportJena154_GraphVarScope.java

Author: andy
Date: Thu Nov  3 13:10:25 2011
New Revision: 1197095

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

Added:
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/dev/ReportJena154_GraphVarScope.java   (contents, props changed)
      - copied, changed from r1196607, incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/dev/ReportGraphVarScope.java
Removed:
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/dev/ReportGraphVarScope.java
Modified:
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/   (props changed)

Propchange: incubator/jena/Scratch/AFS/Jena-Dev/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Nov  3 13:10:25 2011
@@ -1 +1,3 @@
 tmp
+
+DB

Copied: incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/dev/ReportJena154_GraphVarScope.java (from r1196607, incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/dev/ReportGraphVarScope.java)
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/dev/ReportJena154_GraphVarScope.java?p2=incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/dev/ReportJena154_GraphVarScope.java&p1=incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/dev/ReportGraphVarScope.java&r1=1196607&r2=1197095&rev=1197095&view=diff
==============================================================================
--- incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/dev/ReportGraphVarScope.java (original)
+++ incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/dev/ReportJena154_GraphVarScope.java Thu Nov  3 13:10:25 2011
@@ -32,35 +32,44 @@ import com.hp.hpl.jena.sparql.core.Datas
 import com.hp.hpl.jena.sparql.core.DatasetGraphFactory ;
 import com.hp.hpl.jena.sparql.core.Quad ;
 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 ;
 import com.hp.hpl.jena.tdb.TDBFactory ;
 import com.hp.hpl.jena.tdb.base.file.Location ;
 
-public class ReportGraphVarScope
+public class ReportJena154_GraphVarScope
 {
     static String queryStr =
-        "SELECT ?g WHERE { GRAPH ?g { ?s ?p ?o . FILTER (bound(?g) ) } }";
+        "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) {
-
-        ARQ.setExecutionLogging(Explain.InfoLevel.ALL) ;
+        //if ( false ) 
+            ARQ.setExecutionLogging(Explain.InfoLevel.ALL) ;
+        
+        System.out.println("Test query: "+queryStr) ;
         
         if ( true )
         {
             Query q = QueryFactory.create(queryStr) ; 
             Op op1 = Algebra.compile(q) ;
             Op op1a = Algebra.optimize(op1) ;
-            System.out.println(op1a) ;
+            //System.out.println(op1a) ;
             
             Op op2 = Algebra.toQuadForm(op1) ;
             Op op2a = Algebra.toQuadForm(op1a) ;
-            System.out.println(op2a) ;
             
-           
+            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) ;
         }
         
         if ( true )
@@ -72,6 +81,8 @@ public class ReportGraphVarScope
             System.out.println() ;
         }
         
+        System.exit(0) ;
+        
         if ( true )
         {
             System.out.println("Plain TDB") ;
@@ -80,43 +91,60 @@ public class ReportGraphVarScope
             query(dsg) ; 
             System.out.println() ;
         }
-        System.exit(0) ;
-//        String DIR = "DB" ;
-//        FileOps.ensureDir(DIR) ;
-//        FileOps.clearDirectory(DIR) ;
-//        StoreConnection storeConnection = StoreConnection.make(DIR);
-
-        StoreConnection storeConnection = StoreConnection.make(Location.mem());
-        DatasetGraphTxn dsgTxn = null;
-        
-        DatasetGraph dsg = storeConnection.getBaseDataset() ;
         
-        if ( dsg.isEmpty() )
+        if ( true )
         {
-            System.out.println("Transactionally add quad") ;
-            try {
-                dsgTxn = storeConnection.begin(ReadWrite.WRITE);
-                setup(dsgTxn) ;
-                dsgTxn.commit();
-            } catch (Exception e) {
-                dsgTxn.abort();
-            } finally { dsgTxn.close(); }
+    //        String DIR = "DB" ;
+    //        FileOps.ensureDir(DIR) ;
+    //        FileOps.clearDirectory(DIR) ;
+    //        StoreConnection storeConnection = StoreConnection.make(DIR);
+    
+            StoreConnection storeConnection = StoreConnection.make(Location.mem());
+            DatasetGraphTxn dsgTxn = null;
+            
+            DatasetGraph dsg = storeConnection.getBaseDataset() ;
+            
+            if ( dsg.isEmpty() )
+            {
+                if ( true )
+                {
+                    System.out.println("Transactionally add quad") ;
+                    try {
+                        dsgTxn = storeConnection.begin(ReadWrite.WRITE);
+                        setup(dsgTxn) ;
+                        dsgTxn.commit();
+                    } catch (Exception e) {
+                        dsgTxn.abort();
+                    } finally { dsgTxn.close(); }
+                }
+                else
+                {
+                    if ( false )
+                    {
+                        System.out.println("Non-transactionally add quad") ;
+                        setup(dsg) ;
+                    }
+                }
+            }
+            System.out.println("Query over Base") ;
+            query(dsg) ;
+            System.out.println() ;
+            
+            System.out.println("Query over TXN") ;
+            dsgTxn = storeConnection.begin(ReadWrite.READ);
+            query(dsgTxn) ;
+            System.out.println() ;
+            dsgTxn.close();
+            StoreConnection.release(Location.mem());
         }
-        System.out.println("Query over Base") ;
-        query(dsg) ;
-        
-        System.out.println("Query over TXN") ;
-        dsgTxn = storeConnection.begin(ReadWrite.READ);
-        query(dsgTxn) ;
-        dsgTxn.close();
-
-        System.out.println("END"); 
-        StoreConnection.release(Location.mem());
     }
 
     public static void query(DatasetGraph dsg)
     {
-        SSE.write(dsg) ;
+        if ( dsg.isEmpty() )
+            System.out.println("Empty dataset") ;
+        //if ( false )
+            SSE.write(dsg) ;
         QueryExecution queryExecution =
             //QueryExecutionFactory.create(queryStr, dsgTxn.toDataset()) ;
             QueryExecutionFactory.create(queryStr, DatasetFactory.create(dsg)) ;
@@ -130,4 +158,4 @@ public class ReportGraphVarScope
         Quad q = SSE.parseQuad("(<graphURI> <s> <p> <o>)") ;
         dsg.add(q) ;
     }
-}
+}
\ No newline at end of file

Propchange: incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/dev/ReportJena154_GraphVarScope.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain