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 2017/01/01 13:41:29 UTC

[1/2] jena git commit: Use dummy Transactional to ensure query or update is done inside a Txn.

Repository: jena
Updated Branches:
  refs/heads/master 0becdc7e1 -> 6bcb1da3b


Use dummy Transactional to ensure query or update is done inside a Txn.

Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/3ceff6b6
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/3ceff6b6
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/3ceff6b6

Branch: refs/heads/master
Commit: 3ceff6b6ee4b4d7ceaf97c8f5e96d20d8289eca0
Parents: 0becdc7
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Dec 31 15:55:52 2016 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Sun Jan 1 13:34:44 2017 +0000

----------------------------------------------------------------------
 jena-cmds/src/main/java/arq/query.java  | 93 +++++++++++++-------------
 jena-cmds/src/main/java/arq/update.java | 99 +++++++++++++---------------
 2 files changed, 89 insertions(+), 103 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/3ceff6b6/jena-cmds/src/main/java/arq/query.java
----------------------------------------------------------------------
diff --git a/jena-cmds/src/main/java/arq/query.java b/jena-cmds/src/main/java/arq/query.java
index 9a9ed5f..36047a2 100644
--- a/jena-cmds/src/main/java/arq/query.java
+++ b/jena-cmds/src/main/java/arq/query.java
@@ -31,10 +31,13 @@ import org.apache.jena.riot.RiotNotFoundException ;
 import org.apache.jena.riot.SysRIOT ;
 import org.apache.jena.shared.JenaException ;
 import org.apache.jena.sparql.ARQInternalErrorException ;
+import org.apache.jena.sparql.core.Transactional ;
+import org.apache.jena.sparql.core.TransactionalNull;
 import org.apache.jena.sparql.mgt.Explain ;
 import org.apache.jena.sparql.resultset.ResultSetException ;
 import org.apache.jena.sparql.resultset.ResultsFormat ;
 import org.apache.jena.sparql.util.QueryExecUtils ;
