[FLINK-30454] Fixing visibility issue for SizeGauge.SizeSupplier;

Also changing visibility JsonJobResultEntry.FIELD_NAME_VERSION as per JLS§6.6.1 requirements. This closes apache#21531
mbalassi · Dec 22, 2022 · f82be84 · f82be84
1 parent 287929c
commit f82be84
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/...ime/src/main/java/org/apache/flink/runtime/highavailability/FileSystemJobResultStore.java b/...ime/src/main/java/org/apache/flink/runtime/highavailability/FileSystemJobResultStore.java
@@ -207,7 +207,7 @@ public Set<JobResult> getDirtyResultsInternal() throws IOException {
  @VisibleForTesting
  static class JsonJobResultEntry extends JobResultEntry {
  private static final String FIELD_NAME_RESULT = "result";
- private static final String FIELD_NAME_VERSION = "version";
+ static final String FIELD_NAME_VERSION = "version";
 
  private JsonJobResultEntry(JobResultEntry entry) {
  this(entry.getJobResult());

diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/groups/TaskIOMetricGroup.java b/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/groups/TaskIOMetricGroup.java
@@ -245,7 +245,7 @@ public void registerResultPartitionBytesCounter(
  this.resultPartitionBytes.put(resultPartitionId, resultPartitionBytesCounter);
  }
 
- public void registerMailboxSizeSupplier(SizeGauge.SizeSupplier<Integer> supplier) {
+ public void registerMailboxSizeSupplier(SizeSupplier<Integer> supplier) {
  this.mailboxSize.registerSupplier(supplier);
  }
 
@@ -275,11 +275,6 @@ public long getCount() {
  private static class SizeGauge implements Gauge<Integer> {
  private SizeSupplier<Integer> supplier;
 
- @FunctionalInterface
- public interface SizeSupplier<R> {
- R get();
- }
-
  public void registerSupplier(SizeSupplier<Integer> supplier) {
  this.supplier = supplier;
  }
@@ -293,4 +288,10 @@ public Integer getValue() {
  }
  }
  }
+
+ /** Supplier for sizes. */
+ @FunctionalInterface
+ public interface SizeSupplier<R> {
+ R get();
+ }
 }