You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by yh...@apache.org on 2024/10/23 21:37:51 UTC

(beam) branch master updated: Fix JavaPreCommit on Java11 (#32912)

This is an automated email from the ASF dual-hosted git repository.

yhu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git


The following commit(s) were added to refs/heads/master by this push:
     new 172a0298c55 Fix JavaPreCommit on Java11 (#32912)
172a0298c55 is described below

commit 172a0298c557b2dc1aba8e7ef212a13ae6142113
Author: Yi Hu <ya...@google.com>
AuthorDate: Wed Oct 23 17:37:45 2024 -0400

    Fix JavaPreCommit on Java11 (#32912)
    
    * Disable affected Samza runner test in Java9+
    
    * Specify text log_kind for platorm independent logging
---
 .../java/org/apache/beam/runners/prism/PrismExecutor.java   | 12 ++++++++++++
 .../org/apache/beam/runners/prism/PrismExecutorTest.java    | 13 ++++++++-----
 .../samza/metrics/TestSamzaRunnerWithTransformMetrics.java  |  3 +++
 .../apache/beam/runners/samza/runtime/GroupByKeyOpTest.java | 10 ++++++++++
 .../runners/samza/runtime/SamzaStoreStateInternalsTest.java |  8 ++++++++
 5 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/runners/prism/java/src/main/java/org/apache/beam/runners/prism/PrismExecutor.java b/runners/prism/java/src/main/java/org/apache/beam/runners/prism/PrismExecutor.java
index fda5db923a7..0f9816337f9 100644
--- a/runners/prism/java/src/main/java/org/apache/beam/runners/prism/PrismExecutor.java
+++ b/runners/prism/java/src/main/java/org/apache/beam/runners/prism/PrismExecutor.java
@@ -31,6 +31,8 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 import org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.io.ByteStreams;
 import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
 import org.slf4j.Logger;
@@ -157,6 +159,16 @@ abstract class PrismExecutor {
 
     abstract Builder setArguments(List<String> arguments);
 
+    Builder addArguments(List<String> arguments) {
+      Optional<List<String>> original = getArguments();
+      if (!original.isPresent()) {
+        return this.setArguments(arguments);
+      }
+      List<String> newArguments =
+          Stream.concat(original.get().stream(), arguments.stream()).collect(Collectors.toList());
+      return this.setArguments(newArguments);
+    }
+
     abstract Optional<List<String>> getArguments();
 
     abstract PrismExecutor autoBuild();
diff --git a/runners/prism/java/src/test/java/org/apache/beam/runners/prism/PrismExecutorTest.java b/runners/prism/java/src/test/java/org/apache/beam/runners/prism/PrismExecutorTest.java
index eb497f0a4c4..a81e3e24ee6 100644
--- a/runners/prism/java/src/test/java/org/apache/beam/runners/prism/PrismExecutorTest.java
+++ b/runners/prism/java/src/test/java/org/apache/beam/runners/prism/PrismExecutorTest.java
@@ -59,7 +59,7 @@ public class PrismExecutorTest {
     sleep(3000L);
     executor.stop();
     String output = outputStream.toString(StandardCharsets.UTF_8.name());
-    assertThat(output).contains("INFO Serving JobManagement endpoint=localhost:8073");
+    assertThat(output).contains("level=INFO msg=\"Serving JobManagement\" endpoint=localhost:8073");
   }
 
   @Test
@@ -71,7 +71,8 @@ public class PrismExecutorTest {
     executor.stop();
     try (Stream<String> stream = Files.lines(log.toPath(), StandardCharsets.UTF_8)) {
       String output = stream.collect(Collectors.joining("\n"));
-      assertThat(output).contains("INFO Serving JobManagement endpoint=localhost:8073");
+      assertThat(output)
+          .contains("level=INFO msg=\"Serving JobManagement\" endpoint=localhost:8073");
     }
   }
 
@@ -79,21 +80,23 @@ public class PrismExecutorTest {
   public void executeWithCustomArgumentsThenStop() throws IOException {
     PrismExecutor executor =
         underTest()
-            .setArguments(Collections.singletonList("-" + JOB_PORT_FLAG_NAME + "=5555"))
+            .addArguments(Collections.singletonList("-" + JOB_PORT_FLAG_NAME + "=5555"))
             .build();
     ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
     executor.execute(outputStream);
     sleep(3000L);
     executor.stop();
     String output = outputStream.toString(StandardCharsets.UTF_8.name());
-    assertThat(output).contains("INFO Serving JobManagement endpoint=localhost:5555");
+    assertThat(output).contains("level=INFO msg=\"Serving JobManagement\" endpoint=localhost:5555");
   }
 
   @Test
   public void executeWithPortFinderThenStop() throws IOException {}
 
   private PrismExecutor.Builder underTest() {
-    return PrismExecutor.builder().setCommand(getLocalPrismBuildOrIgnoreTest());
+    return PrismExecutor.builder()
+        .setCommand(getLocalPrismBuildOrIgnoreTest())
+        .setArguments(Collections.singletonList("--log_kind=text")); // disable color control chars
   }
 
   private void sleep(long millis) {
diff --git a/runners/samza/src/test/java/org/apache/beam/runners/samza/metrics/TestSamzaRunnerWithTransformMetrics.java b/runners/samza/src/test/java/org/apache/beam/runners/samza/metrics/TestSamzaRunnerWithTransformMetrics.java
index e0bcbed1577..68674d202cd 100644
--- a/runners/samza/src/test/java/org/apache/beam/runners/samza/metrics/TestSamzaRunnerWithTransformMetrics.java
+++ b/runners/samza/src/test/java/org/apache/beam/runners/samza/metrics/TestSamzaRunnerWithTransformMetrics.java
@@ -21,6 +21,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeTrue;
 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.mock;
@@ -59,6 +60,8 @@ import org.junit.Test;
 public class TestSamzaRunnerWithTransformMetrics {
   @Test
   public void testSamzaRunnerWithDefaultMetrics() {
+    // TODO(https://github.com/apache/beam/issues/32208)
+    assumeTrue(System.getProperty("java.version").startsWith("1."));
     SamzaPipelineOptions options = PipelineOptionsFactory.create().as(SamzaPipelineOptions.class);
     InMemoryMetricsReporter inMemoryMetricsReporter = new InMemoryMetricsReporter();
     options.setMetricsReporters(ImmutableList.of(inMemoryMetricsReporter));
diff --git a/runners/samza/src/test/java/org/apache/beam/runners/samza/runtime/GroupByKeyOpTest.java b/runners/samza/src/test/java/org/apache/beam/runners/samza/runtime/GroupByKeyOpTest.java
index 8670d9a46ea..73454cc9542 100644
--- a/runners/samza/src/test/java/org/apache/beam/runners/samza/runtime/GroupByKeyOpTest.java
+++ b/runners/samza/src/test/java/org/apache/beam/runners/samza/runtime/GroupByKeyOpTest.java
@@ -17,6 +17,8 @@
  */
 package org.apache.beam.runners.samza.runtime;
 
+import static org.junit.Assume.assumeTrue;
+
 import java.io.Serializable;
 import java.util.Arrays;
 import org.apache.beam.sdk.coders.KvCoder;
@@ -35,11 +37,19 @@ import org.apache.beam.sdk.values.PCollection;
 import org.apache.beam.sdk.values.TimestampedValue;
 import org.joda.time.Duration;
 import org.joda.time.Instant;
+import org.junit.BeforeClass;
 import org.junit.Rule;
 import org.junit.Test;
 
 /** Tests for GroupByKeyOp. */
 public class GroupByKeyOpTest implements Serializable {
+
+  @BeforeClass
+  public static void beforeClass() {
+    // TODO(https://github.com/apache/beam/issues/32208)
+    assumeTrue(System.getProperty("java.version").startsWith("1."));
+  }
+
   @Rule
   public final transient TestPipeline pipeline =
       TestPipeline.fromOptions(
diff --git a/runners/samza/src/test/java/org/apache/beam/runners/samza/runtime/SamzaStoreStateInternalsTest.java b/runners/samza/src/test/java/org/apache/beam/runners/samza/runtime/SamzaStoreStateInternalsTest.java
index 00416260017..9409efbcf39 100644
--- a/runners/samza/src/test/java/org/apache/beam/runners/samza/runtime/SamzaStoreStateInternalsTest.java
+++ b/runners/samza/src/test/java/org/apache/beam/runners/samza/runtime/SamzaStoreStateInternalsTest.java
@@ -21,6 +21,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeTrue;
 
 import java.io.File;
 import java.io.IOException;
@@ -75,6 +76,7 @@ import org.apache.samza.storage.kv.KeyValueStoreMetrics;
 import org.apache.samza.storage.kv.inmemory.InMemoryKeyValueStorageEngineFactory;
 import org.apache.samza.storage.kv.inmemory.InMemoryKeyValueStore;
 import org.apache.samza.system.SystemStreamPartition;
+import org.junit.BeforeClass;
 import org.junit.Rule;
 import org.junit.Test;
 
@@ -91,6 +93,12 @@ public class SamzaStoreStateInternalsTest implements Serializable {
       TestPipeline.fromOptions(
           PipelineOptionsFactory.fromArgs("--runner=TestSamzaRunner").create());
 
+  @BeforeClass
+  public static void beforeClass() {
+    // TODO(https://github.com/apache/beam/issues/32208)
+    assumeTrue(System.getProperty("java.version").startsWith("1."));
+  }
+
   @Test
   public void testMapStateIterator() {
     final String stateId = "foo";