You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by rv...@apache.org on 2015/03/17 12:21:39 UTC
[27/52] [abbrv] jena git commit: JENA-895 : Do backup inside a read
transaction.
JENA-895 : Do backup inside a read transaction.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/a8caf7f8
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/a8caf7f8
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/a8caf7f8
Branch: refs/heads/JENA-507
Commit: a8caf7f8f514ed60f7a8f252acb13b05d164cfc1
Parents: 3ecbdba
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Mar 7 16:32:50 2015 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat Mar 7 16:32:50 2015 +0000
----------------------------------------------------------------------
.../org/apache/jena/fuseki/mgt/ActionBackup.java | 18 ++++--------------
1 file changed, 4 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/a8caf7f8/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/mgt/ActionBackup.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/mgt/ActionBackup.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/mgt/ActionBackup.java
index 34f134e..21679f0 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/mgt/ActionBackup.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/mgt/ActionBackup.java
@@ -28,8 +28,6 @@ import org.apache.jena.fuseki.servlets.ServletOps ;
import org.slf4j.Logger ;
import org.slf4j.LoggerFactory ;
-import com.hp.hpl.jena.sparql.core.DatasetGraph ;
-
public class ActionBackup extends ActionAsyncTask
{
public ActionBackup() { super() ; }
@@ -48,24 +46,16 @@ public class ActionBackup extends ActionAsyncTask
ServletOps.errorOccurred("Null for dataset name in item request");
return null ;
}
+
action.log.info(format("[%d] Backup dataset %s", action.id, name)) ;
return new BackupTask(action) ;
}
- static class BackupTask implements Runnable {
+ static class BackupTask extends TaskBase {
static private Logger log = LoggerFactory.getLogger("Backup") ;
- private final long actionId ;
- private final DatasetGraph dataset ;
- private final String datasetName ;
-
public BackupTask(HttpAction action) {
- this.actionId = action.id ;
- action.getDataAccessPoint() ;
- action.getDataAccessPoint().getDataService() ;
- action.getDataAccessPoint().getDataService().getDataset() ;
- this.dataset = action.getDataAccessPoint().getDataService().getDataset() ;
- this.datasetName = action.getDatasetName() ;
+ super(action) ;
}
@Override
@@ -73,7 +63,7 @@ public class ActionBackup extends ActionAsyncTask
try {
String backupFilename = Backup.chooseFileName(datasetName) ;
log.info(format("[%d] >>>> Start backup %s -> %s", actionId, datasetName, backupFilename)) ;
- Backup.backup(dataset, backupFilename) ;
+ Backup.backup(transactional, dataset, backupFilename) ;
log.info(format("[%d] <<<< Finish backup %s -> %s", actionId, datasetName, backupFilename)) ;
} catch (Exception ex) {
log.info(format("[%d] **** Exception in backup", actionId), ex) ;