Merge pull request #21917 from [cherry-pick][release-2.40.0] Merge pull request #21910: Revert "convert windmill min timestamp to …

[cherry-pick][release-2.40.0] Merge pull request #21910: Revert "convert windmill min timestamp to …

Author: pabloem

runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/WindmillTimeUtils.java

@@ -45,9 +45,6 @@ public static Instant windmillToHarnessTimestamp(long timestampUs) {
     // 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;

runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/WindmillTimeUtilsTest.java

@@ -23,7 +23,6 @@
 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 void testWindmillToHarnessTimestamp() {
     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