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 2012/01/31 19:11:04 UTC
svn commit: r1238724 - in /incubator/jena/Jena2/ARQ/trunk/src/main/java:
arq/cmdline/CmdUpdate.java arq/update.java
com/hp/hpl/jena/sparql/core/TransactionalNull.java
Author: andy
Date: Tue Jan 31 18:11:03 2012
New Revision: 1238724
URL: http://svn.apache.org/viewvc?rev=1238724&view=rev
Log:
Add transaction control to arq.update.
Added:
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/TransactionalNull.java
Modified:
incubator/jena/Jena2/ARQ/trunk/src/main/java/arq/cmdline/CmdUpdate.java
incubator/jena/Jena2/ARQ/trunk/src/main/java/arq/update.java
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/arq/cmdline/CmdUpdate.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/arq/cmdline/CmdUpdate.java?rev=1238724&r1=1238723&r2=1238724&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/arq/cmdline/CmdUpdate.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/arq/cmdline/CmdUpdate.java Tue Jan 31 18:11:03 2012
@@ -56,6 +56,7 @@ public abstract class CmdUpdate extends
GraphStore graphStore = modGraphStore.getGraphStore() ;
if ( graphStore.getDefaultGraph() == null )
graphStore.setDefaultGraph(ModelFactory.createDefaultModel().getGraph());
+ // Migrate trasnaction flag to DatsetGraph ... sometime
execUpdate(graphStore) ;
}
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/arq/update.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/arq/update.java?rev=1238724&r1=1238723&r2=1238724&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/arq/update.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/arq/update.java Tue Jan 31 18:11:03 2012
@@ -26,7 +26,10 @@ import arq.cmd.CmdException ;
import arq.cmdline.ArgDecl ;
import arq.cmdline.CmdUpdate ;
+import com.hp.hpl.jena.query.ReadWrite ;
import com.hp.hpl.jena.sparql.SystemARQ ;
+import com.hp.hpl.jena.sparql.core.TransactionalNull ;
+import com.hp.hpl.jena.sparql.core.Transactional ;
import com.hp.hpl.jena.sparql.util.Utils ;
import com.hp.hpl.jena.update.GraphStore ;
import com.hp.hpl.jena.update.UpdateExecutionFactory ;
@@ -73,20 +76,34 @@ public class update extends CmdUpdate
{
if ( requestFiles.size() == 0 && getPositional().size() == 0 )
throw new CmdException("Nothing to do") ;
+
+ Transactional transactional = (graphStore instanceof Transactional ) ? (Transactional)graphStore : new TransactionalNull() ;
for ( Iterator<String> iter = requestFiles.iterator() ; iter.hasNext() ; )
{
String filename = iter.next();
- execOneFile(filename, graphStore) ;
+ try {
+ transactional.begin(ReadWrite.WRITE) ;
+ execOneFile(filename, graphStore) ;
+ transactional.commit() ;
+ } finally { transactional.end() ; }
}
for ( Iterator<String> iter = super.getPositional().iterator() ; iter.hasNext() ; )
{
String requestString = iter.next();
requestString = indirect(requestString) ;
- execOne(requestString, graphStore) ;
+
+ try {
+ transactional.begin(ReadWrite.WRITE) ;
+ execOne(requestString, graphStore) ;
+ transactional.commit() ;
+ } finally { transactional.end() ; }
+
+
}
SystemARQ.sync(graphStore) ;
+
if ( dump )
//SSE.write(graphStore) ;
NQuadsWriter.write(System.out, graphStore) ;
Added: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/TransactionalNull.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/TransactionalNull.java?rev=1238724&view=auto
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/TransactionalNull.java (added)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/TransactionalNull.java Tue Jan 31 18:11:03 2012
@@ -0,0 +1,58 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.hp.hpl.jena.sparql.core;
+
+import com.hp.hpl.jena.query.ReadWrite ;
+
+public class TransactionalNull implements Transactional
+{
+ boolean inTransaction = false ;
+
+ @Override
+ public void begin(ReadWrite readWrite)
+ {
+ inTransaction = true ;
+ }
+
+ @Override
+ public void commit()
+ {
+ inTransaction = false ;
+ }
+
+ @Override
+ public void abort()
+ {
+ inTransaction = false ;
+ }
+
+ @Override
+ public boolean isInTransaction()
+ {
+ return inTransaction ;
+ }
+
+ @Override
+ public void end()
+ {
+ inTransaction = false ;
+ }
+
+}
+