aboutsummaryrefslogtreecommitdiff
path: root/docs/streaming-programming-guide.md
diff options
context:
space:
mode:
authorAaron Davidson <aaron@databricks.com>2013-10-08 14:18:31 -0700
committerAaron Davidson <aaron@databricks.com>2013-10-08 14:18:31 -0700
commit4ea8ee468fb1f50fce56853a5127a89efc45b706 (patch)
tree83a40f1f28b43121b7359e5dcdd00ce04daa7b79 /docs/streaming-programming-guide.md
parent749233b869da188920d8d72af7b82e586993d17c (diff)
downloadspark-4ea8ee468fb1f50fce56853a5127a89efc45b706.tar.gz
spark-4ea8ee468fb1f50fce56853a5127a89efc45b706.tar.bz2
spark-4ea8ee468fb1f50fce56853a5127a89efc45b706.zip
Add docs for standalone scheduler fault tolerance
Also fix a couple HTML/Markdown issues in other files.
Diffstat (limited to 'docs/streaming-programming-guide.md')
-rw-r--r--docs/streaming-programming-guide.md5
1 files changed, 2 insertions, 3 deletions
diff --git a/docs/streaming-programming-guide.md b/docs/streaming-programming-guide.md
index c7df172024..835b257238 100644
--- a/docs/streaming-programming-guide.md
+++ b/docs/streaming-programming-guide.md
@@ -122,12 +122,12 @@ Spark Streaming features windowed computations, which allow you to apply transfo
<table class="table">
<tr><th style="width:30%">Transformation</th><th>Meaning</th></tr>
<tr>
- <td> <b>window</b>(<i>windowDuration</i>, </i>slideDuration</i>) </td>
+ <td> <b>window</b>(<i>windowDuration</i>, <i>slideDuration</i>) </td>
<td> Return a new DStream which is computed based on windowed batches of the source DStream. <i>windowDuration</i> is the width of the window and <i>slideTime</i> is the frequency during which the window is calculated. Both times must be multiples of the batch interval.
</td>
</tr>
<tr>
- <td> <b>countByWindow</b>(<i>windowDuration</i>, </i>slideDuration</i>) </td>
+ <td> <b>countByWindow</b>(<i>windowDuration</i>, <i>slideDuration</i>) </td>
<td> Return a sliding count of elements in the stream. <i>windowDuration</i> and <i>slideDuration</i> are exactly as defined in <code>window()</code>.
</td>
</tr>
@@ -161,7 +161,6 @@ Spark Streaming features windowed computations, which allow you to apply transfo
<i>windowDuration</i> and <i>slideDuration</i> are exactly as defined in <code>window()</code>.
</td>
</tr>
-
</table>
A complete list of DStream operations is available in the API documentation of [DStream](api/streaming/index.html#org.apache.spark.streaming.DStream) and [PairDStreamFunctions](api/streaming/index.html#org.apache.spark.streaming.PairDStreamFunctions).