You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by ke...@apache.org on 2017/10/25 21:00:48 UTC
[1/2] beam git commit: Fix remaining nullability errors
Repository: beam
Updated Branches:
refs/heads/master bf1b90d05 -> 94d7f747b
Fix remaining nullability errors
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/717ab927
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/717ab927
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/717ab927
Branch: refs/heads/master
Commit: 717ab9272036ff630f3f09829b706024aacdb450
Parents: cf6261e
Author: Kenneth Knowles <ke...@apache.org>
Authored: Wed Oct 25 09:38:55 2017 -0700
Committer: Kenneth Knowles <ke...@apache.org>
Committed: Wed Oct 25 12:45:32 2017 -0700
----------------------------------------------------------------------
.../main/java/org/apache/beam/runners/apex/ApexRunnerResult.java | 4 +++-
.../apache/beam/runners/flink/FlinkBatchPipelineTranslator.java | 3 ++-
.../org/apache/beam/runners/gearpump/GearpumpPipelineResult.java | 3 ++-
.../java/org/apache/beam/sdk/runners/TransformHierarchy.java | 4 ++++
.../src/main/java/org/apache/beam/sdk/state/ReadableStates.java | 4 +++-
5 files changed, 14 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/beam/blob/717ab927/runners/apex/src/main/java/org/apache/beam/runners/apex/ApexRunnerResult.java
----------------------------------------------------------------------
diff --git a/runners/apex/src/main/java/org/apache/beam/runners/apex/ApexRunnerResult.java b/runners/apex/src/main/java/org/apache/beam/runners/apex/ApexRunnerResult.java
index cc24ddd..6ed61cf 100644
--- a/runners/apex/src/main/java/org/apache/beam/runners/apex/ApexRunnerResult.java
+++ b/runners/apex/src/main/java/org/apache/beam/runners/apex/ApexRunnerResult.java
@@ -19,6 +19,7 @@ package org.apache.beam.runners.apex;
import com.datatorrent.api.DAG;
import java.io.IOException;
+import javax.annotation.Nullable;
import org.apache.apex.api.Launcher.AppHandle;
import org.apache.apex.api.Launcher.ShutdownMode;
import org.apache.beam.sdk.Pipeline;
@@ -52,7 +53,8 @@ public class ApexRunnerResult implements PipelineResult {
}
@Override
- public State waitUntilFinish(Duration duration) {
+ @Nullable
+ public State waitUntilFinish(@Nullable Duration duration) {
long timeout = (duration == null || duration.getMillis() < 1) ? Long.MAX_VALUE
: System.currentTimeMillis() + duration.getMillis();
try {
http://git-wip-us.apache.org/repos/asf/beam/blob/717ab927/runners/flink/src/main/java/org/apache/beam/runners/flink/FlinkBatchPipelineTranslator.java
----------------------------------------------------------------------
diff --git a/runners/flink/src/main/java/org/apache/beam/runners/flink/FlinkBatchPipelineTranslator.java b/runners/flink/src/main/java/org/apache/beam/runners/flink/FlinkBatchPipelineTranslator.java
index 50910b5..d22a5da 100644
--- a/runners/flink/src/main/java/org/apache/beam/runners/flink/FlinkBatchPipelineTranslator.java
+++ b/runners/flink/src/main/java/org/apache/beam/runners/flink/FlinkBatchPipelineTranslator.java
@@ -17,6 +17,7 @@
*/
package org.apache.beam.runners.flink;
+import javax.annotation.Nullable;
import org.apache.beam.sdk.Pipeline;
import org.apache.beam.sdk.options.PipelineOptions;
import org.apache.beam.sdk.runners.TransformHierarchy;
@@ -127,7 +128,7 @@ class FlinkBatchPipelineTranslator extends FlinkPipelineTranslator {
* Returns a translator for the given node, if it is possible, otherwise null.
*/
private static BatchTransformTranslator<?> getTranslator(TransformHierarchy.Node node) {
- PTransform<?, ?> transform = node.getTransform();
+ @Nullable PTransform<?, ?> transform = node.getTransform();
// Root of the graph is null
if (transform == null) {
http://git-wip-us.apache.org/repos/asf/beam/blob/717ab927/runners/gearpump/src/main/java/org/apache/beam/runners/gearpump/GearpumpPipelineResult.java
----------------------------------------------------------------------
diff --git a/runners/gearpump/src/main/java/org/apache/beam/runners/gearpump/GearpumpPipelineResult.java b/runners/gearpump/src/main/java/org/apache/beam/runners/gearpump/GearpumpPipelineResult.java
index dd7fa23..4a7e589 100644
--- a/runners/gearpump/src/main/java/org/apache/beam/runners/gearpump/GearpumpPipelineResult.java
+++ b/runners/gearpump/src/main/java/org/apache/beam/runners/gearpump/GearpumpPipelineResult.java
@@ -83,7 +83,8 @@ public class GearpumpPipelineResult implements PipelineResult {
@Override
public MetricResults metrics() {
- return null;
+ throw new UnsupportedOperationException(
+ String.format("%s does not support querying metrics", getClass().getSimpleName()));
}
private State getGearpumpState() {
http://git-wip-us.apache.org/repos/asf/beam/blob/717ab927/sdks/java/core/src/main/java/org/apache/beam/sdk/runners/TransformHierarchy.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/runners/TransformHierarchy.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/runners/TransformHierarchy.java
index ec1f7d9..6c99bb7 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/runners/TransformHierarchy.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/runners/TransformHierarchy.java
@@ -394,7 +394,11 @@ public class TransformHierarchy {
/**
* Returns the transform associated with this transform node.
+ *
+ * @return {@code null} if and only if this is the root node of the graph, which has no
+ * associated transform
*/
+ @Nullable
public PTransform<?, ?> getTransform() {
return transform;
}
http://git-wip-us.apache.org/repos/asf/beam/blob/717ab927/sdks/java/core/src/main/java/org/apache/beam/sdk/state/ReadableStates.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/state/ReadableStates.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/state/ReadableStates.java
index 6977a97..94d76a7 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/state/ReadableStates.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/state/ReadableStates.java
@@ -17,6 +17,7 @@
*/
package org.apache.beam.sdk.state;
+import javax.annotation.Nullable;
import org.apache.beam.sdk.annotations.Internal;
/**
@@ -28,9 +29,10 @@ public class ReadableStates {
/**
* A {@link ReadableState} constructed from a constant value, hence immediately available.
*/
- public static <T> ReadableState<T> immediate(final T value) {
+ public static <T> ReadableState<T> immediate(@Nullable final T value) {
return new ReadableState<T>() {
@Override
+ @Nullable
public T read() {
return value;
}
[2/2] beam git commit: This closes #4039: [BEAM-3081] Findbugs
stragglers
Posted by ke...@apache.org.
This closes #4039: [BEAM-3081] Findbugs stragglers
Fix remaining nullability errors
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/94d7f747
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/94d7f747
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/94d7f747
Branch: refs/heads/master
Commit: 94d7f747b24116a066ddbb005dacb97a5cd22a3b
Parents: bf1b90d 717ab92
Author: Kenneth Knowles <ke...@apache.org>
Authored: Wed Oct 25 12:45:44 2017 -0700
Committer: Kenneth Knowles <ke...@apache.org>
Committed: Wed Oct 25 12:45:44 2017 -0700
----------------------------------------------------------------------
.../main/java/org/apache/beam/runners/apex/ApexRunnerResult.java | 4 +++-
.../apache/beam/runners/flink/FlinkBatchPipelineTranslator.java | 3 ++-
.../org/apache/beam/runners/gearpump/GearpumpPipelineResult.java | 3 ++-
.../java/org/apache/beam/sdk/runners/TransformHierarchy.java | 4 ++++
.../src/main/java/org/apache/beam/sdk/state/ReadableStates.java | 4 +++-
5 files changed, 14 insertions(+), 4 deletions(-)
----------------------------------------------------------------------