You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by pa...@apache.org on 2022/06/16 21:45:15 UTC
[beam] branch release-2.40.0 updated: Merge pull request #21910: Revert "convert windmill min timestamp to beam min timestamp"
This is an automated email from the ASF dual-hosted git repository.
pabloem pushed a commit to branch release-2.40.0
in repository https://gitbox.apache.org/repos/asf/beam.git
The following commit(s) were added to refs/heads/release-2.40.0 by this push:
new 424cffe37f2 Merge pull request #21910: Revert "convert windmill min timestamp to beam min timestamp"
new c0abd9e6fdb Merge pull request #21917 from [cherry-pick][release-2.40.0] Merge pull request #21910: Revert "convert windmill min timestamp to …
424cffe37f2 is described below
commit 424cffe37f21b3b8ed6b20f95c286afbb0ff4205
Author: Kenneth Knowles <ke...@apache.org>
AuthorDate: Thu Jun 16 07:57:04 2022 -0700
Merge pull request #21910: Revert "convert windmill min timestamp to beam min timestamp"
---
.../apache/beam/runners/dataflow/worker/WindmillTimeUtils.java | 3 ---
.../beam/runners/dataflow/worker/WindmillTimeUtilsTest.java | 10 ----------
2 files changed, 13 deletions(-)
diff --git a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/WindmillTimeUtils.java b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/WindmillTimeUtils.java
index 9732826bdd6..8552c27d596 100644
--- a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/WindmillTimeUtils.java
+++ b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/WindmillTimeUtils.java
@@ -45,9 +45,6 @@ public class WindmillTimeUtils {
// Windmill should never send us an unknown timestamp.
Preconditions.checkArgument(timestampUs != Long.MIN_VALUE);
Instant result = new Instant(divideAndRoundDown(timestampUs, 1000));
- if (result.isBefore(BoundedWindow.TIMESTAMP_MIN_VALUE)) {
- return BoundedWindow.TIMESTAMP_MIN_VALUE;
- }
if (result.isAfter(BoundedWindow.TIMESTAMP_MAX_VALUE)) {
// End of time.
return BoundedWindow.TIMESTAMP_MAX_VALUE;
diff --git a/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/WindmillTimeUtilsTest.java b/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/WindmillTimeUtilsTest.java
index 84e76d2f8bd..5f910c3acb5 100644
--- a/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/WindmillTimeUtilsTest.java
+++ b/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/WindmillTimeUtilsTest.java
@@ -23,7 +23,6 @@ import static org.apache.beam.runners.dataflow.worker.WindmillTimeUtils.windmill
import static org.junit.Assert.assertEquals;
import org.apache.beam.sdk.transforms.windowing.BoundedWindow;
-import org.joda.time.Duration;
import org.joda.time.Instant;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -57,15 +56,6 @@ public class WindmillTimeUtilsTest {
assertEquals(new Instant(-17), windmillToHarnessTimestamp(-16987));
assertEquals(new Instant(-17), windmillToHarnessTimestamp(-17000));
assertEquals(new Instant(-18), windmillToHarnessTimestamp(-17001));
- assertEquals(BoundedWindow.TIMESTAMP_MIN_VALUE, windmillToHarnessTimestamp(Long.MIN_VALUE + 1));
- assertEquals(BoundedWindow.TIMESTAMP_MIN_VALUE, windmillToHarnessTimestamp(Long.MIN_VALUE + 2));
- // Long.MIN_VALUE = -9223372036854775808, need to add 1808 microseconds to get to next
- // millisecond returned by Beam.
- assertEquals(
- BoundedWindow.TIMESTAMP_MIN_VALUE.plus(Duration.millis(1)),
- windmillToHarnessTimestamp(Long.MIN_VALUE + 1808));
- assertEquals(
- BoundedWindow.TIMESTAMP_MIN_VALUE, windmillToHarnessTimestamp(Long.MIN_VALUE + 1807));
}
@Test