You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kudu.apache.org by gr...@apache.org on 2018/04/27 03:54:58 UTC

[10/12] kudu git commit: java: fix remainder of error-prone issues

java: fix remainder of error-prone issues

- Suppress a few false positives where we are doing something sketchy
  but know it to be OK

- Fix two cases where a class member shadowed a member of a superclass

- Avoid StringBuffer in timestampToString. StringBuffer is synchronized,
  so it is probably more efficient to use plain String concatenation
  instead.[1]

- Avoid reference-equality checks in Status.fromMasterErrorPB and
  Status.fromTabletServerErrorPB. Based on the call sites I believe
  these checks would never have fired, because we only call these
  methods in cases where we know there to have been an actual error.

- Fix construction of the Flume KuduOperationProducer implementation to
  properly throw exceptions by using
  clazz.getDeclaredConstructor().newInstance() instead of
  clazz.newInstance()[2]

[1] https://github.com/google/error-prone/blob/master/docs/bugpattern/JdkObsolete.md
[2] https://github.com/google/error-prone/blob/master/docs/bugpattern/ClassNewInstance.md

Change-Id: I54f67c9718e1022d7996ab1cb827f68c1beb5d3d
Reviewed-on: http://gerrit.cloudera.org:8080/10202
Reviewed-by: Grant Henke <gr...@apache.org>
Tested-by: Todd Lipcon <to...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/kudu/repo
Commit: http://git-wip-us.apache.org/repos/asf/kudu/commit/c5521d99
Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/c5521d99
Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/c5521d99

Branch: refs/heads/master
Commit: c5521d99b574f270d0a97bc082a177259c9f2f54
Parents: 4b91889
Author: Todd Lipcon <to...@apache.org>
Authored: Wed Apr 25 12:15:21 2018 -0700
Committer: Todd Lipcon <to...@apache.org>
Committed: Thu Apr 26 22:21:17 2018 +0000

----------------------------------------------------------------------
 .../java/org/apache/kudu/client/AsyncKuduClient.java  |  1 +
 .../apache/kudu/client/ConnectToMasterRequest.java    |  4 ++--
 .../apache/kudu/client/IsAlterTableDoneRequest.java   |  8 ++++----
 .../apache/kudu/client/IsCreateTableDoneRequest.java  |  8 ++++----
 .../java/org/apache/kudu/client/PartitionPruner.java  |  3 ++-
 .../java/org/apache/kudu/client/RequestTracker.java   |  2 +-
 .../main/java/org/apache/kudu/client/RowError.java    |  2 ++
 .../main/java/org/apache/kudu/client/RowResult.java   |  6 ++----
 .../org/apache/kudu/client/RowResultIterator.java     |  1 +
 .../src/main/java/org/apache/kudu/client/Status.java  | 14 ++++----------
 .../java/org/apache/kudu/flume/sink/KuduSink.java     |  8 ++++----
 11 files changed, 27 insertions(+), 30 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kudu/blob/c5521d99/java/kudu-client/src/main/java/org/apache/kudu/client/AsyncKuduClient.java
----------------------------------------------------------------------
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 47f9758..383df92 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
@@ -2102,6 +2102,7 @@ public class AsyncKuduClient implements AutoCloseable {
     return Deferred.group(deferreds);
   }
 
