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 2016/03/17 21:47:34 UTC
[2/8] incubator-beam git commit: Add casts to fix mvn verify errors
Add casts to fix mvn verify errors
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/f06e2a97
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/f06e2a97
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/f06e2a97
Branch: refs/heads/master
Commit: f06e2a977b8e8bee456d3323ab664da3b97f0aa5
Parents: 659f0b8
Author: bchambers <bc...@google.com>
Authored: Wed Mar 16 12:44:20 2016 -0700
Committer: bchambers <bc...@google.com>
Committed: Thu Mar 17 11:12:36 2016 -0700
----------------------------------------------------------------------
.../dataflow/sdk/runners/DataflowPipelineRunner.java | 13 +++++++------
.../sdk/runners/inprocess/FlattenEvaluatorFactory.java | 6 ++++--
.../runners/inprocess/GroupByKeyEvaluatorFactory.java | 7 ++++---
.../runners/inprocess/ParDoMultiEvaluatorFactory.java | 5 ++++-
.../runners/inprocess/ParDoSingleEvaluatorFactory.java | 5 ++++-
.../sdk/runners/inprocess/ViewEvaluatorFactory.java | 7 ++++---
.../cloud/dataflow/sdk/transforms/DoFnReflector.java | 7 ++++---
.../google/cloud/dataflow/sdk/util/DoFnRunners.java | 4 +++-
8 files changed, 34 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/f06e2a97/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/DataflowPipelineRunner.java
----------------------------------------------------------------------
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/DataflowPipelineRunner.java b/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/DataflowPipelineRunner.java
index 29f9b85..5fbbcac 100644
--- a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/DataflowPipelineRunner.java
+++ b/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/DataflowPipelineRunner.java
@@ -866,12 +866,13 @@ public class DataflowPipelineRunner extends PipelineRunner<DataflowPipelineJob>
input.getWindowingStrategy().getWindowFn().windowCoder();
@SuppressWarnings({"rawtypes", "unchecked"})
- PCollectionView<ViewT> view = PCollectionViews.singletonView(
- input.getPipeline(),
- (WindowingStrategy) input.getWindowingStrategy(),
- hasDefault,
- defaultValue,
- defaultValueCoder);
+ PCollectionView<ViewT> view =
+ (PCollectionView<ViewT>) PCollectionViews.<FinalT, W>singletonView(
+ input.getPipeline(),
+ (WindowingStrategy) input.getWindowingStrategy(),
+ hasDefault,
+ defaultValue,
+ defaultValueCoder);
IsmRecordCoder<WindowedValue<FinalT>> ismCoder =
coderForSingleton(windowCoder, defaultValueCoder);
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/f06e2a97/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/FlattenEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/FlattenEvaluatorFactory.java b/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/FlattenEvaluatorFactory.java
index bde1df4..ce315be 100644
--- a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/FlattenEvaluatorFactory.java
+++ b/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/FlattenEvaluatorFactory.java
@@ -30,13 +30,15 @@ import com.google.cloud.dataflow.sdk.values.PCollectionList;
* {@link PTransform}.
*/
class FlattenEvaluatorFactory implements TransformEvaluatorFactory {
- @SuppressWarnings({"unchecked", "rawtypes"})
@Override
public <InputT> TransformEvaluator<InputT> forApplication(
AppliedPTransform<?, ?, ?> application,
CommittedBundle<?> inputBundle,
InProcessEvaluationContext evaluationContext) {
- return createInMemoryEvaluator((AppliedPTransform) application, inputBundle, evaluationContext);
+ @SuppressWarnings({"cast", "unchecked", "rawtypes"})
+ TransformEvaluator<InputT> evaluator = (TransformEvaluator<InputT>) createInMemoryEvaluator(
+ (AppliedPTransform) application, inputBundle, evaluationContext);
+ return evaluator;
}
private <InputT> TransformEvaluator<InputT> createInMemoryEvaluator(
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/f06e2a97/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/GroupByKeyEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/GroupByKeyEvaluatorFactory.java b/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/GroupByKeyEvaluatorFactory.java
index ec63be8..dec78d6 100644
--- a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/GroupByKeyEvaluatorFactory.java
+++ b/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/GroupByKeyEvaluatorFactory.java
@@ -54,13 +54,14 @@ import java.util.Map;
*/
class GroupByKeyEvaluatorFactory implements TransformEvaluatorFactory {
@Override
- @SuppressWarnings({"unchecked", "rawtypes"})
public <InputT> TransformEvaluator<InputT> forApplication(
AppliedPTransform<?, ?, ?> application,
CommittedBundle<?> inputBundle,
InProcessEvaluationContext evaluationContext) {
- return createEvaluator(
- (AppliedPTransform) application, (CommittedBundle) inputBundle, evaluationContext);
+ @SuppressWarnings({"cast", "unchecked", "rawtypes"})
+ TransformEvaluator<InputT> evaluator = (TransformEvaluator<InputT>) createEvaluator(
+ (AppliedPTransform) application, (CommittedBundle) inputBundle, evaluationContext);
+ return evaluator;
}
private <K, V> TransformEvaluator<KV<K, WindowedValue<V>>> createEvaluator(
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/f06e2a97/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/ParDoMultiEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/ParDoMultiEvaluatorFactory.java b/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/ParDoMultiEvaluatorFactory.java
index 24142c2..659bdd2 100644
--- a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/ParDoMultiEvaluatorFactory.java
+++ b/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/ParDoMultiEvaluatorFactory.java
@@ -43,7 +43,10 @@ class ParDoMultiEvaluatorFactory implements TransformEvaluatorFactory {
AppliedPTransform<?, ?, ?> application,
CommittedBundle<?> inputBundle,
InProcessEvaluationContext evaluationContext) {
- return createMultiEvaluator((AppliedPTransform) application, inputBundle, evaluationContext);
+ @SuppressWarnings({"cast", "unchecked", "rawtypes"})
+ TransformEvaluator<T> evaluator = (TransformEvaluator<T>) createMultiEvaluator(
+ (AppliedPTransform) application, inputBundle, evaluationContext);
+ return evaluator;
}
private static <InT, OuT> ParDoInProcessEvaluator<InT> createMultiEvaluator(
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/f06e2a97/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/ParDoSingleEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/ParDoSingleEvaluatorFactory.java b/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/ParDoSingleEvaluatorFactory.java
index af5914b..e9bc1f7 100644
--- a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/ParDoSingleEvaluatorFactory.java
+++ b/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/ParDoSingleEvaluatorFactory.java
@@ -40,7 +40,10 @@ class ParDoSingleEvaluatorFactory implements TransformEvaluatorFactory {
final AppliedPTransform<?, ?, ?> application,
CommittedBundle<?> inputBundle,
InProcessEvaluationContext evaluationContext) {
- return createSingleEvaluator((AppliedPTransform) application, inputBundle, evaluationContext);
+ @SuppressWarnings({"cast", "unchecked", "rawtypes"})
+ TransformEvaluator<T> evaluator = (TransformEvaluator<T>) createSingleEvaluator(
+ (AppliedPTransform) application, inputBundle, evaluationContext);
+ return evaluator;
}
private static <InputT, OutputT> ParDoInProcessEvaluator<InputT> createSingleEvaluator(
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/f06e2a97/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/ViewEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/ViewEvaluatorFactory.java b/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/ViewEvaluatorFactory.java
index 314d81f..dd2bfb1 100644
--- a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/ViewEvaluatorFactory.java
+++ b/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/ViewEvaluatorFactory.java
@@ -42,14 +42,15 @@ import java.util.List;
* written.
*/
class ViewEvaluatorFactory implements TransformEvaluatorFactory {
- @SuppressWarnings({"rawtypes", "unchecked"})
@Override
public <T> TransformEvaluator<T> forApplication(
AppliedPTransform<?, ?, ?> application,
InProcessPipelineRunner.CommittedBundle<?> inputBundle,
InProcessEvaluationContext evaluationContext) {
- return createEvaluator(
- (AppliedPTransform) application, evaluationContext);
+ @SuppressWarnings({"cast", "unchecked", "rawtypes"})
+ TransformEvaluator<T> evaluator = (TransformEvaluator<T>) createEvaluator(
+ (AppliedPTransform) application, evaluationContext);
+ return evaluator;
}
private <InT, OuT> TransformEvaluator<Iterable<InT>> createEvaluator(
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/f06e2a97/sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/DoFnReflector.java
----------------------------------------------------------------------
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/DoFnReflector.java b/sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/DoFnReflector.java
index 1bb05fb..1c46541 100644
--- a/sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/DoFnReflector.java
+++ b/sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/DoFnReflector.java
@@ -625,19 +625,20 @@ public abstract class DoFnReflector {
@Override
public void startBundle(DoFn<InputT, OutputT>.Context c) throws Exception {
ContextAdapter<InputT, OutputT> adapter = new ContextAdapter<>(fn, c);
- reflector.invokeStartBundle(fn, adapter, adapter);
+ reflector.invokeStartBundle(fn, (DoFnWithContext<InputT, OutputT>.Context) adapter, adapter);
}
@Override
public void finishBundle(DoFn<InputT, OutputT>.Context c) throws Exception {
ContextAdapter<InputT, OutputT> adapter = new ContextAdapter<>(fn, c);
- reflector.invokeFinishBundle(fn, adapter, adapter);
+ reflector.invokeFinishBundle(fn, (DoFnWithContext<InputT, OutputT>.Context) adapter, adapter);
}
@Override
public void processElement(DoFn<InputT, OutputT>.ProcessContext c) throws Exception {
ProcessContextAdapter<InputT, OutputT> adapter = new ProcessContextAdapter<>(fn, c);
- reflector.invokeProcessElement(fn, adapter, adapter);
+ reflector.invokeProcessElement(
+ fn, (DoFnWithContext<InputT, OutputT>.ProcessContext) adapter, adapter);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/f06e2a97/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/DoFnRunners.java
----------------------------------------------------------------------
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/DoFnRunners.java b/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/DoFnRunners.java
index 64a0968..d56b36e 100644
--- a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/DoFnRunners.java
+++ b/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/DoFnRunners.java
@@ -115,7 +115,8 @@ public class DoFnRunners {
if (doFn instanceof ReduceFnExecutor) {
@SuppressWarnings("rawtypes")
ReduceFnExecutor fn = (ReduceFnExecutor) doFn;
- return lateDataDroppingRunner(
+ @SuppressWarnings({"unchecked", "cast", "rawtypes"})
+ DoFnRunner<InputT, OutputT> runner = (DoFnRunner<InputT, OutputT>) lateDataDroppingRunner(
options,
fn,
sideInputReader,
@@ -125,6 +126,7 @@ public class DoFnRunners {
stepContext,
addCounterMutator,
(WindowingStrategy) windowingStrategy);
+ return runner;
}
return simpleRunner(
options,