You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by zh...@apache.org on 2021/08/30 07:49:38 UTC
[flink] 06/06: [FLINK-23833][coordination] Rename
IntermediateResult#notifyPartitionChanged to
IntermediateResult#clearCacheForConsumedPartitionGroup
This is an automated email from the ASF dual-hosted git repository.
zhuzh pushed a commit to branch release-1.14
in repository https://gitbox.apache.org/repos/asf/flink.git
commit be857d1fdf8853b0315152521e27714ced6b1204
Author: Thesharing <cy...@outlook.com>
AuthorDate: Fri Aug 27 17:06:40 2021 +0800
[FLINK-23833][coordination] Rename IntermediateResult#notifyPartitionChanged to IntermediateResult#clearCacheForConsumedPartitionGroup
---
.../org/apache/flink/runtime/executiongraph/DefaultExecutionGraph.java | 2 +-
.../org/apache/flink/runtime/executiongraph/IntermediateResult.java | 3 ++-
.../flink/runtime/executiongraph/IntermediateResultPartition.java | 2 +-
.../runtime/executiongraph/RemoveCachedShuffleDescriptorTest.java | 2 +-
4 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/DefaultExecutionGraph.java b/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/DefaultExecutionGraph.java
index df02a9b..2a494ff 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/DefaultExecutionGraph.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/DefaultExecutionGraph.java
@@ -1288,7 +1288,7 @@ public class DefaultExecutionGraph implements ExecutionGraph, InternalExecutionG
checkNotNull(
intermediateResults.get(
releasablePartitionGroup.getIntermediateDataSetID()));
- totalResult.notifyPartitionChanged(releasablePartitionGroup);
+ totalResult.clearCachedInformationForPartitionGroup(releasablePartitionGroup);
}
final List<ResultPartitionID> releasablePartitionIds =
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/IntermediateResult.java b/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/IntermediateResult.java
index b3d684f..3da5ffd 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/IntermediateResult.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/IntermediateResult.java
@@ -172,7 +172,8 @@ public class IntermediateResult {
this.shuffleDescriptorCache.put(consumedPartitionGroup, shuffleDescriptors);
}
- public void notifyPartitionChanged(ConsumedPartitionGroup consumedPartitionGroup) {
+ public void clearCachedInformationForPartitionGroup(
+ ConsumedPartitionGroup consumedPartitionGroup) {
// When a ConsumedPartitionGroup changes, the cache of ShuffleDescriptors for this
// partition group is no longer valid and needs to be removed.
//
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/IntermediateResultPartition.java b/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/IntermediateResultPartition.java
index 31b7835..e3fd7a1 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/IntermediateResultPartition.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/IntermediateResultPartition.java
@@ -95,7 +95,7 @@ public class IntermediateResultPartition {
}
hasDataProduced = false;
for (ConsumedPartitionGroup consumedPartitionGroup : getConsumedPartitionGroups()) {
- totalResult.notifyPartitionChanged(consumedPartitionGroup);
+ totalResult.clearCachedInformationForPartitionGroup(consumedPartitionGroup);
}
}
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/executiongraph/RemoveCachedShuffleDescriptorTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/executiongraph/RemoveCachedShuffleDescriptorTest.java
index ac2cc53..f2c0610 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/executiongraph/RemoveCachedShuffleDescriptorTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/executiongraph/RemoveCachedShuffleDescriptorTest.java
@@ -65,7 +65,7 @@ import static org.junit.Assert.assertNull;
/**
* Tests for removing cached {@link ShuffleDescriptor}s when the related partitions are no longer
* valid. Currently, there are two scenarios as illustrated in {@link
- * IntermediateResult#notifyPartitionChanged}.
+ * IntermediateResult#clearCachedInformationForPartitionGroup}.
*/
public class RemoveCachedShuffleDescriptorTest extends TestLogger {