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/04/05 22:56:36 UTC
[2/8] incubator-beam git commit: Merge 'apache/master' into GBK,
resolve benign import conflict
Merge 'apache/master' into GBK, resolve benign import conflict
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/6751e495
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/6751e495
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/6751e495
Branch: refs/heads/master
Commit: 6751e49559ea39ca0358c99e04d0d86a35d07084
Parents: 589ef8a 706fc53
Author: Kenneth Knowles <kl...@google.com>
Authored: Mon Mar 28 09:12:54 2016 -0700
Committer: Kenneth Knowles <kl...@google.com>
Committed: Mon Mar 28 09:12:54 2016 -0700
----------------------------------------------------------------------
.gitignore | 2 +
.../spark/translation/TransformTranslator.java | 32 ++++++----
.../translation/MultiOutputWordCountTest.java | 19 +++++-
.../translation/WindowedWordCountTest.java | 63 +++++++++++++++----
.../inprocess/InMemoryWatermarkManager.java | 3 +-
.../inprocess/InProcessTimerInternals.java | 1 -
.../sdk/util/LateDataDroppingDoFnRunner.java | 3 +-
.../dataflow/sdk/util/PaneInfoTracker.java | 2 +-
.../sdk/util/ReduceFnContextFactory.java | 1 -
.../cloud/dataflow/sdk/util/ReduceFnRunner.java | 65 +++++++++++++++++---
.../cloud/dataflow/sdk/util/TimerInternals.java | 4 +-
.../google/cloud/dataflow/sdk/util/Timers.java | 3 +-
.../sdk/util/TriggerContextFactory.java | 1 -
.../cloud/dataflow/sdk/util/TriggerRunner.java | 2 +
.../cloud/dataflow/sdk/util/WatermarkHold.java | 58 ++++++++++++-----
.../dataflow/sdk/io/CountingInputTest.java | 1 +
.../cloud/dataflow/sdk/util/ReduceFnTester.java | 8 +--
.../cloud/dataflow/sdk/util/TriggerTester.java | 10 ++-
18 files changed, 203 insertions(+), 75 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/6751e495/runners/spark/src/main/java/org/apache/beam/runners/spark/translation/TransformTranslator.java
----------------------------------------------------------------------
diff --cc runners/spark/src/main/java/org/apache/beam/runners/spark/translation/TransformTranslator.java
index adb6e68,7f72235..7abf1bf
--- a/runners/spark/src/main/java/org/apache/beam/runners/spark/translation/TransformTranslator.java
+++ b/runners/spark/src/main/java/org/apache/beam/runners/spark/translation/TransformTranslator.java
@@@ -79,8 -80,8 +80,9 @@@ import org.apache.spark.api.java.JavaRD
import org.apache.spark.api.java.JavaSparkContext;
import org.apache.spark.api.java.function.Function;
import org.apache.spark.api.java.function.Function2;
+ import org.apache.spark.api.java.function.PairFlatMapFunction;
import org.apache.spark.api.java.function.PairFunction;
+
import scala.Tuple2;
/**
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/6751e495/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/ReduceFnRunner.java
----------------------------------------------------------------------