You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by fa...@apache.org on 2023/07/12 10:41:45 UTC
[flink] branch master updated (2dfff436c09 -> 354a8852766)
This is an automated email from the ASF dual-hosted git repository.
fanrui pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
from 2dfff436c09 [FLINK-32549][network] Tiered storage memory manager supports ownership transfer for buffers
new 224aa2e9ca2 [FLINK-32420][refactor] Add the AbstractHeapPriorityQueueElement
new 354a8852766 [FLINK-32420][connectors/common] Using the HeapPriorityQueue to improve the watermark aggregation performance when parallelism is high
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../source/coordinator/SourceCoordinator.java | 76 ++++++++++++++----
.../heap/AbstractHeapPriorityQueueElement.java} | 24 +++---
.../SourceCoordinatorAlignmentTest.java | 92 ++++++++++++++++++++++
.../state/InternalPriorityQueueTestBase.java | 18 +----
.../runtime/testutils/statemigration/TestType.java | 18 +----
.../state/RocksDBCachingPriorityQueueSet.java | 17 +---
6 files changed, 175 insertions(+), 70 deletions(-)
copy flink-runtime/src/{test/java/org/apache/flink/runtime/state/heap/HeapPriorityQueueSetTest.java => main/java/org/apache/flink/runtime/state/heap/AbstractHeapPriorityQueueElement.java} (62%)
[flink] 01/02: [FLINK-32420][refactor] Add the AbstractHeapPriorityQueueElement
Posted by fa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
fanrui pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
commit 224aa2e9ca20ed7ce009a2c2f485c1a232e4c807
Author: 1996fanrui <19...@gmail.com>
AuthorDate: Thu Jun 29 00:36:58 2023 +0800
[FLINK-32420][refactor] Add the AbstractHeapPriorityQueueElement
---
.../heap/AbstractHeapPriorityQueueElement.java | 39 ++++++++++++++++++++++
.../state/InternalPriorityQueueTestBase.java | 18 ++--------
.../runtime/testutils/statemigration/TestType.java | 18 ++--------
.../state/RocksDBCachingPriorityQueueSet.java | 17 ++--------
4 files changed, 47 insertions(+), 45 deletions(-)
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/AbstractHeapPriorityQueueElement.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/AbstractHeapPriorityQueueElement.java
new file mode 100644
index 00000000000..bee5c0eb3ab
--- /dev/null
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/AbstractHeapPriorityQueueElement.java
@@ -0,0 +1,39 @@
+/*
+ * 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.runtime.state.heap;
+
+/** Abstract base class for {@link HeapPriorityQueueElement}. */
+public abstract class AbstractHeapPriorityQueueElement implements HeapPriorityQueueElement {
+
+ private int internalIndex;
+
+ public AbstractHeapPriorityQueueElement() {
+ this.internalIndex = HeapPriorityQueueElement.NOT_CONTAINED;
+ }
+
+ @Override
+ public int getInternalIndex() {
+ return internalIndex;
+ }
+
+ @Override
+ public void setInternalIndex(int newIndex) {
+ this.internalIndex = newIndex;
+ }
+}
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/state/InternalPriorityQueueTestBase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/state/InternalPriorityQueueTestBase.java
index 4a3b243fca4..0d1387dc4d0 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/state/InternalPriorityQueueTestBase.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/state/InternalPriorityQueueTestBase.java
@@ -25,7 +25,7 @@ import org.apache.flink.core.memory.ByteArrayOutputStreamWithPos;
import org.apache.flink.core.memory.DataInputView;
import org.apache.flink.core.memory.DataOutputView;
import org.apache.flink.core.memory.DataOutputViewStreamWrapper;
-import org.apache.flink.runtime.state.heap.HeapPriorityQueueElement;
+import org.apache.flink.runtime.state.heap.AbstractHeapPriorityQueueElement;
import org.apache.flink.util.CloseableIterator;
import org.apache.flink.util.MathUtils;
@@ -343,17 +343,15 @@ public abstract class InternalPriorityQueueTestBase {
protected abstract boolean testSetSemanticsAgainstDuplicateElements();
/** Payload for usage in the test. */
- protected static class TestElement
- implements HeapPriorityQueueElement, Keyed<Long>, PriorityComparable<TestElement> {
+ protected static class TestElement extends AbstractHeapPriorityQueueElement
+ implements Keyed<Long>, PriorityComparable<TestElement> {
private final long key;
private final long priority;
- private int internalIndex;
public TestElement(long key, long priority) {
this.key = key;
this.priority = priority;
- this.internalIndex = NOT_CONTAINED;
}
@Override
@@ -369,16 +367,6 @@ public abstract class InternalPriorityQueueTestBase {
return priority;
}
- @Override
- public int getInternalIndex() {
- return internalIndex;
- }
-
- @Override
- public void setInternalIndex(int newIndex) {
- internalIndex = newIndex;
- }
-
@Override
public boolean equals(Object o) {
if (this == o) {
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/statemigration/TestType.java b/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/statemigration/TestType.java
index b024f76cd41..8db517f68b3 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/statemigration/TestType.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/statemigration/TestType.java
@@ -24,7 +24,7 @@ import org.apache.flink.core.memory.DataInputView;
import org.apache.flink.core.memory.DataOutputView;
import org.apache.flink.runtime.state.Keyed;
import org.apache.flink.runtime.state.PriorityComparable;
-import org.apache.flink.runtime.state.heap.HeapPriorityQueueElement;
+import org.apache.flink.runtime.state.heap.AbstractHeapPriorityQueueElement;
import org.junit.Assert;
@@ -38,10 +38,8 @@ import java.util.Objects;
*
* <p>This is implemented so that the type can also be used as keyed priority queue state.
*/
-public class TestType
- implements HeapPriorityQueueElement, PriorityComparable<TestType>, Keyed<String> {
-
- private int index;
+public class TestType extends AbstractHeapPriorityQueueElement
+ implements PriorityComparable<TestType>, Keyed<String> {
private final int value;
private final String key;
@@ -65,16 +63,6 @@ public class TestType
return Integer.compare(value, other.value);
}
- @Override
- public int getInternalIndex() {
- return index;
- }
-
- @Override
- public void setInternalIndex(int newIndex) {
- this.index = newIndex;
- }
-
@Override
public boolean equals(Object obj) {
if (obj == null || !(obj instanceof TestType)) {
diff --git a/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/contrib/streaming/state/RocksDBCachingPriorityQueueSet.java b/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/contrib/streaming/state/RocksDBCachingPriorityQueueSet.java
index 8dbaca93f5e..b3d0112dc60 100644
--- a/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/contrib/streaming/state/RocksDBCachingPriorityQueueSet.java
+++ b/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/contrib/streaming/state/RocksDBCachingPriorityQueueSet.java
@@ -23,6 +23,7 @@ import org.apache.flink.core.memory.DataInputDeserializer;
import org.apache.flink.core.memory.DataOutputSerializer;
import org.apache.flink.runtime.state.CompositeKeySerializationUtils;
import org.apache.flink.runtime.state.InternalPriorityQueue;
+import org.apache.flink.runtime.state.heap.AbstractHeapPriorityQueueElement;
import org.apache.flink.runtime.state.heap.HeapPriorityQueueElement;
import org.apache.flink.util.CloseableIterator;
import org.apache.flink.util.FlinkRuntimeException;
@@ -56,7 +57,7 @@ import static org.apache.flink.contrib.streaming.state.RocksDBCachingPriorityQue
* @param <E> the type of the contained elements in the queue.
*/
public class RocksDBCachingPriorityQueueSet<E extends HeapPriorityQueueElement>
- implements InternalPriorityQueue<E>, HeapPriorityQueueElement {
+ extends AbstractHeapPriorityQueueElement implements InternalPriorityQueue<E> {
/** Serialized empty value to insert into RocksDB. */
private static final byte[] DUMMY_BYTES = new byte[] {};
@@ -102,9 +103,6 @@ public class RocksDBCachingPriorityQueueSet<E extends HeapPriorityQueueElement>
/** This flag is true iff all elements in RocksDB are also contained in the cache. */
private boolean allElementsInCache;
- /** Index for management as a {@link HeapPriorityQueueElement}. */
- private int internalIndex;
-
RocksDBCachingPriorityQueueSet(
@Nonnegative int keyGroupId,
@Nonnegative int keyGroupPrefixBytes,
@@ -127,7 +125,6 @@ public class RocksDBCachingPriorityQueueSet<E extends HeapPriorityQueueElement>
this.allElementsInCache = false;
this.groupPrefixBytes = createKeyGroupBytes(keyGroupId, keyGroupPrefixBytes);
this.seekHint = groupPrefixBytes;
- this.internalIndex = HeapPriorityQueueElement.NOT_CONTAINED;
}
@Nullable
@@ -289,16 +286,6 @@ public class RocksDBCachingPriorityQueueSet<E extends HeapPriorityQueueElement>
}
}
- @Override
- public int getInternalIndex() {
- return internalIndex;
- }
-
- @Override
- public void setInternalIndex(int newIndex) {
- this.internalIndex = newIndex;
- }
-
@Nonnull
private RocksBytesIterator orderedBytesIterator() {
flushWriteBatch();
[flink] 02/02: [FLINK-32420][connectors/common] Using the HeapPriorityQueue to improve the watermark aggregation performance when parallelism is high
Posted by fa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
fanrui pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
commit 354a8852766b16873b5fad972e4440c1eaa4c40a
Author: 1996fanrui <19...@gmail.com>
AuthorDate: Thu Jun 29 01:06:08 2023 +0800
[FLINK-32420][connectors/common] Using the HeapPriorityQueue to improve the watermark aggregation performance when parallelism is high
---
.../source/coordinator/SourceCoordinator.java | 76 ++++++++++++++----
.../SourceCoordinatorAlignmentTest.java | 92 ++++++++++++++++++++++
2 files changed, 154 insertions(+), 14 deletions(-)
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/source/coordinator/SourceCoordinator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/source/coordinator/SourceCoordinator.java
index f3b4f9dc775..faeac9a8dc4 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/source/coordinator/SourceCoordinator.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/source/coordinator/SourceCoordinator.java
@@ -38,6 +38,10 @@ import org.apache.flink.runtime.source.event.ReportedWatermarkEvent;
import org.apache.flink.runtime.source.event.RequestSplitEvent;
import org.apache.flink.runtime.source.event.SourceEventWrapper;
import org.apache.flink.runtime.source.event.WatermarkAlignmentEvent;
+import org.apache.flink.runtime.state.PriorityComparable;
+import org.apache.flink.runtime.state.PriorityComparator;
+import org.apache.flink.runtime.state.heap.AbstractHeapPriorityQueueElement;
+import org.apache.flink.runtime.state.heap.HeapPriorityQueue;
import org.apache.flink.util.ExceptionUtils;
import org.apache.flink.util.FlinkException;
import org.apache.flink.util.TemporaryClassLoaderContext;
@@ -46,6 +50,7 @@ import org.apache.flink.util.function.ThrowingRunnable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.io.ByteArrayInputStream;
@@ -53,7 +58,6 @@ import java.io.ByteArrayOutputStream;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import java.util.Comparator;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -642,9 +646,47 @@ public class SourceCoordinator<SplitT extends SourceSplit, EnumChkT>
}
}
- private static class WatermarkAggregator<T> {
- private final Map<T, Watermark> watermarks = new HashMap<>();
- private Watermark aggregatedWatermark = new Watermark(Long.MIN_VALUE);
+ /** The watermark element for {@link HeapPriorityQueue}. */
+ public static class WatermarkElement extends AbstractHeapPriorityQueueElement
+ implements PriorityComparable<WatermarkElement> {
+
+ private final Watermark watermark;
+
+ public WatermarkElement(Watermark watermark) {
+ this.watermark = watermark;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (o instanceof WatermarkElement) {
+ return watermark.equals(((WatermarkElement) o).watermark);
+ }
+ return false;
+ }
+
+ @Override
+ public int hashCode() {
+ return watermark.hashCode();
+ }
+
+ @Override
+ public int comparePriorityTo(@Nonnull WatermarkElement other) {
+ return Long.compare(watermark.getTimestamp(), other.watermark.getTimestamp());
+ }
+ }
+
+ /** The aggregated watermark is the smallest watermark of all keys. */
+ static class WatermarkAggregator<T> {
+
+ private final Map<T, WatermarkElement> watermarks = new HashMap<>();
+
+ private final HeapPriorityQueue<WatermarkElement> orderedWatermarks =
+ new HeapPriorityQueue<>(PriorityComparator.forPriorityComparableObjects(), 10);
+
+ private static final Watermark DEFAULT_WATERMARK = new Watermark(Long.MIN_VALUE);
/**
* Update the {@link Watermark} for the given {@code key)}.
@@ -653,17 +695,20 @@ public class SourceCoordinator<SplitT extends SourceSplit, EnumChkT>
* Optional.empty()} otherwise.
*/
public Optional<Watermark> aggregate(T key, Watermark watermark) {
- watermarks.put(key, watermark);
- Watermark newMinimum =
- watermarks.values().stream()
- .min(Comparator.comparingLong(Watermark::getTimestamp))
- .orElseThrow(IllegalStateException::new);
- if (newMinimum.equals(aggregatedWatermark)) {
+ Watermark oldAggregatedWatermark = getAggregatedWatermark();
+
+ WatermarkElement watermarkElement = new WatermarkElement(watermark);
+ WatermarkElement oldWatermarkElement = watermarks.put(key, watermarkElement);
+ if (oldWatermarkElement != null) {
+ orderedWatermarks.remove(oldWatermarkElement);
+ }
+ orderedWatermarks.add(watermarkElement);
+
+ Watermark newAggregatedWatermark = getAggregatedWatermark();
+ if (newAggregatedWatermark.equals(oldAggregatedWatermark)) {
return Optional.empty();
- } else {
- aggregatedWatermark = newMinimum;
- return Optional.of(aggregatedWatermark);
}
+ return Optional.of(newAggregatedWatermark);
}
public Set<T> keySet() {
@@ -671,7 +716,10 @@ public class SourceCoordinator<SplitT extends SourceSplit, EnumChkT>
}
public Watermark getAggregatedWatermark() {
- return aggregatedWatermark;
+ WatermarkElement aggregatedWatermarkElement = orderedWatermarks.peek();
+ return aggregatedWatermarkElement == null
+ ? DEFAULT_WATERMARK
+ : aggregatedWatermarkElement.watermark;
}
}
}
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/source/coordinator/SourceCoordinatorAlignmentTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/source/coordinator/SourceCoordinatorAlignmentTest.java
index fb465d6c695..d479c34f63f 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/source/coordinator/SourceCoordinatorAlignmentTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/source/coordinator/SourceCoordinatorAlignmentTest.java
@@ -18,6 +18,7 @@
package org.apache.flink.runtime.source.coordinator;
+import org.apache.flink.api.common.eventtime.Watermark;
import org.apache.flink.api.common.eventtime.WatermarkAlignmentParams;
import org.apache.flink.api.connector.source.Source;
import org.apache.flink.api.connector.source.mocks.MockSourceSplit;
@@ -30,7 +31,10 @@ import org.apache.flink.runtime.source.event.WatermarkAlignmentEvent;
import org.junit.jupiter.api.Test;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
+import java.util.Random;
import java.util.Set;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.atomic.AtomicInteger;
@@ -41,6 +45,8 @@ import static org.assertj.core.api.Assertions.assertThat;
@SuppressWarnings("serial")
class SourceCoordinatorAlignmentTest extends SourceCoordinatorTestBase {
+ private static final Random RANDOM = new Random();
+
@Test
void testWatermarkAlignment() throws Exception {
try (AutoCloseableRegistry closeableRegistry = new AutoCloseableRegistry()) {
@@ -258,6 +264,92 @@ class SourceCoordinatorAlignmentTest extends SourceCoordinatorTestBase {
assertThat(operatorCoordinatorContext.isJobFailed()).isFalse();
}
+ @Test
+ void testWatermarkAggregator() {
+ final SourceCoordinator.WatermarkAggregator<Integer> combinedWatermark =
+ new SourceCoordinator.WatermarkAggregator<>();
+
+ combinedWatermark.aggregate(0, new Watermark(10));
+ assertThat(combinedWatermark.getAggregatedWatermark().getTimestamp()).isEqualTo(10);
+
+ combinedWatermark.aggregate(1, new Watermark(12));
+ assertThat(combinedWatermark.getAggregatedWatermark().getTimestamp()).isEqualTo(10);
+
+ combinedWatermark.aggregate(2, new Watermark(13));
+ assertThat(combinedWatermark.getAggregatedWatermark().getTimestamp()).isEqualTo(10);
+
+ combinedWatermark.aggregate(1, new Watermark(9));
+ assertThat(combinedWatermark.getAggregatedWatermark().getTimestamp()).isEqualTo(9);
+
+ // The watermark of idle source
+ combinedWatermark.aggregate(1, new Watermark(Long.MAX_VALUE));
+ assertThat(combinedWatermark.getAggregatedWatermark().getTimestamp()).isEqualTo(10);
+
+ combinedWatermark.aggregate(1, new Watermark(8));
+ assertThat(combinedWatermark.getAggregatedWatermark().getTimestamp()).isEqualTo(8);
+
+ combinedWatermark.aggregate(1, new Watermark(20));
+ assertThat(combinedWatermark.getAggregatedWatermark().getTimestamp()).isEqualTo(10);
+
+ combinedWatermark.aggregate(0, new Watermark(23));
+ assertThat(combinedWatermark.getAggregatedWatermark().getTimestamp()).isEqualTo(13);
+
+ combinedWatermark.aggregate(2, new Watermark(22));
+ assertThat(combinedWatermark.getAggregatedWatermark().getTimestamp()).isEqualTo(20);
+ }
+
+ @Test
+ void testWatermarkAggregatorRandomly() {
+ testWatermarkAggregatorRandomly(20, 1000, true, true);
+ testWatermarkAggregatorRandomly(20, 1000, true, false);
+ testWatermarkAggregatorRandomly(20, 2000, true, true);
+ testWatermarkAggregatorRandomly(20, 2000, true, false);
+ testWatermarkAggregatorRandomly(20, 5000, true, true);
+ testWatermarkAggregatorRandomly(20, 5000, true, false);
+ testWatermarkAggregatorRandomly(10, 10000, true, true);
+ testWatermarkAggregatorRandomly(10, 10000, true, false);
+ }
+
+ private void testWatermarkAggregatorRandomly(
+ int roundNumber, int keyNumber, boolean checkResult, boolean testSourceIdle) {
+ final SourceCoordinator.WatermarkAggregator<Integer> combinedWatermark =
+ new SourceCoordinator.WatermarkAggregator<>();
+ final Map<Integer, Long> latestWatermarks = new HashMap<>();
+
+ for (long round = 0; round < roundNumber; round++) {
+ for (int key = 0; key < keyNumber; key++) {
+ long timestamp = getRandomTimestamp(testSourceIdle);
+ combinedWatermark.aggregate(key, new Watermark(timestamp));
+
+ if (checkResult) {
+ latestWatermarks.put(key, timestamp);
+ // Disable the check for benchmark
+ assertAggregatedWatermark(combinedWatermark, latestWatermarks);
+ }
+ }
+ }
+ }
+
+ // Randomizes the last three digits of the timestamp
+ private long getRandomTimestamp(boolean testSourceIdle) {
+ if (testSourceIdle && RANDOM.nextInt(100) == 0) {
+ // Simulate the source idle and the default watermark
+ return RANDOM.nextBoolean() ? Long.MAX_VALUE : Long.MIN_VALUE;
+ }
+ return System.currentTimeMillis() / 1000 * 1000 + RANDOM.nextInt(1000);
+ }
+
+ private void assertAggregatedWatermark(
+ SourceCoordinator.WatermarkAggregator<Integer> combinedWatermark,
+ Map<Integer, Long> latestWatermarks) {
+ long expectAggregatedWatermark =
+ latestWatermarks.values().stream()
+ .min(Comparable::compareTo)
+ .orElseThrow(IllegalStateException::new);
+ assertThat(combinedWatermark.getAggregatedWatermark().getTimestamp())
+ .isEqualTo(expectAggregatedWatermark);
+ }
+
private SourceCoordinator<?, ?> getAndStartNewSourceCoordinator(
WatermarkAlignmentParams watermarkAlignmentParams,
AutoCloseableRegistry closeableRegistry)