You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by da...@apache.org on 2016/06/07 16:59:56 UTC

[11/11] incubator-beam git commit: Merge branch 'master' into release-0.1.0-incubating

Merge branch 'master' into release-0.1.0-incubating


Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/54942431
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/54942431
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/54942431

Branch: refs/heads/release-0.1.0-incubating
Commit: 54942431ad391232a9caac83fc7ee80fb64db24c
Parents: d6a3baa bbd05a9
Author: Davor Bonaci <da...@google.com>
Authored: Tue Jun 7 09:58:38 2016 -0700
Committer: Davor Bonaci <da...@google.com>
Committed: Tue Jun 7 09:58:38 2016 -0700

----------------------------------------------------------------------
 .travis.yml                                     |   2 +-
 distributions/pom.xml                           |  62 +++
 distributions/src/main/assembly/src.xml         |  55 +++
 examples/java/pom.xml                           |  14 +-
 examples/java8/pom.xml                          |  16 +-
 examples/pom.xml                                |   6 +-
 pom.xml                                         |  45 +-
 runners/core-java/pom.xml                       |  10 +-
 runners/direct-java/pom.xml                     |  18 +-
 .../beam/runners/direct/BundleFactory.java      |   4 +-
 .../direct/ExecutorServiceParallelExecutor.java |  19 +-
 .../ImmutabilityCheckingBundleFactory.java      |   4 +-
 .../direct/InMemoryWatermarkManager.java        |  70 +--
 .../runners/direct/InProcessBundleFactory.java  |  25 +-
 .../direct/InProcessEvaluationContext.java      |  10 +-
 .../direct/InProcessExecutionContext.java       |   4 +-
 ...InProcessGroupByKeyOnlyEvaluatorFactory.java |   6 +-
 .../runners/direct/InProcessPipelineRunner.java |   7 +-
 .../apache/beam/runners/direct/StepAndKey.java  |   8 +-
 .../beam/runners/direct/StructuralKey.java      |  77 ++++
 .../direct/GroupByKeyEvaluatorFactoryTest.java  |  27 +-
 .../ImmutabilityCheckingBundleFactoryTest.java  |  13 +-
 .../direct/InMemoryWatermarkManagerTest.java    |  95 ++--
 .../direct/InProcessBundleFactoryTest.java      |  54 ++-
 .../direct/InProcessEvaluationContextTest.java  |  52 ++-
 ...ocessGroupByKeyOnlyEvaluatorFactoryTest.java |  33 +-
 .../direct/InProcessPipelineRunnerTest.java     |  60 +++
 .../direct/InProcessTimerInternalsTest.java     |   3 +-
 .../direct/ParDoInProcessEvaluatorTest.java     |   2 +-
 .../direct/ParDoMultiEvaluatorFactoryTest.java  |  29 +-
 .../direct/ParDoSingleEvaluatorFactoryTest.java |  35 +-
 .../beam/runners/direct/StructuralKeyTest.java  |  81 ++++
 runners/flink/examples/pom.xml                  |  10 +-
 runners/flink/pom.xml                           |   6 +-
 runners/flink/runner/pom.xml                    |  20 +-
 runners/google-cloud-dataflow-java/pom.xml      |  14 +-
 runners/pom.xml                                 |   7 +-
 runners/spark/pom.xml                           |  32 +-
 sdks/java/build-tools/pom.xml                   |   4 +-
 sdks/java/build-tools/src/main/assembly/src.xml |  56 ---
 sdks/java/core/pom.xml                          |   4 +-
 .../org/apache/beam/sdk/util/PubsubClient.java  |  54 ++-
 sdks/java/extensions/join-library/pom.xml       |   8 +-
 sdks/java/extensions/pom.xml                    |   5 +-
 sdks/java/io/google-cloud-platform/pom.xml      |  10 +-
 sdks/java/io/hdfs/pom.xml                       |   8 +-
 sdks/java/io/kafka/pom.xml                      |   8 +-
 .../org/apache/beam/sdk/io/kafka/KafkaIO.java   | 441 ++++++++++++++++++-
 .../apache/beam/sdk/io/kafka/KafkaIOTest.java   | 300 ++++++++++++-
 sdks/java/io/pom.xml                            |   5 +-
 sdks/java/java8tests/pom.xml                    |   8 +-
 sdks/java/maven-archetypes/examples/pom.xml     |   4 +-
 .../main/resources/archetype-resources/pom.xml  |   6 +-
 sdks/java/maven-archetypes/pom.xml              |   4 +-
 sdks/java/maven-archetypes/starter/pom.xml      |   5 +-
 .../main/resources/archetype-resources/pom.xml  |   2 +-
 .../resources/projects/basic/reference/pom.xml  |   2 +-
 sdks/java/pom.xml                               |   4 +-
 sdks/pom.xml                                    |   6 +-
 testing/travis/README.md                        |  23 +
 testing/travis/test_wordcount.sh                | 125 ++++++
 travis/README.md                                |  23 -
 travis/test_wordcount.sh                        | 125 ------
 63 files changed, 1632 insertions(+), 643 deletions(-)
----------------------------------------------------------------------