This is an automated email from the ASF dual-hosted git repository.
guozhang pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/kafka.git
The following commit(s) were added to refs/heads/trunk by this push:
new 2514a42 KAFKA-7269: Add docs for KStream.merge (#5512)
2514a42 is described below
commit 2514a42e84c4e4bad9ac560c09e3d397707436d8
Author: lucapette <[email protected]>
AuthorDate: Wed Aug 29 18:34:54 2018 +0200
KAFKA-7269: Add docs for KStream.merge (#5512)
Matthias J. Sax <[email protected]>, Bill Bejeck <[email protected]>
---
docs/streams/developer-guide/dsl-api.html | 31 +++++++++++++++++++++++++++----
1 file changed, 27 insertions(+), 4 deletions(-)
diff --git a/docs/streams/developer-guide/dsl-api.html
b/docs/streams/developer-guide/dsl-api.html
index beb83a3..f61f052 100644
--- a/docs/streams/developer-guide/dsl-api.html
+++ b/docs/streams/developer-guide/dsl-api.html
@@ -591,7 +591,30 @@
</div>
</td>
</tr>
- <tr class="row-even"><td><p
class="first"><strong>Peek</strong></p>
+ <tr class="row-even"><td><p
class="first"><strong>Merge</strong></p>
+ <ul class="last simple">
+ <li>KStream → KStream</li>
+ </ul>
+ </td>
+ <td><p class="first">Merges records of two streams
into one larger stream.
+ (<a class="reference external"
+
href="../../../javadoc/org/apache/kafka/streams/kstream/KStream.html#merge-org.apache.kafka.streams.kstream.KStream-">details</a>)
+ <p>There is no ordering guarantee between records
+ from different streams in the merged stream.
Relative order is preserved within each input stream though (ie, records within
the same input stream are processed in order)</p>
+ <div class="last highlight-java">
+ <div class="highlight">
+ <pre>
+<span class="n">KStream</span><span class="o"><</span><span
class="kt">byte</span><span class="o">[],</span> <span
class="n">String</span><span class="o">></span> <span
class="n">stream1</span> <span class="o">=</span> <span class="o">...;</span>
+
+<span class="n">KStream</span><span class="o"><</span><span
class="kt">byte</span><span class="o">[],</span> <span
class="n">String</span><span class="o">></span> <span
class="n">stream2</span> <span class="o">=</span> <span class="o">...;</span>
+
+<span class="n">KStream</span><span class="o"><</span><span
class="kt">byte</span><span class="o">[],</span> <span
class="n">String</span><span class="o">></span> <span
class="n">merged</span> <span class="o">=</span> <span
class="n">stream1</span><span class="o">.</span><span
class="na">merge</span><span class="o">(</span><span
class="n">stream2</span><span class="o">);</span>
+ </pre>
+ </div>
+ </div>
+ </td>
+ </tr>
+ <tr class="row-odd"><td><p
class="first"><strong>Peek</strong></p>
<ul class="last simple">
<li>KStream → KStream</li>
</ul>
@@ -622,7 +645,7 @@
</div>
</td>
</tr>
- <tr class="row-odd"><td><p
class="first"><strong>Print</strong></p>
+ <tr class="row-even"><td><p
class="first"><strong>Print</strong></p>
<ul class="last simple">
<li>KStream → void</li>
</ul>
@@ -641,7 +664,7 @@
</div>
</td>
</tr>
- <tr class="row-even"><td><p
class="first"><strong>SelectKey</strong></p>
+ <tr class="row-odd"><td><p
class="first"><strong>SelectKey</strong></p>
<ul class="last simple">
<li>KStream → KStream</li>
</ul>
@@ -669,7 +692,7 @@
</div>
</td>
</tr>
- <tr class="row-odd"><td><p class="first"><strong>Table to
Stream</strong></p>
+ <tr class="row-even"><td><p class="first"><strong>Table to
Stream</strong></p>
<ul class="last simple">
<li>KTable → KStream</li>
</ul>
