Repository: flink Updated Branches: refs/heads/master 5f63bf98c -> 65ce51c24
[FLINK-6876] [streaming] Correct the comments of DataStream#assignTimestampsAndWatermarks This closes #4092 Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/65ce51c2 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/65ce51c2 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/65ce51c2 Branch: refs/heads/master Commit: 65ce51c24b2b755fc66af9c996f6fabca298ae74 Parents: 5f63bf9 Author: ä»å ¸ <[email protected]> Authored: Fri Jun 9 11:58:39 2017 +0800 Committer: Jark Wu <[email protected]> Committed: Mon Jun 12 12:49:28 2017 +0800 ---------------------------------------------------------------------- .../scala/org/apache/flink/streaming/api/scala/DataStream.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/65ce51c2/flink-streaming-scala/src/main/scala/org/apache/flink/streaming/api/scala/DataStream.scala ---------------------------------------------------------------------- diff --git a/flink-streaming-scala/src/main/scala/org/apache/flink/streaming/api/scala/DataStream.scala b/flink-streaming-scala/src/main/scala/org/apache/flink/streaming/api/scala/DataStream.scala index cccd377..3875f66 100644 --- a/flink-streaming-scala/src/main/scala/org/apache/flink/streaming/api/scala/DataStream.scala +++ b/flink-streaming-scala/src/main/scala/org/apache/flink/streaming/api/scala/DataStream.scala @@ -32,7 +32,7 @@ import org.apache.flink.core.fs.{FileSystem, Path} import org.apache.flink.streaming.api.collector.selector.OutputSelector import org.apache.flink.streaming.api.datastream.{AllWindowedStream => JavaAllWindowedStream, DataStream => JavaStream, KeyedStream => JavaKeyedStream, _} import org.apache.flink.streaming.api.functions.sink.SinkFunction -import org.apache.flink.streaming.api.functions.timestamps.AscendingTimestampExtractor +import org.apache.flink.streaming.api.functions.timestamps.{AscendingTimestampExtractor, BoundedOutOfOrdernessTimestampExtractor} import org.apache.flink.streaming.api.functions.{AssignerWithPeriodicWatermarks, AssignerWithPunctuatedWatermarks, ProcessFunction, TimestampExtractor} import org.apache.flink.streaming.api.operators.OneInputStreamOperator import org.apache.flink.streaming.api.windowing.assigners._ @@ -788,7 +788,7 @@ class DataStream[T](stream: JavaStream[T]) { * For the second case and when the watermarks are required to lag behind the maximum * timestamp seen so far in the elements of the stream by a fixed amount of time, and this * amount is known in advance, use the - * [[org.apache.flink.streaming.api.functions.TimestampExtractorWithFixedAllowedLateness]]. + * [[BoundedOutOfOrdernessTimestampExtractor]]. * * For cases where watermarks should be created in an irregular fashion, for example * based on certain markers that some element carry, use the
