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/03/15 04:58:23 UTC
[1/4] incubator-beam git commit: Version management
Repository: incubator-beam
Updated Branches:
refs/heads/master c3fbeda6c -> c0b9fc660
Version management
Declare version 1.6.0-SNAPSHOT.
----Release Notes----
[]
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=116803966
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/781da200
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/781da200
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/781da200
Branch: refs/heads/master
Commit: 781da2002baf7386e632c6a26f5f2bfd0e6b161b
Parents: c3fbeda
Author: davor <da...@google.com>
Authored: Wed Mar 9 14:32:12 2016 -0800
Committer: Dan Halperin <dh...@google.com>
Committed: Mon Mar 14 20:35:38 2016 -0700
----------------------------------------------------------------------
examples/pom.xml | 2 +-
maven-archetypes/examples/pom.xml | 2 +-
maven-archetypes/starter/pom.xml | 2 +-
pom.xml | 2 +-
sdk/pom.xml | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/781da200/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index 2218367..c15f73f 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>com.google.cloud.dataflow</groupId>
<artifactId>google-cloud-dataflow-java-sdk-parent</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
</parent>
<groupId>com.google.cloud.dataflow</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/781da200/maven-archetypes/examples/pom.xml
----------------------------------------------------------------------
diff --git a/maven-archetypes/examples/pom.xml b/maven-archetypes/examples/pom.xml
index 6cb1852..4e99908 100644
--- a/maven-archetypes/examples/pom.xml
+++ b/maven-archetypes/examples/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>com.google.cloud.dataflow</groupId>
<artifactId>google-cloud-dataflow-java-sdk-parent</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/781da200/maven-archetypes/starter/pom.xml
----------------------------------------------------------------------
diff --git a/maven-archetypes/starter/pom.xml b/maven-archetypes/starter/pom.xml
index b5b3251..0aa71c4 100644
--- a/maven-archetypes/starter/pom.xml
+++ b/maven-archetypes/starter/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>com.google.cloud.dataflow</groupId>
<artifactId>google-cloud-dataflow-java-sdk-parent</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/781da200/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 7e5e078..6fb0b32 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,7 +35,7 @@
<url>http://cloud.google.com/dataflow</url>
<inceptionYear>2013</inceptionYear>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
<licenses>
<license>
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/781da200/sdk/pom.xml
----------------------------------------------------------------------
diff --git a/sdk/pom.xml b/sdk/pom.xml
index f782b78..d7e10a5 100644
--- a/sdk/pom.xml
+++ b/sdk/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>com.google.cloud.dataflow</groupId>
<artifactId>google-cloud-dataflow-java-sdk-parent</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
</parent>
<groupId>com.google.cloud.dataflow</groupId>
[2/4] incubator-beam git commit: Select worker harness container
image for release 1.5.0
Posted by da...@apache.org.
Select worker harness container image for release 1.5.0
----Release Notes----
[]
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=116798931
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/0e75e6ae
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/0e75e6ae
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/0e75e6ae
Branch: refs/heads/master
Commit: 0e75e6aeee2c599d5a0f002aa992632c054a60a6
Parents: 781da20
Author: davor <da...@google.com>
Authored: Wed Mar 9 13:47:10 2016 -0800
Committer: Dan Halperin <dh...@google.com>
Committed: Mon Mar 14 20:41:12 2016 -0700
----------------------------------------------------------------------
.../cloud/dataflow/sdk/runners/DataflowPipelineRunner.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/0e75e6ae/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 c90b904..29f9b85 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
@@ -211,9 +211,9 @@ public class DataflowPipelineRunner extends PipelineRunner<DataflowPipelineJob>
// Default Docker container images that execute Dataflow worker harness, residing in Google
// Container Registry, separately for Batch and Streaming.
public static final String BATCH_WORKER_HARNESS_CONTAINER_IMAGE
- = "dataflow.gcr.io/v1beta3/java-batch:github-20160225-00";
+ = "dataflow.gcr.io/v1beta3/java-batch:1.5.0";
public static final String STREAMING_WORKER_HARNESS_CONTAINER_IMAGE
- = "dataflow.gcr.io/v1beta3/java-streaming:github-20160225-00";
+ = "dataflow.gcr.io/v1beta3/java-streaming:1.5.0";
// The limit of CreateJob request size.
private static final int CREATE_JOB_REQUEST_LIMIT_BYTES = 10 * 1024 * 1024;
[3/4] incubator-beam git commit: Version management for remaining poms
Posted by da...@apache.org.
Version management for remaining poms
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/8d17dde0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/8d17dde0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/8d17dde0
Branch: refs/heads/master
Commit: 8d17dde0248f92c7fdf685de61d7c32a6042f62f
Parents: 0e75e6a
Author: Dan Halperin <dh...@google.com>
Authored: Mon Mar 14 20:42:09 2016 -0700
Committer: Dan Halperin <dh...@google.com>
Committed: Mon Mar 14 20:42:09 2016 -0700
----------------------------------------------------------------------
runners/flink/pom.xml | 4 ++--
runners/pom.xml | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/8d17dde0/runners/flink/pom.xml
----------------------------------------------------------------------
diff --git a/runners/flink/pom.xml b/runners/flink/pom.xml
index b1929d2..c8c5d84 100644
--- a/runners/flink/pom.xml
+++ b/runners/flink/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.beam</groupId>
<artifactId>runners</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
</parent>
<artifactId>flink-runner</artifactId>
@@ -48,7 +48,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<flink.version>1.0.0</flink.version>
- <beam.version>1.5.0-SNAPSHOT</beam.version>
+ <beam.version>1.6.0-SNAPSHOT</beam.version>
<scala.major.version>2.10</scala.major.version>
<!-- Default parameters for mvn exec:exec -->
<clazz>org.apache.beam.runners.flink.examples.WordCount</clazz>
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/8d17dde0/runners/pom.xml
----------------------------------------------------------------------
diff --git a/runners/pom.xml b/runners/pom.xml
index 757e208..980900b 100644
--- a/runners/pom.xml
+++ b/runners/pom.xml
@@ -25,12 +25,12 @@
<parent>
<groupId>com.google.cloud.dataflow</groupId>
<artifactId>google-cloud-dataflow-java-sdk-parent</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.beam</groupId>
<artifactId>runners</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
<packaging>pom</packaging>
[4/4] incubator-beam git commit: This closes #47
Posted by da...@apache.org.
This closes #47
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/c0b9fc66
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/c0b9fc66
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/c0b9fc66
Branch: refs/heads/master
Commit: c0b9fc66080f4ec4394c135e4bde9d11085596c5
Parents: b864ce8 8d17dde
Author: Davor Bonaci <da...@google.com>
Authored: Mon Mar 14 20:47:44 2016 -0700
Committer: Davor Bonaci <da...@google.com>
Committed: Mon Mar 14 20:47:44 2016 -0700
----------------------------------------------------------------------
.gitignore | 5 +
.travis.yml | 4 +-
DISCLAIMER | 10 +
NOTICE | 12 +
README.md | 21 +-
examples/pom.xml | 2 +-
maven-archetypes/examples/pom.xml | 2 +-
maven-archetypes/starter/pom.xml | 2 +-
pom.xml | 2 +-
runners/flink/README.md | 4 +-
runners/flink/pom.xml | 41 +-
.../FlinkBatchPipelineTranslator.java | 14 +-
.../FlinkStreamingPipelineTranslator.java | 15 +-
.../apache/beam/runners/flink/AvroITCase.java | 28 +-
runners/pom.xml | 4 +-
runners/spark/.gitignore | 10 +
runners/spark/.travis.yml | 22 +
runners/spark/README.md | 113 +
runners/spark/build-resources/checkstyle.xml | 222 +
runners/spark/build-resources/header-file.txt | 14 +
runners/spark/pom.xml | 469 ++
.../com/cloudera/dataflow/hadoop/HadoopIO.java | 202 +
.../dataflow/hadoop/NullWritableCoder.java | 71 +
.../cloudera/dataflow/hadoop/WritableCoder.java | 120 +
.../com/cloudera/dataflow/io/ConsoleIO.java | 60 +
.../com/cloudera/dataflow/io/CreateStream.java | 66 +
.../java/com/cloudera/dataflow/io/KafkaIO.java | 128 +
.../dataflow/spark/BroadcastHelper.java | 121 +
.../com/cloudera/dataflow/spark/ByteArray.java | 52 +
.../cloudera/dataflow/spark/CoderHelpers.java | 185 +
.../cloudera/dataflow/spark/DoFnFunction.java | 93 +
.../dataflow/spark/EvaluationContext.java | 283 +
.../dataflow/spark/EvaluationResult.java | 62 +
.../dataflow/spark/MultiDoFnFunction.java | 115 +
.../dataflow/spark/ShardNameBuilder.java | 106 +
.../dataflow/spark/ShardNameTemplateAware.java | 28 +
.../dataflow/spark/ShardNameTemplateHelper.java | 58 +
.../dataflow/spark/SparkContextFactory.java | 66 +
.../dataflow/spark/SparkPipelineEvaluator.java | 52 +
.../dataflow/spark/SparkPipelineOptions.java | 39 +
.../spark/SparkPipelineOptionsFactory.java | 27 +
.../spark/SparkPipelineOptionsRegistrar.java | 27 +
.../dataflow/spark/SparkPipelineRunner.java | 252 +
.../spark/SparkPipelineRunnerRegistrar.java | 27 +
.../dataflow/spark/SparkPipelineTranslator.java | 27 +
.../dataflow/spark/SparkProcessContext.java | 250 +
.../dataflow/spark/SparkRuntimeContext.java | 212 +
.../spark/TemplatedAvroKeyOutputFormat.java | 40 +
.../TemplatedSequenceFileOutputFormat.java | 40 +
.../spark/TemplatedTextOutputFormat.java | 40 +
.../dataflow/spark/TransformEvaluator.java | 24 +
.../dataflow/spark/TransformTranslator.java | 800 +++
.../dataflow/spark/WindowingHelpers.java | 59 +
.../spark/aggregators/AggAccumParam.java | 35 +
.../spark/aggregators/NamedAggregators.java | 202 +
.../SparkStreamingPipelineOptions.java | 40 +
.../SparkStreamingPipelineOptionsFactory.java | 27 +
.../SparkStreamingPipelineOptionsRegistrar.java | 28 +
.../streaming/StreamingEvaluationContext.java | 226 +
.../streaming/StreamingTransformTranslator.java | 414 ++
.../StreamingWindowPipelineDetector.java | 100 +
...ataflow.sdk.options.PipelineOptionsRegistrar | 17 +
...dataflow.sdk.runners.PipelineRunnerRegistrar | 16 +
.../dataflow/hadoop/WritableCoderTest.java | 42 +
.../dataflow/spark/AvroPipelineTest.java | 103 +
.../dataflow/spark/CombineGloballyTest.java | 87 +
.../dataflow/spark/CombinePerKeyTest.java | 69 +
.../com/cloudera/dataflow/spark/DeDupTest.java | 55 +
.../cloudera/dataflow/spark/DoFnOutputTest.java | 57 +
.../cloudera/dataflow/spark/EmptyInputTest.java | 64 +
.../spark/HadoopFileFormatPipelineTest.java | 105 +
.../spark/MultiOutputWordCountTest.java | 148 +
.../cloudera/dataflow/spark/NumShardsTest.java | 89 +
.../dataflow/spark/SerializationTest.java | 183 +
.../dataflow/spark/ShardNameBuilderTest.java | 82 +
.../dataflow/spark/SideEffectsTest.java | 77 +
.../dataflow/spark/SimpleWordCountTest.java | 117 +
.../spark/TestSparkPipelineOptionsFactory.java | 34 +
.../com/cloudera/dataflow/spark/TfIdfTest.java | 60 +
.../dataflow/spark/TransformTranslatorTest.java | 95 +
.../dataflow/spark/WindowedWordCountTest.java | 63 +
.../spark/streaming/FlattenStreamingTest.java | 84 +
.../spark/streaming/KafkaStreamingTest.java | 133 +
.../streaming/SimpleStreamingWordCountTest.java | 73 +
.../utils/DataflowAssertStreaming.java | 39 +
.../streaming/utils/EmbeddedKafkaCluster.java | 314 ++
runners/spark/src/test/resources/person.avsc | 23 +
runners/spark/src/test/resources/pg1112.txt | 4853 ++++++++++++++++++
runners/spark/src/test/resources/pg2264.txt | 3667 +++++++++++++
runners/spark/src/test/resources/test_text.txt | 2 +
sdk/pom.xml | 2 +-
.../sdk/runners/DataflowPipelineRunner.java | 4 +-
.../cloud/dataflow/sdk/util/CombineFnUtil.java | 57 +
.../sdk/util/MergingActiveWindowSet.java | 19 +-
.../cloud/dataflow/sdk/util/ReduceFnRunner.java | 10 +-
.../dataflow/sdk/util/state/StateTags.java | 24 +-
.../dataflow/sdk/util/ReduceFnRunnerTest.java | 37 +
.../dataflow/sdk/util/state/StateTagTest.java | 65 +
98 files changed, 16717 insertions(+), 72 deletions(-)
----------------------------------------------------------------------