Skip to content

[BEAM-10505][BEAM-10530] Add truncate capability. #12773

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 14, 2020
Merged

[BEAM-10505][BEAM-10530] Add truncate capability. #12773

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...nstruction-java/src/main/java/org/apache/beam/runners/core/construction/Environments.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
import org.apache.beam.model.pipeline.v1.RunnerApi.ProcessPayload;
import org.apache.beam.model.pipeline.v1.RunnerApi.StandardArtifacts;
import org.apache.beam.model.pipeline.v1.RunnerApi.StandardEnvironments;
import org.apache.beam.model.pipeline.v1.RunnerApi.StandardPTransforms.SplittableParDoComponents;
import org.apache.beam.model.pipeline.v1.RunnerApi.StandardProtocols;
import org.apache.beam.sdk.options.PipelineOptions;
import org.apache.beam.sdk.options.PortablePipelineOptions;
Expand Down Expand Up @@ -314,8 +315,7 @@ public static Set<String> getJavaCapabilities() {
capabilities.add(BeamUrns.getUrn(StandardProtocols.Enum.MULTI_CORE_BUNDLE_PROCESSING));
capabilities.add(BeamUrns.getUrn(StandardProtocols.Enum.PROGRESS_REPORTING));
capabilities.add("beam:version:sdk_base:" + JAVA_SDK_HARNESS_CONTAINER_URL);
// TODO(BEAM-10505): Add the capability back.
// capabilities.add(BeamUrns.getUrn(SplittableParDoComponents.TRUNCATE_SIZED_RESTRICTION));
capabilities.add(BeamUrns.getUrn(SplittableParDoComponents.TRUNCATE_SIZED_RESTRICTION));
return capabilities.build();
}

Expand Down
13 changes: 6 additions & 7 deletions ...uction-java/src/test/java/org/apache/beam/runners/core/construction/EnvironmentsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,13 +104,12 @@ public void testCapabilities() {
assertThat(
Environments.getJavaCapabilities(),
hasItem(BeamUrns.getUrn(RunnerApi.StandardProtocols.Enum.MULTI_CORE_BUNDLE_PROCESSING)));
// TODO(BEAM-10505): Add the check back.
// assertThat(
// Environments.getJavaCapabilities(),
// hasItem(
// BeamUrns.getUrn(
// RunnerApi.StandardPTransforms.SplittableParDoComponents
// .TRUNCATE_SIZED_RESTRICTION)));
assertThat(
Environments.getJavaCapabilities(),
hasItem(
BeamUrns.getUrn(
RunnerApi.StandardPTransforms.SplittableParDoComponents
.TRUNCATE_SIZED_RESTRICTION)));
}

@Test
Expand Down
3 changes: 1 addition & 2 deletions sdks/python/apache_beam/transforms/environments.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -596,8 +596,7 @@ def _python_sdk_capabilities_iter():
yield common_urns.protocols.WORKER_STATUS.urn
yield python_urns.PACKED_COMBINE_FN
yield 'beam:version:sdk_base:' + DockerEnvironment.default_docker_image()
#TODO(BEAM-10530): Add truncate capability.
# yield common_urns.sdf_components.TRUNCATE_SIZED_RESTRICTION.urn
yield common_urns.sdf_components.TRUNCATE_SIZED_RESTRICTION.urn


def python_sdk_dependencies(options, tmp_dir=None):
Expand Down
7 changes: 3 additions & 4 deletions sdks/python/apache_beam/transforms/environments_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,9 @@ def test_sdk_capabilities(self):
sdk_capabilities = environments.python_sdk_capabilities()
self.assertIn(common_urns.coders.LENGTH_PREFIX.urn, sdk_capabilities)
self.assertIn(common_urns.protocols.WORKER_STATUS.urn, sdk_capabilities)
#TODO(BEAM-10530): Add truncate capability.
# self.assertIn(
# common_urns.sdf_components.TRUNCATE_SIZED_RESTRICTION.urn,
# sdk_capabilities)
self.assertIn(
common_urns.sdf_components.TRUNCATE_SIZED_RESTRICTION.urn,
sdk_capabilities)

def test_default_capabilities(self):
environment = DockerEnvironment.from_options(
Expand Down