+import org.apache.jena.system.Txn ;
 
 public class query extends CmdARQ
 {
@@ -51,18 +54,18 @@ public class query extends CmdARQ
     protected ModDataset    modDataset =  null ;
     protected ModResultsOut modResults =  new ModResultsOut() ;
     protected ModEngine     modEngine =   new ModEngine() ;
-    
+
     public static void main (String... argv)
     {
         new query(argv).mainRun() ;
     }
-    
+
     public query(String[] argv)
     {
         super(argv) ;
         modQuery = new ModQueryIn(getDefaultSyntax()) ; 
         modDataset = setModDataset() ;
-       
+
         super.addModule(modQuery) ;
         super.addModule(modResults) ;
         super.addModule(modDataset) ;
@@ -94,23 +97,20 @@ public class query extends CmdARQ
         if ( contains(argRepeat) )
         {
             String[] x = getValue(argRepeat).split(",") ;
-            if ( x.length == 1 )
+            if ( x.length == 1 ) 
             {
                 try { repeatCount = Integer.parseInt(x[0]) ; }
                 catch (NumberFormatException ex)
                 { throw new CmdException("Can't parse "+x[0]+" in arg "+getValue(argRepeat)+" as an integer") ; }
-                
             }
-            else if ( x.length == 2 )
-            {
+            else if ( x.length == 2 ) {
                 try { warmupCount = Integer.parseInt(x[0]) ; }
                 catch (NumberFormatException ex)
                 { throw new CmdException("Can't parse "+x[0]+" in arg "+getValue(argRepeat)+" as an integer") ; }
                 try { repeatCount = Integer.parseInt(x[1]) ; }
                 catch (NumberFormatException ex)
                 { throw new CmdException("Can't parse "+x[1]+" in arg "+getValue(argRepeat)+" as an integer") ; }
-            }
-            else
+            } else
                 throw new CmdException("Wrong format for repeat count: "+getValue(argRepeat)) ;
         }
         if ( isVerbose() )
@@ -191,44 +191,50 @@ public class query extends CmdARQ
     protected long totalTime = 0 ;
     protected void queryExec(boolean timed, ResultsFormat fmt)
     {
-        try{
+        try {
             Query query = modQuery.getQuery() ;
-            if ( isVerbose() )
-            {
-                IndentedWriter out = new IndentedWriter(System.out, true) ;
-                query.serialize(out) ;
-                out.flush() ;
+            if ( isVerbose() ) {
+                IndentedWriter out = new IndentedWriter(System.out, true);
+                query.serialize(out);
+                out.flush();
                 System.out.println();
             }
             
             if ( isQuiet() )
                 LogCtl.setError(SysRIOT.riotLoggerName) ;
             Dataset dataset = getDataset() ;
-            modTime.startTimer() ;
-            QueryExecution qe = QueryExecutionFactory.create(query, dataset) ;
             // Check there is a dataset
-            
-            if ( dataset == null && ! query.hasDatasetDescription() )
-            {
+            if ( dataset == null && !query.hasDatasetDescription() ) {
                 System.err.println("Dataset not specified in query nor provided on command line.");
-                throw new TerminationException(1) ;
-            }
-            try { QueryExecUtils.executeQuery(query, qe, fmt) ; } 
-            catch (QueryCancelledException ex) { 
-                System.out.flush() ;
-                System.err.println("Query timed out") ;
+                throw new TerminationException(1);
             }
-            
-            long time = modTime.endTimer() ;
-            if ( timed )
-            {
-                totalTime += time ;
-                System.err.println("Time: "+modTime.timeStr(time)+" sec") ;
-            }
-            qe.close() ;
+            Transactional transactional = (dataset.supportsTransactionAbort()) ? dataset : new TransactionalNull() ;
+            Txn.executeRead(transactional, ()->{
+                modTime.startTimer() ;
+                try ( QueryExecution qe = QueryExecutionFactory.create(query, dataset) ) {
+                    try { QueryExecUtils.executeQuery(query, qe, fmt); }
+                    catch (QueryCancelledException ex) {
+                        System.out.flush();
+                        System.err.println("Query timed out");
+                    }
+
+                    long time = modTime.endTimer();
+                    if ( timed ) {
+                        totalTime += time;
+                        System.err.println("Time: " + modTime.timeStr(time) + " sec");
+                    }
+                }
+                catch (ResultSetException ex) {
+                    System.err.println(ex.getMessage());
+                    ex.printStackTrace(System.err);
+                }
+                catch (QueryException qEx) {
+                    // System.err.println(qEx.getMessage()) ;
+                    throw new CmdException("Query Exeception", qEx);
+                }
+            });
         }
-        catch (ARQInternalErrorException intEx)
-        {
+        catch (ARQInternalErrorException intEx) {
             System.err.println(intEx.getMessage()) ;
             if ( intEx.getCause() != null )
             {
@@ -238,20 +244,9 @@ public class query extends CmdARQ
             }
             intEx.printStackTrace(System.err) ;
         }
-        catch (ResultSetException ex)
-        {
-            System.err.println(ex.getMessage()) ;
-            ex.printStackTrace(System.err) ;
-        }
-        catch (QueryException qEx)
-        {
-            //System.err.println(qEx.getMessage()) ;
-            throw new CmdException("Query Exeception", qEx) ;
-        }
         catch (JenaException | CmdException ex) { throw ex ; }
-        catch (Exception ex)
-        {
+        catch (Exception ex) {
             throw new CmdException("Exception", ex) ;
         }
-    }    
+    }
 }

http://git-wip-us.apache.org/repos/asf/jena/blob/3ceff6b6/jena-cmds/src/main/java/arq/update.java
----------------------------------------------------------------------
diff --git a/jena-cmds/src/main/java/arq/update.java b/jena-cmds/src/main/java/arq/update.java
index 7dc7f71..f2f3065 100644
--- a/jena-cmds/src/main/java/arq/update.java
+++ b/jena-cmds/src/main/java/arq/update.java
@@ -18,109 +18,100 @@
 
 package arq;
 
-import java.util.List ;
+import java.util.List;
 
-import arq.cmdline.CmdUpdate ;
+import arq.cmdline.CmdUpdate;
 import jena.cmd.ArgDecl;
 import jena.cmd.CmdException;
-import org.apache.jena.atlas.lib.Lib ;
-import org.apache.jena.query.ReadWrite ;
-import org.apache.jena.riot.Lang ;
-import org.apache.jena.riot.RDFDataMgr ;
-import org.apache.jena.sparql.SystemARQ ;
-import org.apache.jena.sparql.core.DatasetGraph ;
-import org.apache.jena.sparql.core.DatasetGraphFactory ;
-import org.apache.jena.sparql.core.Transactional ;
-import org.apache.jena.sparql.core.TransactionalNull ;
-import org.apache.jena.update.UpdateExecutionFactory ;
-import org.apache.jena.update.UpdateFactory ;
-import org.apache.jena.update.UpdateRequest ;
+import org.apache.jena.atlas.lib.Lib;
+import org.apache.jena.query.ReadWrite;
+import org.apache.jena.riot.Lang;
+import org.apache.jena.riot.RDFDataMgr;
+import org.apache.jena.sparql.SystemARQ;
+import org.apache.jena.sparql.core.DatasetGraph;
+import org.apache.jena.sparql.core.DatasetGraphFactory;
+import org.apache.jena.sparql.core.Transactional;
+import org.apache.jena.sparql.core.TransactionalNull;
+import org.apache.jena.system.Txn;
+import org.apache.jena.update.UpdateExecutionFactory;
+import org.apache.jena.update.UpdateFactory;
+import org.apache.jena.update.UpdateRequest;
 
 public class update extends CmdUpdate
 {
-    static final ArgDecl updateArg = new ArgDecl(ArgDecl.HasValue, "update", "file") ;
-    static final ArgDecl dumpArg = new ArgDecl(ArgDecl.NoValue, "dump") ;       // Write the result to stdout.
+    static final ArgDecl updateArg = new ArgDecl(ArgDecl.HasValue, "update", "file");
+    static final ArgDecl dumpArg = new ArgDecl(ArgDecl.NoValue, "dump");       // Write the result to stdout.
     
-    List<String> requestFiles = null ;
-    boolean dump = false ;
+    List<String> requestFiles = null;
+    boolean dump = false;
     
     public static void main (String... argv)
-    { new update(argv).mainRun() ; }
+    { new update(argv).mainRun(); }
     
     protected update(String[] argv) {
-        super(argv) ;
-        super.add(updateArg, "--update=FILE", "Update commands to execute") ;
-        super.add(dumpArg, "--dump", "Dump the resulting graph store") ;
+        super(argv);
+        super.add(updateArg, "--update=FILE", "Update commands to execute");
+        super.add(dumpArg, "--dump", "Dump the resulting graph store");
     }
 
     @Override
     protected void processModulesAndArgs() {
-        requestFiles = getValues(updateArg) ; // ????
-        dump = contains(dumpArg) ;
-        super.processModulesAndArgs() ;
+        requestFiles = getValues(updateArg); // ????
+        dump = contains(dumpArg);
+        super.processModulesAndArgs();
     }
 
     @Override
-    protected String getCommandName() { return Lib.className(this) ; }
+    protected String getCommandName() { return Lib.className(this); }
     
     @Override
-    protected String getSummary() { return getCommandName()+" --desc=assembler [--dump] --update=<request file>" ; }
+    protected String getSummary() { return getCommandName()+" --desc=assembler [--dump] --update=<request file>"; }
 
     // Subclass for specialised commands making common updates more convenient
     @Override
     protected void execUpdate(DatasetGraph graphStore) {
         if ( requestFiles.size() == 0 && getPositional().size() == 0 )
-            throw new CmdException("Nothing to do") ;
+            throw new CmdException("Nothing to do");
 
-        Transactional transactional = (graphStore.supportsTransactionAbort()) ? graphStore : new TransactionalNull() ;
+        Transactional transactional = (graphStore.supportsTransactionAbort()) ? graphStore : new TransactionalNull();
 
         for ( String filename : requestFiles ) {
             try {
-                transactional.begin(ReadWrite.WRITE) ;
-                execOneFile(filename, graphStore) ;
-                transactional.commit() ;
+                transactional.begin(ReadWrite.WRITE);
+                execOneFile(filename, graphStore);
+                transactional.commit();
             }
             catch (Throwable ex) { 
-                try { transactional.abort() ; } catch (Exception ex2) {}
-                throw ex ;
+                try { transactional.abort(); } catch (Exception ex2) {}
+                throw ex;
             }
-            finally { transactional.end() ; }
+            finally { transactional.end(); }
         }
 
         for ( String requestString : super.getPositional() ) {
-            requestString = indirect(requestString) ;
-
-            try {
-                transactional.begin(ReadWrite.WRITE) ;
-                execOne(requestString, graphStore) ;
-                transactional.commit() ;
-            }
-            catch (Throwable ex) { 
-                try { transactional.abort() ; } catch (Exception ex2) {}
-                throw ex ;
-            }
-            finally { transactional.end() ; }
+            String requestString2 = indirect(requestString);
+            Txn.executeWrite(transactional, ()->execOne(requestString2, graphStore));
         }
         
         if ( ! ( transactional instanceof DatasetGraph ) )
-            SystemARQ.sync(graphStore) ;
+            SystemARQ.sync(graphStore);
 
         if ( dump )
-            RDFDataMgr.write(System.out, graphStore, Lang.NQUADS) ;
+            RDFDataMgr.write(System.out, graphStore, Lang.NQUADS);
     }
 
     private void execOneFile(String filename, DatasetGraph store) {
-        UpdateRequest req = UpdateFactory.read(filename, updateSyntax) ;
-        UpdateExecutionFactory.create(req, store).execute() ;
+        UpdateRequest req = UpdateFactory.read(filename, updateSyntax);
+        UpdateExecutionFactory.create(req, store).execute();
     }
 
     private void execOne(String requestString, DatasetGraph store) {
-        UpdateRequest req = UpdateFactory.create(requestString, updateSyntax) ;
-        UpdateExecutionFactory.create(req, store).execute() ;
+        UpdateRequest req = UpdateFactory.create(requestString, updateSyntax);
+        UpdateExecutionFactory.create(req, store).execute();
     }
 
     @Override
     protected DatasetGraph dealWithNoDataset() {
-        return DatasetGraphFactory.create() ;
+        return DatasetGraphFactory.create();
     }
 }


[2/2] jena git commit: JENA-1271: Merge commit 'refs/pull/201/head' of github.com:apache/jena

Posted by an...@apache.org.
JENA-1271: Merge commit 'refs/pull/201/head' of github.com:apache/jena

This closes #210.


Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/6bcb1da3
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/6bcb1da3
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/6bcb1da3

Branch: refs/heads/master
Commit: 6bcb1da3be2abcbd9a1096f6b1e73d6cb7ffe72d
Parents: 0becdc7 3ceff6b
Author: Andy Seaborne <an...@apache.org>
Authored: Sun Jan 1 13:40:44 2017 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Sun Jan 1 13:40:44 2017 +0000

----------------------------------------------------------------------
 jena-cmds/src/main/java/arq/query.java  | 93 +++++++++++++-------------
 jena-cmds/src/main/java/arq/update.java | 99 +++++++++++++---------------
 2 files changed, 89 insertions(+), 103 deletions(-)
----------------------------------------------------------------------