You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by bu...@apache.org on 2016/09/09 15:20:39 UTC

svn commit: r997041 - in /websites/staging/jena/trunk/content: ./ documentation/txn/txn.html

Author: buildbot
Date: Fri Sep  9 15:20:39 2016
New Revision: 997041

Log:
Staging update by buildbot for jena

Modified:
    websites/staging/jena/trunk/content/   (props changed)
    websites/staging/jena/trunk/content/documentation/txn/txn.html

Propchange: websites/staging/jena/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Fri Sep  9 15:20:39 2016
@@ -1 +1 @@
-1760002
+1760038

Modified: websites/staging/jena/trunk/content/documentation/txn/txn.html
==============================================================================
--- websites/staging/jena/trunk/content/documentation/txn/txn.html (original)
+++ websites/staging/jena/trunk/content/documentation/txn/txn.html Fri Sep  9 15:20:39 2016
@@ -183,14 +183,14 @@ to use transactions.</p>
 contained in a Java lambda expression or a Java Runnable object, in the correct entry
 and exit code for a transaction, eliminating coding errors.</p>
 <p>The form is:</p>
-<div class="codehilite"><pre><span class="n">Txn</span><span class="p">.</span><span class="n">execRead</span><span class="p">(</span><span class="n">ds</span><span class="p">,</span> <span class="p">()</span><span class="o">-&gt;</span> <span class="p">{</span>
+<div class="codehilite"><pre><span class="n">Txn</span><span class="p">.</span><span class="n">executeRead</span><span class="p">(</span><span class="n">ds</span><span class="p">,</span> <span class="p">()</span><span class="o">-&gt;</span> <span class="p">{</span>
     <span class="p">.</span> <span class="p">.</span> <span class="p">.</span>
 <span class="p">})</span> <span class="p">;</span>
 </pre></div>
 
 
 <p>and</p>
-<div class="codehilite"><pre><span class="n">Txn</span><span class="p">.</span><span class="n">execWrite</span><span class="p">(</span><span class="n">ds</span><span class="p">,</span> <span class="p">()</span><span class="o">-&gt;</span> <span class="p">{</span>
+<div class="codehilite"><pre><span class="n">Txn</span><span class="p">.</span><span class="n">executeWrite</span><span class="p">(</span><span class="n">ds</span><span class="p">,</span> <span class="p">()</span><span class="o">-&gt;</span> <span class="p">{</span>
     <span class="p">.</span> <span class="p">.</span> <span class="p">.</span>
 <span class="p">})</span> <span class="p">;</span>
 </pre></div>
@@ -200,7 +200,7 @@ and exit code for a transaction, elimina
 <p>This first example shows how to write a SPARQL query .</p>
 <div class="codehilite"><pre><span class="n">Dataset</span> <span class="n">ds</span> <span class="p">=</span> <span class="p">...</span> <span class="p">;</span>
 <span class="n">Query</span> <span class="n">query</span> <span class="p">=</span> <span class="p">...</span> <span class="p">;</span>
-<span class="n">Txn</span><span class="p">.</span><span class="n">execRead</span><span class="p">(</span><span class="n">ds</span><span class="p">,</span> <span class="p">()</span><span class="o">-&gt;</span> <span class="p">{</span>
+<span class="n">Txn</span><span class="p">.</span><span class="n">executeRead</span><span class="p">(</span><span class="n">ds</span><span class="p">,</span> <span class="p">()</span><span class="o">-&gt;</span> <span class="p">{</span>
     <span class="k">try</span><span class="p">(</span><span class="n">QueryExecution</span> <span class="n">qExec</span> <span class="p">=</span> <span class="n">QueryExecutionFactory</span><span class="p">.</span><span class="n">create</span><span class="p">(</span><span class="n">query</span><span class="p">,</span> <span class="n">ds</span><span class="p">))</span> <span class="p">{</span>
         <span class="n">ResultSetFormatter</span><span class="p">.</span><span class="n">out</span><span class="p">(</span><span class="n">qExec</span><span class="p">.</span><span class="n">execSelect</span><span class="p">())</span> <span class="p">;</span>
     <span class="p">}</span>
@@ -213,7 +213,7 @@ and exit code for a transaction, elimina
 <p>Writing to a file is a read-action (it does not update the RDF data, the
 writer needs to read the dataset or model):</p>
 <div class="codehilite"><pre><span class="n">Dataset</span> <span class="n">ds</span> <span class="p">=</span> <span class="p">...</span> <span class="p">;</span>
-<span class="n">Txn</span><span class="p">.</span><span class="n">execRead</span><span class="p">(</span><span class="n">ds</span><span class="p">,</span> <span class="p">()</span><span class="o">-&gt;</span> <span class="p">{</span>
+<span class="n">Txn</span><span class="p">.</span><span class="n">executeRead</span><span class="p">(</span><span class="n">ds</span><span class="p">,</span> <span class="p">()</span><span class="o">-&gt;</span> <span class="p">{</span>
     <span class="n">RDFDataMgr</span><span class="p">.</span><span class="n">write</span><span class="p">(</span><span class="n">System</span><span class="p">.</span><span class="n">out</span><span class="p">,</span> <span class="n">ds</span><span class="p">,</span> <span class="n">Lang</span><span class="p">.</span><span class="n">TRIG</span><span class="p">)</span> <span class="p">;</span>
 <span class="p">})</span> <span class="p">;</span>
 </pre></div>
@@ -222,7 +222,7 @@ writer needs to read the dataset or mode
 <p>whereas reading data into an RDF dataset needs to be a write transaction
 (the dataset or model is chanaged).</p>
 <div class="codehilite"><pre><span class="n">Dataset</span> <span class="n">ds</span> <span class="p">=</span> <span class="p">...</span> <span class="p">;</span>
-<span class="n">Txn</span><span class="p">.</span><span class="n">execWrite</span><span class="p">(</span><span class="n">ds</span><span class="p">,</span> <span class="p">()</span><span class="o">-&gt;</span> <span class="p">{</span>
+<span class="n">Txn</span><span class="p">.</span><span class="n">executeWrite</span><span class="p">(</span><span class="n">ds</span><span class="p">,</span> <span class="p">()</span><span class="o">-&gt;</span> <span class="p">{</span>
     <span class="n">RDFDataMgr</span><span class="p">.</span><span class="n">read</span><span class="p">(</span><span class="n">ds</span><span class="p">,</span> &quot;<span class="n">data</span><span class="p">.</span><span class="n">ttl</span>&quot;<span class="p">)</span> <span class="p">;</span>
 <span class="p">})</span> <span class="p">;</span>
 </pre></div>
@@ -234,7 +234,7 @@ queries:</p>
 <div class="codehilite"><pre><span class="n">Dataset</span> <span class="n">ds</span> <span class="p">=</span> <span class="p">...</span> <span class="p">;</span>
 <span class="n">Query</span> <span class="n">query1</span> <span class="p">=</span> <span class="p">...</span> <span class="p">;</span>
 <span class="n">Query</span> <span class="n">query2</span> <span class="p">=</span> <span class="p">...</span> <span class="p">;</span>
-<span class="n">Txn</span><span class="p">.</span><span class="n">execRead</span><span class="p">(</span><span class="n">ds</span><span class="p">,</span> <span class="p">()</span><span class="o">-&gt;</span> <span class="p">{</span>
+<span class="n">Txn</span><span class="p">.</span><span class="n">executeRead</span><span class="p">(</span><span class="n">ds</span><span class="p">,</span> <span class="p">()</span><span class="o">-&gt;</span> <span class="p">{</span>
      <span class="k">try</span><span class="p">(</span><span class="n">QueryExecution</span> <span class="n">qExec1</span> <span class="p">=</span> <span class="n">QueryExecutionFactory</span><span class="p">.</span><span class="n">create</span><span class="p">(</span><span class="n">query1</span><span class="p">,</span> <span class="n">ds</span><span class="p">))</span> <span class="p">{</span>
          <span class="p">...</span>
      <span class="p">}</span>
@@ -245,7 +245,7 @@ queries:</p>
 </pre></div>
 
 
-<p>The <code>Txn.exec</code> block can return a result but only with the condition
+<p>A <code>Txn.calculateRead</code> block can return a result but only with the condition
 that what is returned does not touch the data again unless it uses a new
 transaction.</p>
 <p>This includes returning a result set or returning a model from a dataset.</p>
@@ -254,7 +254,7 @@ called, new data might be read from the
 results needs to be take:</p>
 <div class="codehilite"><pre><span class="n">Dataset</span> <span class="n">ds</span> <span class="p">=</span> <span class="p">...</span> <span class="p">;</span>
 <span class="n">Query</span> <span class="n">query</span> <span class="p">=</span> <span class="p">...</span> <span class="p">;</span>
-<span class="n">List</span><span class="o">&lt;</span><span class="n">String</span><span class="o">&gt;</span> <span class="n">results</span> <span class="p">=</span> <span class="n">Txn</span><span class="p">.</span><span class="n">execReadRtn</span><span class="p">(</span><span class="n">ds</span><span class="p">,</span> <span class="p">()</span><span class="o">-&gt;</span> <span class="p">{</span>
+<span class="n">List</span><span class="o">&lt;</span><span class="n">String</span><span class="o">&gt;</span> <span class="n">results</span> <span class="p">=</span> <span class="n">Txn</span><span class="p">.</span><span class="n">calculateRead</span><span class="p">(</span><span class="n">ds</span><span class="p">,</span> <span class="p">()</span><span class="o">-&gt;</span> <span class="p">{</span>
      <span class="n">List</span><span class="o">&lt;</span><span class="n">String</span><span class="o">&gt;</span> <span class="n">accumulator</span> <span class="p">=</span> <span class="n">new</span> <span class="n">ArrayList</span><span class="o">&lt;&gt;</span><span class="p">()</span> <span class="p">;</span>
      <span class="k">try</span><span class="p">(</span><span class="n">QueryExecution</span> <span class="n">qExec</span> <span class="p">=</span> <span class="n">QueryExecutionFactory</span><span class="p">.</span><span class="n">create</span><span class="p">(</span><span class="n">query</span><span class="p">,</span> <span class="n">ds</span><span class="p">))</span> <span class="p">{</span>
          <span class="n">qExec</span><span class="p">.</span><span class="n">execSelect</span><span class="p">().</span><span class="n">forEachRemaining</span><span class="p">((</span><span class="n">row</span><span class="p">)</span><span class="o">-&gt;</span><span class="p">{</span>
@@ -268,7 +268,7 @@ results needs to be take:</p>
 
 <span class="n">Dataset</span> <span class="n">ds</span> <span class="p">=</span> <span class="p">...</span> <span class="p">;</span>
 <span class="n">Query</span> <span class="n">query</span> <span class="p">=</span> <span class="p">...</span> <span class="p">;</span>
-<span class="n">ResultSet</span> <span class="n">List</span><span class="o">&lt;</span><span class="n">String</span><span class="o">&gt;</span> <span class="n">resultSet</span> <span class="p">=</span> <span class="n">Txn</span><span class="p">.</span><span class="n">execReadRtn</span><span class="p">(</span><span class="n">ds</span><span class="p">,</span> <span class="p">()</span><span class="o">-&gt;</span> <span class="p">{</span>
+<span class="n">ResultSet</span> <span class="n">List</span><span class="o">&lt;</span><span class="n">String</span><span class="o">&gt;</span> <span class="n">resultSet</span> <span class="p">=</span> <span class="n">Txn</span><span class="p">.</span><span class="n">calculateRead</span><span class="p">(</span><span class="n">ds</span><span class="p">,</span> <span class="p">()</span><span class="o">-&gt;</span> <span class="p">{</span>
      <span class="n">List</span><span class="o">&lt;</span><span class="n">String</span><span class="o">&gt;</span> <span class="n">accumulator</span> <span class="p">=</span> <span class="n">new</span> <span class="n">ArrayList</span><span class="o">&lt;&gt;</span><span class="p">()</span> <span class="p">;</span>
      <span class="k">try</span><span class="p">(</span><span class="n">QueryExecution</span> <span class="n">qExec</span> <span class="p">=</span> <span class="n">QueryExecutionFactory</span><span class="p">.</span><span class="n">create</span><span class="p">(</span><span class="n">query</span><span class="p">,</span> <span class="n">ds</span><span class="p">))</span> <span class="p">{</span>
          <span class="k">return</span> <span class="n">ResutSetFactory</span><span class="p">.</span><span class="n">copyResults</span><span class="p">(</span><span class="n">qExec</span><span class="p">.</span><span class="n">execSelect</span><span class="p">())</span> <span class="p">;</span>
@@ -283,19 +283,19 @@ results needs to be take:</p>
 Model should not be passed out of a transaction because they are still atatched to the
 dataset.</p>
 <h2 id="autocommit-and-transaction-continuation">Autocommit and Transaction continuation<a class="headerlink" href="#autocommit-and-transaction-continuation" title="Permanent link">&para;</a></h2>
-<p>If there is a transaction already started for the thread, the <code>Txn.exec</code> will be performed as part of
+<p>If there is a transaction already started for the thread, the <code>Txn.execute...</code> will be performed as part of
 the transaction and that transaction is not terminated.  If there is not transaction already started,
-a transaction is wrapped around the <code>Txn.exec</code> action.</p>
+a transaction is wrapped around the <code>Txn.execute...</code> action.</p>
 <div class="codehilite"><pre><span class="n">Dataset</span> <span class="n">datsset</span> <span class="p">=</span> <span class="p">...</span>
 <span class="o">//</span> <span class="n">Main</span> <span class="n">transaction</span><span class="p">.</span>
 <span class="n">dataset</span><span class="p">.</span><span class="n">begin</span><span class="p">(</span><span class="n">ReadWrite</span><span class="p">.</span><span class="n">WRITE</span><span class="p">)</span> <span class="p">;</span>
 <span class="k">try</span> <span class="p">{</span>
   <span class="p">...</span>
   <span class="o">//</span> <span class="n">Part</span> <span class="n">of</span> <span class="n">the</span> <span class="n">transaction</span> <span class="n">above</span><span class="p">.</span>
-  <span class="n">Txn</span><span class="p">.</span><span class="n">execRead</span><span class="p">(</span><span class="n">dataset</span><span class="p">,</span> <span class="p">()</span> <span class="o">-&gt;</span> <span class="p">...)</span> <span class="p">;</span>
+  <span class="n">Txn</span><span class="p">.</span><span class="n">executeRead</span><span class="p">(</span><span class="n">dataset</span><span class="p">,</span> <span class="p">()</span> <span class="o">-&gt;</span> <span class="p">...)</span> <span class="p">;</span>
   <span class="p">...</span>
   <span class="o">//</span> <span class="n">Part</span> <span class="n">of</span> <span class="n">the</span> <span class="n">transaction</span> <span class="n">above</span> <span class="o">-</span> <span class="n">no</span> <span class="n">commit</span><span class="o">/</span><span class="n">abort</span>
-  <span class="n">Txn</span><span class="p">.</span><span class="n">execWrite</span><span class="p">(</span><span class="n">dataset</span><span class="p">,</span> <span class="p">()</span> <span class="o">-&gt;</span> <span class="p">...)</span> <span class="p">;</span>
+  <span class="n">Txn</span><span class="p">.</span><span class="n">executeWrite</span><span class="p">(</span><span class="n">dataset</span><span class="p">,</span> <span class="p">()</span> <span class="o">-&gt;</span> <span class="p">...)</span> <span class="p">;</span>
 
   <span class="n">dataset</span><span class="p">.</span><span class="n">commit</span><span class="p">()</span> <span class="p">;</span>
 <span class="p">}</span> <span class="n">finally</span> <span class="p">{</span> <span class="n">dataset</span><span class="p">.</span><span class="k">end</span><span class="p">()</span> <span class="p">;</span> <span class="p">}</span>