aljoscha commented on a change in pull request #13443:
URL: https://github.com/apache/flink/pull/13443#discussion_r494142023
##########
File path:
flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/InternalTimeServiceManager.java
##########
@@ -19,214 +19,62 @@
package org.apache.flink.streaming.api.operators;
import org.apache.flink.annotation.Internal;
-import org.apache.flink.annotation.VisibleForTesting;
import org.apache.flink.api.common.typeutils.TypeSerializer;
-import org.apache.flink.core.memory.DataOutputView;
-import org.apache.flink.core.memory.DataOutputViewStreamWrapper;
-import org.apache.flink.runtime.state.KeyGroupRange;
-import org.apache.flink.runtime.state.KeyGroupedInternalPriorityQueue;
-import org.apache.flink.runtime.state.KeyGroupsList;
-import org.apache.flink.runtime.state.KeyedStateBackend;
-import org.apache.flink.runtime.state.KeyedStateCheckpointOutputStream;
-import org.apache.flink.runtime.state.PriorityQueueSetFactory;
+import org.apache.flink.runtime.state.CheckpointableKeyedStateBackend;
+import org.apache.flink.runtime.state.KeyGroupStatePartitionStreamProvider;
import org.apache.flink.runtime.state.StateSnapshotContext;
import org.apache.flink.streaming.api.watermark.Watermark;
import org.apache.flink.streaming.runtime.tasks.ProcessingTimeService;
-import org.apache.flink.util.Preconditions;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-import static org.apache.flink.util.Preconditions.checkNotNull;
/**
* An entity keeping all the time-related services available to all operators
extending the
- * {@link AbstractStreamOperator}. Right now, this is only a
- * {@link InternalTimerServiceImpl timer services}.
+ * {@link AbstractStreamOperator} or {@link AbstractStreamOperatorV2}.
*
* <b>NOTE:</b> These services are only available to keyed operators.
*
* @param <K> The type of keys used for the timers and the registry.
*/
@Internal
-public class InternalTimeServiceManager<K> {
- protected static final Logger LOG =
LoggerFactory.getLogger(InternalTimeServiceManager.class);
-
- @VisibleForTesting
- static final String TIMER_STATE_PREFIX = "_timer_state";
- @VisibleForTesting
- static final String PROCESSING_TIMER_PREFIX = TIMER_STATE_PREFIX +
"/processing_";
- @VisibleForTesting
- static final String EVENT_TIMER_PREFIX = TIMER_STATE_PREFIX + "/event_";
-
- private final KeyGroupRange localKeyGroupRange;
- private final KeyContext keyContext;
-
- private final PriorityQueueSetFactory priorityQueueSetFactory;
- private final ProcessingTimeService processingTimeService;
-
- private final Map<String, InternalTimerServiceImpl<K, ?>> timerServices;
-
- private final boolean useLegacySynchronousSnapshots;
-
- InternalTimeServiceManager(
- KeyGroupRange localKeyGroupRange,
+public interface InternalTimeServiceManager<K> {
+ /**
+ * Creates an {@link InternalTimerService} for handling a group of
timers identified by
+ * the given {@code name}. The timers are scoped to a key and namespace.
+ *
+ * <p>When the timer is due it will call the given {@link Triggerable}.
+ */
Review comment:
Maybe `When a timer fires the given {@link Triggerable} will be
invoked.`.
##########
File path:
flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/InternalTimeServiceManager.java
##########
@@ -19,214 +19,62 @@
package org.apache.flink.streaming.api.operators;
import org.apache.flink.annotation.Internal;
-import org.apache.flink.annotation.VisibleForTesting;
import org.apache.flink.api.common.typeutils.TypeSerializer;
-import org.apache.flink.core.memory.DataOutputView;
-import org.apache.flink.core.memory.DataOutputViewStreamWrapper;
-import org.apache.flink.runtime.state.KeyGroupRange;
-import org.apache.flink.runtime.state.KeyGroupedInternalPriorityQueue;
-import org.apache.flink.runtime.state.KeyGroupsList;
-import org.apache.flink.runtime.state.KeyedStateBackend;
-import org.apache.flink.runtime.state.KeyedStateCheckpointOutputStream;
-import org.apache.flink.runtime.state.PriorityQueueSetFactory;
+import org.apache.flink.runtime.state.CheckpointableKeyedStateBackend;
+import org.apache.flink.runtime.state.KeyGroupStatePartitionStreamProvider;
import org.apache.flink.runtime.state.StateSnapshotContext;
import org.apache.flink.streaming.api.watermark.Watermark;
import org.apache.flink.streaming.runtime.tasks.ProcessingTimeService;
-import org.apache.flink.util.Preconditions;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-import static org.apache.flink.util.Preconditions.checkNotNull;
/**
* An entity keeping all the time-related services available to all operators
extending the
- * {@link AbstractStreamOperator}. Right now, this is only a
- * {@link InternalTimerServiceImpl timer services}.
+ * {@link AbstractStreamOperator} or {@link AbstractStreamOperatorV2}.
*
* <b>NOTE:</b> These services are only available to keyed operators.
*
* @param <K> The type of keys used for the timers and the registry.
*/
@Internal
-public class InternalTimeServiceManager<K> {
- protected static final Logger LOG =
LoggerFactory.getLogger(InternalTimeServiceManager.class);
-
- @VisibleForTesting
- static final String TIMER_STATE_PREFIX = "_timer_state";
- @VisibleForTesting
- static final String PROCESSING_TIMER_PREFIX = TIMER_STATE_PREFIX +
"/processing_";
- @VisibleForTesting
- static final String EVENT_TIMER_PREFIX = TIMER_STATE_PREFIX + "/event_";
-
- private final KeyGroupRange localKeyGroupRange;
- private final KeyContext keyContext;
-
- private final PriorityQueueSetFactory priorityQueueSetFactory;
- private final ProcessingTimeService processingTimeService;
-
- private final Map<String, InternalTimerServiceImpl<K, ?>> timerServices;
-
- private final boolean useLegacySynchronousSnapshots;
-
- InternalTimeServiceManager(
- KeyGroupRange localKeyGroupRange,
+public interface InternalTimeServiceManager<K> {
+ /**
+ * Creates an {@link InternalTimerService} for handling a group of
timers identified by
+ * the given {@code name}. The timers are scoped to a key and namespace.
+ *
+ * <p>When the timer is due it will call the given {@link Triggerable}.
+ */
+ <N> InternalTimerService<N> getInternalTimerService(
+ String name,
+ TypeSerializer<K> keySerializer,
+ TypeSerializer<N> namespaceSerializer,
+ Triggerable<K, N> triggerable);
+
+ /**
+ * It advances the Watermark of all managed {@link InternalTimerService
timer services},
+ * potentially firing the event time timers.
Review comment:
```suggestion
* Advances the Watermark of all managed {@link InternalTimerService
timer services},
* potentially firing event time timers.
```
##########
File path:
flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/InternalTimeServiceManagerImpl.java
##########
@@ -0,0 +1,270 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.flink.streaming.api.operators;
+
+import org.apache.flink.annotation.Internal;
+import org.apache.flink.annotation.VisibleForTesting;
+import org.apache.flink.api.common.typeutils.TypeSerializer;
+import org.apache.flink.core.memory.DataOutputView;
+import org.apache.flink.core.memory.DataOutputViewStreamWrapper;
+import org.apache.flink.runtime.state.AbstractKeyedStateBackend;
+import org.apache.flink.runtime.state.CheckpointableKeyedStateBackend;
+import org.apache.flink.runtime.state.KeyGroupRange;
+import org.apache.flink.runtime.state.KeyGroupStatePartitionStreamProvider;
+import org.apache.flink.runtime.state.KeyGroupedInternalPriorityQueue;
+import org.apache.flink.runtime.state.KeyGroupsList;
+import org.apache.flink.runtime.state.KeyedStateCheckpointOutputStream;
+import org.apache.flink.runtime.state.PriorityQueueSetFactory;
+import org.apache.flink.runtime.state.StateSnapshotContext;
+import org.apache.flink.streaming.api.watermark.Watermark;
+import org.apache.flink.streaming.runtime.tasks.ProcessingTimeService;
+import org.apache.flink.util.Preconditions;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.apache.flink.util.Preconditions.checkNotNull;
+
+/**
+ * An entity keeping all the time-related services available to all operators
extending the
Review comment:
Here I also think we don't need to mention the operators.
##########
File path:
flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/InternalTimeServiceManager.java
##########
@@ -19,214 +19,62 @@
package org.apache.flink.streaming.api.operators;
import org.apache.flink.annotation.Internal;
-import org.apache.flink.annotation.VisibleForTesting;
import org.apache.flink.api.common.typeutils.TypeSerializer;
-import org.apache.flink.core.memory.DataOutputView;
-import org.apache.flink.core.memory.DataOutputViewStreamWrapper;
-import org.apache.flink.runtime.state.KeyGroupRange;
-import org.apache.flink.runtime.state.KeyGroupedInternalPriorityQueue;
-import org.apache.flink.runtime.state.KeyGroupsList;
-import org.apache.flink.runtime.state.KeyedStateBackend;
-import org.apache.flink.runtime.state.KeyedStateCheckpointOutputStream;
-import org.apache.flink.runtime.state.PriorityQueueSetFactory;
+import org.apache.flink.runtime.state.CheckpointableKeyedStateBackend;
+import org.apache.flink.runtime.state.KeyGroupStatePartitionStreamProvider;
import org.apache.flink.runtime.state.StateSnapshotContext;
import org.apache.flink.streaming.api.watermark.Watermark;
import org.apache.flink.streaming.runtime.tasks.ProcessingTimeService;
-import org.apache.flink.util.Preconditions;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-import static org.apache.flink.util.Preconditions.checkNotNull;
/**
* An entity keeping all the time-related services available to all operators
extending the
- * {@link AbstractStreamOperator}. Right now, this is only a
- * {@link InternalTimerServiceImpl timer services}.
+ * {@link AbstractStreamOperator} or {@link AbstractStreamOperatorV2}.
*
* <b>NOTE:</b> These services are only available to keyed operators.
*
* @param <K> The type of keys used for the timers and the registry.
*/
@Internal
-public class InternalTimeServiceManager<K> {
- protected static final Logger LOG =
LoggerFactory.getLogger(InternalTimeServiceManager.class);
-
- @VisibleForTesting
- static final String TIMER_STATE_PREFIX = "_timer_state";
- @VisibleForTesting
- static final String PROCESSING_TIMER_PREFIX = TIMER_STATE_PREFIX +
"/processing_";
- @VisibleForTesting
- static final String EVENT_TIMER_PREFIX = TIMER_STATE_PREFIX + "/event_";
-
- private final KeyGroupRange localKeyGroupRange;
- private final KeyContext keyContext;
-
- private final PriorityQueueSetFactory priorityQueueSetFactory;
- private final ProcessingTimeService processingTimeService;
-
- private final Map<String, InternalTimerServiceImpl<K, ?>> timerServices;
-
- private final boolean useLegacySynchronousSnapshots;
-
- InternalTimeServiceManager(
- KeyGroupRange localKeyGroupRange,
+public interface InternalTimeServiceManager<K> {
+ /**
+ * Creates an {@link InternalTimerService} for handling a group of
timers identified by
+ * the given {@code name}. The timers are scoped to a key and namespace.
+ *
+ * <p>When the timer is due it will call the given {@link Triggerable}.
+ */
+ <N> InternalTimerService<N> getInternalTimerService(
+ String name,
+ TypeSerializer<K> keySerializer,
+ TypeSerializer<N> namespaceSerializer,
+ Triggerable<K, N> triggerable);
+
+ /**
+ * It advances the Watermark of all managed {@link InternalTimerService
timer services},
+ * potentially firing the event time timers.
+ */
+ void advanceWatermark(Watermark watermark) throws Exception;
+
+ /**
+ * Snapshots the timers in the keyed state.
+ *
+ * <p><b>TODO:</b> This can be removed once heap-based timers are
integrated with RocksDB
+ * incremental snapshots.
+ */
+ void snapshotState(
+ StateSnapshotContext context,
+ String operatorName) throws Exception;
+
+ /**
+ * A provider pattern for creating an instance of a {@link
InternalTimeServiceManager}.
+ * Allows substituting the manager that will be used in the runtime.
+ */
Review comment:
```suggestion
/**
* A provider pattern for creating an instance of a {@link
InternalTimeServiceManager}.
* Allows substituting the manager that will be used at runtime.
*/
```
##########
File path:
flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/InternalTimeServiceManager.java
##########
@@ -19,214 +19,62 @@
package org.apache.flink.streaming.api.operators;
import org.apache.flink.annotation.Internal;
-import org.apache.flink.annotation.VisibleForTesting;
import org.apache.flink.api.common.typeutils.TypeSerializer;
-import org.apache.flink.core.memory.DataOutputView;
-import org.apache.flink.core.memory.DataOutputViewStreamWrapper;
-import org.apache.flink.runtime.state.KeyGroupRange;
-import org.apache.flink.runtime.state.KeyGroupedInternalPriorityQueue;
-import org.apache.flink.runtime.state.KeyGroupsList;
-import org.apache.flink.runtime.state.KeyedStateBackend;
-import org.apache.flink.runtime.state.KeyedStateCheckpointOutputStream;
-import org.apache.flink.runtime.state.PriorityQueueSetFactory;
+import org.apache.flink.runtime.state.CheckpointableKeyedStateBackend;
+import org.apache.flink.runtime.state.KeyGroupStatePartitionStreamProvider;
import org.apache.flink.runtime.state.StateSnapshotContext;
import org.apache.flink.streaming.api.watermark.Watermark;
import org.apache.flink.streaming.runtime.tasks.ProcessingTimeService;
-import org.apache.flink.util.Preconditions;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-import static org.apache.flink.util.Preconditions.checkNotNull;
/**
* An entity keeping all the time-related services available to all operators
extending the
- * {@link AbstractStreamOperator}. Right now, this is only a
- * {@link InternalTimerServiceImpl timer services}.
+ * {@link AbstractStreamOperator} or {@link AbstractStreamOperatorV2}.
*
* <b>NOTE:</b> These services are only available to keyed operators.
*
* @param <K> The type of keys used for the timers and the registry.
*/
@Internal
-public class InternalTimeServiceManager<K> {
- protected static final Logger LOG =
LoggerFactory.getLogger(InternalTimeServiceManager.class);
-
- @VisibleForTesting
- static final String TIMER_STATE_PREFIX = "_timer_state";
- @VisibleForTesting
- static final String PROCESSING_TIMER_PREFIX = TIMER_STATE_PREFIX +
"/processing_";
- @VisibleForTesting
- static final String EVENT_TIMER_PREFIX = TIMER_STATE_PREFIX + "/event_";
-
- private final KeyGroupRange localKeyGroupRange;
- private final KeyContext keyContext;
-
- private final PriorityQueueSetFactory priorityQueueSetFactory;
- private final ProcessingTimeService processingTimeService;
-
- private final Map<String, InternalTimerServiceImpl<K, ?>> timerServices;
-
- private final boolean useLegacySynchronousSnapshots;
-
- InternalTimeServiceManager(
- KeyGroupRange localKeyGroupRange,
+public interface InternalTimeServiceManager<K> {
+ /**
+ * Creates an {@link InternalTimerService} for handling a group of
timers identified by
+ * the given {@code name}. The timers are scoped to a key and namespace.
+ *
+ * <p>When the timer is due it will call the given {@link Triggerable}.
+ */
+ <N> InternalTimerService<N> getInternalTimerService(
+ String name,
+ TypeSerializer<K> keySerializer,
+ TypeSerializer<N> namespaceSerializer,
+ Triggerable<K, N> triggerable);
+
+ /**
+ * It advances the Watermark of all managed {@link InternalTimerService
timer services},
+ * potentially firing the event time timers.
+ */
+ void advanceWatermark(Watermark watermark) throws Exception;
+
+ /**
+ * Snapshots the timers in the keyed state.
Review comment:
```suggestion
* Snapshots the timers to keyed state.
```
##########
File path:
flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/InternalTimeServiceManager.java
##########
@@ -19,214 +19,62 @@
package org.apache.flink.streaming.api.operators;
import org.apache.flink.annotation.Internal;
-import org.apache.flink.annotation.VisibleForTesting;
import org.apache.flink.api.common.typeutils.TypeSerializer;
-import org.apache.flink.core.memory.DataOutputView;
-import org.apache.flink.core.memory.DataOutputViewStreamWrapper;
-import org.apache.flink.runtime.state.KeyGroupRange;
-import org.apache.flink.runtime.state.KeyGroupedInternalPriorityQueue;
-import org.apache.flink.runtime.state.KeyGroupsList;
-import org.apache.flink.runtime.state.KeyedStateBackend;
-import org.apache.flink.runtime.state.KeyedStateCheckpointOutputStream;
-import org.apache.flink.runtime.state.PriorityQueueSetFactory;
+import org.apache.flink.runtime.state.CheckpointableKeyedStateBackend;
+import org.apache.flink.runtime.state.KeyGroupStatePartitionStreamProvider;
import org.apache.flink.runtime.state.StateSnapshotContext;
import org.apache.flink.streaming.api.watermark.Watermark;
import org.apache.flink.streaming.runtime.tasks.ProcessingTimeService;
-import org.apache.flink.util.Preconditions;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-import static org.apache.flink.util.Preconditions.checkNotNull;
/**
* An entity keeping all the time-related services available to all operators
extending the
- * {@link AbstractStreamOperator}. Right now, this is only a
- * {@link InternalTimerServiceImpl timer services}.
+ * {@link AbstractStreamOperator} or {@link AbstractStreamOperatorV2}.
Review comment:
I think we don't even need to mention the relation to the operators here.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
[email protected]
