You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by gu...@apache.org on 2021/08/01 12:40:31 UTC
[spark] branch master updated: [SPARK-36362][CORE][SQL][FOLLOWUP]
Fix java linter errors
This is an automated email from the ASF dual-hosted git repository.
gurwls223 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/master by this push:
new 22c4922 [SPARK-36362][CORE][SQL][FOLLOWUP] Fix java linter errors
22c4922 is described below
commit 22c49226f70f76caa268602d78f6c23e40aeae09
Author: Dongjoon Hyun <do...@apache.org>
AuthorDate: Sun Aug 1 21:40:03 2021 +0900
[SPARK-36362][CORE][SQL][FOLLOWUP] Fix java linter errors
### What changes were proposed in this pull request?
This is a follow-up of #33594 to fix the Java linter error.
### Why are the changes needed?
To recover GitHub Action.
### Does this PR introduce _any_ user-facing change?
No.
### How was this patch tested?
Pass the GitHub Action.
Closes #33601 from dongjoon-hyun/SPARK-36362.
Authored-by: Dongjoon Hyun <do...@apache.org>
Signed-off-by: Hyukjin Kwon <gu...@apache.org>
---
.../java/org/apache/spark/util/kvstore/DBIteratorSuite.java | 3 ++-
.../java/org/apache/spark/network/RpcIntegrationSuite.java | 3 ++-
.../src/test/java/org/apache/spark/network/StreamSuite.java | 13 ++++++++-----
.../org/apache/spark/network/crypto/AuthEngineSuite.java | 1 -
.../apache/spark/network/util/NettyMemoryMetricsSuite.java | 3 ++-
.../main/java/org/apache/spark/unsafe/types/UTF8String.java | 6 ++++--
.../java/org/apache/spark/unsafe/types/UTF8StringSuite.java | 8 ++++++--
.../org/apache/spark/sql/JavaColumnExpressionSuite.java | 12 ++++++------
8 files changed, 30 insertions(+), 19 deletions(-)
diff --git a/common/kvstore/src/test/java/org/apache/spark/util/kvstore/DBIteratorSuite.java b/common/kvstore/src/test/java/org/apache/spark/util/kvstore/DBIteratorSuite.java
index 4c55e21..ab1e272 100644
--- a/common/kvstore/src/test/java/org/apache/spark/util/kvstore/DBIteratorSuite.java
+++ b/common/kvstore/src/test/java/org/apache/spark/util/kvstore/DBIteratorSuite.java
@@ -73,7 +73,8 @@ public abstract class DBIteratorSuite {
private static final BaseComparator NATURAL_ORDER = (t1, t2) -> t1.key.compareTo(t2.key);
private static final BaseComparator REF_INDEX_ORDER = (t1, t2) -> t1.id.compareTo(t2.id);
private static final BaseComparator COPY_INDEX_ORDER = (t1, t2) -> t1.name.compareTo(t2.name);
- private static final BaseComparator NUMERIC_INDEX_ORDER = (t1, t2) -> Integer.compare(t1.num, t2.num);
+ private static final BaseComparator NUMERIC_INDEX_ORDER =
+ (t1, t2) -> Integer.compare(t1.num, t2.num);
private static final BaseComparator CHILD_INDEX_ORDER = (t1, t2) -> t1.child.compareTo(t2.child);
/**
diff --git a/common/network-common/src/test/java/org/apache/spark/network/RpcIntegrationSuite.java b/common/network-common/src/test/java/org/apache/spark/network/RpcIntegrationSuite.java
index eeb59c7..3f5e33cb 100644
--- a/common/network-common/src/test/java/org/apache/spark/network/RpcIntegrationSuite.java
+++ b/common/network-common/src/test/java/org/apache/spark/network/RpcIntegrationSuite.java
@@ -305,7 +305,8 @@ public class RpcIntegrationSuite {
@Test
public void sendOneWayMessage() throws Exception {
final String message = "no reply";
- try (TransportClient client = clientFactory.createClient(TestUtils.getLocalHost(), server.getPort())) {
+ try (TransportClient client =
+ clientFactory.createClient(TestUtils.getLocalHost(), server.getPort())) {
client.send(JavaUtils.stringToBytes(message));
assertEquals(0, client.getHandler().numOutstandingRequests());
diff --git a/common/network-common/src/test/java/org/apache/spark/network/StreamSuite.java b/common/network-common/src/test/java/org/apache/spark/network/StreamSuite.java
index ecc7a44..9c18de8 100644
--- a/common/network-common/src/test/java/org/apache/spark/network/StreamSuite.java
+++ b/common/network-common/src/test/java/org/apache/spark/network/StreamSuite.java
@@ -24,7 +24,6 @@ import java.io.IOException;
import java.io.OutputStream;
import java.nio.ByteBuffer;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.List;
import java.util.concurrent.Executors;
import java.util.concurrent.ExecutorService;
@@ -109,7 +108,8 @@ public class StreamSuite {
@Test
public void testZeroLengthStream() throws Throwable {
- try (TransportClient client = clientFactory.createClient(TestUtils.getLocalHost(), server.getPort())) {
+ try (TransportClient client =
+ clientFactory.createClient(TestUtils.getLocalHost(), server.getPort())) {
StreamTask task = new StreamTask(client, "emptyBuffer", TimeUnit.SECONDS.toMillis(5));
task.run();
task.check();
@@ -118,7 +118,8 @@ public class StreamSuite {
@Test
public void testSingleStream() throws Throwable {
- try (TransportClient client = clientFactory.createClient(TestUtils.getLocalHost(), server.getPort())) {
+ try (TransportClient client =
+ clientFactory.createClient(TestUtils.getLocalHost(), server.getPort())) {
StreamTask task = new StreamTask(client, "largeBuffer", TimeUnit.SECONDS.toMillis(5));
task.run();
task.check();
@@ -127,7 +128,8 @@ public class StreamSuite {
@Test
public void testMultipleStreams() throws Throwable {
- try (TransportClient client = clientFactory.createClient(TestUtils.getLocalHost(), server.getPort())) {
+ try (TransportClient client =
+ clientFactory.createClient(TestUtils.getLocalHost(), server.getPort())) {
for (int i = 0; i < 20; i++) {
StreamTask task = new StreamTask(client, STREAMS[i % STREAMS.length],
TimeUnit.SECONDS.toMillis(5));
@@ -141,7 +143,8 @@ public class StreamSuite {
public void testConcurrentStreams() throws Throwable {
ExecutorService executor = Executors.newFixedThreadPool(20);
- try (TransportClient client = clientFactory.createClient(TestUtils.getLocalHost(), server.getPort())) {
+ try (TransportClient client =
+ clientFactory.createClient(TestUtils.getLocalHost(), server.getPort())) {
List<StreamTask> tasks = new ArrayList<>();
for (int i = 0; i < 20; i++) {
StreamTask task = new StreamTask(client, STREAMS[i % STREAMS.length],
diff --git a/common/network-common/src/test/java/org/apache/spark/network/crypto/AuthEngineSuite.java b/common/network-common/src/test/java/org/apache/spark/network/crypto/AuthEngineSuite.java
index 7c6dbad..0f3a27f 100644
--- a/common/network-common/src/test/java/org/apache/spark/network/crypto/AuthEngineSuite.java
+++ b/common/network-common/src/test/java/org/apache/spark/network/crypto/AuthEngineSuite.java
@@ -19,7 +19,6 @@ package org.apache.spark.network.crypto;
import java.nio.ByteBuffer;
import java.nio.channels.WritableByteChannel;
-import java.util.Arrays;
import java.util.Map;
import java.security.InvalidKeyException;
import java.util.Random;
diff --git a/common/network-common/src/test/java/org/apache/spark/network/util/NettyMemoryMetricsSuite.java b/common/network-common/src/test/java/org/apache/spark/network/util/NettyMemoryMetricsSuite.java
index a314127..896ee67 100644
--- a/common/network-common/src/test/java/org/apache/spark/network/util/NettyMemoryMetricsSuite.java
+++ b/common/network-common/src/test/java/org/apache/spark/network/util/NettyMemoryMetricsSuite.java
@@ -108,7 +108,8 @@ public class NettyMemoryMetricsSuite {
Assert.assertNotNull(clientMetricMap.get(
MetricRegistry.name("shuffle-client", directMemoryMetric)));
- try (TransportClient client = clientFactory.createClient(TestUtils.getLocalHost(), server.getPort())) {
+ try (TransportClient client =
+ clientFactory.createClient(TestUtils.getLocalHost(), server.getPort())) {
Assert.assertTrue(client.isActive());
Assert.assertTrue(((Gauge<Long>)serverMetricMap.get(
diff --git a/common/unsafe/src/main/java/org/apache/spark/unsafe/types/UTF8String.java b/common/unsafe/src/main/java/org/apache/spark/unsafe/types/UTF8String.java
index 18dd606..9fdbd50 100644
--- a/common/unsafe/src/main/java/org/apache/spark/unsafe/types/UTF8String.java
+++ b/common/unsafe/src/main/java/org/apache/spark/unsafe/types/UTF8String.java
@@ -906,7 +906,8 @@ public final class UTF8String implements Comparable<UTF8String>, Externalizable,
// the partial string of the padding
UTF8String remain = pad.substring(0, spaces - padChars * count);
- int resultSize = Math.toIntExact((long) numBytes + (long) pad.numBytes * count + remain.numBytes);
+ int resultSize =
+ Math.toIntExact((long) numBytes + (long) pad.numBytes * count + remain.numBytes);
byte[] data = new byte[resultSize];
copyMemory(this.base, this.offset, data, BYTE_ARRAY_OFFSET, this.numBytes);
int offset = this.numBytes;
@@ -939,7 +940,8 @@ public final class UTF8String implements Comparable<UTF8String>, Externalizable,
// the partial string of the padding
UTF8String remain = pad.substring(0, spaces - padChars * count);
- int resultSize = Math.toIntExact((long) numBytes + (long) pad.numBytes * count + remain.numBytes);
+ int resultSize =
+ Math.toIntExact((long) numBytes + (long) pad.numBytes * count + remain.numBytes);
byte[] data = new byte[resultSize];
int offset = 0;
diff --git a/common/unsafe/src/test/java/org/apache/spark/unsafe/types/UTF8StringSuite.java b/common/unsafe/src/test/java/org/apache/spark/unsafe/types/UTF8StringSuite.java
index 255893f..e433dc0 100644
--- a/common/unsafe/src/test/java/org/apache/spark/unsafe/types/UTF8StringSuite.java
+++ b/common/unsafe/src/test/java/org/apache/spark/unsafe/types/UTF8StringSuite.java
@@ -400,8 +400,12 @@ public class UTF8StringSuite {
public void split() {
UTF8String[] negativeAndZeroLimitCase =
new UTF8String[]{fromString("ab"), fromString("def"), fromString("ghi"), fromString("")};
- assertArrayEquals(negativeAndZeroLimitCase, fromString("ab,def,ghi,").split(fromString(","), 0));
- assertArrayEquals(negativeAndZeroLimitCase, fromString("ab,def,ghi,").split(fromString(","), -1));
+ assertArrayEquals(
+ negativeAndZeroLimitCase,
+ fromString("ab,def,ghi,").split(fromString(","), 0));
+ assertArrayEquals(
+ negativeAndZeroLimitCase,
+ fromString("ab,def,ghi,").split(fromString(","), -1));
assertArrayEquals(
new UTF8String[]{fromString("ab"), fromString("def,ghi,")},
fromString("ab,def,ghi,").split(fromString(","), 2));
diff --git a/sql/core/src/test/java/test/org/apache/spark/sql/JavaColumnExpressionSuite.java b/sql/core/src/test/java/test/org/apache/spark/sql/JavaColumnExpressionSuite.java
index a0275ff..4478742 100644
--- a/sql/core/src/test/java/test/org/apache/spark/sql/JavaColumnExpressionSuite.java
+++ b/sql/core/src/test/java/test/org/apache/spark/sql/JavaColumnExpressionSuite.java
@@ -59,14 +59,14 @@ public class JavaColumnExpressionSuite {
Dataset<Row> df = spark.createDataFrame(rows, schema);
// Test with different types of collections
Assert.assertArrayEquals(
- (Row[]) df.filter(df.col("a").isInCollection(Arrays.asList(1, 2))).collect(),
- (Row[]) df.filter((FilterFunction<Row>) r -> r.getInt(0) == 1 || r.getInt(0) == 2).collect());
+ (Row[]) df.filter(df.col("a").isInCollection(Arrays.asList(1, 2))).collect(),
+ (Row[]) df.filter((FilterFunction<Row>) r -> r.getInt(0) == 1 || r.getInt(0) == 2).collect());
Assert.assertArrayEquals(
- (Row[]) df.filter(df.col("a").isInCollection(new HashSet<>(Arrays.asList(1, 2)))).collect(),
- (Row[]) df.filter((FilterFunction<Row>) r -> r.getInt(0) == 1 || r.getInt(0) == 2).collect());
+ (Row[]) df.filter(df.col("a").isInCollection(new HashSet<>(Arrays.asList(1, 2)))).collect(),
+ (Row[]) df.filter((FilterFunction<Row>) r -> r.getInt(0) == 1 || r.getInt(0) == 2).collect());
Assert.assertArrayEquals(
- (Row[]) df.filter(df.col("a").isInCollection(new ArrayList<>(Arrays.asList(3, 1)))).collect(),
- (Row[]) df.filter((FilterFunction<Row>) r -> r.getInt(0) == 3 || r.getInt(0) == 1).collect());
+ (Row[]) df.filter(df.col("a").isInCollection(new ArrayList<>(Arrays.asList(3, 1)))).collect(),
+ (Row[]) df.filter((FilterFunction<Row>) r -> r.getInt(0) == 3 || r.getInt(0) == 1).collect());
}
@Test
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org