diff --git a/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/Environments.java b/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/Environments.java index 1583d134405d..0033584ba602 100644 --- a/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/Environments.java +++ b/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/Environments.java @@ -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; @@ -314,8 +315,7 @@ public static Set 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(); } diff --git a/runners/core-construction-java/src/test/java/org/apache/beam/runners/core/construction/EnvironmentsTest.java b/runners/core-construction-java/src/test/java/org/apache/beam/runners/core/construction/EnvironmentsTest.java index a562e33ffdec..7d8476de5f8a 100644 --- a/runners/core-construction-java/src/test/java/org/apache/beam/runners/core/construction/EnvironmentsTest.java +++ b/runners/core-construction-java/src/test/java/org/apache/beam/runners/core/construction/EnvironmentsTest.java @@ -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 diff --git a/sdks/python/apache_beam/transforms/environments.py b/sdks/python/apache_beam/transforms/environments.py index 2befe70951dd..a91159c17382 100644 --- a/sdks/python/apache_beam/transforms/environments.py +++ b/sdks/python/apache_beam/transforms/environments.py @@ -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): diff --git a/sdks/python/apache_beam/transforms/environments_test.py b/sdks/python/apache_beam/transforms/environments_test.py index 46be8405de22..a313dad402a9 100644 --- a/sdks/python/apache_beam/transforms/environments_test.py +++ b/sdks/python/apache_beam/transforms/environments_test.py @@ -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(