This is an automated email from the ASF dual-hosted git repository. mgreber pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/kudu.git
The following commit(s) were added to refs/heads/master by this push: new 8d11a4a6d [java] Various fixes 8d11a4a6d is described below commit 8d11a4a6dda561b044bf9763913b7c4efa746b95 Author: zchovan <zcho...@cloudera.com> AuthorDate: Mon Jun 24 13:07:42 2024 +0200 [java] Various fixes This commit is a collection of various fixes for Java buildtime warnings. There are two WarningSuppressions introduced, both are a bit debatable: * PartitionPruner.splitIntoHashSpecificRanges() - the method returns either ImmutableList or simple List as a return value, converting the simple list to ImmutableList would involve a full copy (e.g. ImmutableList.copyOf()) so there is a potential performance impact * TestKuduScanner.testScannerLeaderChanged() - at the end of the method, a try/catch block's catch branch asserts that the thrownø exception is not a 'Scanner not found' problem, which is weird only, because during a green run, the catch branch should not be hit. I'm not sure if this was done to avoid flakyness. Change-Id: I9fd8583ad73231da5878414beda143408fab74ad Reviewed-on: http://gerrit.cloudera.org:8080/21547 Tested-by: Attila Bukor <abu...@apache.org> Reviewed-by: Marton Greber <greber...@gmail.com> --- java/kudu-backup/src/main/scala/org/apache/kudu/backup/KuduBackup.scala | 2 +- .../kudu-backup/src/main/scala/org/apache/kudu/backup/KuduRestore.scala | 2 +- .../src/main/java/org/apache/kudu/client/AsyncKuduClient.java | 2 +- java/kudu-client/src/main/java/org/apache/kudu/client/KuduClient.java | 2 +- java/kudu-client/src/main/java/org/apache/kudu/client/Operation.java | 2 +- .../src/main/java/org/apache/kudu/client/PartitionPruner.java | 1 + .../java/org/apache/kudu/client/RangePartitionWithCustomHashSchema.java | 1 - .../src/test/java/org/apache/kudu/client/TestKuduScanner.java | 1 + 8 files changed, 7 insertions(+), 6 deletions(-) diff --git a/java/kudu-backup/src/main/scala/org/apache/kudu/backup/KuduBackup.scala b/java/kudu-backup/src/main/scala/org/apache/kudu/backup/KuduBackup.scala index e4bcfb857..bc7faeef6 100644 --- a/java/kudu-backup/src/main/scala/org/apache/kudu/backup/KuduBackup.scala +++ b/java/kudu-backup/src/main/scala/org/apache/kudu/backup/KuduBackup.scala @@ -25,9 +25,9 @@ import org.apache.yetus.audience.InterfaceStability import org.slf4j.Logger import org.slf4j.LoggerFactory +import java.util.concurrent.ForkJoinPool; import scala.collection.JavaConverters._ import scala.collection.parallel.ForkJoinTaskSupport -import scala.concurrent.forkjoin.ForkJoinPool; import scala.util.Failure import scala.util.Success import scala.util.Try diff --git a/java/kudu-backup/src/main/scala/org/apache/kudu/backup/KuduRestore.scala b/java/kudu-backup/src/main/scala/org/apache/kudu/backup/KuduRestore.scala index 87c2d84ea..fe5deae7a 100644 --- a/java/kudu-backup/src/main/scala/org/apache/kudu/backup/KuduRestore.scala +++ b/java/kudu-backup/src/main/scala/org/apache/kudu/backup/KuduRestore.scala @@ -35,7 +35,7 @@ import org.slf4j.LoggerFactory import scala.collection.JavaConverters._ import scala.collection.parallel.ForkJoinTaskSupport -import scala.concurrent.forkjoin.ForkJoinPool +import java.util.concurrent.ForkJoinPool; import scala.util.Failure import scala.util.Success import scala.util.Try diff --git a/java/kudu-client/src/main/java/org/apache/kudu/client/AsyncKuduClient.java b/java/kudu-client/src/main/java/org/apache/kudu/client/AsyncKuduClient.java index 84ffedf97..618f92fce 100644 --- a/java/kudu-client/src/main/java/org/apache/kudu/client/AsyncKuduClient.java +++ b/java/kudu-client/src/main/java/org/apache/kudu/client/AsyncKuduClient.java @@ -1194,7 +1194,7 @@ public class AsyncKuduClient implements AutoCloseable { /** * Set JWT (JSON Web Token) to authenticate the client to a server. * <p> - * @note If {@link #importAuthenticationCredentials(byte[] authnData)} and + * Note: If {@link #importAuthenticationCredentials(byte[] authnData)} and * this method are called on the same object, the JWT provided with this call * overrides the corresponding JWT that comes as a part of the imported * authentication credentials (if present). diff --git a/java/kudu-client/src/main/java/org/apache/kudu/client/KuduClient.java b/java/kudu-client/src/main/java/org/apache/kudu/client/KuduClient.java index 6d8e7f82b..a17ca8534 100644 --- a/java/kudu-client/src/main/java/org/apache/kudu/client/KuduClient.java +++ b/java/kudu-client/src/main/java/org/apache/kudu/client/KuduClient.java @@ -483,7 +483,7 @@ public class KuduClient implements AutoCloseable { /** * Set JWT (JSON Web Token) to authenticate the client to a server. * <p> - * @note If {@link #importAuthenticationCredentials(byte[] authnData)} and + * Note: If {@link #importAuthenticationCredentials(byte[] authnData)} and * this method are called on the same object, the JWT provided with this call * overrides the corresponding JWT that comes as a part of the imported * authentication credentials (if present). diff --git a/java/kudu-client/src/main/java/org/apache/kudu/client/Operation.java b/java/kudu-client/src/main/java/org/apache/kudu/client/Operation.java index 81d7b0efe..f47ccdeda 100644 --- a/java/kudu-client/src/main/java/org/apache/kudu/client/Operation.java +++ b/java/kudu-client/src/main/java/org/apache/kudu/client/Operation.java @@ -269,7 +269,7 @@ public abstract class Operation extends KuduRpc<OperationResponse> { * @param row the row to set */ public void setRow(PartialRow row) { - Preconditions.checkArgument(row.getSchema() == table.getSchema(), + Preconditions.checkArgument(row.getSchema().equals(table.getSchema()), "The row's schema must be equal by reference to the table schema"); this.row = row; } diff --git a/java/kudu-client/src/main/java/org/apache/kudu/client/PartitionPruner.java b/java/kudu-client/src/main/java/org/apache/kudu/client/PartitionPruner.java index f0a8e7649..3db114a08 100644 --- a/java/kudu-client/src/main/java/org/apache/kudu/client/PartitionPruner.java +++ b/java/kudu-client/src/main/java/org/apache/kudu/client/PartitionPruner.java @@ -508,6 +508,7 @@ public class PartitionPruner { return KeyEncoder.encodeRangePartitionKey(row, rangeSchema); } + @SuppressWarnings("MixedMutabilityReturnType") static List<PartitionSchema.EncodedRangeBoundsWithHashSchema> splitIntoHashSpecificRanges( byte[] scanLowerBound, byte[] scanUpperBound, PartitionSchema ps) { final List<PartitionSchema.EncodedRangeBoundsWithHashSchema> ranges = diff --git a/java/kudu-client/src/main/java/org/apache/kudu/client/RangePartitionWithCustomHashSchema.java b/java/kudu-client/src/main/java/org/apache/kudu/client/RangePartitionWithCustomHashSchema.java index df3c0c676..2f0271254 100644 --- a/java/kudu-client/src/main/java/org/apache/kudu/client/RangePartitionWithCustomHashSchema.java +++ b/java/kudu-client/src/main/java/org/apache/kudu/client/RangePartitionWithCustomHashSchema.java @@ -42,7 +42,6 @@ public class RangePartitionWithCustomHashSchema extends RangePartition { * @param upperBound lower bound of the range partition * @param lowerBoundType lower bound type: inclusive/exclusive * @param upperBoundType upper bound type: inclusive/exclusive - * @return new RangePartitionWithCustomHashSchema object */ public RangePartitionWithCustomHashSchema( PartialRow lowerBound, diff --git a/java/kudu-client/src/test/java/org/apache/kudu/client/TestKuduScanner.java b/java/kudu-client/src/test/java/org/apache/kudu/client/TestKuduScanner.java index 9b4e86659..a2a2be739 100644 --- a/java/kudu-client/src/test/java/org/apache/kudu/client/TestKuduScanner.java +++ b/java/kudu-client/src/test/java/org/apache/kudu/client/TestKuduScanner.java @@ -607,6 +607,7 @@ public class TestKuduScanner { } @Test + @SuppressWarnings("MissingFail") public void testScannerLeaderChanged() throws Exception { // Prepare the table for testing. Schema schema = createManyStringsSchema();