You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by jx...@apache.org on 2013/08/21 01:53:12 UTC
svn commit: r1516039 - in /hbase/trunk:
hbase-client/src/main/java/org/apache/hadoop/hbase/
hbase-client/src/main/java/org/apache/hadoop/hbase/client/
hbase-client/src/main/java/org/apache/hadoop/hbase/snapshot/
hbase-server/src/main/java/org/apache/ha...
Author: jxiang
Date: Tue Aug 20 23:53:11 2013
New Revision: 1516039
URL: http://svn.apache.org/r1516039
Log:
HBASE-9273 Consolidate isSystemTable checking
Modified:
hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/HTableDescriptor.java
hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java
hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/snapshot/ClientSnapshotDescriptionUtils.java
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionCoprocessorHost.java
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/model/TableRegionModel.java
hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java
hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java
hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java
Modified: hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/HTableDescriptor.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/HTableDescriptor.java?rev=1516039&r1=1516038&r2=1516039&view=diff
==============================================================================
--- hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/HTableDescriptor.java (original)
+++ hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/HTableDescriptor.java Tue Aug 20 23:53:11 2013
@@ -430,18 +430,6 @@ public class HTableDescriptor implements
}
/**
- * Checks of the tableName being passed is a system table
- *
- *
- * @return true if a tableName is a member of the system
- * namesapce (aka hbase)
- */
- public static boolean isSystemTable(final TableName tableName) {
- return tableName.getNamespaceAsString()
- .equals(NamespaceDescriptor.SYSTEM_NAMESPACE_NAME_STR);
- }
-
- /**
* Getter for accessing the metadata associated with the key
*
* @param key The key.
Modified: hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java?rev=1516039&r1=1516038&r2=1516039&view=diff
==============================================================================
--- hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java (original)
+++ hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java Tue Aug 20 23:53:11 2013
@@ -304,7 +304,7 @@ public class HTable implements HTableInt
*/
private void finishSetup() throws IOException {
this.connection.locateRegion(tableName, HConstants.EMPTY_START_ROW);
- this.operationTimeout = HTableDescriptor.isSystemTable(tableName) ?
+ this.operationTimeout = tableName.isSystemTable() ?
this.configuration.getInt(HConstants.HBASE_CLIENT_META_OPERATION_TIMEOUT,
HConstants.DEFAULT_HBASE_CLIENT_OPERATION_TIMEOUT):
this.configuration.getInt(HConstants.HBASE_CLIENT_OPERATION_TIMEOUT,
Modified: hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/snapshot/ClientSnapshotDescriptionUtils.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/snapshot/ClientSnapshotDescriptionUtils.java?rev=1516039&r1=1516038&r2=1516039&view=diff
==============================================================================
--- hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/snapshot/ClientSnapshotDescriptionUtils.java (original)
+++ hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/snapshot/ClientSnapshotDescriptionUtils.java Tue Aug 20 23:53:11 2013
@@ -21,8 +21,6 @@ package org.apache.hadoop.hbase.snapshot
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.hbase.TableName;
-import org.apache.hadoop.hbase.HTableDescriptor;
-import org.apache.hadoop.hbase.protobuf.ProtobufUtil;
import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos;
import org.apache.hadoop.hbase.util.Bytes;
@@ -46,7 +44,7 @@ public class ClientSnapshotDescriptionUt
// make sure the table name is valid, this will implicitly check validity
TableName tableName = TableName.valueOf(snapshot.getTable());
- if (HTableDescriptor.isSystemTable(tableName)) {
+ if (tableName.isSystemTable()) {
throw new IllegalArgumentException("System table snapshots are not allowed");
}
}
Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java?rev=1516039&r1=1516038&r2=1516039&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java Tue Aug 20 23:53:11 2013
@@ -47,7 +47,6 @@ import org.apache.hadoop.conf.Configurat
import org.apache.hadoop.hbase.Chore;
import org.apache.hadoop.hbase.HBaseIOException;
import org.apache.hadoop.hbase.TableName;
-import org.apache.hadoop.hbase.HTableDescriptor;
import org.apache.hadoop.hbase.exceptions.DeserializationException;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.HRegionInfo;
@@ -453,7 +452,7 @@ public class AssignmentManager extends Z
// its a clean cluster startup, else its a failover.
Map<HRegionInfo, ServerName> regions = regionStates.getRegionAssignments();
for (Map.Entry<HRegionInfo, ServerName> e: regions.entrySet()) {
- if (!HTableDescriptor.isSystemTable(e.getKey().getTableName())
+ if (!e.getKey().getTableName().isSystemTable()
&& e.getValue() != null) {
LOG.debug("Found " + e + " out on cluster");
failover = true;
@@ -2575,7 +2574,7 @@ public class AssignmentManager extends Z
//remove system tables because they would have been assigned earlier
for(Iterator<HRegionInfo> iter = allRegions.keySet().iterator();
iter.hasNext();) {
- if (HTableDescriptor.isSystemTable(iter.next().getTableName())) {
+ if (iter.next().getTableName().isSystemTable()) {
iter.remove();
}
}
Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java?rev=1516039&r1=1516038&r2=1516039&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java Tue Aug 20 23:53:11 2013
@@ -1045,7 +1045,7 @@ MasterServices, Server {
MetaReader.fullScan(catalogTracker, disabledOrDisablingOrEnabling, true);
for(Iterator<HRegionInfo> iter = allRegions.keySet().iterator();
iter.hasNext();) {
- if (!HTableDescriptor.isSystemTable(iter.next().getTableName())) {
+ if (!iter.next().getTableName().isSystemTable()) {
iter.remove();
}
}
@@ -2601,7 +2601,7 @@ MasterServices, Server {
}
if (descriptorMap != null) {
for(HTableDescriptor desc: descriptorMap.values()) {
- if(!HTableDescriptor.isSystemTable(desc.getTableName())) {
+ if(!desc.getTableName().isSystemTable()) {
descriptors.add(desc);
}
}
Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionCoprocessorHost.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionCoprocessorHost.java?rev=1516039&r1=1516038&r2=1516039&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionCoprocessorHost.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionCoprocessorHost.java Tue Aug 20 23:53:11 2013
@@ -39,7 +39,6 @@ import org.apache.hadoop.hbase.Coprocess
import org.apache.hadoop.hbase.HBaseConfiguration;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.HRegionInfo;
-import org.apache.hadoop.hbase.HTableDescriptor;
import org.apache.hadoop.hbase.KeyValue;
import org.apache.hadoop.hbase.client.Append;
import org.apache.hadoop.hbase.client.Delete;
@@ -147,7 +146,7 @@ public class RegionCoprocessorHost
loadSystemCoprocessors(conf, REGION_COPROCESSOR_CONF_KEY);
// load system default cp's for user tables from configuration.
- if (!HTableDescriptor.isSystemTable(region.getRegionInfo().getTableName())) {
+ if (!region.getRegionInfo().getTableName().isSystemTable()) {
loadSystemCoprocessors(conf, USER_REGION_COPROCESSOR_CONF_KEY);
}
Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/model/TableRegionModel.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/model/TableRegionModel.java?rev=1516039&r1=1516038&r2=1516039&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/model/TableRegionModel.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/model/TableRegionModel.java Tue Aug 20 23:53:11 2013
@@ -27,7 +27,6 @@ import javax.xml.bind.annotation.XmlRoot
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.HRegionInfo;
-import org.apache.hadoop.hbase.HTableDescriptor;
import org.apache.hadoop.hbase.util.Bytes;
/**
@@ -96,10 +95,9 @@ public class TableRegionModel implements
@XmlAttribute
public String getName() {
byte [] tableNameAsBytes = Bytes.toBytes(this.table);
+ TableName tableName = TableName.valueOf(tableNameAsBytes);
byte [] nameAsBytes = HRegionInfo.createRegionName(
- TableName.valueOf(tableNameAsBytes),
- this.startKey, this.id,
- !HTableDescriptor.isSystemTable(TableName.valueOf(tableNameAsBytes)));
+ tableName, this.startKey, this.id, !tableName.isSystemTable());
return Bytes.toString(nameAsBytes);
}
Modified: hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java?rev=1516039&r1=1516038&r2=1516039&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java (original)
+++ hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java Tue Aug 20 23:53:11 2013
@@ -1325,7 +1325,7 @@ public class TestAdmin {
HRegionServer rs = TEST_UTIL.getRSForFirstRegionInTable(TABLENAME);
List<HRegionInfo> onlineRegions = ProtobufUtil.getOnlineRegions(rs);
for (HRegionInfo regionInfo : onlineRegions) {
- if (!HTableDescriptor.isSystemTable(regionInfo.getTableName())) {
+ if (!regionInfo.getTableName().isSystemTable()) {
info = regionInfo;
admin.closeRegionWithEncodedRegionName(regionInfo.getEncodedName(), rs
.getServerName().getServerName());
Modified: hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java?rev=1516039&r1=1516038&r2=1516039&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java (original)
+++ hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java Tue Aug 20 23:53:11 2013
@@ -1121,7 +1121,7 @@ public class TestDistributedLogSplitting
HRegionServer hrs = rst.getRegionServer();
List<HRegionInfo> hris = ProtobufUtil.getOnlineRegions(hrs);
for (HRegionInfo hri : hris) {
- if (HTableDescriptor.isSystemTable(hri.getTableName())) {
+ if (hri.getTableName().isSystemTable()) {
continue;
}
LOG.debug("adding data to rs = " + rst.getName() +
@@ -1146,7 +1146,7 @@ public class TestDistributedLogSplitting
for(Iterator<HRegionInfo> iter = regions.iterator(); iter.hasNext(); ) {
HRegionInfo regionInfo = iter.next();
- if(HTableDescriptor.isSystemTable(regionInfo.getTableName())) {
+ if(regionInfo.getTableName().isSystemTable()) {
iter.remove();
}
}
Modified: hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java?rev=1516039&r1=1516038&r2=1516039&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java (original)
+++ hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java Tue Aug 20 23:53:11 2013
@@ -1868,8 +1868,7 @@ public class TestHBaseFsck {
@Override
public boolean processRow(Result rowResult) throws IOException {
- if(!HTableDescriptor.isSystemTable(MetaScanner.getHRegionInfo(rowResult)
- .getTableName())) {
+ if(!MetaScanner.getHRegionInfo(rowResult).getTableName().isSystemTable()) {
Delete delete = new Delete(rowResult.getRow());
delete.deleteColumn(HConstants.CATALOG_FAMILY, HConstants.REGIONINFO_QUALIFIER);
deletes.add(delete);