Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-12663 unify getTableDescriptors() and listTableDescriptors

This commit is contained in:
Matteo Bertozzi 2014-12-10 15:15:53 +00:00
parent 51bbbbaf2b
commit f763b5d2c4
11 changed files with 625 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

533
hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/MasterProtos.java
View File

@ -34206,6 +34206,21 @@ public final class MasterProtos {
* <code>optional bool include_sys_tables = 3 [default = false];</code>
*/
boolean getIncludeSysTables();
// optional string namespace = 4;
/**
* <code>optional string namespace = 4;</code>
*/
boolean hasNamespace();
/**
* <code>optional string namespace = 4;</code>
*/
java.lang.String getNamespace();
/**
* <code>optional string namespace = 4;</code>
*/
com.google.protobuf.ByteString
getNamespaceBytes();
}
/**
* Protobuf type {@code GetTableDescriptorsRequest}
@ -34276,6 +34291,11 @@ public final class MasterProtos {
includeSysTables_ = input.readBool();
break;
}
case 34: {
bitField0_ |= 0x00000004;
namespace_ = input.readBytes();
break;
}
}
}
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
@ -34414,10 +34434,54 @@ public final class MasterProtos {
return includeSysTables_;
}
// optional string namespace = 4;
public static final int NAMESPACE_FIELD_NUMBER = 4;
private java.lang.Object namespace_;
/**
* <code>optional string namespace = 4;</code>
*/
public boolean hasNamespace() {
return ((bitField0_ & 0x00000004) == 0x00000004);
}
/**
* <code>optional string namespace = 4;</code>
*/
public java.lang.String getNamespace() {
java.lang.Object ref = namespace_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
} else {
com.google.protobuf.ByteString bs =
(com.google.protobuf.ByteString) ref;
java.lang.String s = bs.toStringUtf8();
if (bs.isValidUtf8()) {
namespace_ = s;
}
return s;
}
}
/**
* <code>optional string namespace = 4;</code>
*/
public com.google.protobuf.ByteString
getNamespaceBytes() {
java.lang.Object ref = namespace_;
if (ref instanceof java.lang.String) {
com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref);
namespace_ = b;
return b;
} else {
return (com.google.protobuf.ByteString) ref;
}
}
private void initFields() {
tableNames_ = java.util.Collections.emptyList();
regex_ = "";
includeSysTables_ = false;
namespace_ = "";
}
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
@ -34446,6 +34510,9 @@ public final class MasterProtos {
if (((bitField0_ & 0x00000002) == 0x00000002)) {
output.writeBool(3, includeSysTables_);
}
if (((bitField0_ & 0x00000004) == 0x00000004)) {
output.writeBytes(4, getNamespaceBytes());
}
getUnknownFields().writeTo(output);
}
@ -34467,6 +34534,10 @@ public final class MasterProtos {
size += com.google.protobuf.CodedOutputStream
.computeBoolSize(3, includeSysTables_);
}
if (((bitField0_ & 0x00000004) == 0x00000004)) {
size += com.google.protobuf.CodedOutputStream
.computeBytesSize(4, getNamespaceBytes());
}
size += getUnknownFields().getSerializedSize();
memoizedSerializedSize = size;
return size;
@ -34502,6 +34573,11 @@ public final class MasterProtos {
result = result && (getIncludeSysTables()
== other.getIncludeSysTables());
}
result = result && (hasNamespace() == other.hasNamespace());
if (hasNamespace()) {
result = result && getNamespace()
.equals(other.getNamespace());
}
result = result &&
getUnknownFields().equals(other.getUnknownFields());
return result;
@ -34527,6 +34603,10 @@ public final class MasterProtos {
hash = (37 * hash) + INCLUDE_SYS_TABLES_FIELD_NUMBER;
hash = (53 * hash) + hashBoolean(getIncludeSysTables());
}
if (hasNamespace()) {
hash = (37 * hash) + NAMESPACE_FIELD_NUMBER;
hash = (53 * hash) + getNamespace().hashCode();
}
hash = (29 * hash) + getUnknownFields().hashCode();
memoizedHashCode = hash;
return hash;
@ -34647,6 +34727,8 @@ public final class MasterProtos {
bitField0_ = (bitField0_ & ~0x00000002);
includeSysTables_ = false;
bitField0_ = (bitField0_ & ~0x00000004);
namespace_ = "";
bitField0_ = (bitField0_ & ~0x00000008);
return this;
}
@ -34692,6 +34774,10 @@ public final class MasterProtos {
to_bitField0_ |= 0x00000002;
}
result.includeSysTables_ = includeSysTables_;
if (((from_bitField0_ & 0x00000008) == 0x00000008)) {
to_bitField0_ |= 0x00000004;
}
result.namespace_ = namespace_;
result.bitField0_ = to_bitField0_;
onBuilt();
return result;
@ -34742,6 +34828,11 @@ public final class MasterProtos {
if (other.hasIncludeSysTables()) {
setIncludeSysTables(other.getIncludeSysTables());
}
if (other.hasNamespace()) {
bitField0_ |= 0x00000008;
namespace_ = other.namespace_;
onChanged();
}
this.mergeUnknownFields(other.getUnknownFields());
return this;
}
@ -35122,6 +35213,80 @@ public final class MasterProtos {
return this;
}
// optional string namespace = 4;
private java.lang.Object namespace_ = "";
/**
* <code>optional string namespace = 4;</code>
*/
public boolean hasNamespace() {
return ((bitField0_ & 0x00000008) == 0x00000008);
}
/**
* <code>optional string namespace = 4;</code>
*/
public java.lang.String getNamespace() {
java.lang.Object ref = namespace_;
if (!(ref instanceof java.lang.String)) {
java.lang.String s = ((com.google.protobuf.ByteString) ref)
.toStringUtf8();
namespace_ = s;
return s;
} else {
return (java.lang.String) ref;
}
}
/**
* <code>optional string namespace = 4;</code>
*/
public com.google.protobuf.ByteString
getNamespaceBytes() {
java.lang.Object ref = namespace_;
if (ref instanceof String) {
com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref);
namespace_ = b;
return b;
} else {
return (com.google.protobuf.ByteString) ref;
}
}
/**
* <code>optional string namespace = 4;</code>
*/
public Builder setNamespace(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
}
bitField0_ |= 0x00000008;
namespace_ = value;
onChanged();
return this;
}
/**
* <code>optional string namespace = 4;</code>
*/
public Builder clearNamespace() {
bitField0_ = (bitField0_ & ~0x00000008);
namespace_ = getDefaultInstance().getNamespace();
onChanged();
return this;
}
/**
* <code>optional string namespace = 4;</code>
*/
public Builder setNamespaceBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
}
bitField0_ |= 0x00000008;
namespace_ = value;
onChanged();
return this;
}
// @@protoc_insertion_point(builder_scope:GetTableDescriptorsRequest)
}
@ -35881,6 +36046,21 @@ public final class MasterProtos {
* <code>optional bool include_sys_tables = 2 [default = false];</code>
*/
boolean getIncludeSysTables();
// optional string namespace = 3;
/**
* <code>optional string namespace = 3;</code>
*/
boolean hasNamespace();
/**
* <code>optional string namespace = 3;</code>
*/
java.lang.String getNamespace();
/**
* <code>optional string namespace = 3;</code>
*/
com.google.protobuf.ByteString
getNamespaceBytes();
}
/**
* Protobuf type {@code GetTableNamesRequest}
@ -35943,6 +36123,11 @@ public final class MasterProtos {
includeSysTables_ = input.readBool();
break;
}
case 26: {
bitField0_ |= 0x00000004;
namespace_ = input.readBytes();
break;
}
}
}
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
@ -36042,9 +36227,53 @@ public final class MasterProtos {
return includeSysTables_;
}
// optional string namespace = 3;
public static final int NAMESPACE_FIELD_NUMBER = 3;
private java.lang.Object namespace_;
/**
* <code>optional string namespace = 3;</code>
*/
public boolean hasNamespace() {
return ((bitField0_ & 0x00000004) == 0x00000004);
}
/**
* <code>optional string namespace = 3;</code>
*/
public java.lang.String getNamespace() {
java.lang.Object ref = namespace_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
} else {
com.google.protobuf.ByteString bs =
(com.google.protobuf.ByteString) ref;
java.lang.String s = bs.toStringUtf8();
if (bs.isValidUtf8()) {
namespace_ = s;
}
return s;
}
}
/**
* <code>optional string namespace = 3;</code>
*/
public com.google.protobuf.ByteString
getNamespaceBytes() {
java.lang.Object ref = namespace_;
if (ref instanceof java.lang.String) {
com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref);
namespace_ = b;
return b;
} else {
return (com.google.protobuf.ByteString) ref;
}
}
private void initFields() {
regex_ = "";
includeSysTables_ = false;
namespace_ = "";
}
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
@ -36064,6 +36293,9 @@ public final class MasterProtos {
if (((bitField0_ & 0x00000002) == 0x00000002)) {
output.writeBool(2, includeSysTables_);
}
if (((bitField0_ & 0x00000004) == 0x00000004)) {
output.writeBytes(3, getNamespaceBytes());
}
getUnknownFields().writeTo(output);
}
@ -36081,6 +36313,10 @@ public final class MasterProtos {
size += com.google.protobuf.CodedOutputStream
.computeBoolSize(2, includeSysTables_);
}
if (((bitField0_ & 0x00000004) == 0x00000004)) {
size += com.google.protobuf.CodedOutputStream
.computeBytesSize(3, getNamespaceBytes());
}
size += getUnknownFields().getSerializedSize();
memoizedSerializedSize = size;
return size;
@ -36114,6 +36350,11 @@ public final class MasterProtos {
result = result && (getIncludeSysTables()
== other.getIncludeSysTables());
}
result = result && (hasNamespace() == other.hasNamespace());
if (hasNamespace()) {
result = result && getNamespace()
.equals(other.getNamespace());
}
result = result &&
getUnknownFields().equals(other.getUnknownFields());
return result;
@ -36135,6 +36376,10 @@ public final class MasterProtos {
hash = (37 * hash) + INCLUDE_SYS_TABLES_FIELD_NUMBER;
hash = (53 * hash) + hashBoolean(getIncludeSysTables());
}
if (hasNamespace()) {
hash = (37 * hash) + NAMESPACE_FIELD_NUMBER;
hash = (53 * hash) + getNamespace().hashCode();
}
hash = (29 * hash) + getUnknownFields().hashCode();
memoizedHashCode = hash;
return hash;
@ -36248,6 +36493,8 @@ public final class MasterProtos {
bitField0_ = (bitField0_ & ~0x00000001);
includeSysTables_ = false;
bitField0_ = (bitField0_ & ~0x00000002);
namespace_ = "";
bitField0_ = (bitField0_ & ~0x00000004);
return this;
}
@ -36284,6 +36531,10 @@ public final class MasterProtos {
to_bitField0_ |= 0x00000002;
}
result.includeSysTables_ = includeSysTables_;
if (((from_bitField0_ & 0x00000004) == 0x00000004)) {
to_bitField0_ |= 0x00000004;
}
result.namespace_ = namespace_;
result.bitField0_ = to_bitField0_;
onBuilt();
return result;
@ -36308,6 +36559,11 @@ public final class MasterProtos {
if (other.hasIncludeSysTables()) {
setIncludeSysTables(other.getIncludeSysTables());
}
if (other.hasNamespace()) {
bitField0_ |= 0x00000004;
namespace_ = other.namespace_;
onChanged();
}
this.mergeUnknownFields(other.getUnknownFields());
return this;
}
@ -36442,6 +36698,80 @@ public final class MasterProtos {
return this;
}
// optional string namespace = 3;
private java.lang.Object namespace_ = "";
/**
* <code>optional string namespace = 3;</code>
*/
public boolean hasNamespace() {
return ((bitField0_ & 0x00000004) == 0x00000004);
}
/**
* <code>optional string namespace = 3;</code>
*/
public java.lang.String getNamespace() {
java.lang.Object ref = namespace_;
if (!(ref instanceof java.lang.String)) {
java.lang.String s = ((com.google.protobuf.ByteString) ref)
.toStringUtf8();
namespace_ = s;
return s;
} else {
return (java.lang.String) ref;
}
}
/**
* <code>optional string namespace = 3;</code>
*/
public com.google.protobuf.ByteString
getNamespaceBytes() {
java.lang.Object ref = namespace_;
if (ref instanceof String) {
com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref);
namespace_ = b;
return b;
} else {
return (com.google.protobuf.ByteString) ref;
}
}
/**
* <code>optional string namespace = 3;</code>
*/
public Builder setNamespace(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
}
bitField0_ |= 0x00000004;
namespace_ = value;
onChanged();
return this;
}
/**
* <code>optional string namespace = 3;</code>
*/
public Builder clearNamespace() {
bitField0_ = (bitField0_ & ~0x00000004);
namespace_ = getDefaultInstance().getNamespace();
onChanged();
return this;
}
/**
* <code>optional string namespace = 3;</code>
*/
public Builder setNamespaceBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
}
bitField0_ |= 0x00000004;
namespace_ = value;
onChanged();
return this;
}
// @@protoc_insertion_point(builder_scope:GetTableNamesRequest)
}
@ -45265,105 +45595,106 @@ public final class MasterProtos {
"se\"=\n\033GetSchemaAlterStatusRequest\022\036\n\ntab" +
"le_name\030\001 \002(\0132\n.TableName\"T\n\034GetSchemaAl",
"terStatusResponse\022\035\n\025yet_to_update_regio" +
"ns\030\001 \001(\r\022\025\n\rtotal_regions\030\002 \001(\r\"o\n\032GetTa" +
"bleDescriptorsRequest\022\037\n\013table_names\030\001 \003" +
"(\0132\n.TableName\022\r\n\005regex\030\002 \001(\t\022!\n\022include" +
"_sys_tables\030\003 \001(\010:\005false\"A\n\033GetTableDesc" +
"riptorsResponse\022\"\n\014table_schema\030\001 \003(\0132\014." +
"TableSchema\"H\n\024GetTableNamesRequest\022\r\n\005r" +
"egex\030\001 \001(\t\022!\n\022include_sys_tables\030\002 \001(\010:\005" +
"false\"8\n\025GetTableNamesResponse\022\037\n\013table_" +
"names\030\001 \003(\0132\n.TableName\"\031\n\027GetClusterSta",
"tusRequest\"B\n\030GetClusterStatusResponse\022&" +
"\n\016cluster_status\030\001 \002(\0132\016.ClusterStatus\"\030" +
"\n\026IsMasterRunningRequest\"4\n\027IsMasterRunn" +
"ingResponse\022\031\n\021is_master_running\030\001 \002(\010\"@" +
"\n\024ExecProcedureRequest\022(\n\tprocedure\030\001 \002(" +
"\0132\025.ProcedureDescription\"F\n\025ExecProcedur" +
"eResponse\022\030\n\020expected_timeout\030\001 \001(\003\022\023\n\013r" +
"eturn_data\030\002 \001(\014\"B\n\026IsProcedureDoneReque" +
"st\022(\n\tprocedure\030\001 \001(\0132\025.ProcedureDescrip" +
"tion\"W\n\027IsProcedureDoneResponse\022\023\n\004done\030",
"\001 \001(\010:\005false\022\'\n\010snapshot\030\002 \001(\0132\025.Procedu" +
"reDescription2\365\027\n\rMasterService\022S\n\024GetSc" +
"hemaAlterStatus\022\034.GetSchemaAlterStatusRe" +
"quest\032\035.GetSchemaAlterStatusResponse\022P\n\023" +
"GetTableDescriptors\022\033.GetTableDescriptor" +
"sRequest\032\034.GetTableDescriptorsResponse\022>" +
"\n\rGetTableNames\022\025.GetTableNamesRequest\032\026" +
".GetTableNamesResponse\022G\n\020GetClusterStat" +
"us\022\030.GetClusterStatusRequest\032\031.GetCluste" +
"rStatusResponse\022D\n\017IsMasterRunning\022\027.IsM",
"asterRunningRequest\032\030.IsMasterRunningRes" +
"ponse\0222\n\tAddColumn\022\021.AddColumnRequest\032\022." +
"AddColumnResponse\022;\n\014DeleteColumn\022\024.Dele" +
"teColumnRequest\032\025.DeleteColumnResponse\022;" +
"\n\014ModifyColumn\022\024.ModifyColumnRequest\032\025.M" +
"odifyColumnResponse\0225\n\nMoveRegion\022\022.Move" +
"RegionRequest\032\023.MoveRegionResponse\022Y\n\026Di" +
"spatchMergingRegions\022\036.DispatchMergingRe" +
"gionsRequest\032\037.DispatchMergingRegionsRes" +
"ponse\022;\n\014AssignRegion\022\024.AssignRegionRequ",
"est\032\025.AssignRegionResponse\022A\n\016UnassignRe" +
"gion\022\026.UnassignRegionRequest\032\027.UnassignR" +
"egionResponse\022>\n\rOfflineRegion\022\025.Offline" +
"RegionRequest\032\026.OfflineRegionResponse\0228\n" +
"\013DeleteTable\022\023.DeleteTableRequest\032\024.Dele" +
"teTableResponse\022>\n\rtruncateTable\022\025.Trunc" +
"ateTableRequest\032\026.TruncateTableResponse\022" +
"8\n\013EnableTable\022\023.EnableTableRequest\032\024.En" +
"ableTableResponse\022;\n\014DisableTable\022\024.Disa" +
"bleTableRequest\032\025.DisableTableResponse\0228",
"\n\013ModifyTable\022\023.ModifyTableRequest\032\024.Mod" +
"ifyTableResponse\0228\n\013CreateTable\022\023.Create" +
"TableRequest\032\024.CreateTableResponse\022/\n\010Sh" +
"utdown\022\020.ShutdownRequest\032\021.ShutdownRespo" +
"nse\0225\n\nStopMaster\022\022.StopMasterRequest\032\023." +
"StopMasterResponse\022,\n\007Balance\022\017.BalanceR" +
"equest\032\020.BalanceResponse\022M\n\022SetBalancerR" +
"unning\022\032.SetBalancerRunningRequest\032\033.Set" +
"BalancerRunningResponse\022A\n\016RunCatalogSca" +
"n\022\026.RunCatalogScanRequest\032\027.RunCatalogSc",
"anResponse\022S\n\024EnableCatalogJanitor\022\034.Ena" +
"bleCatalogJanitorRequest\032\035.EnableCatalog" +
"JanitorResponse\022\\\n\027IsCatalogJanitorEnabl" +
"ed\022\037.IsCatalogJanitorEnabledRequest\032 .Is" +
"CatalogJanitorEnabledResponse\022L\n\021ExecMas" +
"terService\022\032.CoprocessorServiceRequest\032\033" +
".CoprocessorServiceResponse\022/\n\010Snapshot\022" +
"\020.SnapshotRequest\032\021.SnapshotResponse\022V\n\025" +
"GetCompletedSnapshots\022\035.GetCompletedSnap" +
"shotsRequest\032\036.GetCompletedSnapshotsResp",
"onse\022A\n\016DeleteSnapshot\022\026.DeleteSnapshotR" +
"equest\032\027.DeleteSnapshotResponse\022A\n\016IsSna" +
"pshotDone\022\026.IsSnapshotDoneRequest\032\027.IsSn" +
"apshotDoneResponse\022D\n\017RestoreSnapshot\022\027." +
"RestoreSnapshotRequest\032\030.RestoreSnapshot" +
"Response\022V\n\025IsRestoreSnapshotDone\022\035.IsRe" +
"storeSnapshotDoneRequest\032\036.IsRestoreSnap" +
"shotDoneResponse\022>\n\rExecProcedure\022\025.Exec" +
"ProcedureRequest\032\026.ExecProcedureResponse" +
"\022E\n\024ExecProcedureWithRet\022\025.ExecProcedure",
"Request\032\026.ExecProcedureResponse\022D\n\017IsPro" +
"cedureDone\022\027.IsProcedureDoneRequest\032\030.Is" +
"ProcedureDoneResponse\022D\n\017ModifyNamespace" +
"\022\027.ModifyNamespaceRequest\032\030.ModifyNamesp" +
"aceResponse\022D\n\017CreateNamespace\022\027.CreateN" +
"amespaceRequest\032\030.CreateNamespaceRespons" +
"e\022D\n\017DeleteNamespace\022\027.DeleteNamespaceRe" +
"quest\032\030.DeleteNamespaceResponse\022Y\n\026GetNa" +
"mespaceDescriptor\022\036.GetNamespaceDescript" +
"orRequest\032\037.GetNamespaceDescriptorRespon",
"se\022_\n\030ListNamespaceDescriptors\022 .ListNam" +
"espaceDescriptorsRequest\032!.ListNamespace" +
"DescriptorsResponse\022t\n\037ListTableDescript" +
"orsByNamespace\022\'.ListTableDescriptorsByN" +
"amespaceRequest\032(.ListTableDescriptorsBy" +
"NamespaceResponse\022b\n\031ListTableNamesByNam" +
"espace\022!.ListTableNamesByNamespaceReques" +
"t\032\".ListTableNamesByNamespaceResponseBB\n" +
"*org.apache.hadoop.hbase.protobuf.genera" +
"tedB\014MasterProtosH\001\210\001\001\240\001\001"
"ns\030\001 \001(\r\022\025\n\rtotal_regions\030\002 \001(\r\"\202\001\n\032GetT" +
"ableDescriptorsRequest\022\037\n\013table_names\030\001 " +
"\003(\0132\n.TableName\022\r\n\005regex\030\002 \001(\t\022!\n\022includ" +
"e_sys_tables\030\003 \001(\010:\005false\022\021\n\tnamespace\030\004" +
" \001(\t\"A\n\033GetTableDescriptorsResponse\022\"\n\014t" +
"able_schema\030\001 \003(\0132\014.TableSchema\"[\n\024GetTa" +
"bleNamesRequest\022\r\n\005regex\030\001 \001(\t\022!\n\022includ" +
"e_sys_tables\030\002 \001(\010:\005false\022\021\n\tnamespace\030\003" +
" \001(\t\"8\n\025GetTableNamesResponse\022\037\n\013table_n",
"ames\030\001 \003(\0132\n.TableName\"\031\n\027GetClusterStat" +
"usRequest\"B\n\030GetClusterStatusResponse\022&\n" +
"\016cluster_status\030\001 \002(\0132\016.ClusterStatus\"\030\n" +
"\026IsMasterRunningRequest\"4\n\027IsMasterRunni" +
"ngResponse\022\031\n\021is_master_running\030\001 \002(\010\"@\n" +
"\024ExecProcedureRequest\022(\n\tprocedure\030\001 \002(\013" +
"2\025.ProcedureDescription\"F\n\025ExecProcedure" +
"Response\022\030\n\020expected_timeout\030\001 \001(\003\022\023\n\013re" +
"turn_data\030\002 \001(\014\"B\n\026IsProcedureDoneReques" +
"t\022(\n\tprocedure\030\001 \001(\0132\025.ProcedureDescript",
"ion\"W\n\027IsProcedureDoneResponse\022\023\n\004done\030\001" +
" \001(\010:\005false\022\'\n\010snapshot\030\002 \001(\0132\025.Procedur" +
"eDescription2\365\027\n\rMasterService\022S\n\024GetSch" +
"emaAlterStatus\022\034.GetSchemaAlterStatusReq" +
"uest\032\035.GetSchemaAlterStatusResponse\022P\n\023G" +
"etTableDescriptors\022\033.GetTableDescriptors" +
"Request\032\034.GetTableDescriptorsResponse\022>\n" +
"\rGetTableNames\022\025.GetTableNamesRequest\032\026." +
"GetTableNamesResponse\022G\n\020GetClusterStatu" +
"s\022\030.GetClusterStatusRequest\032\031.GetCluster",
"StatusResponse\022D\n\017IsMasterRunning\022\027.IsMa" +
"sterRunningRequest\032\030.IsMasterRunningResp" +
"onse\0222\n\tAddColumn\022\021.AddColumnRequest\032\022.A" +
"ddColumnResponse\022;\n\014DeleteColumn\022\024.Delet" +
"eColumnRequest\032\025.DeleteColumnResponse\022;\n" +
"\014ModifyColumn\022\024.ModifyColumnRequest\032\025.Mo" +
"difyColumnResponse\0225\n\nMoveRegion\022\022.MoveR" +
"egionRequest\032\023.MoveRegionResponse\022Y\n\026Dis" +
"patchMergingRegions\022\036.DispatchMergingReg" +
"ionsRequest\032\037.DispatchMergingRegionsResp",
"onse\022;\n\014AssignRegion\022\024.AssignRegionReque" +
"st\032\025.AssignRegionResponse\022A\n\016UnassignReg" +
"ion\022\026.UnassignRegionRequest\032\027.UnassignRe" +
"gionResponse\022>\n\rOfflineRegion\022\025.OfflineR" +
"egionRequest\032\026.OfflineRegionResponse\0228\n\013" +
"DeleteTable\022\023.DeleteTableRequest\032\024.Delet" +
"eTableResponse\022>\n\rtruncateTable\022\025.Trunca" +
"teTableRequest\032\026.TruncateTableResponse\0228" +
"\n\013EnableTable\022\023.EnableTableRequest\032\024.Ena" +
"bleTableResponse\022;\n\014DisableTable\022\024.Disab",
"leTableRequest\032\025.DisableTableResponse\0228\n" +
"\013ModifyTable\022\023.ModifyTableRequest\032\024.Modi" +
"fyTableResponse\0228\n\013CreateTable\022\023.CreateT" +
"ableRequest\032\024.CreateTableResponse\022/\n\010Shu" +
"tdown\022\020.ShutdownRequest\032\021.ShutdownRespon" +
"se\0225\n\nStopMaster\022\022.StopMasterRequest\032\023.S" +
"topMasterResponse\022,\n\007Balance\022\017.BalanceRe" +
"quest\032\020.BalanceResponse\022M\n\022SetBalancerRu" +
"nning\022\032.SetBalancerRunningRequest\032\033.SetB" +
"alancerRunningResponse\022A\n\016RunCatalogScan",
"\022\026.RunCatalogScanRequest\032\027.RunCatalogSca" +
"nResponse\022S\n\024EnableCatalogJanitor\022\034.Enab" +
"leCatalogJanitorRequest\032\035.EnableCatalogJ" +
"anitorResponse\022\\\n\027IsCatalogJanitorEnable" +
"d\022\037.IsCatalogJanitorEnabledRequest\032 .IsC" +
"atalogJanitorEnabledResponse\022L\n\021ExecMast" +
"erService\022\032.CoprocessorServiceRequest\032\033." +
"CoprocessorServiceResponse\022/\n\010Snapshot\022\020" +
".SnapshotRequest\032\021.SnapshotResponse\022V\n\025G" +
"etCompletedSnapshots\022\035.GetCompletedSnaps",
"hotsRequest\032\036.GetCompletedSnapshotsRespo" +
"nse\022A\n\016DeleteSnapshot\022\026.DeleteSnapshotRe" +
"quest\032\027.DeleteSnapshotResponse\022A\n\016IsSnap" +
"shotDone\022\026.IsSnapshotDoneRequest\032\027.IsSna" +
"pshotDoneResponse\022D\n\017RestoreSnapshot\022\027.R" +
"estoreSnapshotRequest\032\030.RestoreSnapshotR" +
"esponse\022V\n\025IsRestoreSnapshotDone\022\035.IsRes" +
"toreSnapshotDoneRequest\032\036.IsRestoreSnaps" +
"hotDoneResponse\022>\n\rExecProcedure\022\025.ExecP" +
"rocedureRequest\032\026.ExecProcedureResponse\022",
"E\n\024ExecProcedureWithRet\022\025.ExecProcedureR" +
"equest\032\026.ExecProcedureResponse\022D\n\017IsProc" +
"edureDone\022\027.IsProcedureDoneRequest\032\030.IsP" +
"rocedureDoneResponse\022D\n\017ModifyNamespace\022" +
"\027.ModifyNamespaceRequest\032\030.ModifyNamespa" +
"ceResponse\022D\n\017CreateNamespace\022\027.CreateNa" +
"mespaceRequest\032\030.CreateNamespaceResponse" +
"\022D\n\017DeleteNamespace\022\027.DeleteNamespaceReq" +
"uest\032\030.DeleteNamespaceResponse\022Y\n\026GetNam" +
"espaceDescriptor\022\036.GetNamespaceDescripto",
"rRequest\032\037.GetNamespaceDescriptorRespons" +
"e\022_\n\030ListNamespaceDescriptors\022 .ListName" +
"spaceDescriptorsRequest\032!.ListNamespaceD" +
"escriptorsResponse\022t\n\037ListTableDescripto" +
"rsByNamespace\022\'.ListTableDescriptorsByNa" +
"mespaceRequest\032(.ListTableDescriptorsByN" +
"amespaceResponse\022b\n\031ListTableNamesByName" +
"space\022!.ListTableNamesByNamespaceRequest" +
"\032\".ListTableNamesByNamespaceResponseBB\n*" +
"org.apache.hadoop.hbase.protobuf.generat",
"edB\014MasterProtosH\001\210\001\001\240\001\001"
};
com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
@ -45795,7 +46126,7 @@ public final class MasterProtos {
internal_static_GetTableDescriptorsRequest_fieldAccessorTable = new
com.google.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_GetTableDescriptorsRequest_descriptor,
new java.lang.String[] { "TableNames", "Regex", "IncludeSysTables", });
new java.lang.String[] { "TableNames", "Regex", "IncludeSysTables", "Namespace", });
internal_static_GetTableDescriptorsResponse_descriptor =
getDescriptor().getMessageTypes().get(71);
internal_static_GetTableDescriptorsResponse_fieldAccessorTable = new
@ -45807,7 +46138,7 @@ public final class MasterProtos {
internal_static_GetTableNamesRequest_fieldAccessorTable = new
com.google.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_GetTableNamesRequest_descriptor,
new java.lang.String[] { "Regex", "IncludeSysTables", });
new java.lang.String[] { "Regex", "IncludeSysTables", "Namespace", });
internal_static_GetTableNamesResponse_descriptor =
getDescriptor().getMessageTypes().get(73);
internal_static_GetTableNamesResponse_fieldAccessorTable = new

