Repository: beam Updated Branches: refs/heads/master 7587d29f5 -> bef2d3738
DataflowRunner misc cleanups Bad use of format string, very old debugging assert Project: http://git-wip-us.apache.org/repos/asf/beam/repo Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/3fb3a0c5 Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/3fb3a0c5 Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/3fb3a0c5 Branch: refs/heads/master Commit: 3fb3a0c5f200bd04387a3fbdc89f0855e737b8c8 Parents: 7587d29 Author: Dan Halperin <[email protected]> Authored: Tue Apr 11 13:47:34 2017 -0700 Committer: Dan Halperin <[email protected]> Committed: Tue Apr 11 15:01:34 2017 -0700 ---------------------------------------------------------------------- .../beam/runners/dataflow/DataflowPipelineTranslator.java | 3 --- .../java/org/apache/beam/runners/dataflow/DataflowRunner.java | 7 ++++--- 2 files changed, 4 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/beam/blob/3fb3a0c5/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowPipelineTranslator.java ---------------------------------------------------------------------- diff --git a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowPipelineTranslator.java b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowPipelineTranslator.java index 1a2e663..34da996 100644 --- a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowPipelineTranslator.java +++ b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowPipelineTranslator.java @@ -23,7 +23,6 @@ import static com.google.common.base.Preconditions.checkState; import static com.google.common.base.Strings.isNullOrEmpty; import static org.apache.beam.sdk.util.SerializableUtils.serializeToByteArray; import static org.apache.beam.sdk.util.StringUtils.byteArrayToJsonString; -import static org.apache.beam.sdk.util.StringUtils.jsonStringToByteArray; import static org.apache.beam.sdk.util.Structs.addBoolean; import static org.apache.beam.sdk.util.Structs.addDictionary; import static org.apache.beam.sdk.util.Structs.addList; @@ -49,7 +48,6 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; import java.io.IOException; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.LinkedList; @@ -895,7 +893,6 @@ public class DataflowPipelineTranslator { WindowingStrategy<?, ?> strategy = context.getOutput(transform).getWindowingStrategy(); byte[] serializedBytes = serializeToByteArray(strategy); String serializedJson = byteArrayToJsonString(serializedBytes); - assert Arrays.equals(serializedBytes, jsonStringToByteArray(serializedJson)); stepContext.addInput(PropertyNames.SERIALIZED_FN, serializedJson); } }); http://git-wip-us.apache.org/repos/asf/beam/blob/3fb3a0c5/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowRunner.java ---------------------------------------------------------------------- diff --git a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowRunner.java b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowRunner.java index 9b993f4..1708d8a 100644 --- a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowRunner.java +++ b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowRunner.java @@ -580,9 +580,10 @@ public class DataflowRunner extends PipelineRunner<DataflowPipelineJob> { } String fileLocation = firstNonNull( options.getTemplateLocation(), options.getDataflowJobFile()); - checkArgument(fileLocation.startsWith("/") || fileLocation.startsWith("gs://"), - String.format( - "Location must be local or on Cloud Storage, got {}.", fileLocation)); + checkArgument( + fileLocation.startsWith("/") || fileLocation.startsWith("gs://"), + "Location must be local or on Cloud Storage, got %s.", + fileLocation); String workSpecJson = DataflowPipelineTranslator.jobToString(newJob); try (PrintWriter printWriter = new PrintWriter( Channels.newOutputStream(IOChannelUtils.create(fileLocation, MimeTypes.TEXT)))) {
