root
/
kafka
mirror of https://github.com/apache/kafka.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

HOTFIX: Remove git conflict markers in streams.html 

Author: Guozhang Wang <wangguoz@gmail.com>

Reviewers: Ismael Juma <ismael@juma.me.uk>

Closes #1922 from guozhangwang/KHotfix-streams-html
This commit is contained in:
Guozhang Wang 2016-09-28 02:31:58 +01:00 committed by Ismael Juma
parent 64acd90859
commit 8bbb0b216f
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docs/streams.html
View File

@ -298,11 +298,8 @@ based on them.
<pre> <pre>
// written in Java 8+, using lambda expressions // written in Java 8+, using lambda expressions
<<<<<<< HEAD
KTable<Windowed<String>, Long> counts = source1.aggregateByKey( KTable<Windowed<String>, Long> counts = source1.aggregateByKey(
=======
KTable<Windowed<String>, Long> counts = source1.groupByKey().aggregate(
>>>>>>> 268cff7... KAFKA-4112: Remove alpha quality label from Kafka Streams in docs
() -> 0L, // initial value () -> 0L, // initial value
(aggKey, value, aggregate) -> aggregate + 1L, // aggregating value (aggKey, value, aggregate) -> aggregate + 1L, // aggregating value
TimeWindows.of("counts",5000L).advanceBy(1000L), // intervals in milliseconds TimeWindows.of("counts",5000L).advanceBy(1000L), // intervals in milliseconds