[jena] branch master updated: JENA-1937: tdb2.tdbupdate --loc and --mem arguments

[an...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

andy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jena.git


The following commit(s) were added to refs/heads/master by this push:
     new 7e0ebea  JENA-1937: tdb2.tdbupdate --loc and --mem arguments
     new 39e19de  Merge pull request #590 from afs/jena-1937-tdb2.tdbupdate
7e0ebea is described below

commit 7e0ebeafbcb4ce28186500fc71c405b75a1b4de0
Author: Andy Seaborne <an...@apache.org>
AuthorDate: Tue Jul 30 22:34:23 2019 +0100

    JENA-1937: tdb2.tdbupdate --loc and --mem arguments
---
 jena-cmds/src/main/java/arq/cmdline/CmdUpdate.java | 6 ------
 jena-cmds/src/main/java/arq/update.java            | 2 +-
 jena-cmds/src/main/java/tdb/tdbupdate.java         | 3 +--
 jena-cmds/src/main/java/tdb2/tdbupdate.java        | 2 +-
 4 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/jena-cmds/src/main/java/arq/cmdline/CmdUpdate.java b/jena-cmds/src/main/java/arq/cmdline/CmdUpdate.java
index 230751b..a2e9310 100644
--- a/jena-cmds/src/main/java/arq/cmdline/CmdUpdate.java
+++ b/jena-cmds/src/main/java/arq/cmdline/CmdUpdate.java
@@ -38,12 +38,6 @@ public abstract class CmdUpdate extends CmdARQ
         return new ModDatasetGeneralAssembler() ;
     }
 
-    /** @deprecated Use {@link setModDataset} */ 
-    @Deprecated
-    protected ModDataset setModeDataset() {
-        return setModDataset();
-    }
-
     @Override
     protected void processModulesAndArgs()
     {
diff --git a/jena-cmds/src/main/java/arq/update.java b/jena-cmds/src/main/java/arq/update.java
index a7d3727..860197c 100644
--- a/jena-cmds/src/main/java/arq/update.java
+++ b/jena-cmds/src/main/java/arq/update.java
@@ -86,7 +86,7 @@ public class update extends CmdUpdate
             SystemARQ.sync(graphStore);
 
         if ( dump )
-            RDFDataMgr.write(System.out, graphStore, Lang.NQUADS);
+            Txn.executeRead(transactional, ()->RDFDataMgr.write(System.out, graphStore, Lang.NQUADS) );
     }
 
     protected void execOneFile(String filename, DatasetGraph store) {
diff --git a/jena-cmds/src/main/java/tdb/tdbupdate.java b/jena-cmds/src/main/java/tdb/tdbupdate.java
index 350217c..4871f5b 100644
--- a/jena-cmds/src/main/java/tdb/tdbupdate.java
+++ b/jena-cmds/src/main/java/tdb/tdbupdate.java
@@ -29,8 +29,7 @@ import tdb.cmdline.ModTDBDataset ;
 public class tdbupdate extends arq.update
 {
     // Inherits from arq.update so is not a CmdTDB.  Mixins for Java!
-    public static void main(String...argv)
- {
+    public static void main(String...argv) {
         CmdTDB.init();
         // Do everything with flushing transactions.
         TransactionManager.QueueBatchSize = 0;
diff --git a/jena-cmds/src/main/java/tdb2/tdbupdate.java b/jena-cmds/src/main/java/tdb2/tdbupdate.java
index c40c245..503d6b9 100644
--- a/jena-cmds/src/main/java/tdb2/tdbupdate.java
+++ b/jena-cmds/src/main/java/tdb2/tdbupdate.java
@@ -45,7 +45,7 @@ public class tdbupdate extends arq.update {
     }
 
     @Override
-    protected ModDataset setModeDataset() {
+    protected ModDataset setModDataset() {
         return new ModTDBDataset();
     }