You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2016/01/15 19:25:56 UTC
[1/2] hbase git commit: Revert "v1" Bad commit message; revert
Repository: hbase
Updated Branches:
refs/heads/master c516968b8 -> 76bce7732
Revert "v1"
Bad commit message; revert
This reverts commit c516968b8ccd478dcefff07d5f1d82480231c029.
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/300fe5e6
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/300fe5e6
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/300fe5e6
Branch: refs/heads/master
Commit: 300fe5e6bfb58cbc3381ea6a04071b25334704c2
Parents: c516968
Author: stack <st...@apache.org>
Authored: Fri Jan 15 10:24:58 2016 -0800
Committer: stack <st...@apache.org>
Committed: Fri Jan 15 10:24:58 2016 -0800
----------------------------------------------------------------------
.../hadoop/hbase/client/HConnectable.java | 50 ++++++++++++++++++++
.../hadoop/hbase/client/MetricsConnection.java | 2 +-
.../hbase/client/RetriesExhaustedException.java | 3 +-
.../RetryingCallerInterceptorFactory.java | 2 -
.../hadoop/hbase/filter/BinaryComparator.java | 2 +-
.../hbase/filter/BinaryPrefixComparator.java | 2 +-
.../hadoop/hbase/filter/FuzzyRowFilter.java | 8 +++-
.../hadoop/hbase/filter/LongComparator.java | 2 +
.../hbase/filter/MultiRowRangeFilter.java | 2 -
.../apache/hadoop/hbase/ipc/RpcClientImpl.java | 24 +++-------
.../hadoop/hbase/protobuf/RequestConverter.java | 2 +-
11 files changed, 71 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/300fe5e6/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HConnectable.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HConnectable.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HConnectable.java
new file mode 100644
index 0000000..f5f841d
--- /dev/null
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HConnectable.java
@@ -0,0 +1,50 @@
+/**
+ * Copyright The Apache Software Foundation
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.hbase.client;
+
+import java.io.IOException;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hbase.classification.InterfaceAudience;
+
+/**
+ * This class makes it convenient for one to execute a command in the context
+ * of a {@link HConnection} instance based on the given {@link Configuration}.
+ *
+ * <p>
+ * If you find yourself wanting to use a {@link HConnection} for a relatively
+ * short duration of time, and do not want to deal with the hassle of creating
+ * and cleaning up that resource, then you should consider using this
+ * convenience class.
+ *
+ * @param <T>
+ * the return type of the {@link HConnectable#connect(HConnection)}
+ * method.
+ */
+@InterfaceAudience.Private
+public abstract class HConnectable<T> {
+ protected Configuration conf;
+
+ protected HConnectable(Configuration conf) {
+ this.conf = conf;
+ }
+
+ public abstract T connect(HConnection connection) throws IOException;
+}
http://git-wip-us.apache.org/repos/asf/hbase/blob/300fe5e6/hbase-client/src/main/java/org/apache/hadoop/hbase/client/MetricsConnection.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/MetricsConnection.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/MetricsConnection.java
index 6a292bc..4fdc587 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/MetricsConnection.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/MetricsConnection.java
@@ -105,7 +105,7 @@ public class MetricsConnection {
}
@VisibleForTesting
- protected static final class CallTracker {
+ protected final class CallTracker {
private final String name;
@VisibleForTesting final Timer callTimer;
@VisibleForTesting final Histogram reqHist;
http://git-wip-us.apache.org/repos/asf/hbase/blob/300fe5e6/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RetriesExhaustedException.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RetriesExhaustedException.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RetriesExhaustedException.java
index dc25f64..a452bbc 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RetriesExhaustedException.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RetriesExhaustedException.java
@@ -85,7 +85,8 @@ public class RetriesExhaustedException extends IOException {
public RetriesExhaustedException(final int numRetries,
final List<ThrowableWithExtraContext> exceptions) {
super(getMessage(numRetries, exceptions),
- exceptions.isEmpty()? null: exceptions.get(exceptions.size() - 1).t);
+ (exceptions != null && !exceptions.isEmpty() ?
+ exceptions.get(exceptions.size() - 1).t : null));
}
private static String getMessage(String callableVitals, int numTries,
http://git-wip-us.apache.org/repos/asf/hbase/blob/300fe5e6/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RetryingCallerInterceptorFactory.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RetryingCallerInterceptorFactory.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RetryingCallerInterceptorFactory.java
index 5a70582..15475f8 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RetryingCallerInterceptorFactory.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RetryingCallerInterceptorFactory.java
@@ -59,8 +59,6 @@ class RetryingCallerInterceptorFactory {
* {@link RetryingCallerInterceptor} object according to the
* configuration.
*/
- @edu.umd.cs.findbugs.annotations.SuppressWarnings(value="REC_CATCH_EXCEPTION",
- justification="Convert thrown exception to unchecked")
public RetryingCallerInterceptor build() {
RetryingCallerInterceptor ret = NO_OP_INTERCEPTOR;
if (failFast) {
http://git-wip-us.apache.org/repos/asf/hbase/blob/300fe5e6/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/BinaryComparator.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/BinaryComparator.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/BinaryComparator.java
index 3cbb7b9..0f2ed2b 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/BinaryComparator.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/BinaryComparator.java
@@ -53,7 +53,7 @@ public class BinaryComparator extends ByteArrayComparable {
@Override
public int compareTo(ByteBuffer value, int offset, int length) {
- return ByteBufferUtils.compareTo(this.value, 0, this.value.length, value, offset, length);
+ return -(ByteBufferUtils.compareTo(value, offset, length, this.value, 0, this.value.length));
}
/**
http://git-wip-us.apache.org/repos/asf/hbase/blob/300fe5e6/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/BinaryPrefixComparator.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/BinaryPrefixComparator.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/BinaryPrefixComparator.java
index a26edbc..c4d5197 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/BinaryPrefixComparator.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/BinaryPrefixComparator.java
@@ -58,7 +58,7 @@ public class BinaryPrefixComparator extends ByteArrayComparable {
if (this.value.length <= length) {
length = this.value.length;
}
- return ByteBufferUtils.compareTo(this.value, 0, this.value.length, value, offset, length);
+ return -(ByteBufferUtils.compareTo(value, offset, length, this.value, 0, this.value.length));
}
/**
http://git-wip-us.apache.org/repos/asf/hbase/blob/300fe5e6/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FuzzyRowFilter.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FuzzyRowFilter.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FuzzyRowFilter.java
index 0f01fb7..e31f0b5 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FuzzyRowFilter.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FuzzyRowFilter.java
@@ -189,8 +189,12 @@ public class FuzzyRowFilter extends FilterBase {
@Override
public int compare(Pair<byte[], Pair<byte[], byte[]>> o1,
Pair<byte[], Pair<byte[], byte[]>> o2) {
- return isReversed()? Bytes.compareTo(o2.getFirst(), o1.getFirst()):
- Bytes.compareTo(o1.getFirst(), o2.getFirst());
+ int compare = Bytes.compareTo(o1.getFirst(), o2.getFirst());
+ if (!isReversed()) {
+ return compare;
+ } else {
+ return -compare;
+ }
}
});
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/300fe5e6/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/LongComparator.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/LongComparator.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/LongComparator.java
index 9c56772..fd456e4 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/LongComparator.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/LongComparator.java
@@ -89,6 +89,8 @@ public class LongComparator extends ByteArrayComparable {
*/
boolean areSerializedFieldsEqual(LongComparator other) {
if (other == this) return true;
+ if (!(other instanceof LongComparator)) return false;
+
return super.areSerializedFieldsEqual(other);
}
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/300fe5e6/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/MultiRowRangeFilter.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/MultiRowRangeFilter.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/MultiRowRangeFilter.java
index 5f9c833..e5ce27c 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/MultiRowRangeFilter.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/MultiRowRangeFilter.java
@@ -503,8 +503,6 @@ public class MultiRowRangeFilter extends FilterBase {
}
@Override
- @edu.umd.cs.findbugs.annotations.SuppressWarnings(value="EQ_COMPARETO_USE_OBJECT_EQUALS",
- justification="This compareTo is not of this Object, but of referenced RowRange")
public int compareTo(RowRange other) {
return Bytes.compareTo(this.startRow, other.startRow);
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/300fe5e6/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClientImpl.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClientImpl.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClientImpl.java
index 940fcd1..ca8a149 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClientImpl.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClientImpl.java
@@ -383,7 +383,7 @@ public class RpcClientImpl extends AbstractRpcClient {
}
}
- private synchronized UserInformation getUserInfo(UserGroupInformation ugi) {
+ private UserInformation getUserInfo(UserGroupInformation ugi) {
if (ugi == null || authMethod == AuthMethod.DIGEST) {
// Don't send user for token auth
return null;
@@ -804,9 +804,7 @@ public class RpcClientImpl extends AbstractRpcClient {
byte [] preamble = new byte [rpcHeaderLen + 2];
System.arraycopy(HConstants.RPC_HEADER, 0, preamble, 0, rpcHeaderLen);
preamble[rpcHeaderLen] = HConstants.RPC_CURRENT_VERSION;
- synchronized (this) {
- preamble[rpcHeaderLen + 1] = authMethod.code;
- }
+ preamble[rpcHeaderLen + 1] = authMethod.code;
outStream.write(preamble);
outStream.flush();
}
@@ -882,8 +880,6 @@ public class RpcClientImpl extends AbstractRpcClient {
* threads.
* @see #readResponse()
*/
- @edu.umd.cs.findbugs.annotations.SuppressWarnings(value="IS2_INCONSISTENT_SYNC",
- justification="Findbugs is misinterpreting locking missing fact that this.outLock is held")
private void writeRequest(Call call, final int priority, Span span) throws IOException {
RequestHeader.Builder builder = RequestHeader.newBuilder();
builder.setCallId(call.id);
@@ -917,8 +913,8 @@ public class RpcClientImpl extends AbstractRpcClient {
checkIsOpen(); // Now we're checking that it didn't became idle in between.
try {
- call.callStats.setRequestSizeBytes(IPCUtil.write(this.out, header, call.param,
- cellBlock));
+ call.callStats.setRequestSizeBytes(
+ IPCUtil.write(this.out, header, call.param, cellBlock));
} catch (IOException e) {
// We set the value inside the synchronized block, this way the next in line
// won't even try to write. Otherwise we might miss a call in the calls map?
@@ -936,20 +932,14 @@ public class RpcClientImpl extends AbstractRpcClient {
// We added a call, and may be started the connection close. In both cases, we
// need to notify the reader.
- doNotify();
+ synchronized (this) {
+ notifyAll();
+ }
// Now that we notified, we can rethrow the exception if any. Otherwise we're good.
if (writeException != null) throw writeException;
}
- @edu.umd.cs.findbugs.annotations.SuppressWarnings(value="NN_NAKED_NOTIFY",
- justification="Presume notifyAll is because we are closing/shutting down")
- private synchronized void doNotify() {
- // Make a separate method so can do synchronize and add findbugs annotation; only one
- // annotation at at time in source 1.7.
- notifyAll(); // Findbugs: NN_NAKED_NOTIFY
- }
-
/* Receive a response.
* Because only one receiver, so no synchronization on in.
*/
http://git-wip-us.apache.org/repos/asf/hbase/blob/300fe5e6/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/RequestConverter.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/RequestConverter.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/RequestConverter.java
index 9d659fc..bd4c427 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/RequestConverter.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/RequestConverter.java
@@ -463,7 +463,7 @@ public final class RequestConverter {
builder.setScan(ProtobufUtil.toScan(scan));
builder.setClientHandlesPartials(true);
builder.setClientHandlesHeartbeats(true);
- builder.setTrackScanMetrics(scan.isScanMetricsEnabled());
+ builder.setTrackScanMetrics(scan != null && scan.isScanMetricsEnabled());
return builder.build();
}
[2/2] hbase git commit: HBASE-15115 Fix findbugs complaints in
hbase-client
Posted by st...@apache.org.
HBASE-15115 Fix findbugs complaints in hbase-client
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/76bce773
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/76bce773
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/76bce773
Branch: refs/heads/master
Commit: 76bce7732633a0881ff7cb0dfd2f56f13a98303a
Parents: 300fe5e
Author: stack <st...@apache.org>
Authored: Fri Jan 15 10:25:49 2016 -0800
Committer: stack <st...@apache.org>
Committed: Fri Jan 15 10:25:49 2016 -0800
----------------------------------------------------------------------
.../hadoop/hbase/client/HConnectable.java | 50 --------------------
.../hadoop/hbase/client/MetricsConnection.java | 2 +-
.../hbase/client/RetriesExhaustedException.java | 3 +-
.../RetryingCallerInterceptorFactory.java | 2 +
.../hadoop/hbase/filter/BinaryComparator.java | 2 +-
.../hbase/filter/BinaryPrefixComparator.java | 2 +-
.../hadoop/hbase/filter/FuzzyRowFilter.java | 8 +---
.../hadoop/hbase/filter/LongComparator.java | 2 -
.../hbase/filter/MultiRowRangeFilter.java | 2 +
.../apache/hadoop/hbase/ipc/RpcClientImpl.java | 24 +++++++---
.../hadoop/hbase/protobuf/RequestConverter.java | 2 +-
11 files changed, 28 insertions(+), 71 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/76bce773/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HConnectable.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HConnectable.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HConnectable.java
deleted file mode 100644
index f5f841d..0000000
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HConnectable.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * Copyright The Apache Software Foundation
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.hadoop.hbase.client;
-
-import java.io.IOException;
-
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hbase.classification.InterfaceAudience;
-
-/**
- * This class makes it convenient for one to execute a command in the context
- * of a {@link HConnection} instance based on the given {@link Configuration}.
- *
- * <p>
- * If you find yourself wanting to use a {@link HConnection} for a relatively
- * short duration of time, and do not want to deal with the hassle of creating
- * and cleaning up that resource, then you should consider using this
- * convenience class.
- *
- * @param <T>
- * the return type of the {@link HConnectable#connect(HConnection)}
- * method.
- */
-@InterfaceAudience.Private
-public abstract class HConnectable<T> {
- protected Configuration conf;
-
- protected HConnectable(Configuration conf) {
- this.conf = conf;
- }
-
- public abstract T connect(HConnection connection) throws IOException;
-}
http://git-wip-us.apache.org/repos/asf/hbase/blob/76bce773/hbase-client/src/main/java/org/apache/hadoop/hbase/client/MetricsConnection.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/MetricsConnection.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/MetricsConnection.java
index 4fdc587..6a292bc 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/MetricsConnection.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/MetricsConnection.java
@@ -105,7 +105,7 @@ public class MetricsConnection {
}
@VisibleForTesting
- protected final class CallTracker {
+ protected static final class CallTracker {
private final String name;
@VisibleForTesting final Timer callTimer;
@VisibleForTesting final Histogram reqHist;
http://git-wip-us.apache.org/repos/asf/hbase/blob/76bce773/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RetriesExhaustedException.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RetriesExhaustedException.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RetriesExhaustedException.java
index a452bbc..dc25f64 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RetriesExhaustedException.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RetriesExhaustedException.java
@@ -85,8 +85,7 @@ public class RetriesExhaustedException extends IOException {
public RetriesExhaustedException(final int numRetries,
final List<ThrowableWithExtraContext> exceptions) {
super(getMessage(numRetries, exceptions),
- (exceptions != null && !exceptions.isEmpty() ?
- exceptions.get(exceptions.size() - 1).t : null));
+ exceptions.isEmpty()? null: exceptions.get(exceptions.size() - 1).t);
}
private static String getMessage(String callableVitals, int numTries,
http://git-wip-us.apache.org/repos/asf/hbase/blob/76bce773/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RetryingCallerInterceptorFactory.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RetryingCallerInterceptorFactory.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RetryingCallerInterceptorFactory.java
index 15475f8..5a70582 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RetryingCallerInterceptorFactory.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RetryingCallerInterceptorFactory.java
@@ -59,6 +59,8 @@ class RetryingCallerInterceptorFactory {
* {@link RetryingCallerInterceptor} object according to the
* configuration.
*/
+ @edu.umd.cs.findbugs.annotations.SuppressWarnings(value="REC_CATCH_EXCEPTION",
+ justification="Convert thrown exception to unchecked")
public RetryingCallerInterceptor build() {
RetryingCallerInterceptor ret = NO_OP_INTERCEPTOR;
if (failFast) {
http://git-wip-us.apache.org/repos/asf/hbase/blob/76bce773/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/BinaryComparator.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/BinaryComparator.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/BinaryComparator.java
index 0f2ed2b..3cbb7b9 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/BinaryComparator.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/BinaryComparator.java
@@ -53,7 +53,7 @@ public class BinaryComparator extends ByteArrayComparable {
@Override
public int compareTo(ByteBuffer value, int offset, int length) {
- return -(ByteBufferUtils.compareTo(value, offset, length, this.value, 0, this.value.length));
+ return ByteBufferUtils.compareTo(this.value, 0, this.value.length, value, offset, length);
}
/**
http://git-wip-us.apache.org/repos/asf/hbase/blob/76bce773/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/BinaryPrefixComparator.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/BinaryPrefixComparator.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/BinaryPrefixComparator.java
index c4d5197..a26edbc 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/BinaryPrefixComparator.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/BinaryPrefixComparator.java
@@ -58,7 +58,7 @@ public class BinaryPrefixComparator extends ByteArrayComparable {
if (this.value.length <= length) {
length = this.value.length;
}
- return -(ByteBufferUtils.compareTo(value, offset, length, this.value, 0, this.value.length));
+ return ByteBufferUtils.compareTo(this.value, 0, this.value.length, value, offset, length);
}
/**
http://git-wip-us.apache.org/repos/asf/hbase/blob/76bce773/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FuzzyRowFilter.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FuzzyRowFilter.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FuzzyRowFilter.java
index e31f0b5..0f01fb7 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FuzzyRowFilter.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FuzzyRowFilter.java
@@ -189,12 +189,8 @@ public class FuzzyRowFilter extends FilterBase {
@Override
public int compare(Pair<byte[], Pair<byte[], byte[]>> o1,
Pair<byte[], Pair<byte[], byte[]>> o2) {
- int compare = Bytes.compareTo(o1.getFirst(), o2.getFirst());
- if (!isReversed()) {
- return compare;
- } else {
- return -compare;
- }
+ return isReversed()? Bytes.compareTo(o2.getFirst(), o1.getFirst()):
+ Bytes.compareTo(o1.getFirst(), o2.getFirst());
}
});
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/76bce773/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/LongComparator.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/LongComparator.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/LongComparator.java
index fd456e4..9c56772 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/LongComparator.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/LongComparator.java
@@ -89,8 +89,6 @@ public class LongComparator extends ByteArrayComparable {
*/
boolean areSerializedFieldsEqual(LongComparator other) {
if (other == this) return true;
- if (!(other instanceof LongComparator)) return false;
-
return super.areSerializedFieldsEqual(other);
}
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/76bce773/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/MultiRowRangeFilter.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/MultiRowRangeFilter.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/MultiRowRangeFilter.java
index e5ce27c..5f9c833 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/MultiRowRangeFilter.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/MultiRowRangeFilter.java
@@ -503,6 +503,8 @@ public class MultiRowRangeFilter extends FilterBase {
}
@Override
+ @edu.umd.cs.findbugs.annotations.SuppressWarnings(value="EQ_COMPARETO_USE_OBJECT_EQUALS",
+ justification="This compareTo is not of this Object, but of referenced RowRange")
public int compareTo(RowRange other) {
return Bytes.compareTo(this.startRow, other.startRow);
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/76bce773/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClientImpl.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClientImpl.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClientImpl.java
index ca8a149..940fcd1 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClientImpl.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClientImpl.java
@@ -383,7 +383,7 @@ public class RpcClientImpl extends AbstractRpcClient {
}
}
- private UserInformation getUserInfo(UserGroupInformation ugi) {
+ private synchronized UserInformation getUserInfo(UserGroupInformation ugi) {
if (ugi == null || authMethod == AuthMethod.DIGEST) {
// Don't send user for token auth
return null;
@@ -804,7 +804,9 @@ public class RpcClientImpl extends AbstractRpcClient {
byte [] preamble = new byte [rpcHeaderLen + 2];
System.arraycopy(HConstants.RPC_HEADER, 0, preamble, 0, rpcHeaderLen);
preamble[rpcHeaderLen] = HConstants.RPC_CURRENT_VERSION;
- preamble[rpcHeaderLen + 1] = authMethod.code;
+ synchronized (this) {
+ preamble[rpcHeaderLen + 1] = authMethod.code;
+ }
outStream.write(preamble);
outStream.flush();
}
@@ -880,6 +882,8 @@ public class RpcClientImpl extends AbstractRpcClient {
* threads.
* @see #readResponse()
*/
+ @edu.umd.cs.findbugs.annotations.SuppressWarnings(value="IS2_INCONSISTENT_SYNC",
+ justification="Findbugs is misinterpreting locking missing fact that this.outLock is held")
private void writeRequest(Call call, final int priority, Span span) throws IOException {
RequestHeader.Builder builder = RequestHeader.newBuilder();
builder.setCallId(call.id);
@@ -913,8 +917,8 @@ public class RpcClientImpl extends AbstractRpcClient {
checkIsOpen(); // Now we're checking that it didn't became idle in between.
try {
- call.callStats.setRequestSizeBytes(
- IPCUtil.write(this.out, header, call.param, cellBlock));
+ call.callStats.setRequestSizeBytes(IPCUtil.write(this.out, header, call.param,
+ cellBlock));
} catch (IOException e) {
// We set the value inside the synchronized block, this way the next in line
// won't even try to write. Otherwise we might miss a call in the calls map?
@@ -932,14 +936,20 @@ public class RpcClientImpl extends AbstractRpcClient {
// We added a call, and may be started the connection close. In both cases, we
// need to notify the reader.
- synchronized (this) {
- notifyAll();
- }
+ doNotify();
// Now that we notified, we can rethrow the exception if any. Otherwise we're good.
if (writeException != null) throw writeException;
}
+ @edu.umd.cs.findbugs.annotations.SuppressWarnings(value="NN_NAKED_NOTIFY",
+ justification="Presume notifyAll is because we are closing/shutting down")
+ private synchronized void doNotify() {
+ // Make a separate method so can do synchronize and add findbugs annotation; only one
+ // annotation at at time in source 1.7.
+ notifyAll(); // Findbugs: NN_NAKED_NOTIFY
+ }
+
/* Receive a response.
* Because only one receiver, so no synchronization on in.
*/
http://git-wip-us.apache.org/repos/asf/hbase/blob/76bce773/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/RequestConverter.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/RequestConverter.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/RequestConverter.java
index bd4c427..9d659fc 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/RequestConverter.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/RequestConverter.java
@@ -463,7 +463,7 @@ public final class RequestConverter {
builder.setScan(ProtobufUtil.toScan(scan));
builder.setClientHandlesPartials(true);
builder.setClientHandlesHeartbeats(true);
- builder.setTrackScanMetrics(scan != null && scan.isScanMetricsEnabled());
+ builder.setTrackScanMetrics(scan.isScanMetricsEnabled());
return builder.build();
}