You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by an...@apache.org on 2016/02/11 05:21:30 UTC
hbase git commit: HBASE-15198 RPC client not using Codec and
CellBlock for puts by default.
Repository: hbase
Updated Branches:
refs/heads/master fec973389 -> 29a192ef3
HBASE-15198 RPC client not using Codec and CellBlock for puts by default.
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/29a192ef
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/29a192ef
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/29a192ef
Branch: refs/heads/master
Commit: 29a192ef3cbe3b9cc12a6ee38f39e1199ac9790f
Parents: fec9733
Author: anoopsjohn <an...@gmail.com>
Authored: Thu Feb 11 09:51:11 2016 +0530
Committer: anoopsjohn <an...@gmail.com>
Committed: Thu Feb 11 09:51:11 2016 +0530
----------------------------------------------------------------------
.../hadoop/hbase/client/ClusterConnection.java | 5 ++++
.../hbase/client/ConnectionImplementation.java | 5 ++++
.../hbase/client/MultiServerCallable.java | 8 ++-----
.../hadoop/hbase/ipc/AbstractRpcClient.java | 5 ++++
.../org/apache/hadoop/hbase/ipc/RpcClient.java | 6 +++++
.../hadoop/hbase/protobuf/ProtobufUtil.java | 4 ----
.../hadoop/hbase/protobuf/RequestConverter.java | 10 +++++++-
.../hbase/client/TestFromClientSide3.java | 6 +++++
.../security/access/TestAccessController.java | 24 --------------------
9 files changed, 38 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/29a192ef/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClusterConnection.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClusterConnection.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClusterConnection.java
index 741989f..45589be 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClusterConnection.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClusterConnection.java
@@ -303,4 +303,9 @@ public interface ClusterConnection extends HConnection {
*/
public MetricsConnection getConnectionMetrics();
+ /**
+ * @return true when this connection uses a {@link org.apache.hadoop.hbase.codec.Codec} and so
+ * supports cell blocks.
+ */
+ boolean hasCellBlockSupport();
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/29a192ef/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionImplementation.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionImplementation.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionImplementation.java
index dc59e6e..dfa9937 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionImplementation.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionImplementation.java
@@ -2255,4 +2255,9 @@ class ConnectionImplementation implements ClusterConnection, Closeable {
return RpcRetryingCallerFactory
.instantiate(conf, this.interceptor, this.getStatisticsTracker());
}
+
+ @Override
+ public boolean hasCellBlockSupport() {
+ return this.rpcClient.hasCellBlockSupport();
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/hbase/blob/29a192ef/hbase-client/src/main/java/org/apache/hadoop/hbase/client/MultiServerCallable.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/MultiServerCallable.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/MultiServerCallable.java
index 72ae829..85b401e 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/MultiServerCallable.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/MultiServerCallable.java
@@ -22,7 +22,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.CellScannable;
import org.apache.hadoop.hbase.CellUtil;
import org.apache.hadoop.hbase.DoNotRetryIOException;
@@ -152,11 +151,8 @@ class MultiServerCallable<R> extends RegionServerCallable<MultiResponse> impleme
// This is not exact -- the configuration could have changed on us after connection was set up
// but it will do for now.
HConnection connection = getConnection();
- if (connection == null) return true; // Default is to do cellblocks.
- Configuration configuration = connection.getConfiguration();
- if (configuration == null) return true;
- String codec = configuration.get(HConstants.RPC_CODEC_CONF_KEY, "");
- return codec != null && codec.length() > 0;
+ if (!(connection instanceof ClusterConnection)) return true; // Default is to do cellblocks.
+ return ((ClusterConnection) connection).hasCellBlockSupport();
}
@Override
http://git-wip-us.apache.org/repos/asf/hbase/blob/29a192ef/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AbstractRpcClient.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AbstractRpcClient.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AbstractRpcClient.java
index e33ef3a..a53fb70 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AbstractRpcClient.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AbstractRpcClient.java
@@ -149,6 +149,11 @@ public abstract class AbstractRpcClient implements RpcClient {
}
}
+ @Override
+ public boolean hasCellBlockSupport() {
+ return this.codec != null;
+ }
+
/**
* Encapsulate the ugly casting and RuntimeException conversion in private method.
* @param conf configuration
http://git-wip-us.apache.org/repos/asf/hbase/blob/29a192ef/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClient.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClient.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClient.java
index cf689f5..540e224 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClient.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClient.java
@@ -83,4 +83,10 @@ import java.io.IOException;
* using this client.
*/
@Override public void close();
+
+ /**
+ * @return true when this client uses a {@link org.apache.hadoop.hbase.codec.Codec} and so
+ * supports cell blocks.
+ */
+ boolean hasCellBlockSupport();
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/hbase/blob/29a192ef/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java
index e9a1223..261a9aa 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java
@@ -1188,10 +1188,6 @@ public final class ProtobufUtil {
valueBuilder.setValue(ByteStringer.wrap(
cell.getValueArray(), cell.getValueOffset(), cell.getValueLength()));
valueBuilder.setTimestamp(cell.getTimestamp());
- if(cell.getTagsLength() > 0) {
- valueBuilder.setTags(ByteStringer.wrap(cell.getTagsArray(), cell.getTagsOffset(),
- cell.getTagsLength()));
- }
if (type == MutationType.DELETE || (type == MutationType.PUT && CellUtil.isDelete(cell))) {
KeyValue.Type keyValueType = KeyValue.Type.codeToType(cell.getTypeByte());
valueBuilder.setDeleteType(toDeleteType(keyValueType));
http://git-wip-us.apache.org/repos/asf/hbase/blob/29a192ef/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..572d92c 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
@@ -648,8 +648,16 @@ public final class RequestConverter {
cells.add(i);
builder.addAction(actionBuilder.setMutation(ProtobufUtil.toMutationNoData(
MutationType.INCREMENT, i, mutationBuilder, action.getNonce())));
+ } else if (row instanceof RegionCoprocessorServiceExec) {
+ RegionCoprocessorServiceExec exec = (RegionCoprocessorServiceExec) row;
+ builder.addAction(actionBuilder.setServiceCall(
+ ClientProtos.CoprocessorServiceCall.newBuilder()
+ .setRow(ByteStringer.wrap(exec.getRow()))
+ .setServiceName(exec.getMethod().getService().getFullName())
+ .setMethodName(exec.getMethod().getName())
+ .setRequest(exec.getRequest().toByteString())));
} else if (row instanceof RowMutations) {
- continue; // ignore RowMutations
+ throw new UnsupportedOperationException("No RowMutations in multi calls; use mutateRow");
} else {
throw new DoNotRetryIOException("Multi doesn't support " + row.getClass().getName());
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/29a192ef/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide3.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide3.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide3.java
index 7194c57..5995191 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide3.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide3.java
@@ -475,4 +475,10 @@ public class TestFromClientSide3 {
assertTrue(Arrays.equals(res.getValue(FAMILY, COL_QUAL), VAL_BYTES));
table.close();
}
+
+ @Test
+ public void testConnectionDefaultUsesCodec() throws Exception {
+ ClusterConnection con = (ClusterConnection) TEST_UTIL.getConnection();
+ assertTrue(con.hasCellBlockSupport());
+ }
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/29a192ef/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController.java
index 9f20c11..081663d 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController.java
@@ -2509,30 +2509,6 @@ public class TestAccessController extends SecureTestUtil {
}
@Test (timeout=180000)
- public void testReservedCellTags() throws Exception {
- AccessTestAction putWithReservedTag = new AccessTestAction() {
- @Override
- public Object run() throws Exception {
- try(Connection conn = ConnectionFactory.createConnection(conf);
- Table t = conn.getTable(TEST_TABLE);) {
- KeyValue kv = new KeyValue(TEST_ROW, TEST_FAMILY, TEST_QUALIFIER,
- HConstants.LATEST_TIMESTAMP, HConstants.EMPTY_BYTE_ARRAY,
- new Tag[] { new ArrayBackedTag(AccessControlLists.ACL_TAG_TYPE,
- ProtobufUtil.toUsersAndPermissions(USER_OWNER.getShortName(),
- new Permission(Permission.Action.READ)).toByteArray()) });
- t.put(new Put(TEST_ROW).add(kv));
- }
- return null;
- }
- };
-
- // Current user is superuser
- verifyAllowed(putWithReservedTag, User.getCurrent());
- // No other user should be allowed
- verifyDenied(putWithReservedTag, USER_OWNER, USER_ADMIN, USER_CREATE, USER_RW, USER_RO);
- }
-
- @Test (timeout=180000)
public void testSetQuota() throws Exception {
AccessTestAction setUserQuotaAction = new AccessTestAction() {
@Override