reuvenlax commented on a change in pull request #15056:
URL: https://github.com/apache/beam/pull/15056#discussion_r663296194
##########
File path:
runners/direct-java/src/main/java/org/apache/beam/runners/direct/StatefulParDoEvaluatorFactory.java
##########
@@ -173,48 +174,73 @@ public void processElement(WindowedValue<KeyedWorkItem<K,
KV<K, InputT>>> gbkRes
for (WindowedValue<KV<K, InputT>> windowedValue :
gbkResult.getValue().elementsIterable()) {
delegateEvaluator.processElement(windowedValue);
}
-
- final Instant inputWatermarkTime =
timerInternals.currentInputWatermarkTime();
PriorityQueue<TimerData> toBeFiredTimers =
new PriorityQueue<>(Comparator.comparing(TimerData::getTimestamp));
- gbkResult.getValue().timersIterable().forEach(toBeFiredTimers::add);
- while (!timerInternals.containsUpdateForTimeBefore(inputWatermarkTime)
+ Instant maxWatermarkTime = BoundedWindow.TIMESTAMP_MIN_VALUE;
+ Instant maxProcessingTime = BoundedWindow.TIMESTAMP_MIN_VALUE;
+ Instant maxSynchronizedProcessingTime =
BoundedWindow.TIMESTAMP_MIN_VALUE;
+ for (TimerData timerData : gbkResult.getValue().timersIterable()) {
+ toBeFiredTimers.add(timerData);
+ switch (timerData.getDomain()) {
+ case EVENT_TIME:
+ maxWatermarkTime = Ordering.natural().max(maxWatermarkTime,
timerData.getTimestamp());
+ break;
+ case PROCESSING_TIME:
+ maxProcessingTime = Ordering.natural().max(maxProcessingTime,
timerData.getTimestamp());
+ break;
+ case SYNCHRONIZED_PROCESSING_TIME:
+ maxSynchronizedProcessingTime =
+ Ordering.natural().max(maxSynchronizedProcessingTime,
timerData.getTimestamp());
+ }
+ }
+
+ while (!timerInternals.containsUpdateForTimeBefore(
+ maxWatermarkTime, maxProcessingTime,
maxSynchronizedProcessingTime)
&& !toBeFiredTimers.isEmpty()) {
+
TimerData timer = toBeFiredTimers.poll();
checkState(
timer.getNamespace() instanceof WindowNamespace,
- "Expected Timer %s to be in a %s, but got %s",
+ "Expected Timer %s to be in a %s, but got %s",
Review comment:
Done
##########
File path: sdks/java/core/src/main/java/org/apache/beam/sdk/state/Timer.java
##########
@@ -81,6 +81,9 @@
*/
Review comment:
Will add this test to the followon PR, as it will fail until that is in
##########
File path: sdks/java/core/src/main/java/org/apache/beam/sdk/state/Timer.java
##########
@@ -81,6 +81,9 @@
*/
void setRelative();
+ /** Clears a timer. */
Review comment:
Done
##########
File path:
runners/direct-java/src/main/java/org/apache/beam/runners/direct/WatermarkManager.java
##########
@@ -670,7 +670,8 @@ private synchronized void updateTimers(TimerUpdate update) {
existingTimersForKey.get(
deletedTimer.getNamespace(),
deletedTimer.getTimerId() + '+' +
deletedTimer.getTimerFamilyId());
-
+ System.err.println(
Review comment:
Done
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
