You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ch...@apache.org on 2018/03/20 09:14:53 UTC
[4/6] flink git commit: [hotfix][javadocs] Minor javadoc fixes
[hotfix][javadocs] Minor javadoc fixes
This close sä5696
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/cfd8df40
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/cfd8df40
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/cfd8df40
Branch: refs/heads/master
Commit: cfd8df405cb91278f4c8d81cc294daaaa8b07840
Parents: b6bbd12
Author: sihuazhou <su...@163.com>
Authored: Wed Mar 14 16:22:44 2018 +0800
Committer: zentol <ch...@apache.org>
Committed: Tue Mar 20 10:14:26 2018 +0100
----------------------------------------------------------------------
.../org/apache/flink/runtime/jobmaster/slotpool/SlotProvider.java | 3 ++-
.../org/apache/flink/runtime/state/heap/AbstractHeapState.java | 3 +--
.../org/apache/flink/runtime/state/heap/HeapAggregatingState.java | 3 +--
.../flink/contrib/streaming/state/RocksDBAggregatingState.java | 2 +-
4 files changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/cfd8df40/flink-runtime/src/main/java/org/apache/flink/runtime/jobmaster/slotpool/SlotProvider.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmaster/slotpool/SlotProvider.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmaster/slotpool/SlotProvider.java
index 1653138..91c0372 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmaster/slotpool/SlotProvider.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmaster/slotpool/SlotProvider.java
@@ -46,9 +46,10 @@ public interface SlotProvider {
/**
* Allocating slot with specific requirement.
*
+ * @param slotRequestId identifying the slot request
* @param task The task to allocate the slot for
* @param allowQueued Whether allow the task be queued if we do not have enough resource
- * @param preferredLocations preferred locations for the slot allocation
+ * @param slotProfile profile of the requested slot
* @param timeout after which the allocation fails with a timeout exception
* @return The future of the allocation
*/
http://git-wip-us.apache.org/repos/asf/flink/blob/cfd8df40/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/AbstractHeapState.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/AbstractHeapState.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/AbstractHeapState.java
index 66360e4..7f629ae 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/AbstractHeapState.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/AbstractHeapState.java
@@ -19,7 +19,6 @@
package org.apache.flink.runtime.state.heap;
import org.apache.flink.annotation.VisibleForTesting;
-import org.apache.flink.api.common.state.ListState;
import org.apache.flink.api.common.state.State;
import org.apache.flink.api.common.state.StateDescriptor;
import org.apache.flink.api.common.typeutils.TypeSerializer;
@@ -29,7 +28,7 @@ import org.apache.flink.runtime.state.internal.InternalKvState;
import org.apache.flink.util.Preconditions;
/**
- * Base class for partitioned {@link ListState} implementations that are backed by a regular
+ * Base class for partitioned {@link State} implementations that are backed by a regular
* heap hash map. The concrete implementations define how the state is checkpointed.
*
* @param <K> The type of the key.
http://git-wip-us.apache.org/repos/asf/flink/blob/cfd8df40/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/HeapAggregatingState.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/HeapAggregatingState.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/HeapAggregatingState.java
index 3fa8cd4..6dd5cec 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/HeapAggregatingState.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/HeapAggregatingState.java
@@ -21,7 +21,6 @@ package org.apache.flink.runtime.state.heap;
import org.apache.flink.api.common.functions.AggregateFunction;
import org.apache.flink.api.common.state.AggregatingState;
import org.apache.flink.api.common.state.AggregatingStateDescriptor;
-import org.apache.flink.api.common.state.ReducingState;
import org.apache.flink.api.common.typeutils.TypeSerializer;
import org.apache.flink.runtime.state.StateTransformationFunction;
import org.apache.flink.runtime.state.internal.InternalAggregatingState;
@@ -30,7 +29,7 @@ import org.apache.flink.util.Preconditions;
import java.io.IOException;
/**
- * Heap-backed partitioned {@link ReducingState} that is
+ * Heap-backed partitioned {@link AggregatingState} that is
* snapshotted into files.
*
* @param <K> The type of the key.
http://git-wip-us.apache.org/repos/asf/flink/blob/cfd8df40/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/contrib/streaming/state/RocksDBAggregatingState.java
----------------------------------------------------------------------
diff --git a/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/contrib/streaming/state/RocksDBAggregatingState.java b/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/contrib/streaming/state/RocksDBAggregatingState.java
index f2d1d86..4dfc772 100644
--- a/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/contrib/streaming/state/RocksDBAggregatingState.java
+++ b/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/contrib/streaming/state/RocksDBAggregatingState.java
@@ -53,7 +53,7 @@ public class RocksDBAggregatingState<K, N, T, ACC, R>
private final AggregateFunction<T, ACC, R> aggFunction;
/**
- * Creates a new {@code RocksDBFoldingState}.
+ * Creates a new {@code RocksDBAggregatingState}.
*
* @param namespaceSerializer
* The serializer for the namespace.