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/04/22 23:36:06 UTC
[1/2] incubator-beam git commit: Remove substring in Job Name
validation
Repository: incubator-beam
Updated Branches:
refs/heads/master 19fb537a1 -> cf4c3e204
Remove substring in Job Name validation
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/0e252df7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/0e252df7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/0e252df7
Branch: refs/heads/master
Commit: 0e252df784ea46c196bd5b7a74de88341bc2e5f8
Parents: 19fb537
Author: Thomas Groh <tg...@google.com>
Authored: Fri Apr 22 14:02:53 2016 -0700
Committer: Thomas Groh <tg...@google.com>
Committed: Fri Apr 22 14:24:00 2016 -0700
----------------------------------------------------------------------
.../beam/sdk/runners/DataflowPipelineRunner.java | 1 -
.../beam/sdk/runners/DataflowPipelineRunnerTest.java | 13 +------------
2 files changed, 1 insertion(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/0e252df7/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/sdk/runners/DataflowPipelineRunner.java
----------------------------------------------------------------------
diff --git a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/sdk/runners/DataflowPipelineRunner.java b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/sdk/runners/DataflowPipelineRunner.java
index 48e92a2..d2f8bbe 100644
--- a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/sdk/runners/DataflowPipelineRunner.java
+++ b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/sdk/runners/DataflowPipelineRunner.java
@@ -291,7 +291,6 @@ public class DataflowPipelineRunner extends PipelineRunner<DataflowPipelineJob>
String jobName =
dataflowOptions
.getJobName()
- .substring(0, Math.min(dataflowOptions.getJobName().length(), 40))
.toLowerCase();
checkArgument(
jobName.matches("[a-z]([-a-z0-9]*[a-z0-9])?"),
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/0e252df7/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/sdk/runners/DataflowPipelineRunnerTest.java
----------------------------------------------------------------------
diff --git a/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/sdk/runners/DataflowPipelineRunnerTest.java b/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/sdk/runners/DataflowPipelineRunnerTest.java
index 412eccb..f888c5b 100644
--- a/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/sdk/runners/DataflowPipelineRunnerTest.java
+++ b/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/sdk/runners/DataflowPipelineRunnerTest.java
@@ -144,7 +144,7 @@ public class DataflowPipelineRunnerTest {
private static void assertValidJob(Job job) {
assertNull(job.getId());
assertNull(job.getCurrentState());
- assertTrue(Pattern.matches("[a-z]([-a-z0-9]{0,38}[a-z0-9])?", job.getName()));
+ assertTrue(Pattern.matches("[a-z]([-a-z0-9]*[a-z0-9])?", job.getName()));
}
private Pipeline buildDataflowPipeline(DataflowPipelineOptions options) {
@@ -232,17 +232,6 @@ public class DataflowPipelineRunnerTest {
}
@Test
- public void testFromOptionsWithLongNameTruncates() throws Exception {
- String longName = "thisnameisreallyquitelonganddoneinordertoforcetruncation";
- ArgumentCaptor<Job> jobCaptor = ArgumentCaptor.forClass(Job.class);
- DataflowPipelineOptions options = buildPipelineOptions(jobCaptor);
- options.setJobName(longName);
-
- DataflowPipelineRunner runner = DataflowPipelineRunner.fromOptions(options);
- assertThat(options.getJobName(), equalTo(longName.substring(0, 40)));
- }
-
- @Test
public void testFromOptionsWithUppercaseConvertsToLowercase() throws Exception {
String mixedCase = "ThisJobNameHasMixedCase";
ArgumentCaptor<Job> jobCaptor = ArgumentCaptor.forClass(Job.class);
[2/2] incubator-beam git commit: This closes #233
Posted by da...@apache.org.
This closes #233
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/cf4c3e20
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/cf4c3e20
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/cf4c3e20
Branch: refs/heads/master
Commit: cf4c3e204c106a2c1ea87803abffc81dd1c34067
Parents: 19fb537 0e252df
Author: Davor Bonaci <da...@google.com>
Authored: Fri Apr 22 14:31:51 2016 -0700
Committer: Davor Bonaci <da...@google.com>
Committed: Fri Apr 22 14:31:51 2016 -0700
----------------------------------------------------------------------
.../beam/sdk/runners/DataflowPipelineRunner.java | 1 -
.../beam/sdk/runners/DataflowPipelineRunnerTest.java | 13 +------------
2 files changed, 1 insertion(+), 13 deletions(-)
----------------------------------------------------------------------