Skip to content

[FLINK-26334][datastream] for 1.14.0 . Modified getWindowStartWithOff… #19158

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fapaul merged 1 commit into from
Mar 21, 2022
Merged

[FLINK-26334][datastream] for 1.14.0 . Modified getWindowStartWithOff… #19158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion ...aming-java/src/main/java/org/apache/flink/streaming/api/windowing/windows/TimeWindow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,12 @@ public int compare(TimeWindow o1, TimeWindow o2) {
* @return window start
*/
public static long getWindowStartWithOffset(long timestamp, long offset, long windowSize) {
return timestamp - (timestamp - offset + windowSize) % windowSize;
final long remainder = (timestamp - offset) % windowSize;
// handle both positive and negative cases
if (remainder < 0) {
return timestamp - (remainder + windowSize);
} else {
return timestamp - remainder;
}
}
}
21 changes: 18 additions & 3 deletions .../src/test/java/org/apache/flink/streaming/runtime/operators/windowing/TimeWindowTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,23 +29,38 @@
public class TimeWindowTest {
@Test
public void testGetWindowStartWithOffset() {
// [0, 7), [7, 14), [14, 21)...
// [-21, -14), [-14, -7), [-7, 0), [0, 7), [7, 14), [14, 21)...
long offset = 0;
Assert.assertEquals(TimeWindow.getWindowStartWithOffset(-8, offset, 7), -14);
Assert.assertEquals(TimeWindow.getWindowStartWithOffset(-7, offset, 7), -7);
Assert.assertEquals(TimeWindow.getWindowStartWithOffset(-6, offset, 7), -7);
Assert.assertEquals(TimeWindow.getWindowStartWithOffset(-1, offset, 7), -7);
Assert.assertEquals(TimeWindow.getWindowStartWithOffset(1, offset, 7), 0);
Assert.assertEquals(TimeWindow.getWindowStartWithOffset(6, offset, 7), 0);
Assert.assertEquals(TimeWindow.getWindowStartWithOffset(7, offset, 7), 7);
Assert.assertEquals(TimeWindow.getWindowStartWithOffset(8, offset, 7), 7);

// [-4, 3), [3, 10), [10, 17)...
// [-11, -4), [-4, 3), [3, 10), [10, 17)...
offset = 3;
Assert.assertEquals(TimeWindow.getWindowStartWithOffset(-10, offset, 7), -11);
Assert.assertEquals(TimeWindow.getWindowStartWithOffset(-9, offset, 7), -11);
Assert.assertEquals(TimeWindow.getWindowStartWithOffset(-3, offset, 7), -4);
Assert.assertEquals(TimeWindow.getWindowStartWithOffset(-2, offset, 7), -4);
Assert.assertEquals(TimeWindow.getWindowStartWithOffset(-1, offset, 7), -4);
Assert.assertEquals(TimeWindow.getWindowStartWithOffset(1, offset, 7), -4);
Assert.assertEquals(TimeWindow.getWindowStartWithOffset(2, offset, 7), -4);
Assert.assertEquals(TimeWindow.getWindowStartWithOffset(3, offset, 7), 3);
Assert.assertEquals(TimeWindow.getWindowStartWithOffset(9, offset, 7), 3);
Assert.assertEquals(TimeWindow.getWindowStartWithOffset(10, offset, 7), 10);

// [-2, 5), [5, 12), [12, 19)...
// [-16, -9), [-9, -2), [-2, 5), [5, 12), [12, 19)...
offset = -2;
Assert.assertEquals(TimeWindow.getWindowStartWithOffset(-12, offset, 7), -16);
Assert.assertEquals(TimeWindow.getWindowStartWithOffset(-7, offset, 7), -9);
Assert.assertEquals(TimeWindow.getWindowStartWithOffset(-4, offset, 7), -9);
Assert.assertEquals(TimeWindow.getWindowStartWithOffset(-3, offset, 7), -9);
Assert.assertEquals(TimeWindow.getWindowStartWithOffset(2, offset, 7), -2);
Assert.assertEquals(TimeWindow.getWindowStartWithOffset(-1, offset, 7), -2);
Assert.assertEquals(TimeWindow.getWindowStartWithOffset(1, offset, 7), -2);
Assert.assertEquals(TimeWindow.getWindowStartWithOffset(-2, offset, 7), -2);
Assert.assertEquals(TimeWindow.getWindowStartWithOffset(3, offset, 7), -2);
Expand Down
8 changes: 7 additions & 1 deletion ...ble-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/TimeWindow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,13 @@ public TimeWindowSerializerSnapshot() {
* @return window start
*/
public static long getWindowStartWithOffset(long timestamp, long offset, long windowSize) {
return timestamp - (timestamp - offset + windowSize) % windowSize;
final long remainder = (timestamp - offset) % windowSize;
// handle both positive and negative cases
if (remainder < 0) {
return timestamp - (remainder + windowSize);
} else {
return timestamp - remainder;
}
}

public static TimeWindow of(long start, long end) {
Expand Down