This is an automated email from the ASF dual-hosted git repository.
pnowojski pushed a commit to branch release-1.19
in repository https://gitbox.apache.org/repos/asf/flink.git
The following commit(s) were added to refs/heads/release-1.19 by this push:
new e2ac98a2b34 (1.19 and 1.20 only) fixup! [FLINK-35886][task] Use
RelativeClock in WatermarksWithIdleness
e2ac98a2b34 is described below
commit e2ac98a2b349e241e47f63a672542b4fe813c20b
Author: Piotr Nowojski <[email protected]>
AuthorDate: Tue Aug 27 11:16:52 2024 +0200
(1.19 and 1.20 only) fixup! [FLINK-35886][task] Use RelativeClock in
WatermarksWithIdleness
---
.../flink/api/common/eventtime/WatermarkGeneratorSupplier.java | 8 +++++++-
pom.xml | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git
a/flink-core/src/main/java/org/apache/flink/api/common/eventtime/WatermarkGeneratorSupplier.java
b/flink-core/src/main/java/org/apache/flink/api/common/eventtime/WatermarkGeneratorSupplier.java
index 4d149d39259..9bf861b5717 100644
---
a/flink-core/src/main/java/org/apache/flink/api/common/eventtime/WatermarkGeneratorSupplier.java
+++
b/flink-core/src/main/java/org/apache/flink/api/common/eventtime/WatermarkGeneratorSupplier.java
@@ -21,6 +21,7 @@ package org.apache.flink.api.common.eventtime;
import org.apache.flink.annotation.PublicEvolving;
import org.apache.flink.metrics.MetricGroup;
import org.apache.flink.util.clock.RelativeClock;
+import org.apache.flink.util.clock.SystemClock;
import java.io.Serializable;
@@ -61,8 +62,13 @@ public interface WatermarkGeneratorSupplier<T> extends
Serializable {
* WatermarkGenerator} could not have been executed due to execution
being blocked by the
* runtime. For example a backpressure or watermark alignment blocking
the progress.
*
+ * <p>The default implementation that returns {@link SystemClock} is
only for 1.19 and 1.20
+ * release to keep binary compatibility of the user's code.
+ *
* @see RelativeClock
*/
- RelativeClock getInputActivityClock();
+ default RelativeClock getInputActivityClock() {
+ return SystemClock.getInstance();
+ }
}
}
diff --git a/pom.xml b/pom.xml
index bb9454c3bf6..503f19eb651 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2355,7 +2355,7 @@ under the License.
<exclude>@org.apache.flink.annotation.Experimental</exclude>
<exclude>@org.apache.flink.annotation.Internal</exclude>
<!-- MARKER:
start exclusions; these will be wiped by
tools/releasing/update_japicmp_configuration.sh -->
- <!-- New method
has been added to the interface, but this interface shouldn't be implemented by
users, only used/called, so this doesn't break API compatibility. -->
+ <!-- New method
has been added to the interface, with a default implementation. This shouldn't
break binary compatibility. -->
<exclude>org.apache.flink.api.common.eventtime.WatermarkGeneratorSupplier$Context</exclude>
<!-- Base
interface has been extracted from the existing Clock class. This interface
shouldn't affect user code. -->
<exclude>org.apache.flink.util.clock.Clock</exclude>
