svn commit: r1438486 - in /jena/trunk: jena-arq/src/main/java/arq/query.java jena-tdb/src/main/java/tdb/cmdline/ModTDBDataset.java

[an...@apache.org]

Author: andy
Date: Fri Jan 25 13:12:13 2013
New Revision: 1438486

URL: http://svn.apache.org/viewvc?rev=1438486&view=rev
Log:
Execution by TDB on in-memory dataset initialized from a file - useful for testing.

Modified:
    jena/trunk/jena-arq/src/main/java/arq/query.java
    jena/trunk/jena-tdb/src/main/java/tdb/cmdline/ModTDBDataset.java

Modified: jena/trunk/jena-arq/src/main/java/arq/query.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/arq/query.java?rev=1438486&r1=1438485&r2=1438486&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/arq/query.java (original)
+++ jena/trunk/jena-arq/src/main/java/arq/query.java Fri Jan 25 13:12:13 2013
@@ -76,9 +76,9 @@ public class query extends CmdARQ
         super.addModule(modTime) ;
 
         super.getUsage().startCategory("Control") ;
-        super.add(argExplain, "--explain", "Explain and log query execution") ;
-        super.add(argRepeat, "--repeat=N or N,M", "Do N times or N warmup and then M times (use for timing to overcome start up costs of Java)");
-        super.add(argOptimize, "--optimize=", "Turn the query optimizer on or off (default: on") ;
+        super.add(argExplain,  "--explain", "Explain and log query execution") ;
+        super.add(argRepeat,   "--repeat=N or N,M", "Do N times or N warmup and then M times (use for timing to overcome start up costs of Java)");
+        super.add(argOptimize, "--optimize=", "Turn the query optimizer on or off (default: on)") ;
     }
 
     @Override

Modified: jena/trunk/jena-tdb/src/main/java/tdb/cmdline/ModTDBDataset.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/tdb/cmdline/ModTDBDataset.java?rev=1438486&r1=1438485&r2=1438486&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/tdb/cmdline/ModTDBDataset.java (original)
+++ jena/trunk/jena-tdb/src/main/java/tdb/cmdline/ModTDBDataset.java Fri Jan 25 13:12:13 2013
@@ -22,6 +22,7 @@ import java.util.ArrayList ;
 import java.util.List ;
 
 import org.apache.jena.atlas.logging.Log ;
+import org.apache.jena.riot.RDFDataMgr ;
 import arq.cmd.CmdException ;
 import arq.cmdline.ArgDecl ;
 import arq.cmdline.CmdArgModule ;
@@ -45,9 +46,9 @@ public class ModTDBDataset extends ModDa
     // Mixes assembler, location and "tdb"
     // Can make a single model or a dataset
     
-    private ArgDecl argMem                  = new ArgDecl(ArgDecl.NoValue, "mem") ;
+    private ArgDecl argMem                  = new ArgDecl(ArgDecl.HasValue, "mem") ;
     private ModTDBAssembler modAssembler    = new ModTDBAssembler() ;
-    private boolean useMemory               = false ;
+    private String inMemFile                = null ;
     
     public ModTDBDataset() {}
     
@@ -61,13 +62,21 @@ public class ModTDBDataset extends ModDa
     @Override
     public void processArgs(CmdArgModule cmdLine)
     {
-        useMemory = cmdLine.contains(argMem) ;
+        inMemFile = cmdLine.getValue(argMem) ;
         modAssembler.processArgs(cmdLine) ;
     }        
 
     @Override
     public Dataset createDataset()
     {
+        if ( inMemFile != null )
+        {
+            Dataset ds = TDBFactory.createDataset() ;
+            RDFDataMgr.read(ds, inMemFile) ;
+            return ds ;
+            
+        }
+        
         if (  modAssembler.getAssemblerFile() != null )
         {
             Dataset thing = null ;