2
hbase-protocol/src/main/protobuf/Master.proto
View File

@ -315,6 +315,7 @@ message GetTableDescriptorsRequest {
repeated TableName table_names = 1;
optional string regex = 2;
optional bool include_sys_tables = 3 [default=false];
optional string namespace = 4;
}
message GetTableDescriptorsResponse {
@ -324,6 +325,7 @@ message GetTableDescriptorsResponse {
message GetTableNamesRequest {
optional string regex = 1;
optional bool include_sys_tables = 2 [default=false];
optional string namespace = 3;
}
message GetTableNamesResponse {

10
hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/BaseMasterAndRegionObserver.java
View File

@ -157,6 +157,16 @@ public abstract class BaseMasterAndRegionObserver extends BaseRegionObserver
NamespaceDescriptor ns) throws IOException {
}
@Override
public void preListNamespaceDescriptors(ObserverContext<MasterCoprocessorEnvironment> ctx,
List<NamespaceDescriptor> descriptors) throws IOException {
}
@Override
public void postListNamespaceDescriptors(ObserverContext<MasterCoprocessorEnvironment> ctx,
List<NamespaceDescriptor> descriptors) throws IOException {
}
@Override
public void preAddColumn(ObserverContext<MasterCoprocessorEnvironment> ctx,
TableName tableName, HColumnDescriptor column) throws IOException {

10
hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/BaseMasterObserver.java
View File

@ -150,6 +150,16 @@ public class BaseMasterObserver implements MasterObserver {
public void postModifyNamespace(ObserverContext<MasterCoprocessorEnvironment> ctx, NamespaceDescriptor ns) throws IOException {
}
@Override
public void preListNamespaceDescriptors(ObserverContext<MasterCoprocessorEnvironment> ctx,
List<NamespaceDescriptor> descriptors) throws IOException {
}
@Override
public void postListNamespaceDescriptors(ObserverContext<MasterCoprocessorEnvironment> ctx,
List<NamespaceDescriptor> descriptors) throws IOException {
}
@Override
public void preAddColumn(ObserverContext<MasterCoprocessorEnvironment> ctx,
TableName tableName, HColumnDescriptor column) throws IOException {

19
hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/MasterObserver.java
View File

@ -788,6 +788,25 @@ public interface MasterObserver extends Coprocessor {
void postModifyNamespace(final ObserverContext<MasterCoprocessorEnvironment> ctx,
NamespaceDescriptor ns) throws IOException;
/**
* Called before a listNamespaceDescriptors request has been processed.
* @param ctx the environment to interact with the framework and master
* @param descriptors an empty list, can be filled with what to return if bypassing
* @throws IOException
*/
void preListNamespaceDescriptors(ObserverContext<MasterCoprocessorEnvironment> ctx,
List<NamespaceDescriptor> descriptors) throws IOException;
/**
* Called after a listNamespaceDescriptors request has been processed.
* @param ctx the environment to interact with the framework and master
* @param descriptors the list of descriptors about to be returned
* @throws IOException
*/
void postListNamespaceDescriptors(ObserverContext<MasterCoprocessorEnvironment> ctx,
List<NamespaceDescriptor> descriptors) throws IOException;
/**
* Called before the table memstore is flushed to disk.
* @param ctx the environment to interact with the framework and master

49
hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
View File

@ -141,7 +141,6 @@ import org.mortbay.jetty.nio.SelectChannelConnector;
import org.mortbay.jetty.servlet.Context;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.protobuf.Descriptors;
import com.google.protobuf.Service;
@ -2058,34 +2057,45 @@ public class HMaster extends HRegionServer implements MasterServices, Server {
@Override
public List<NamespaceDescriptor> listNamespaceDescriptors() throws IOException {
checkNamespaceManagerReady();
return Lists.newArrayList(tableNamespaceManager.list());
final List<NamespaceDescriptor> descriptors = new ArrayList<NamespaceDescriptor>();
boolean bypass = false;
if (cpHost != null) {
bypass = cpHost.preListNamespaceDescriptors(descriptors);
}
if (!bypass) {
descriptors.addAll(tableNamespaceManager.list());
if (cpHost != null) {
cpHost.postListNamespaceDescriptors(descriptors);
}
}
return descriptors;
}
@Override
public List<HTableDescriptor> listTableDescriptorsByNamespace(String name) throws IOException {
getNamespaceDescriptor(name); // check that namespace exists
return Lists.newArrayList(tableDescriptors.getByNamespace(name).values());
return listTableDescriptors(name, null, null, true);
}
@Override
public List<TableName> listTableNamesByNamespace(String name) throws IOException {
List<TableName> tableNames = Lists.newArrayList();
getNamespaceDescriptor(name); // check that namespace exists
for (HTableDescriptor descriptor: tableDescriptors.getByNamespace(name).values()) {
tableNames.add(descriptor.getTableName());
}
return tableNames;
return listTableNames(name, null, true);
}
/**
* Returns the list of table descriptors that match the specified request
*
* @param namespace the namespace to query, or null if querying for all
* @param regex The regular expression to match against, or null if querying for all
* @param tableNameList the list of table names, or null if querying for all
* @param includeSysTables False to match only against userspace tables
* @return the list of table descriptors
*/
public List<HTableDescriptor> listTableDescriptors(final String regex,
public List<HTableDescriptor> listTableDescriptors(final String namespace, final String regex,
final List<TableName> tableNameList, final boolean includeSysTables)
throws IOException {
final List<HTableDescriptor> descriptors = new ArrayList<HTableDescriptor>();
@ -2100,7 +2110,13 @@ public class HMaster extends HRegionServer implements MasterServices, Server {
if (!bypass) {
if (tableNameList == null || tableNameList.size() == 0) {
// request for all TableDescriptors
Collection<HTableDescriptor> htds = tableDescriptors.getAll().values();
Collection<HTableDescriptor> htds;
if (namespace != null && namespace.length() > 0) {
htds = tableDescriptors.getByNamespace(namespace).values();
} else {
htds = tableDescriptors.getAll().values();
}
for (HTableDescriptor desc: htds) {
if (includeSysTables || !desc.getTableName().isSystemTable()) {
descriptors.add(desc);
@ -2132,11 +2148,12 @@ public class HMaster extends HRegionServer implements MasterServices, Server {
/**
* Returns the list of table names that match the specified request
* @param regex The regular expression to match against, or null if querying for all
* @param namespace the namespace to query, or null if querying for all
* @param includeSysTables False to match only against userspace tables
* @return the list of table names
*/
public List<TableName> listTableNames(final String regex, final boolean includeSysTables)
throws IOException {
public List<TableName> listTableNames(final String namespace, final String regex,
final boolean includeSysTables) throws IOException {
final List<HTableDescriptor> descriptors = new ArrayList<HTableDescriptor>();
boolean bypass = false;
@ -2146,7 +2163,13 @@ public class HMaster extends HRegionServer implements MasterServices, Server {
if (!bypass) {
// get all descriptors
Collection<HTableDescriptor> htds = tableDescriptors.getAll().values();
Collection<HTableDescriptor> htds;
if (namespace != null && namespace.length() > 0) {
htds = tableDescriptors.getByNamespace(namespace).values();
} else {
htds = tableDescriptors.getAll().values();
}
for (HTableDescriptor htd: htds) {
if (includeSysTables || !htd.getTableName().isSystemTable()) {
descriptors.add(htd);

22
hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterCoprocessorHost.java
View File

@ -139,6 +139,28 @@ public class MasterCoprocessorHost
});
}
public boolean preListNamespaceDescriptors(final List<NamespaceDescriptor> descriptors)
throws IOException {
return execOperation(coprocessors.isEmpty() ? null : new CoprocessorOperation() {
@Override
public void call(MasterObserver oserver, ObserverContext<MasterCoprocessorEnvironment> ctx)
throws IOException {
oserver.preListNamespaceDescriptors(ctx, descriptors);
}
});
}
public void postListNamespaceDescriptors(final List<NamespaceDescriptor> descriptors)
throws IOException {
execOperation(coprocessors.isEmpty() ? null : new CoprocessorOperation() {
@Override
public void call(MasterObserver oserver, ObserverContext<MasterCoprocessorEnvironment> ctx)
throws IOException {
oserver.postListNamespaceDescriptors(ctx, descriptors);
}
});
}
/* Implementation of hooks for invoking MasterObservers */
public void preCreateTable(final HTableDescriptor htd, final HRegionInfo[] regions)

9
hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java
View File

@ -776,6 +776,7 @@ public class MasterRpcServices extends RSRpcServices
master.checkInitialized();
final String regex = req.hasRegex() ? req.getRegex() : null;
final String namespace = req.hasNamespace() ? req.getNamespace() : null;
List<TableName> tableNameList = null;
if (req.getTableNamesCount() > 0) {
tableNameList = new ArrayList<TableName>(req.getTableNamesCount());
@ -784,8 +785,8 @@ public class MasterRpcServices extends RSRpcServices
}
}
List<HTableDescriptor> descriptors = master.listTableDescriptors(regex, tableNameList,
req.getIncludeSysTables());
List<HTableDescriptor> descriptors = master.listTableDescriptors(namespace, regex,
tableNameList, req.getIncludeSysTables());
GetTableDescriptorsResponse.Builder builder = GetTableDescriptorsResponse.newBuilder();
if (descriptors != null && descriptors.size() > 0) {
@ -814,7 +815,9 @@ public class MasterRpcServices extends RSRpcServices
master.checkInitialized();
final String regex = req.hasRegex() ? req.getRegex() : null;
List<TableName> tableNames = master.listTableNames(regex, req.getIncludeSysTables());
final String namespace = req.hasNamespace() ? req.getNamespace() : null;
List<TableName> tableNames = master.listTableNames(namespace, regex,
req.getIncludeSysTables());
GetTableNamesResponse.Builder builder = GetTableNamesResponse.newBuilder();
if (tableNames != null && tableNames.size() > 0) {

16
hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java
View File

@ -1184,6 +1184,22 @@ public class AccessController extends BaseMasterAndRegionObserver
requireGlobalPermission("modifyNamespace", Action.ADMIN, ns.getName());
}
@Override
public void postListNamespaceDescriptors(ObserverContext<MasterCoprocessorEnvironment> ctx,
List<NamespaceDescriptor> descriptors) throws IOException {
// Retains only those which passes authorization checks, as the checks weren't done as part
// of preGetTableDescriptors.
Iterator<NamespaceDescriptor> itr = descriptors.iterator();
while (itr.hasNext()) {
NamespaceDescriptor desc = itr.next();
try {
requireGlobalPermission("listNamespaces", Action.ADMIN, desc.getName());
} catch (AccessDeniedException e) {
itr.remove();
}
}
}
@Override
public void preTableFlush(final ObserverContext<MasterCoprocessorEnvironment> ctx,
final TableName tableName) throws IOException {

43
hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterObserver.java
View File

@ -91,6 +91,8 @@ public class TestMasterObserver {
private boolean postDeleteNamespaceCalled;
private boolean preModifyNamespaceCalled;
private boolean postModifyNamespaceCalled;
private boolean preListNamespaceDescriptorsCalled;
private boolean postListNamespaceDescriptorsCalled;
private boolean preAddColumnCalled;
private boolean postAddColumnCalled;
private boolean preModifyColumnCalled;
@ -169,6 +171,8 @@ public class TestMasterObserver {
postDeleteNamespaceCalled = false;
preModifyNamespaceCalled = false;
postModifyNamespaceCalled = false;
preListNamespaceDescriptorsCalled = false;
postListNamespaceDescriptorsCalled = false;
preAddColumnCalled = false;
postAddColumnCalled = false;
preModifyColumnCalled = false;
@ -388,6 +392,29 @@ public class TestMasterObserver {
return preModifyNamespaceCalled && !postModifyNamespaceCalled;
}
@Override
public void preListNamespaceDescriptors(ObserverContext<MasterCoprocessorEnvironment> env,
List<NamespaceDescriptor> descriptors) throws IOException {
if (bypass) {
env.bypass();
}
preListNamespaceDescriptorsCalled = true;
}
@Override
public void postListNamespaceDescriptors(ObserverContext<MasterCoprocessorEnvironment> env,
List<NamespaceDescriptor> descriptors) throws IOException {
postListNamespaceDescriptorsCalled = true;
}
public boolean wasListNamespaceDescriptorsCalled() {
return preListNamespaceDescriptorsCalled && postListNamespaceDescriptorsCalled;
}
public boolean preListNamespaceDescriptorsCalledOnly() {
return preListNamespaceDescriptorsCalled && !postListNamespaceDescriptorsCalled;
}
@Override
public void preAddColumn(ObserverContext<MasterCoprocessorEnvironment> env,
TableName tableName, HColumnDescriptor column) throws IOException {
@ -1361,6 +1388,22 @@ public class TestMasterObserver {
admin.createNamespace(NamespaceDescriptor.create(testNamespace).build());
assertTrue("Test namespace should not be created", cp.preCreateNamespaceCalledOnly());
// turn on bypass, run the test
cp.enableBypass(true);
cp.resetStates();
admin.listNamespaceDescriptors();
assertTrue("post listNamespace should not have been called",
cp.preListNamespaceDescriptorsCalledOnly());
// turn off bypass, run the tests again
cp.enableBypass(false);
cp.resetStates();
admin.listNamespaceDescriptors();
assertTrue("post listNamespace should have been called",
cp.wasListNamespaceDescriptorsCalled());
}
private void modifyTableSync(Admin admin, TableName tableName, HTableDescriptor htd)

29
hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestNamespaceCommands.java
View File

@ -21,6 +21,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import java.util.List;
import java.util.Arrays;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HBaseTestingUtility;
@ -30,6 +31,9 @@ import org.apache.hadoop.hbase.HTableDescriptor;
import org.apache.hadoop.hbase.NamespaceDescriptor;
import org.apache.hadoop.hbase.testclassification.MediumTests;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.Admin;
import org.apache.hadoop.hbase.client.Connection;
import org.apache.hadoop.hbase.client.ConnectionFactory;
import org.apache.hadoop.hbase.client.Get;
import org.apache.hadoop.hbase.client.HTable;
import org.apache.hadoop.hbase.client.Result;
@ -186,6 +190,31 @@ public class TestNamespaceCommands extends SecureTestUtil {
verifyDenied(deleteNamespace, USER_NSP_WRITE, USER_CREATE, USER_RW);
}
@Test
public void testListNamespaces() throws Exception {
AccessTestAction listAction = new AccessTestAction() {
@Override
public Object run() throws Exception {
Connection unmanagedConnection =
ConnectionFactory.createConnection(UTIL.getConfiguration());
Admin admin = unmanagedConnection.getAdmin();
try {
return Arrays.asList(admin.listNamespaceDescriptors());
} finally {
admin.close();
unmanagedConnection.close();
}
}
};
verifyAllowed(listAction, SUPERUSER, USER_NSP_ADMIN);
verifyDenied(listAction, USER_NSP_WRITE, USER_CREATE, USER_RW);
// we have 3 namespaces: [default, hbase, TEST_NAMESPACE, TEST_NAMESPACE2]
assertEquals(4, ((List)SUPERUSER.runAs(listAction)).size());
assertEquals(2, ((List)USER_NSP_ADMIN.runAs(listAction)).size());
}
@Test
public void testGrantRevoke() throws Exception{
final String testUser = "testUser";