You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by sr...@apache.org on 2018/07/03 17:32:53 UTC
[4/4] flink git commit: [hotfix][core] Introduce MAX_ARRAY_SIZE as
general constant
[hotfix][core] Introduce MAX_ARRAY_SIZE as general constant
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/8cb89f97
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/8cb89f97
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/8cb89f97
Branch: refs/heads/master
Commit: 8cb89f9790625c0d41779b2297fc944d028aa346
Parents: c34c7e4
Author: Stefan Richter <s....@data-artisans.com>
Authored: Tue Jun 19 10:01:30 2018 +0200
Committer: Stefan Richter <s....@data-artisans.com>
Committed: Tue Jul 3 19:32:08 2018 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/flink/util/CollectionUtil.java | 5 +++++
.../apache/flink/runtime/state/heap/CopyOnWriteStateTable.java | 5 ++---
.../flink/streaming/api/operators/InternalTimerHeap.java | 6 +-----
3 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/8cb89f97/flink-core/src/main/java/org/apache/flink/util/CollectionUtil.java
----------------------------------------------------------------------
diff --git a/flink-core/src/main/java/org/apache/flink/util/CollectionUtil.java b/flink-core/src/main/java/org/apache/flink/util/CollectionUtil.java
index 072d905..4a33ea4 100644
--- a/flink-core/src/main/java/org/apache/flink/util/CollectionUtil.java
+++ b/flink-core/src/main/java/org/apache/flink/util/CollectionUtil.java
@@ -29,6 +29,11 @@ import java.util.Map;
@Internal
public final class CollectionUtil {
+ /**
+ * A safe maximum size for arrays in the JVM.
+ */
+ public static final int MAX_ARRAY_SIZE = Integer.MAX_VALUE - 8;
+
private CollectionUtil() {
throw new AssertionError();
}
http://git-wip-us.apache.org/repos/asf/flink/blob/8cb89f97/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/CopyOnWriteStateTable.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/CopyOnWriteStateTable.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/CopyOnWriteStateTable.java
index 10d5636..3a348a9 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/CopyOnWriteStateTable.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/CopyOnWriteStateTable.java
@@ -39,6 +39,8 @@ import java.util.TreeSet;
import java.util.stream.Stream;
import java.util.stream.StreamSupport;
+import static org.apache.flink.util.CollectionUtil.MAX_ARRAY_SIZE;
+
/**
* Implementation of Flink's in-memory state tables with copy-on-write support. This map does not support null values
* for key or namespace.
@@ -104,9 +106,6 @@ public class CopyOnWriteStateTable<K, N, S> extends StateTable<K, N, S> implemen
*/
private static final Logger LOG = LoggerFactory.getLogger(HeapKeyedStateBackend.class);
- /** Maximum save array size to allocate in a JVM. */
- private static final int MAX_ARRAY_SIZE = Integer.MAX_VALUE - 8;
-
/**
* Min capacity (other than zero) for a {@link CopyOnWriteStateTable}. Must be a power of two
* greater than 1 (and less than 1 << 30).
http://git-wip-us.apache.org/repos/asf/flink/blob/8cb89f97/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/InternalTimerHeap.java
----------------------------------------------------------------------
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/InternalTimerHeap.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/InternalTimerHeap.java
index 0abc29d..09f5a14 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/InternalTimerHeap.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/InternalTimerHeap.java
@@ -38,6 +38,7 @@ import java.util.List;
import java.util.NoSuchElementException;
import java.util.Set;
+import static org.apache.flink.util.CollectionUtil.MAX_ARRAY_SIZE;
import static org.apache.flink.util.Preconditions.checkArgument;
/**
@@ -58,11 +59,6 @@ import static org.apache.flink.util.Preconditions.checkArgument;
public class InternalTimerHeap<K, N> implements Iterable<InternalTimer<K, N>> {
/**
- * A safe maximum size for arrays in the JVM.
- */
- private static final int MAX_ARRAY_SIZE = Integer.MAX_VALUE - 8;
-
- /**
* Comparator for {@link TimerHeapInternalTimer}, based on the timestamp in ascending order.
*/
private static final Comparator<TimerHeapInternalTimer<?, ?>> COMPARATOR =