This closes #250

apache · May 24, 2017 · f03fb60 · f03fb60
2 parents 0b8e34d + 047a210
commit f03fb60
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 23 deletions.
diff --git a/content/documentation/io/built-in/index.html b/content/documentation/io/built-in/index.html
@@ -255,6 +255,10 @@ <h1 id="in-progress-io-transforms">In-Progress I/O Transforms</h1>
     <td>RestIO</td><td>Java</td>
     <td><a href="https://issues.apache.org/jira/browse/BEAM-1946">BEAM-1946</a></td>
   </tr>
+  <tr>
+    <td>TikaIO</td><td>Java</td>
+    <td><a href="https://issues.apache.org/jira/browse/BEAM-2328">BEAM-2328</a></td>
+  </tr>
 </table>
 
     </div>

diff --git a/content/documentation/programming-guide/index.html b/content/documentation/programming-guide/index.html
@@ -402,14 +402,14 @@ <h4 id="creating-a-pcollection-from-in-memory-data">Creating a PCollection from
 </code></pre>
 </div>
 
-<div class="language-py highlighter-rouge"><pre class="highlight"><code><span class="n">p</span> <span class="o">=</span> <span class="n">beam</span><span class="o">.</span><span class="n">Pipeline</span><span class="p">(</span><span class="n">options</span><span class="o">=</span><span class="n">pipeline_options</span><span class="p">)</span>
+<div class="language-py highlighter-rouge"><pre class="highlight"><code><span class="k">with</span> <span class="n">beam</span><span class="o">.</span><span class="n">Pipeline</span><span class="p">(</span><span class="n">options</span><span class="o">=</span><span class="n">pipeline_options</span><span class="p">)</span> <span class="k">as</span> <span class="n">p</span><span class="p">:</span>
 
-<span class="n">lines</span> <span class="o">=</span> <span class="p">(</span><span class="n">p</span>
-         <span class="o">|</span> <span class="n">beam</span><span class="o">.</span><span class="n">Create</span><span class="p">([</span>
-             <span class="s">'To be, or not to be: that is the question: '</span><span class="p">,</span>
-             <span class="s">'Whether </span><span class="se">\'</span><span class="s">tis nobler in the mind to suffer '</span><span class="p">,</span>
-             <span class="s">'The slings and arrows of outrageous fortune, '</span><span class="p">,</span>
-             <span class="s">'Or to take arms against a sea of troubles, '</span><span class="p">]))</span>
+  <span class="n">lines</span> <span class="o">=</span> <span class="p">(</span><span class="n">p</span>
+           <span class="o">|</span> <span class="n">beam</span><span class="o">.</span><span class="n">Create</span><span class="p">([</span>
+               <span class="s">'To be, or not to be: that is the question: '</span><span class="p">,</span>
+               <span class="s">'Whether </span><span class="se">\'</span><span class="s">tis nobler in the mind to suffer '</span><span class="p">,</span>
+               <span class="s">'The slings and arrows of outrageous fortune, '</span><span class="p">,</span>
+               <span class="s">'Or to take arms against a sea of troubles, '</span><span class="p">]))</span>
 
 </code></pre>
 </div>
@@ -1128,10 +1128,10 @@ <h5 id="passing-side-inputs-to-pardo">Passing side inputs to ParDo:</h5>
     <span class="n">lower_bound</span><span class="o">=</span><span class="n">pvalue</span><span class="o">.</span><span class="n">AsSingleton</span><span class="p">(</span><span class="n">avg_word_len</span><span class="p">)))</span>
 
 <span class="c"># Mix and match.</span>
-<span class="n">small_but_nontrivial</span> <span class="o">=</span> <span class="n">words</span> <span class="o">|</span> <span class="n">beam</span><span class="o">.</span><span class="n">FlatMap</span><span class="p">(</span><span class="n">filter_using_length</span><span class="p">,</span>
-                                            <span class="n">lower_bound</span><span class="o">=</span><span class="mi">2</span><span class="p">,</span>
-                                            <span class="n">upper_bound</span><span class="o">=</span><span class="n">pvalue</span><span class="o">.</span><span class="n">AsSingleton</span><span class="p">(</span>
-                                                <span class="n">avg_word_len</span><span class="p">))</span>
+<span class="n">small_but_nontrivial</span> <span class="o">=</span> <span class="n">words</span> <span class="o">|</span> <span class="n">beam</span><span class="o">.</span><span class="n">FlatMap</span><span class="p">(</span>
+    <span class="n">filter_using_length</span><span class="p">,</span>
+    <span class="n">lower_bound</span><span class="o">=</span><span class="mi">2</span><span class="p">,</span>
+    <span class="n">upper_bound</span><span class="o">=</span><span class="n">pvalue</span><span class="o">.</span><span class="n">AsSingleton</span><span class="p">(</span><span class="n">avg_word_len</span><span class="p">))</span>
 
 
 <span class="c"># We can also pass side inputs to a ParDo transform, which will get passed to its process method.</span>