+  @SuppressWarnings("ReferenceEquality")
   private static boolean isMasterTable(String tableId) {
     // Checking that it's the same instance so there's absolutely no chance of confusing the master
     // 'table' for a user one.

http://git-wip-us.apache.org/repos/asf/kudu/blob/c5521d99/java/kudu-client/src/main/java/org/apache/kudu/client/ConnectToMasterRequest.java
----------------------------------------------------------------------
diff --git a/java/kudu-client/src/main/java/org/apache/kudu/client/ConnectToMasterRequest.java b/java/kudu-client/src/main/java/org/apache/kudu/client/ConnectToMasterRequest.java
index d555ba3..cf0a579 100644
--- a/java/kudu-client/src/main/java/org/apache/kudu/client/ConnectToMasterRequest.java
+++ b/java/kudu-client/src/main/java/org/apache/kudu/client/ConnectToMasterRequest.java
@@ -73,7 +73,7 @@ public class ConnectToMasterRequest extends KuduRpc<ConnectToMasterResponsePB> {
 
   @Override
   Collection<Integer> getRequiredFeatures() {
-    if (method == CONNECT_TO_MASTER) {
+    if (CONNECT_TO_MASTER.equals(method)) {
       return Collections.singleton(MasterFeatures.CONNECT_TO_MASTER.getNumber());
     }
     return Collections.emptySet();
@@ -82,7 +82,7 @@ public class ConnectToMasterRequest extends KuduRpc<ConnectToMasterResponsePB> {
   @Override
   Pair<ConnectToMasterResponsePB, Object> deserialize(CallResponse callResponse,
                                                        String tsUUID) throws KuduException {
-    if (method == CONNECT_TO_MASTER) {
+    if (CONNECT_TO_MASTER.equals(method)) {
       return deserializeNewRpc(callResponse, tsUUID);
     }
     return deserializeOldRpc(callResponse, tsUUID);

http://git-wip-us.apache.org/repos/asf/kudu/blob/c5521d99/java/kudu-client/src/main/java/org/apache/kudu/client/IsAlterTableDoneRequest.java
----------------------------------------------------------------------
diff --git a/java/kudu-client/src/main/java/org/apache/kudu/client/IsAlterTableDoneRequest.java b/java/kudu-client/src/main/java/org/apache/kudu/client/IsAlterTableDoneRequest.java
index 54f41bc..73c4972 100644
--- a/java/kudu-client/src/main/java/org/apache/kudu/client/IsAlterTableDoneRequest.java
+++ b/java/kudu-client/src/main/java/org/apache/kudu/client/IsAlterTableDoneRequest.java
@@ -31,18 +31,18 @@ import org.apache.kudu.util.Pair;
  */
 @InterfaceAudience.Private
 class IsAlterTableDoneRequest extends KuduRpc<IsAlterTableDoneResponse> {
-  private final TableIdentifierPB.Builder table;
+  private final TableIdentifierPB.Builder tableId;
 
-  IsAlterTableDoneRequest(KuduTable masterTable, TableIdentifierPB.Builder table) {
+  IsAlterTableDoneRequest(KuduTable masterTable, TableIdentifierPB.Builder tableId) {
     super(masterTable);
-    this.table = table;
+    this.tableId = tableId;
   }
 
   @Override
   Message createRequestPB() {
     final IsAlterTableDoneRequestPB.Builder builder =
         IsAlterTableDoneRequestPB.newBuilder();
-    builder.setTable(table);
+    builder.setTable(tableId);
     return builder.build();
   }
 

http://git-wip-us.apache.org/repos/asf/kudu/blob/c5521d99/java/kudu-client/src/main/java/org/apache/kudu/client/IsCreateTableDoneRequest.java
----------------------------------------------------------------------
diff --git a/java/kudu-client/src/main/java/org/apache/kudu/client/IsCreateTableDoneRequest.java b/java/kudu-client/src/main/java/org/apache/kudu/client/IsCreateTableDoneRequest.java
index 6375de4..c08360b 100644
--- a/java/kudu-client/src/main/java/org/apache/kudu/client/IsCreateTableDoneRequest.java
+++ b/java/kudu-client/src/main/java/org/apache/kudu/client/IsCreateTableDoneRequest.java
@@ -29,11 +29,11 @@ import org.apache.kudu.util.Pair;
  */
 @InterfaceAudience.Private
 class IsCreateTableDoneRequest extends KuduRpc<IsCreateTableDoneResponse> {
-  private final TableIdentifierPB.Builder table;
+  private final TableIdentifierPB.Builder tableId;
 
-  IsCreateTableDoneRequest(KuduTable masterTable, TableIdentifierPB.Builder table) {
+  IsCreateTableDoneRequest(KuduTable masterTable, TableIdentifierPB.Builder tableId) {
     super(masterTable);
-    this.table = table;
+    this.tableId = tableId;
   }
 
   @Override
@@ -63,7 +63,7 @@ class IsCreateTableDoneRequest extends KuduRpc<IsCreateTableDoneResponse> {
   Message createRequestPB() {
     final IsCreateTableDoneRequestPB.Builder builder =
         IsCreateTableDoneRequestPB.newBuilder();
-    builder.setTable(table);
+    builder.setTable(tableId);
     return builder.build();
   }
 }

http://git-wip-us.apache.org/repos/asf/kudu/blob/c5521d99/java/kudu-client/src/main/java/org/apache/kudu/client/PartitionPruner.java
----------------------------------------------------------------------
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 702d2ca..ba9e459 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
@@ -21,6 +21,7 @@ import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.BitSet;
+import java.util.Collections;
 import java.util.Deque;
 import java.util.Iterator;
 import java.util.List;
@@ -515,7 +516,7 @@ public class PartitionPruner {
       KuduPredicate predicate = predicates.get(column.getName());
       List<byte[]> predicateValues;
       if (predicate.getType() == KuduPredicate.PredicateType.EQUALITY) {
-        predicateValues = Arrays.asList(predicate.getLower());
+        predicateValues = Collections.singletonList(predicate.getLower());
       } else {
         predicateValues = Arrays.asList(predicate.getInListValues());
       }

http://git-wip-us.apache.org/repos/asf/kudu/blob/c5521d99/java/kudu-client/src/main/java/org/apache/kudu/client/RequestTracker.java
----------------------------------------------------------------------
diff --git a/java/kudu-client/src/main/java/org/apache/kudu/client/RequestTracker.java b/java/kudu-client/src/main/java/org/apache/kudu/client/RequestTracker.java
index de84131..2a8bc2c 100644
--- a/java/kudu-client/src/main/java/org/apache/kudu/client/RequestTracker.java
+++ b/java/kudu-client/src/main/java/org/apache/kudu/client/RequestTracker.java
@@ -27,7 +27,7 @@ import org.apache.yetus.audience.InterfaceAudience;
  */
 @InterfaceAudience.Private
 public class RequestTracker {
-  private Object lock = new Object();
+  private final Object lock = new Object();
 
   @GuardedBy("lock")
   private long nextSeqNo = 1;

http://git-wip-us.apache.org/repos/asf/kudu/blob/c5521d99/java/kudu-client/src/main/java/org/apache/kudu/client/RowError.java
----------------------------------------------------------------------
diff --git a/java/kudu-client/src/main/java/org/apache/kudu/client/RowError.java b/java/kudu-client/src/main/java/org/apache/kudu/client/RowError.java
index c7a27e6..048b3ab 100644
--- a/java/kudu-client/src/main/java/org/apache/kudu/client/RowError.java
+++ b/java/kudu-client/src/main/java/org/apache/kudu/client/RowError.java
@@ -64,6 +64,7 @@ public class RowError {
    * @return A short string representation of the error.
    * @deprecated Please use getErrorStatus() instead. Will be removed in a future version.
    */
+  @Deprecated
   public String getStatus() {
     return status.getCodeName();
   }
@@ -73,6 +74,7 @@ public class RowError {
    * @return The error message.
    * @deprecated Please use getErrorStatus() instead. Will be removed in a future version.
    */
+  @Deprecated
   public String getMessage() {
     return status.getMessage();
   }

http://git-wip-us.apache.org/repos/asf/kudu/blob/c5521d99/java/kudu-client/src/main/java/org/apache/kudu/client/RowResult.java
----------------------------------------------------------------------
diff --git a/java/kudu-client/src/main/java/org/apache/kudu/client/RowResult.java b/java/kudu-client/src/main/java/org/apache/kudu/client/RowResult.java
index 12edbf4..8a08b59 100644
--- a/java/kudu-client/src/main/java/org/apache/kudu/client/RowResult.java
+++ b/java/kudu-client/src/main/java/org/apache/kudu/client/RowResult.java
@@ -577,10 +577,8 @@ public class RowResult {
   static String timestampToString(long timestamp) {
     long tsMillis = timestamp / MS_IN_S;
     long tsMicros = timestamp % US_IN_S;
-    StringBuffer formattedTs = new StringBuffer();
-    DATE_FORMAT.get().format(new Date(tsMillis), formattedTs, new FieldPosition(0));
-    formattedTs.append(String.format(".%06dZ", tsMicros));
-    return formattedTs.toString();
+    String tsStr = DATE_FORMAT.get().format(new Date(tsMillis));
+    return String.format("%s.%06dZ", tsStr, tsMicros);
   }
 
   /**

http://git-wip-us.apache.org/repos/asf/kudu/blob/c5521d99/java/kudu-client/src/main/java/org/apache/kudu/client/RowResultIterator.java
----------------------------------------------------------------------
diff --git a/java/kudu-client/src/main/java/org/apache/kudu/client/RowResultIterator.java b/java/kudu-client/src/main/java/org/apache/kudu/client/RowResultIterator.java
index c776cf8..f5c4cec 100644
--- a/java/kudu-client/src/main/java/org/apache/kudu/client/RowResultIterator.java
+++ b/java/kudu-client/src/main/java/org/apache/kudu/client/RowResultIterator.java
@@ -32,6 +32,7 @@ import org.apache.kudu.util.Slice;
  */
 @InterfaceAudience.Public
 @InterfaceStability.Evolving
+@SuppressWarnings("IterableAndIterator")
 public class RowResultIterator extends KuduRpcResponse implements Iterator<RowResult>,
     Iterable<RowResult> {
 

http://git-wip-us.apache.org/repos/asf/kudu/blob/c5521d99/java/kudu-client/src/main/java/org/apache/kudu/client/Status.java
----------------------------------------------------------------------
diff --git a/java/kudu-client/src/main/java/org/apache/kudu/client/Status.java b/java/kudu-client/src/main/java/org/apache/kudu/client/Status.java
index 382f11a..d0d0d4d 100644
--- a/java/kudu-client/src/main/java/org/apache/kudu/client/Status.java
+++ b/java/kudu-client/src/main/java/org/apache/kudu/client/Status.java
@@ -80,11 +80,8 @@ public class Status {
    * @return status object equivalent to the pb
    */
   static Status fromMasterErrorPB(Master.MasterErrorPB masterErrorPB) {
-    if (masterErrorPB == Master.MasterErrorPB.getDefaultInstance()) {
-      return Status.OK();
-    } else {
-      return new Status(masterErrorPB.getStatus());
-    }
+    assert masterErrorPB.hasStatus() : "no status in PB " + masterErrorPB;
+    return new Status(masterErrorPB.getStatus());
   }
 
   /**
@@ -93,11 +90,8 @@ public class Status {
    * @return status object equivalent to the pb
    */
   static Status fromTabletServerErrorPB(Tserver.TabletServerErrorPB tserverErrorPB) {
-    if (tserverErrorPB == Tserver.TabletServerErrorPB.getDefaultInstance()) {
-      return Status.OK();
-    } else {
-      return new Status(tserverErrorPB.getStatus());
-    }
+    assert tserverErrorPB.hasStatus() : "no status in PB " + tserverErrorPB;
+    return new Status(tserverErrorPB.getStatus());
   }
 
   /**

http://git-wip-us.apache.org/repos/asf/kudu/blob/c5521d99/java/kudu-flume-sink/src/main/java/org/apache/kudu/flume/sink/KuduSink.java
----------------------------------------------------------------------
diff --git a/java/kudu-flume-sink/src/main/java/org/apache/kudu/flume/sink/KuduSink.java b/java/kudu-flume-sink/src/main/java/org/apache/kudu/flume/sink/KuduSink.java
index 74ff910..105bc1e 100644
--- a/java/kudu-flume-sink/src/main/java/org/apache/kudu/flume/sink/KuduSink.java
+++ b/java/kudu-flume-sink/src/main/java/org/apache/kudu/flume/sink/KuduSink.java
@@ -121,7 +121,7 @@ public class KuduSink extends AbstractSink implements Configurable {
   }
 
   @Override
-  public void start() {
+  public synchronized void start() {
     Preconditions.checkState(table == null && session == null,
         "Please call stop before calling start on an old instance.");
 
@@ -151,7 +151,7 @@ public class KuduSink extends AbstractSink implements Configurable {
   }
 
   @Override
-  public void stop() {
+  public synchronized void stop() {
     Exception ex = null;
     try {
       operationsProducer.close();
@@ -182,7 +182,7 @@ public class KuduSink extends AbstractSink implements Configurable {
   public void configure(Context context) {
     masterAddresses = context.getString(MASTER_ADDRESSES);
     Preconditions.checkNotNull(masterAddresses,
-        "Missing master addresses. Please specify property '$s'.",
+        "Missing master addresses. Please specify property '%s'.",
         MASTER_ADDRESSES);
 
     tableName = context.getString(TABLE_NAME);
@@ -209,7 +209,7 @@ public class KuduSink extends AbstractSink implements Configurable {
       Class<? extends KuduOperationsProducer> clazz =
           (Class<? extends KuduOperationsProducer>)
           Class.forName(operationProducerType);
-      operationsProducer = clazz.newInstance();
+      operationsProducer = clazz.getDeclaredConstructor().newInstance();
       operationsProducer.configure(producerContext);
     } catch (Exception e) {
       logger.error("Could not instantiate Kudu operations producer" , e);