You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by al...@apache.org on 2020/05/18 04:53:43 UTC
[flink] branch master updated (ce843a2 -> 59714b9)
This is an automated email from the ASF dual-hosted git repository.
aljoscha pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git.
from ce843a2 [FLINK-17029][jdbc] Introduce a new JDBC connector with new property keys
add 12b984f [FLINK-17658] Add new TimestampAssigner and WatermarkGenerator interfaces
add ba79c0c [FLINK-17658] Don't mention ingestion time in new TimestampAssigner
add 792e0cc [FLINK-17658] Rename DefaultTimestampAssigner to RecordTimestampAssigner
add eaef2d7 [FLINK-17659] Add common watermark strategies and WatermarkStrategies helper
add d755e1b [FLINK-17661] Add APIs for using new WatermarkStrategy/WatermarkGenerator
add a9fc983 [FLINK-17661] Add WatermarkMatchers
add 62911db [FLINK-17661] Add test for new TimestampsAndWatermarksOperator
add 3b309d3 [FLINK-17661] Deprecate old Watermark Assigner API
add e0b5d51 [FLINK-17659] Rework WatermarkStrategy, add Suppliers for TimestampAssigner/WatermarkGenerator
add 3d339de [FLINK-17661] Add Scala API for using new WatermarkStrategy/WatermarkGenerator
add 8e5685d [FLINK-17669] Add WatermarkOutputMultiplexer
add 12197b3 [minor] Fix warnings in AbstractFetcher(Test)
add 5be27b0 [FLINK-17669] Use new WatermarkGenerator for per-partition watermarking in KafkaConsumer
add 59714b9 [FLINK-17766] Use checkpoint lock instead of fine-grained locking in Kafka AbstractFetcher
No new revisions were added by this update.
Summary of changes:
.../connectors/kafka/FlinkKafkaConsumer010.java | 9 +-
.../connectors/kafka/internal/Kafka010Fetcher.java | 16 +-
.../kafka/internal/KafkaConsumerThread.java | 18 +-
.../kafka/internal/Kafka010FetcherTest.java | 9 +-
.../kafka/internal/KafkaConsumerThreadTest.java | 114 ++---
.../connectors/kafka/FlinkKafkaConsumerBase.java | 96 +++-
.../kafka/internals/AbstractFetcher.java | 291 ++++--------
.../kafka/internals/KafkaTopicPartitionState.java | 15 +-
...aTopicPartitionStateWithPeriodicWatermarks.java | 72 ---
...opicPartitionStateWithPunctuatedWatermarks.java | 85 ----
...aTopicPartitionStateWithWatermarkGenerator.java | 96 ++++
.../SourceContextWatermarkOutputAdapter.java | 45 ++
.../kafka/FlinkKafkaConsumerBaseMigrationTest.java | 6 +-
.../kafka/FlinkKafkaConsumerBaseTest.java | 59 ++-
.../kafka/internals/AbstractFetcherTest.java | 380 +--------------
.../internals/AbstractFetcherWatermarksTest.java | 512 +++++++++++++++++++++
.../connectors/kafka/FlinkKafkaConsumer.java | 9 +-
.../kafka/internal/KafkaConsumerThread.java | 18 +-
.../connectors/kafka/internal/KafkaFetcher.java | 15 +-
.../eventtime/AscendingTimestampsWatermarks.java | 46 ++
.../eventtime/BoundedOutOfOrdernessWatermarks.java | 71 +++
.../common/eventtime/IngestionTimeAssigner.java | 24 +-
.../common/eventtime/RecordTimestampAssigner.java | 36 ++
.../eventtime/SerializableTimestampAssigner.java | 30 ++
.../api/common/eventtime}/TimestampAssigner.java | 27 +-
.../eventtime/TimestampAssignerSupplier.java | 83 ++++
.../api/common/eventtime/WatermarkGenerator.java | 47 ++
.../eventtime/WatermarkGeneratorSupplier.java | 60 +++
.../eventtime/WatermarkOutputMultiplexer.java | 268 +++++++++++
.../api/common/eventtime/WatermarkStrategies.java | 242 ++++++++++
.../api/common/eventtime/WatermarkStrategy.java | 52 +++
.../common/eventtime/WatermarksWithIdleness.java | 137 ++++++
.../org/apache/flink/util/clock/ManualClock.java | 10 +-
.../AscendingTimestampsWatermarksTest.java | 62 +++
.../BoundedOutOfOrdernessWatermarksTest.java | 85 ++++
.../common/eventtime/TestingWatermarkOutput.java | 48 ++
.../api/common/eventtime/WatermarkMatchers.java | 49 ++
.../eventtime/WatermarkOutputMultiplexerTest.java | 318 +++++++++++++
.../common/eventtime/WatermarkStrategiesTest.java | 231 ++++++++++
.../eventtime/WatermarksWithIdlenessTest.java | 108 +++++
.../flink/streaming/api/datastream/DataStream.java | 125 +++--
.../functions/AssignerWithPeriodicWatermarks.java | 1 +
.../AssignerWithPunctuatedWatermarks.java | 1 +
.../api/functions/IngestionTimeExtractor.java | 1 +
.../streaming/api/functions/TimestampAssigner.java | 10 +-
.../timestamps/AscendingTimestampExtractor.java | 1 +
.../TimestampsAndPeriodicWatermarksOperator.java | 111 -----
.../TimestampsAndPunctuatedWatermarksOperator.java | 75 ---
.../operators/TimestampsAndWatermarksOperator.java | 174 +++++++
.../AssignerWithPeriodicWatermarksAdapter.java | 83 ++++
.../AssignerWithPunctuatedWatermarksAdapter.java | 85 ++++
...imestampsAndPeriodicWatermarksOperatorTest.java | 203 --------
...estampsAndPunctuatedWatermarksOperatorTest.java | 138 ------
.../TimestampsAndWatermarksOperatorTest.java | 281 +++++++++++
.../flink/streaming/util/WatermarkMatchers.java | 51 ++
.../flink/streaming/api/scala/DataStream.scala | 72 ++-
56 files changed, 3783 insertions(+), 1528 deletions(-)
delete mode 100644 flink-connectors/flink-connector-kafka-base/src/main/java/org/apache/flink/streaming/connectors/kafka/internals/KafkaTopicPartitionStateWithPeriodicWatermarks.java
delete mode 100644 flink-connectors/flink-connector-kafka-base/src/main/java/org/apache/flink/streaming/connectors/kafka/internals/KafkaTopicPartitionStateWithPunctuatedWatermarks.java
create mode 100644 flink-connectors/flink-connector-kafka-base/src/main/java/org/apache/flink/streaming/connectors/kafka/internals/KafkaTopicPartitionStateWithWatermarkGenerator.java
create mode 100644 flink-connectors/flink-connector-kafka-base/src/main/java/org/apache/flink/streaming/connectors/kafka/internals/SourceContextWatermarkOutputAdapter.java
create mode 100644 flink-connectors/flink-connector-kafka-base/src/test/java/org/apache/flink/streaming/connectors/kafka/internals/AbstractFetcherWatermarksTest.java
create mode 100644 flink-core/src/main/java/org/apache/flink/api/common/eventtime/AscendingTimestampsWatermarks.java
create mode 100644 flink-core/src/main/java/org/apache/flink/api/common/eventtime/BoundedOutOfOrdernessWatermarks.java
copy flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/IngestionTimeExtractor.java => flink-core/src/main/java/org/apache/flink/api/common/eventtime/IngestionTimeAssigner.java (59%)
create mode 100644 flink-core/src/main/java/org/apache/flink/api/common/eventtime/RecordTimestampAssigner.java
create mode 100644 flink-core/src/main/java/org/apache/flink/api/common/eventtime/SerializableTimestampAssigner.java
copy {flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions => flink-core/src/main/java/org/apache/flink/api/common/eventtime}/TimestampAssigner.java (64%)
create mode 100644 flink-core/src/main/java/org/apache/flink/api/common/eventtime/TimestampAssignerSupplier.java
create mode 100644 flink-core/src/main/java/org/apache/flink/api/common/eventtime/WatermarkGenerator.java
create mode 100644 flink-core/src/main/java/org/apache/flink/api/common/eventtime/WatermarkGeneratorSupplier.java
create mode 100644 flink-core/src/main/java/org/apache/flink/api/common/eventtime/WatermarkOutputMultiplexer.java
create mode 100644 flink-core/src/main/java/org/apache/flink/api/common/eventtime/WatermarkStrategies.java
create mode 100644 flink-core/src/main/java/org/apache/flink/api/common/eventtime/WatermarkStrategy.java
create mode 100644 flink-core/src/main/java/org/apache/flink/api/common/eventtime/WatermarksWithIdleness.java
create mode 100644 flink-core/src/test/java/org/apache/flink/api/common/eventtime/AscendingTimestampsWatermarksTest.java
create mode 100644 flink-core/src/test/java/org/apache/flink/api/common/eventtime/BoundedOutOfOrdernessWatermarksTest.java
create mode 100644 flink-core/src/test/java/org/apache/flink/api/common/eventtime/TestingWatermarkOutput.java
create mode 100644 flink-core/src/test/java/org/apache/flink/api/common/eventtime/WatermarkMatchers.java
create mode 100644 flink-core/src/test/java/org/apache/flink/api/common/eventtime/WatermarkOutputMultiplexerTest.java
create mode 100644 flink-core/src/test/java/org/apache/flink/api/common/eventtime/WatermarkStrategiesTest.java
create mode 100644 flink-core/src/test/java/org/apache/flink/api/common/eventtime/WatermarksWithIdlenessTest.java
delete mode 100644 flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/TimestampsAndPeriodicWatermarksOperator.java
delete mode 100644 flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/TimestampsAndPunctuatedWatermarksOperator.java
create mode 100644 flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/TimestampsAndWatermarksOperator.java
create mode 100644 flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/util/AssignerWithPeriodicWatermarksAdapter.java
create mode 100644 flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/util/AssignerWithPunctuatedWatermarksAdapter.java
delete mode 100644 flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/TimestampsAndPeriodicWatermarksOperatorTest.java
delete mode 100644 flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/TimestampsAndPunctuatedWatermarksOperatorTest.java
create mode 100644 flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/TimestampsAndWatermarksOperatorTest.java
create mode 100644 flink-streaming-java/src/test/java/org/apache/flink/streaming/util/WatermarkMatchers.java