diff --git a/content/documentation/sdks/python-custom-io/index.html b/content/documentation/sdks/python-custom-io/index.html
@@ -368,8 +368,8 @@ <h2 id="a-namereading-sourcesareading-from-a-new-source"><a name="reading-source
 
 <p>To read data from the source in your pipeline, use the <code class="highlighter-rouge">Read</code> transform:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>p = beam.Pipeline(options=PipelineOptions())
-numbers = p | 'ProduceNumbers' &gt;&gt; beam.io.Read(CountingSource(count))
+<div class="highlighter-rouge"><pre class="highlight"><code>with beam.Pipeline(options=PipelineOptions()) as p:
+  numbers = p | 'ProduceNumbers' &gt;&gt; beam.io.Read(CountingSource(count))
 </code></pre>
 </div>
 
@@ -512,11 +512,11 @@ <h2 id="a-namewriting-sinksawriting-to-a-new-sink"><a name="writing-sinks"></a>W
 
 <p>The following code demonstrates how to write to the sink using the <code class="highlighter-rouge">Write</code> transform.</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>p = beam.Pipeline(options=PipelineOptions())
-kvs = p | 'CreateKVs' &gt;&gt; beam.Create(KVs)
+<div class="highlighter-rouge"><pre class="highlight"><code>with beam.Pipeline(options=PipelineOptions()) as p:
+  kvs = p | 'CreateKVs' &gt;&gt; beam.Create(KVs)
 
-kvs | 'WriteToSimpleKV' &gt;&gt; beam.io.Write(
-    SimpleKVSink('http://url_to_simple_kv/', final_table_name))
+  kvs | 'WriteToSimpleKV' &gt;&gt; beam.io.Write(
+      SimpleKVSink('http://url_to_simple_kv/', final_table_name))
 </code></pre>
 </div>
 
@@ -569,10 +569,10 @@ <h2 id="a-nameptransform-wrappersaptransform-wrappers"><a name="ptransform-wrapp
 
 <p>Finally, write to the sink:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>p = beam.Pipeline(options=PipelineOptions())
-kvs = p | 'CreateKVs' &gt;&gt; beam.core.Create(KVs)
-kvs | 'WriteToSimpleKV' &gt;&gt; WriteToKVSink(
-    'http://url_to_simple_kv/', final_table_name)
+<div class="highlighter-rouge"><pre class="highlight"><code>with beam.Pipeline(options=PipelineOptions()) as p:
+  kvs = p | 'CreateKVs' &gt;&gt; beam.core.Create(KVs)
+  kvs | 'WriteToSimpleKV' &gt;&gt; WriteToKVSink(
+      'http://url_to_simple_kv/', final_table_name)
 </code></pre>
 </div>
 

diff --git a/content/documentation/sdks/python-type-safety/index.html b/content/documentation/sdks/python-type-safety/index.html
@@ -264,7 +264,6 @@ <h2 id="runtime-type-checking">Runtime Type Checking</h2>
 <p>For example, the following code would pass at both pipeline construction and runtime.</p>
 
 <div class="highlighter-rouge"><pre class="highlight"><code>p | beam.Create(['a']) | beam.Map(lambda x: 3).with_output_types(str)
-p.run()
 </code></pre>
 </div>
 

diff --git a/content/get-started/wordcount-example/index.html b/content/get-started/wordcount-example/index.html
@@ -491,7 +491,7 @@ <h3 id="using-parameterizable-pipelineoptions">Using Parameterizable PipelineOpt
                         <span class="n">default</span><span class="o">=</span><span class="s">'gs://my-bucket/input'</span><span class="p">)</span>
 
 <span class="n">options</span> <span class="o">=</span> <span class="n">PipelineOptions</span><span class="p">(</span><span class="n">argv</span><span class="p">)</span>
-<span class="n">p</span> <span class="o">=</span> <span class="n">beam</span><span class="o">.</span><span class="n">Pipeline</span><span class="p">(</span><span class="n">options</span><span class="o">=</span><span class="n">options</span><span class="p">)</span>
+<span class="k">with</span> <span class="n">beam</span><span class="o">.</span><span class="n">Pipeline</span><span class="p">(</span><span class="n">options</span><span class="o">=</span><span class="n">options</span><span class="p">)</span> <span class="k">as</span> <span class="n">p</span><span class="p">:</span>
 </code></pre>
 </div>
 

diff --git a/src/documentation/io/built-in.md b/src/documentation/io/built-in.md
@@ -124,4 +124,8 @@ This table contains I/O transforms that are currently planned or in-progress. St
     <td>RestIO</td><td>Java</td>
     <td><a href="https://issues.apache.org/jira/browse/BEAM-1946">BEAM-1946</a></td>
   </tr>
+  <tr>
+    <td>TikaIO</td><td>Java</td>
+    <td><a href="https://issues.apache.org/jira/browse/BEAM-2328">BEAM-2328</a></td>
+  </tr>
 </table>