Revert #37631 and #38497 on HEAD #38516
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -47,7 +47,6 @@ | |
| import com.google.api.services.dataflow.model.Job; | ||
| import com.google.api.services.dataflow.model.Step; | ||
| import com.google.api.services.dataflow.model.WorkerPool; | ||
| import java.io.File; | ||
| import java.io.IOException; | ||
| import java.io.Serializable; | ||
|
|
@@ -93,8 +92,6 @@ | |
| import org.apache.beam.sdk.options.PipelineOptionsFactory; | ||
| import org.apache.beam.sdk.options.StreamingOptions; | ||
| import org.apache.beam.sdk.options.ValueProvider; | ||
| import org.apache.beam.sdk.state.StateSpec; | ||
| import org.apache.beam.sdk.state.StateSpecs; | ||
| import org.apache.beam.sdk.state.ValueState; | ||
|
|
@@ -169,11 +166,15 @@ public class DataflowPipelineTranslatorTest implements Serializable { | |
| @Rule public transient ExpectedException thrown = ExpectedException.none(); | ||
|
|
||
| private SdkComponents createSdkComponents(PipelineOptions options) { | ||
| SdkComponents sdkComponents = SdkComponents.create(); | ||
|
|
||
| String containerImageURL = | ||
| DataflowRunner.getContainerImageForJob(options.as(DataflowPipelineOptions.class)); | ||
| RunnerApi.Environment defaultEnvironmentForDataflow = | ||
| Environments.createDockerEnvironment(containerImageURL); | ||
|
|
||
| sdkComponents.registerEnvironment(defaultEnvironmentForDataflow); | ||
| return sdkComponents; | ||
| } | ||
|
|
||
| // A Custom Mockito matcher for an initial Job that checks that all | ||
|
|
@@ -1293,16 +1294,15 @@ public String apply(byte[] input) { | |
| file1.deleteOnExit(); | ||
| File file2 = File.createTempFile("file2-", ".txt"); | ||
| file2.deleteOnExit(); | ||
| SdkComponents sdkComponents = SdkComponents.create(); | ||
| sdkComponents.registerEnvironment( | ||
| Environments.createDockerEnvironment(DataflowRunner.getContainerImageForJob(options)) | ||
| .toBuilder() | ||
| .addAllDependencies( | ||
| Environments.getArtifacts( | ||
| ImmutableList.of("file1.txt=" + file1, "file2.txt=" + file2))) | ||
| .addAllCapabilities(Environments.getJavaCapabilities()) | ||
| .build()); | ||
|
|
||
| RunnerApi.Pipeline pipelineProto = PipelineTranslation.toProto(pipeline, sdkComponents, true); | ||
|
|
||
|
|
@@ -1870,53 +1870,4 @@ public OffsetRange getInitialRange(@SuppressWarnings("unused") @Element String e | |
| return null; | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -78,8 +78,7 @@ public void testLengthPrefixingOfKeyCoderInStatefulExecutableStage() throws Exce | |
| // Add another stateful stage with a non-standard key coder | ||
| Pipeline p = Pipeline.create(); | ||
| Coder<Void> keycoder = VoidCoder.of(); | ||
| assertThat(ModelCoderRegistrar.isKnownCoder(keycoder), is(false)); | ||
| p.apply("impulse", Impulse.create()) | ||
| .apply( | ||
| "create", | ||
|
|
@@ -166,8 +165,7 @@ public void onTimer() {} | |
| public void testLengthPrefixingOfInputCoderExecutableStage() throws Exception { | ||
| Pipeline p = Pipeline.create(); | ||
| Coder<Void> voidCoder = VoidCoder.of(); | ||
| assertThat(ModelCoderRegistrar.isKnownCoder(voidCoder), is(false)); | ||
| p.apply("impulse", Impulse.create()) | ||
| .apply( | ||
| ParDo.of( | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -214,11 +214,6 @@ def createUlrValidatesRunnerTask = { name, environmentType, dockerImageTask = "" | |
| // TODO(https://github.com/apache/beam/issues/31231) | ||
| excludeTestsMatching 'org.apache.beam.sdk.transforms.RedistributeTest.testRedistributePreservesMetadata' | ||
|
|
||
| for (String test : sickbayTests) { | ||
| excludeTestsMatching test | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -25,13 +25,11 @@ | |
| import org.apache.beam.model.pipeline.v1.RunnerApi; | ||
| import org.apache.beam.model.pipeline.v1.RunnerApi.FunctionSpec; | ||
| import org.apache.beam.sdk.coders.Coder; | ||
| import org.apache.beam.sdk.util.SerializableUtils; | ||
| import org.apache.beam.vendor.grpc.v1p69p0.com.google.protobuf.ByteString; | ||
| import org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.annotations.VisibleForTesting; | ||
| import org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.collect.BiMap; | ||
| import org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.collect.ImmutableBiMap; | ||
| import org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.collect.ImmutableMap; | ||
| import org.checkerframework.checker.nullness.qual.MonotonicNonNull; | ||
| import org.checkerframework.dataflow.qual.Deterministic; | ||
|
|
@@ -64,8 +62,6 @@ private static class DefaultTranslationContext implements TranslationContext {} | |
|
|
||
| private static @MonotonicNonNull BiMap<Class<? extends Coder>, String> knownCoderUrns; | ||
|
|
||
| private static @MonotonicNonNull Map<Class<? extends Coder>, CoderTranslator<? extends Coder>> | ||
| knownTranslators; | ||
|
|
||
|
|
@@ -84,53 +80,6 @@ static BiMap<Class<? extends Coder>, String> getKnownCoderUrns() { | |
| return knownCoderUrns; | ||
| } | ||
|
|
||
| @VisibleForTesting | ||
| @Deterministic | ||
| static Map<Class<? extends Coder>, CoderTranslator<? extends Coder>> getKnownTranslators() { | ||
|
|
@@ -158,7 +107,7 @@ public static RunnerApi.MessageWithComponents toProto(Coder<?> coder) throws IOE | |
|
|
||
| public static RunnerApi.Coder toProto(Coder<?> coder, SdkComponents components) | ||
| throws IOException { | ||
| if (getKnownCoderUrns().containsKey(coder.getClass())) { | ||
| return toKnownCoder(coder, components); | ||
| } | ||
|
|
||
|
|
@@ -180,10 +129,7 @@ private static RunnerApi.Coder toUnknownCoderWrapper(UnknownCoderWrapper coder) | |
|
|
||
| private static RunnerApi.Coder toKnownCoder(Coder<?> coder, SdkComponents components) | ||
| throws IOException { | ||
| CoderTranslator translator = getKnownTranslators().get(coder.getClass()); | ||
|
Contributor
There was a problem hiding this comment. The explicit null check and descriptive CoderTranslator translator = getKnownTranslators().get(coder.getClass());
if (translator == null) {
throw new IOException("Unable to find CoderTranslator for known Coder: " + coder.getClass());
} |
||
| List<String> componentIds = registerComponents(coder, translator, components); | ||
| return RunnerApi.Coder.newBuilder() | ||
| .addAllComponentCoderIds(componentIds) | ||
|
|
@@ -240,8 +186,8 @@ private static Coder<?> fromKnownCoder( | |
| components.getComponents().getCodersOrThrow(componentId), components, context); | ||
| coderComponents.add(innerCoder); | ||
| } | ||
| Class<? extends Coder> coderType = getKnownCoderUrns().inverse().get(coderUrn); | ||
| CoderTranslator<?> translator = getKnownTranslators().get(coderType); | ||
| if (translator != null) { | ||
| return translator.fromComponents( | ||
| coderComponents, coder.getSpec().getPayload().toByteArray(), context); | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -28,7 +28,6 @@ | |
| * additional payload, which is not currently supported. This exists as a temporary measure. | ||
| */ | ||
| public interface CoderTranslator<T extends Coder<?>> { | ||
| /** Extract all component {@link Coder coders} within a coder. */ | ||
| List<? extends Coder<?>> getComponents(T from); | ||
|
|
||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The file is missing a newline at the end. It is a best practice to end text files with a newline character to ensure compatibility with various Unix tools and to avoid 'No newline at end of file' warnings in diffs.