From 4cb444b3f1e273320dafb78cb263dc313a58a6ab Mon Sep 17 00:00:00 2001 From: Sam Rohde Date: Wed, 22 Feb 2023 10:08:16 -0800 Subject: [PATCH 1/3] Add Data Sampling capability URN to Java SDK --- .../apache/beam/runners/core/construction/Environments.java | 1 + .../beam/runners/core/construction/EnvironmentsTest.java | 3 +++ 2 files changed, 4 insertions(+) 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 c59ca23fd77c..83898f348a2d 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 @@ -423,6 +423,7 @@ public static Set getJavaCapabilities() { capabilities.add("beam:version:sdk_base:" + JAVA_SDK_HARNESS_CONTAINER_URL); capabilities.add(BeamUrns.getUrn(SplittableParDoComponents.TRUNCATE_SIZED_RESTRICTION)); capabilities.add(BeamUrns.getUrn(Primitives.TO_STRING)); + capabilities.add(BeamUrns.getUrn(RunnerApi.StandardProtocols.Enum.DATA_SAMPLING)); 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 17c85323ad16..9a3ed7db6bc7 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 @@ -204,6 +204,9 @@ public void testCapabilities() { assertThat( Environments.getJavaCapabilities(), hasItem(BeamUrns.getUrn(RunnerApi.StandardProtocols.Enum.STATE_CACHING))); + assertThat( + Environments.getJavaCapabilities(), + hasItem(BeamUrns.getUrn(RunnerApi.StandardProtocols.Enum.DATA_SAMPLING))); // Check that SDF truncation is supported assertThat( Environments.getJavaCapabilities(), From e90a8cbaaedc8d8bc7445a05933902c0985ddf7b Mon Sep 17 00:00:00 2001 From: Sam Rohde Date: Wed, 22 Feb 2023 10:11:56 -0800 Subject: [PATCH 2/3] trigger tests From c7f1792cdb0b1574ee5a9a842ecc31db591a73bc Mon Sep 17 00:00:00 2001 From: Lukasz Cwik Date: Wed, 22 Feb 2023 10:13:25 -0800 Subject: [PATCH 3/3] Update runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/Environments.java --- .../org/apache/beam/runners/core/construction/Environments.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 83898f348a2d..646e9bc744ca 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 @@ -423,7 +423,7 @@ public static Set getJavaCapabilities() { capabilities.add("beam:version:sdk_base:" + JAVA_SDK_HARNESS_CONTAINER_URL); capabilities.add(BeamUrns.getUrn(SplittableParDoComponents.TRUNCATE_SIZED_RESTRICTION)); capabilities.add(BeamUrns.getUrn(Primitives.TO_STRING)); - capabilities.add(BeamUrns.getUrn(RunnerApi.StandardProtocols.Enum.DATA_SAMPLING)); + capabilities.add(BeamUrns.getUrn(StandardProtocols.Enum.DATA_SAMPLING)); return capabilities.build(); }