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 2013/09/14 01:18:09 UTC
svn commit: r1523142 [1/2] - in /hbase/branches/0.96:
hbase-client/src/main/java/org/apache/hadoop/hbase/
hbase-client/src/main/java/org/apache/hadoop/hbase/catalog/
hbase-client/src/main/java/org/apache/hadoop/hbase/client/
hbase-client/src/main/java/...
Author: stack
Date: Fri Sep 13 23:18:07 2013
New Revision: 1523142
URL: http://svn.apache.org/r1523142
Log:
HBASE-9508 Restore some API mistakenly removed in client, mapred*, and common
Modified:
hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/HRegionInfo.java
hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/HTableDescriptor.java
hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/catalog/MetaReader.java
hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java
hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java
hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java
hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java
hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTableInterface.java
hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTableMultiplexer.java
hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTablePool.java
hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/client/MetaScanner.java
hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ScannerCallable.java
hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java
hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/security/access/TablePermission.java
hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/security/access/UserPermission.java
hbase/branches/0.96/hbase-common/src/main/java/org/apache/hadoop/hbase/TableName.java
hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/HFileArchiver.java
hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/CoprocessorHost.java
hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/io/HFileLink.java
hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableSplit.java
hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.java
hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableSplit.java
hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java
hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterFileSystem.java
hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionStates.java
hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/SnapshotOfRegionAssignmentFromMeta.java
hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.java
hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/FavoredNodeLoadBalancer.java
hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/RegionLocationFinder.java
hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/ClosedRegionHandler.java
hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/EnableTableHandler.java
hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/OpenedRegionHandler.java
hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/ServerShutdownHandler.java
hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java
hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionCoprocessorHost.java
hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.java
hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/SplitTransaction.java
hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogSplitter.java
hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/client/RemoteHTable.java
hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessControlLists.java
hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java
hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java
hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HMerge.java
hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java
hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMetaScanner.java
hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/SampleRegionWALObserver.java
hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionObserverInterface.java
hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionServerCoprocessorExceptionWithAbort.java
hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionServerCoprocessorExceptionWithRemove.java
hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestWALObserver.java
hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestLoadIncrementalHFilesSplitRecovery.java
hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManager.java
hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestCatalogJanitor.java
hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java
hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterTransitions.java
hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRegionPlacement.java
hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestZKBasedOpenCloseRegion.java
hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEndToEndSplitTransaction.java
hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionFileSystem.java
hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionInfo.java
hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.java
hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerNoMaster.java
hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java
hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFile.java
hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/HLogPerformanceEvaluation.java
hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestTablePermissions.java
hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestExportSnapshot.java
hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestRestoreSnapshotHelper.java
hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java
hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/util/hbck/OfflineMetaRebuildTestCore.java
Modified: hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/HRegionInfo.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/HRegionInfo.java?rev=1523142&r1=1523141&r2=1523142&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/HRegionInfo.java (original)
+++ hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/HRegionInfo.java Fri Sep 13 23:18:07 2013
@@ -402,8 +402,10 @@ public class HRegionInfo implements Comp
* Gets the table name from the specified region name.
* @param regionName
* @return Table name.
+ * @deprecated Since 0.96.0; use #getTable(byte[])
*/
- public static TableName getTableName(byte[] regionName) {
+ @Deprecated
+ public static byte [] getTableName(byte[] regionName) {
int offset = -1;
for (int i = 0; i < regionName.length; i++) {
if (regionName[i] == HConstants.DELIMITER) {
@@ -413,7 +415,18 @@ public class HRegionInfo implements Comp
}
byte[] buff = new byte[offset];
System.arraycopy(regionName, 0, buff, 0, offset);
- return TableName.valueOf(buff);
+ return buff;
+ }
+
+ /**
+ * Gets the table name from the specified region name.
+ * Like {@link #getTableName(byte[])} only returns a {@link TableName} rather than a byte array.
+ * @param regionName
+ * @return Table name
+ * @see #getTableName(byte[])
+ */
+ public static TableName getTable(final byte [] regionName) {
+ return TableName.valueOf(getTableName(regionName));
}
/**
@@ -523,12 +536,26 @@ public class HRegionInfo implements Comp
/**
* Get current table name of the region
* @return byte array of table name
+ * @deprecated Since 0.96.0; use #getTable()
+ */
+ @Deprecated
+ public byte [] getTableName() {
+ return getTable().toBytes();
+ }
+
+ /**
+ * Get current table name of the region
+ * @return TableName
+ * @see #getTableName()
*/
- public TableName getTableName() {
+ public TableName getTable() {
+ // This method name should be getTableName but there was already a method getTableName
+ // that returned a byte array. It is unfortunate given everwhere else, getTableName returns
+ // a TableName instance.
if (tableName == null || tableName.getName().length == 0) {
- tableName = getTableName(getRegionName());
+ tableName = getTable(getRegionName());
}
- return tableName;
+ return this.tableName;
}
/**
@@ -570,7 +597,7 @@ public class HRegionInfo implements Comp
/** @return true if this region is a meta region */
public boolean isMetaRegion() {
- return tableName.equals(HRegionInfo.FIRST_META_REGIONINFO.getTableName());
+ return tableName.equals(HRegionInfo.FIRST_META_REGIONINFO.getTable());
}
/**
@@ -813,7 +840,7 @@ public class HRegionInfo implements Comp
public static RegionInfo convert(final HRegionInfo info) {
if (info == null) return null;
RegionInfo.Builder builder = RegionInfo.newBuilder();
- builder.setTableName(ProtobufUtil.toProtoTableName(info.getTableName()));
+ builder.setTableName(ProtobufUtil.toProtoTableName(info.getTable()));
builder.setRegionId(info.getRegionId());
if (info.getStartKey() != null) {
builder.setStartKey(ByteString.copyFrom(info.getStartKey()));
Modified: hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/HTableDescriptor.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/HTableDescriptor.java?rev=1523142&r1=1523141&r2=1523142&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/HTableDescriptor.java (original)
+++ hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/HTableDescriptor.java Fri Sep 13 23:18:07 2013
@@ -546,6 +546,16 @@ public class HTableDescriptor implements
}
/**
+ * Remove metadata represented by the key from the {@link #values} map
+ *
+ * @param key Key whose key and value we're to remove from HTableDescriptor
+ * parameters.
+ */
+ public void remove(final byte [] key) {
+ remove(new ImmutableBytesWritable(key));
+ }
+
+ /**
* Check if the readOnly flag of the table is set. If the readOnly flag is
* set then the contents of the table can only be read from but not modified.
*
Modified: hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/catalog/MetaReader.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/catalog/MetaReader.java?rev=1523142&r1=1523141&r2=1523142&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/catalog/MetaReader.java (original)
+++ hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/catalog/MetaReader.java Fri Sep 13 23:18:07 2013
@@ -103,9 +103,9 @@ public class MetaReader {
Pair<HRegionInfo, ServerName> region = HRegionInfo.getHRegionInfoAndServerName(r);
HRegionInfo hri = region.getFirst();
if (hri == null) return true;
- if (hri.getTableName() == null) return true;
+ if (hri.getTable() == null) return true;
if (disabledTables.contains(
- hri.getTableName())) return true;
+ hri.getTable())) return true;
// Are we to include split parents in the list?
if (excludeOfflinedSplitParents && hri.isSplitParent()) return true;
regions.put(hri, region.getSecond());
@@ -362,7 +362,7 @@ public class MetaReader {
* <code>tableName</code>
*/
static boolean isInsideTable(final HRegionInfo current, final TableName tableName) {
- return tableName.equals(current.getTableName());
+ return tableName.equals(current.getTable());
}
/**
Modified: hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java?rev=1523142&r1=1523141&r2=1523142&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java (original)
+++ hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java Fri Sep 13 23:18:07 2013
@@ -85,6 +85,15 @@ public class ClientScanner extends Abstr
this(conf, scan, tableName, HConnectionManager.getConnection(conf));
}
+ /**
+ * @deprecated Use {@link #ClientScanner(Configuration, Scan, TableName)}
+ */
+ @Deprecated
+ public ClientScanner(final Configuration conf, final Scan scan,
+ final byte [] tableName) throws IOException {
+ this(conf, scan, TableName.valueOf(tableName));
+ }
+
/**
* Create a new ClientScanner for the specified table
@@ -102,6 +111,15 @@ public class ClientScanner extends Abstr
}
/**
+ * @deprecated Use {@link #ClientScanner(Configuration, Scan, TableName, HConnection)}
+ */
+ @Deprecated
+ public ClientScanner(final Configuration conf, final Scan scan, final byte [] tableName,
+ HConnection connection) throws IOException {
+ this(conf, scan, TableName.valueOf(tableName), connection, new RpcRetryingCallerFactory(conf));
+ }
+
+ /**
* Create a new ClientScanner for the specified table Note that the passed {@link Scan}'s start
* row maybe changed changed.
* @param conf The {@link Configuration} to use.
@@ -158,7 +176,16 @@ public class ClientScanner extends Abstr
return this.connection;
}
- protected TableName getTableName() {
+ /**
+ * @return Table name
+ * @deprecated Since 0.96.0; use {@link #getTable()}
+ */
+ @Deprecated
+ protected byte [] getTableName() {
+ return this.tableName.getName();
+ }
+
+ protected TableName getTable() {
return this.tableName;
}
@@ -253,7 +280,7 @@ public class ClientScanner extends Abstr
int nbRows) {
scan.setStartRow(localStartKey);
ScannerCallable s = new ScannerCallable(getConnection(),
- getTableName(), scan, this.scanMetrics);
+ getTable(), scan, this.scanMetrics);
s.setCaching(nbRows);
return s;
}
Modified: hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java?rev=1523142&r1=1523141&r2=1523142&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java (original)
+++ hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java Fri Sep 13 23:18:07 2013
@@ -494,7 +494,7 @@ public class HBaseAdmin implements Abort
LOG.warn("No serialized HRegionInfo in " + rowResult);
return true;
}
- if (!info.getTableName().equals(desc.getTableName())) {
+ if (!info.getTable().equals(desc.getTableName())) {
return false;
}
ServerName serverName = HRegionInfo.getServerName(rowResult);
Modified: hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java?rev=1523142&r1=1523141&r2=1523142&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java (original)
+++ hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java Fri Sep 13 23:18:07 2013
@@ -926,15 +926,14 @@ public class HConnectionManager {
public boolean processRow(Result row) throws IOException {
HRegionInfo info = MetaScanner.getHRegionInfo(row);
if (info != null && !info.isSplitParent()) {
- if (tableName.equals(info.getTableName())) {
+ if (tableName.equals(info.getTable())) {
ServerName server = HRegionInfo.getServerName(row);
if (server == null) {
available.set(false);
return false;
}
regionCount.incrementAndGet();
- } else if (tableName.compareTo(
- info.getTableName()) < 0) {
+ } else if (tableName.compareTo(info.getTable()) < 0) {
// Return if we are done with the current table
return false;
}
@@ -961,7 +960,7 @@ public class HConnectionManager {
public boolean processRow(Result row) throws IOException {
HRegionInfo info = MetaScanner.getHRegionInfo(row);
if (info != null && !info.isSplitParent()) {
- if (tableName.equals(info.getTableName())) {
+ if (tableName.equals(info.getTable())) {
ServerName server = HRegionInfo.getServerName(row);
if (server == null) {
available.set(false);
@@ -979,7 +978,7 @@ public class HConnectionManager {
// Always empty start row should be counted
regionCount.incrementAndGet();
}
- } else if (tableName.compareTo(info.getTableName()) < 0) {
+ } else if (tableName.compareTo(info.getTable()) < 0) {
// Return if we are done with the current table
return false;
}
@@ -1000,7 +999,7 @@ public class HConnectionManager {
@Override
public HRegionLocation locateRegion(final byte[] regionName) throws IOException {
- return locateRegion(HRegionInfo.getTableName(regionName),
+ return locateRegion(HRegionInfo.getTable(regionName),
HRegionInfo.getStartKey(regionName), false, true);
}
@@ -1113,7 +1112,7 @@ public class HConnectionManager {
}
// possible we got a region of a different table...
- if (!regionInfo.getTableName().equals(tableName)) {
+ if (!regionInfo.getTable().equals(tableName)) {
return false; // stop scanning
}
if (regionInfo.isOffline()) {
@@ -1226,10 +1225,10 @@ public class HConnectionManager {
}
// possible we got a region of a different table...
- if (!regionInfo.getTableName().equals(tableName)) {
+ if (!regionInfo.getTable().equals(tableName)) {
throw new TableNotFoundException(
"Table '" + tableName + "' was not found, got: " +
- regionInfo.getTableName() + ".");
+ regionInfo.getTable() + ".");
}
if (regionInfo.isSplit()) {
throw new RegionOfflineException("the only available region for" +
@@ -2306,7 +2305,7 @@ public class HConnectionManager {
ServerName serverName, long seqNum) {
HRegionLocation newHrl = new HRegionLocation(hri, serverName, seqNum);
synchronized (this.cachedRegionLocations) {
- cacheLocation(hri.getTableName(), source, newHrl);
+ cacheLocation(hri.getTable(), source, newHrl);
}
}
@@ -2320,7 +2319,7 @@ public class HConnectionManager {
HRegionLocation oldLocation;
synchronized (this.cachedRegionLocations) {
Map<byte[], HRegionLocation> tableLocations =
- getTableLocations(hri.getTableName());
+ getTableLocations(hri.getTable());
oldLocation = tableLocations.get(hri.getStartKey());
if (oldLocation != null) {
// Do not delete the cache entry if it's not for the same server that gave us the error.
@@ -2338,7 +2337,7 @@ public class HConnectionManager {
return;
}
synchronized (this.cachedRegionLocations) {
- TableName tableName = location.getRegionInfo().getTableName();
+ TableName tableName = location.getRegionInfo().getTable();
Map<byte[], HRegionLocation> tableLocations =
getTableLocations(tableName);
if (!tableLocations.isEmpty()) {
Modified: hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java?rev=1523142&r1=1523141&r2=1523142&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java (original)
+++ hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java Fri Sep 13 23:18:07 2013
@@ -1007,6 +1007,18 @@ public class HTable implements HTableInt
}
/**
+ * @deprecated Use {@link #incrementColumnValue(byte[], byte[], byte[], long, Durability)}
+ */
+ @Deprecated
+ @Override
+ public long incrementColumnValue(final byte [] row, final byte [] family,
+ final byte [] qualifier, final long amount, final boolean writeToWAL)
+ throws IOException {
+ return incrementColumnValue(row, family, qualifier, amount,
+ writeToWAL? Durability.SKIP_WAL: Durability.USE_DEFAULT);
+ }
+
+ /**
* {@inheritDoc}
*/
@Override
Modified: hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTableInterface.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTableInterface.java?rev=1523142&r1=1523141&r2=1523142&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTableInterface.java (original)
+++ hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTableInterface.java Fri Sep 13 23:18:07 2013
@@ -20,6 +20,7 @@ package org.apache.hadoop.hbase.client;
import com.google.protobuf.Service;
import com.google.protobuf.ServiceException;
+
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.conf.Configuration;
@@ -385,6 +386,14 @@ public interface HTableInterface extends
long amount, Durability durability) throws IOException;
/**
+ * @deprecated Use {@link #incrementColumnValue(byte[], byte[], byte[], long, Durability)}
+ */
+ @Deprecated
+ long incrementColumnValue(final byte [] row, final byte [] family,
+ final byte [] qualifier, final long amount, final boolean writeToWAL)
+ throws IOException;
+
+ /**
* Tells whether or not 'auto-flush' is turned on.
*
* @return {@code true} if 'auto-flush' is enabled (default), meaning
Modified: hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTableMultiplexer.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTableMultiplexer.java?rev=1523142&r1=1523141&r2=1523142&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTableMultiplexer.java (original)
+++ hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTableMultiplexer.java Fri Sep 13 23:18:07 2013
@@ -19,19 +19,6 @@
*/
package org.apache.hadoop.hbase.client;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hbase.HConstants;
-import org.apache.hadoop.hbase.TableName;
-import org.apache.hadoop.hbase.HRegionInfo;
-import org.apache.hadoop.hbase.HRegionLocation;
-import org.apache.hadoop.hbase.ZooKeeperConnectionException;
-import org.apache.hadoop.hbase.util.Bytes;
-import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;
-
import java.io.IOException;
import java.util.AbstractMap.SimpleEntry;
import java.util.ArrayList;
@@ -46,6 +33,18 @@ import java.util.concurrent.LinkedBlocki
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hbase.HConstants;
+import org.apache.hadoop.hbase.HRegionInfo;
+import org.apache.hadoop.hbase.HRegionLocation;
+import org.apache.hadoop.hbase.TableName;
+import org.apache.hadoop.hbase.ZooKeeperConnectionException;
+import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;
+
/**
* HTableMultiplexer provides a thread-safe non blocking PUT API across all the tables.
* Each put will be sharded into different buffer queues based on its destination region server.
@@ -450,7 +449,7 @@ public class HTableMultiplexer {
HRegionLocation oldLoc) throws IOException {
Put failedPut = failedPutStatus.getPut();
// The currentPut is failed. So get the table name for the currentPut.
- TableName tableName = failedPutStatus.getRegionInfo().getTableName();
+ TableName tableName = failedPutStatus.getRegionInfo().getTable();
// Decrease the retry count
int retryCount = failedPutStatus.getRetryCount() - 1;
Modified: hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTablePool.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTablePool.java?rev=1523142&r1=1523141&r2=1523142&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTablePool.java (original)
+++ hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTablePool.java Fri Sep 13 23:18:07 2013
@@ -600,5 +600,11 @@ public class HTablePool implements Close
throw new IllegalStateException("Table=" + new String(table.getTableName()) + " already closed");
}
}
+
+ @Override
+ public long incrementColumnValue(byte[] row, byte[] family,
+ byte[] qualifier, long amount, boolean writeToWAL) throws IOException {
+ return table.incrementColumnValue(row, family, qualifier, amount, writeToWAL);
+ }
}
}
Modified: hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/client/MetaScanner.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/client/MetaScanner.java?rev=1523142&r1=1523141&r2=1523142&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/client/MetaScanner.java (original)
+++ hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/client/MetaScanner.java Fri Sep 13 23:18:07 2013
@@ -355,7 +355,7 @@ public class MetaScanner {
if (info == null) {
return true;
}
- if (!(info.getTableName().equals(tableName))) {
+ if (!(info.getTable().equals(tableName))) {
return false;
}
return super.processRow(rowResult);
Modified: hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ScannerCallable.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ScannerCallable.java?rev=1523142&r1=1523141&r2=1523142&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ScannerCallable.java (original)
+++ hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ScannerCallable.java Fri Sep 13 23:18:07 2013
@@ -102,6 +102,15 @@ public class ScannerCallable extends Reg
}
/**
+ * @deprecated Use {@link #ScannerCallable(HConnection, TableName, Scan, ScanMetrics)}
+ */
+ @Deprecated
+ public ScannerCallable (HConnection connection, final byte [] tableName, Scan scan,
+ ScanMetrics scanMetrics) {
+ this(connection, TableName.valueOf(tableName), scan, scanMetrics);
+ }
+
+ /**
* @param reload force reload of server location
* @throws IOException
*/
Modified: hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java?rev=1523142&r1=1523141&r2=1523142&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java (original)
+++ hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java Fri Sep 13 23:18:07 2013
@@ -1645,7 +1645,7 @@ public final class ProtobufUtil {
AccessControlProtos.TablePermission.Builder builder =
AccessControlProtos.TablePermission.newBuilder();
- builder.setTableName(ProtobufUtil.toProtoTableName(tablePerm.getTable()));
+ builder.setTableName(ProtobufUtil.toProtoTableName(tablePerm.getTableName()));
if (tablePerm.hasFamily()) {
builder.setFamily(ByteString.copyFrom(tablePerm.getFamily()));
}
@@ -2195,7 +2195,7 @@ public final class ProtobufUtil {
// input / output paths are relative to the store dir
// store dir is relative to region dir
CompactionDescriptor.Builder builder = CompactionDescriptor.newBuilder()
- .setTableName(ByteString.copyFrom(info.getTableName().getName()))
+ .setTableName(ByteString.copyFrom(info.getTableName()))
.setEncodedRegionName(ByteString.copyFrom(info.getEncodedNameAsBytes()))
.setFamilyName(ByteString.copyFrom(family))
.setStoreHomeDir(storeDir.getName()); //make relative
Modified: hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/security/access/TablePermission.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/security/access/TablePermission.java?rev=1523142&r1=1523141&r2=1523142&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/security/access/TablePermission.java (original)
+++ hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/security/access/TablePermission.java Fri Sep 13 23:18:07 2013
@@ -151,7 +151,7 @@ public class TablePermission extends Per
return table != null;
}
- public TableName getTable() {
+ public TableName getTableName() {
return table;
}
@@ -318,7 +318,7 @@ public class TablePermission extends Per
}
TablePermission other = (TablePermission)obj;
- if (!(table.equals(other.getTable()) &&
+ if (!(table.equals(other.getTableName()) &&
((family == null && other.getFamily() == null) ||
Bytes.equals(family, other.getFamily())) &&
((qualifier == null && other.getQualifier() == null) ||
Modified: hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/security/access/UserPermission.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/security/access/UserPermission.java?rev=1523142&r1=1523141&r2=1523142&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/security/access/UserPermission.java (original)
+++ hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/security/access/UserPermission.java Fri Sep 13 23:18:07 2013
@@ -140,7 +140,7 @@ public class UserPermission extends Tabl
* @param perm a TablePermission
*/
public UserPermission(byte[] user, TablePermission perm) {
- super(perm.getNamespace(), perm.getTable(), perm.getFamily(), perm.getQualifier(),
+ super(perm.getNamespace(), perm.getTableName(), perm.getFamily(), perm.getQualifier(),
perm.actions);
this.user = user;
}
Modified: hbase/branches/0.96/hbase-common/src/main/java/org/apache/hadoop/hbase/TableName.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-common/src/main/java/org/apache/hadoop/hbase/TableName.java?rev=1523142&r1=1523141&r2=1523142&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-common/src/main/java/org/apache/hadoop/hbase/TableName.java (original)
+++ hbase/branches/0.96/hbase-common/src/main/java/org/apache/hadoop/hbase/TableName.java Fri Sep 13 23:18:07 2013
@@ -129,8 +129,9 @@ public final class TableName implements
return tableName;
}
- public static void isLegalTableQualifierName(final byte[] qualifierName){
+ public static byte [] isLegalTableQualifierName(final byte[] qualifierName){
isLegalTableQualifierName(qualifierName, 0, qualifierName.length);
+ return qualifierName;
}
/**
Modified: hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/HFileArchiver.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/HFileArchiver.java?rev=1523142&r1=1523141&r2=1523142&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/HFileArchiver.java (original)
+++ hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/HFileArchiver.java Fri Sep 13 23:18:07 2013
@@ -72,7 +72,7 @@ public class HFileArchiver {
public static void archiveRegion(Configuration conf, FileSystem fs, HRegionInfo info)
throws IOException {
Path rootDir = FSUtils.getRootDir(conf);
- archiveRegion(fs, rootDir, FSUtils.getTableDir(rootDir, info.getTableName()),
+ archiveRegion(fs, rootDir, FSUtils.getTableDir(rootDir, info.getTable()),
HRegion.getRegionDir(rootDir, info));
}
Modified: hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/CoprocessorHost.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/CoprocessorHost.java?rev=1523142&r1=1523141&r2=1523142&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/CoprocessorHost.java (original)
+++ hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/CoprocessorHost.java Fri Sep 13 23:18:07 2013
@@ -564,6 +564,12 @@ public abstract class CoprocessorHost<E
public void setWriteBufferSize(long writeBufferSize) throws IOException {
table.setWriteBufferSize(writeBufferSize);
}
+
+ @Override
+ public long incrementColumnValue(byte[] row, byte[] family,
+ byte[] qualifier, long amount, boolean writeToWAL) throws IOException {
+ return table.incrementColumnValue(row, family, qualifier, amount, writeToWAL);
+ }
}
/** The coprocessor */
Modified: hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/io/HFileLink.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/io/HFileLink.java?rev=1523142&r1=1523141&r2=1523142&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/io/HFileLink.java (original)
+++ hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/io/HFileLink.java Fri Sep 13 23:18:07 2013
@@ -263,7 +263,7 @@ public class HFileLink extends FileLink
*/
public static String createHFileLinkName(final HRegionInfo hfileRegionInfo,
final String hfileName) {
- return createHFileLinkName(hfileRegionInfo.getTableName(),
+ return createHFileLinkName(hfileRegionInfo.getTable(),
hfileRegionInfo.getEncodedName(), hfileName);
}
@@ -300,7 +300,7 @@ public class HFileLink extends FileLink
public static boolean create(final Configuration conf, final FileSystem fs,
final Path dstFamilyPath, final HRegionInfo hfileRegionInfo,
final String hfileName) throws IOException {
- TableName linkedTable = hfileRegionInfo.getTableName();
+ TableName linkedTable = hfileRegionInfo.getTable();
String linkedRegion = hfileRegionInfo.getEncodedName();
return create(conf, fs, dstFamilyPath, linkedTable, linkedRegion, hfileName);
}
Modified: hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableSplit.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableSplit.java?rev=1523142&r1=1523141&r2=1523142&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableSplit.java (original)
+++ hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableSplit.java Fri Sep 13 23:18:07 2013
@@ -60,7 +60,8 @@ public class TableSplit implements Input
public TableSplit(byte [] tableName, byte [] startRow, byte [] endRow,
final String location) {
- this(TableName.valueOf(tableName), startRow, endRow, location);
+ this(TableName.valueOf(tableName), startRow, endRow,
+ location);
}
/** @return table name */
Modified: hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.java?rev=1523142&r1=1523141&r2=1523142&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.java (original)
+++ hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.java Fri Sep 13 23:18:07 2013
@@ -518,6 +518,16 @@ public class LoadIncrementalHFiles exten
}
/**
+ * @deprecated Use {@link #tryAtomicRegionLoad(HConnection, TableName, byte[], Collection)}
+ */
+ @Deprecated
+ protected List<LoadQueueItem> tryAtomicRegionLoad(final HConnection conn,
+ final byte [] tableName, final byte[] first, Collection<LoadQueueItem> lqis)
+ throws IOException {
+ return tryAtomicRegionLoad(conn, TableName.valueOf(tableName), first, lqis);
+ }
+
+ /**
* Attempts to do an atomic load of many hfiles into a region. If it fails,
* it returns a list of hfiles that need to be retried. If it is successful
* it will return an empty list.
@@ -531,9 +541,8 @@ public class LoadIncrementalHFiles exten
* failure
*/
protected List<LoadQueueItem> tryAtomicRegionLoad(final HConnection conn,
- final TableName tableName,
- final byte[] first, Collection<LoadQueueItem> lqis) throws IOException {
-
+ final TableName tableName, final byte[] first, Collection<LoadQueueItem> lqis)
+ throws IOException {
final List<Pair<byte[], String>> famPaths =
new ArrayList<Pair<byte[], String>>(lqis.size());
for (LoadQueueItem lqi : lqis) {
Modified: hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableSplit.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableSplit.java?rev=1523142&r1=1523141&r2=1523142&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableSplit.java (original)
+++ hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableSplit.java Fri Sep 13 23:18:07 2013
@@ -85,11 +85,20 @@ implements Writable, Comparable<TableSpl
/** Default constructor. */
public TableSplit() {
- this(null, null, HConstants.EMPTY_BYTE_ARRAY,
+ this((TableName)null, null, HConstants.EMPTY_BYTE_ARRAY,
HConstants.EMPTY_BYTE_ARRAY, "");
}
/**
+ * @deprecated Since 0.96.0; use {@link TableSplit#TableSplit(TableName, byte[], byte[], String)}
+ */
+ @Deprecated
+ public TableSplit(final byte [] tableName, Scan scan, byte [] startRow, byte [] endRow,
+ final String location) {
+ this(TableName.valueOf(tableName), scan, startRow, endRow, location);
+ }
+
+ /**
* Creates a new instance while assigning all variables.
*
* @param tableName The name of the current table.
@@ -111,7 +120,16 @@ implements Writable, Comparable<TableSpl
this.endRow = endRow;
this.regionLocation = location;
}
-
+
+ /**
+ * @deprecated Since 0.96.0; use {@link TableSplit#TableSplit(TableName, byte[], byte[], String)}
+ */
+ @Deprecated
+ public TableSplit(final byte [] tableName, byte[] startRow, byte[] endRow,
+ final String location) {
+ this(TableName.valueOf(tableName), startRow, endRow, location);
+ }
+
/**
* Creates a new instance without a scanner.
*
@@ -136,11 +154,23 @@ implements Writable, Comparable<TableSpl
}
/**
+ * Returns the table name converted to a byte array.
+ * @see #getTable()
+ * @return The table name.
+ */
+ public byte [] getTableName() {
+ return tableName.getName();
+ }
+
+ /**
* Returns the table name.
*
* @return The table name.
*/
- public TableName getTableName() {
+ public TableName getTable() {
+ // It is ugly that usually to get a TableName, the method is called getTableName. We can't do
+ // that in here though because there was an existing getTableName in place already since
+ // deprecated.
return tableName;
}
@@ -268,7 +298,7 @@ implements Writable, Comparable<TableSpl
// If The table name of the two splits is the same then compare start row
// otherwise compare based on table names
int tableNameComparison =
- getTableName().compareTo(split.getTableName());
+ getTable().compareTo(split.getTable());
return tableNameComparison != 0 ? tableNameComparison : Bytes.compareTo(
getStartRow(), split.getStartRow());
}
Modified: hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java?rev=1523142&r1=1523141&r2=1523142&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java (original)
+++ hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java Fri Sep 13 23:18:07 2013
@@ -460,7 +460,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 (!e.getKey().getTableName().isSystemTable()
+ if (!e.getKey().getTable().isSystemTable()
&& e.getValue() != null) {
LOG.debug("Found " + e + " out on cluster");
failover = true;
@@ -1282,8 +1282,7 @@ public class AssignmentManager extends Z
if (rs.isOpened()) {
ServerName serverName = rs.getServerName();
regionOnline(regionInfo, serverName);
- boolean disabled = getZKTable().isDisablingOrDisabledTable(
- regionInfo.getTableName());
+ boolean disabled = getZKTable().isDisablingOrDisabledTable(regionInfo.getTable());
if (!serverManager.isServerOnline(serverName) && !disabled) {
LOG.info("Opened " + regionNameStr
+ "but the region server is offline, reassign the region");
@@ -1898,7 +1897,7 @@ public class AssignmentManager extends Z
// When we have a case such as all the regions are added directly into hbase:meta and we call
// assignRegion then we need to make the table ENABLED. Hence in such case the table
// will not be in ENABLING or ENABLED state.
- TableName tableName = region.getTableName();
+ TableName tableName = region.getTable();
if (!zkTable.isEnablingTable(tableName) && !zkTable.isEnabledTable(tableName)) {
LOG.debug("Setting table " + tableName + " to ENABLED state.");
setEnabledTable(tableName);
@@ -2085,7 +2084,7 @@ public class AssignmentManager extends Z
}
private boolean isDisabledorDisablingRegionInRIT(final HRegionInfo region) {
- TableName tableName = region.getTableName();
+ TableName tableName = region.getTable();
boolean disabled = this.zkTable.isDisabledTable(tableName);
if (disabled || this.zkTable.isDisablingTable(tableName)) {
LOG.info("Table " + tableName + (disabled ? " disabled;" : " disabling;") +
@@ -2584,7 +2583,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 (iter.next().getTableName().isSystemTable()) {
+ if (iter.next().getTable().isSystemTable()) {
iter.remove();
}
}
@@ -2603,7 +2602,7 @@ public class AssignmentManager extends Z
}
for (HRegionInfo hri : allRegions.keySet()) {
- TableName tableName = hri.getTableName();
+ TableName tableName = hri.getTable();
if (!zkTable.isEnabledTable(tableName)) {
setEnabledTable(tableName);
}
@@ -2664,7 +2663,7 @@ public class AssignmentManager extends Z
HRegionInfo regionInfo = region.getFirst();
ServerName regionLocation = region.getSecond();
if (regionInfo == null) continue;
- TableName tableName = regionInfo.getTableName();
+ TableName tableName = regionInfo.getTable();
if (tableName.isSystemTable()) continue;
regionStates.createRegionState(regionInfo);
if (regionStates.isRegionInState(regionInfo, State.SPLIT)) {
@@ -3161,7 +3160,7 @@ public class AssignmentManager extends Z
} catch (KeeperException ke) {
server.abort("Unexpected ZK exception deleting node " + hri, ke);
}
- if (zkTable.isDisablingOrDisabledTable(hri.getTableName())) {
+ if (zkTable.isDisablingOrDisabledTable(hri.getTable())) {
it.remove();
regionStates.regionOffline(hri);
continue;
@@ -3193,8 +3192,7 @@ public class AssignmentManager extends Z
// the master to disable, we need to make sure we close those regions in
// that case. This is not racing with the region server itself since RS
// report is done after the split transaction completed.
- if (this.zkTable.isDisablingOrDisabledTable(
- parent.getTableName())) {
+ if (this.zkTable.isDisablingOrDisabledTable(parent.getTable())) {
unassign(a);
unassign(b);
}
@@ -3217,7 +3215,7 @@ public class AssignmentManager extends Z
// the master to disable, we need to make sure we close those regions in
// that case. This is not racing with the region server itself since RS
// report is done after the regions merge transaction completed.
- if (this.zkTable.isDisablingOrDisabledTable(merged.getTableName())) {
+ if (this.zkTable.isDisablingOrDisabledTable(merged.getTable())) {
unassign(merged);
}
}
Modified: hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java?rev=1523142&r1=1523141&r2=1523142&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java (original)
+++ hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java Fri Sep 13 23:18:07 2013
@@ -149,7 +149,7 @@ public class CatalogJanitor extends Chor
HRegionInfo info = HRegionInfo.getHRegionInfo(r);
if (info == null) return true; // Keep scanning
if (isTableSpecified
- && info.getTableName().compareTo(tableName) > 0) {
+ && info.getTable().compareTo(tableName) > 0) {
// Another table, stop scanning
return false;
}
@@ -184,9 +184,8 @@ public class CatalogJanitor extends Chor
final HRegionInfo regionA, final HRegionInfo regionB) throws IOException {
FileSystem fs = this.services.getMasterFileSystem().getFileSystem();
Path rootdir = this.services.getMasterFileSystem().getRootDir();
- Path tabledir = FSUtils.getTableDir(rootdir,
- mergedRegion.getTableName());
- HTableDescriptor htd = getTableDescriptor(mergedRegion.getTableName());
+ Path tabledir = FSUtils.getTableDir(rootdir, mergedRegion.getTable());
+ HTableDescriptor htd = getTableDescriptor(mergedRegion.getTable());
HRegionFileSystem regionFs = null;
try {
regionFs = HRegionFileSystem.openRegionFromFileSystem(
@@ -290,8 +289,7 @@ public class CatalogJanitor extends Chor
if (left == null) return -1;
if (right == null) return 1;
// Same table name.
- int result = left.getTableName().compareTo(
- right.getTableName());
+ int result = left.getTable().compareTo(right.getTable());
if (result != 0) return result;
// Compare start keys.
result = Bytes.compareTo(left.getStartKey(), right.getStartKey());
@@ -375,7 +373,7 @@ public class CatalogJanitor extends Chor
FileSystem fs = this.services.getMasterFileSystem().getFileSystem();
Path rootdir = this.services.getMasterFileSystem().getRootDir();
- Path tabledir = FSUtils.getTableDir(rootdir, daughter.getTableName());
+ Path tabledir = FSUtils.getTableDir(rootdir, daughter.getTable());
HRegionFileSystem regionFs = null;
try {
@@ -387,7 +385,7 @@ public class CatalogJanitor extends Chor
}
boolean references = false;
- HTableDescriptor parentDescriptor = getTableDescriptor(parent.getTableName());
+ HTableDescriptor parentDescriptor = getTableDescriptor(parent.getTable());
for (HColumnDescriptor family: parentDescriptor.getFamilies()) {
if ((references = regionFs.hasReferences(family.getNameAsString()))) {
break;
Modified: hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java?rev=1523142&r1=1523141&r2=1523142&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java (original)
+++ hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java Fri Sep 13 23:18:07 2013
@@ -1070,7 +1070,7 @@ MasterServices, Server {
MetaReader.fullScan(catalogTracker, disabledOrDisablingOrEnabling, true);
for(Iterator<HRegionInfo> iter = allRegions.keySet().iterator();
iter.hasNext();) {
- if (!iter.next().getTableName().isSystemTable()) {
+ if (!iter.next().getTable().isSystemTable()) {
iter.remove();
}
}
@@ -1110,8 +1110,8 @@ MasterServices, Server {
this.assignmentManager.regionOnline(regionInfo, currServer);
}
- if (!this.assignmentManager.getZKTable().isEnabledTable(regionInfo.getTableName())) {
- this.assignmentManager.setEnabledTable(regionInfo.getTableName());
+ if (!this.assignmentManager.getZKTable().isEnabledTable(regionInfo.getTable())) {
+ this.assignmentManager.setEnabledTable(regionInfo.getTable());
}
LOG.info("System region " + regionInfo.getRegionNameAsString() + " assigned, rit=" + rit +
", location=" + catalogTracker.getMetaLocation());
@@ -2096,7 +2096,7 @@ MasterServices, Server {
if (pair == null) {
return false;
}
- if (!pair.getFirst().getTableName().equals(tableName)) {
+ if (!pair.getFirst().getTable().equals(tableName)) {
return false;
}
result.set(pair);
Modified: hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterFileSystem.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterFileSystem.java?rev=1523142&r1=1523141&r2=1523142&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterFileSystem.java (original)
+++ hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterFileSystem.java Fri Sep 13 23:18:07 2013
@@ -588,7 +588,7 @@ public class MasterFileSystem {
public void deleteFamilyFromFS(HRegionInfo region, byte[] familyName)
throws IOException {
// archive family store files
- Path tableDir = FSUtils.getTableDir(rootdir, region.getTableName());
+ Path tableDir = FSUtils.getTableDir(rootdir, region.getTable());
HFileArchiver.archiveFamily(fs, conf, region, tableDir, familyName);
// delete the family folder
Modified: hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionStates.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionStates.java?rev=1523142&r1=1523141&r2=1523142&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionStates.java (original)
+++ hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionStates.java Fri Sep 13 23:18:07 2013
@@ -433,7 +433,7 @@ public class RegionStates {
// before all table's regions.
HRegionInfo boundary = new HRegionInfo(tableName, null, null, false, 0L);
for (HRegionInfo hri: regionAssignments.tailMap(boundary).keySet()) {
- if(!hri.getTableName().equals(tableName)) break;
+ if(!hri.getTable().equals(tableName)) break;
tableRegions.add(hri);
}
return tableRegions;
@@ -529,7 +529,7 @@ public class RegionStates {
for (Map.Entry<ServerName, Set<HRegionInfo>> e: serverHoldings.entrySet()) {
for (HRegionInfo hri: e.getValue()) {
if (hri.isMetaRegion()) continue;
- TableName tablename = hri.getTableName();
+ TableName tablename = hri.getTable();
Map<ServerName, List<HRegionInfo>> svrToRegions = result.get(tablename);
if (svrToRegions == null) {
svrToRegions = new HashMap<ServerName, List<HRegionInfo>>(serverHoldings.size());
Modified: hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/SnapshotOfRegionAssignmentFromMeta.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/SnapshotOfRegionAssignmentFromMeta.java?rev=1523142&r1=1523141&r2=1523142&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/SnapshotOfRegionAssignmentFromMeta.java (original)
+++ hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/SnapshotOfRegionAssignmentFromMeta.java Fri Sep 13 23:18:07 2013
@@ -104,8 +104,8 @@ public class SnapshotOfRegionAssignmentF
HRegionInfo.getHRegionInfoAndServerName(result);
HRegionInfo hri = regionAndServer.getFirst();
if (hri == null) return true;
- if (hri.getTableName() == null) return true;
- if (disabledTables.contains(hri.getTableName())) {
+ if (hri.getTable() == null) return true;
+ if (disabledTables.contains(hri.getTable())) {
return true;
}
// Are we to include split parents in the list?
@@ -144,7 +144,7 @@ public class SnapshotOfRegionAssignmentF
regionNameToRegionInfoMap.put(regionInfo.getRegionNameAsString(), regionInfo);
// Process the table to region map
- TableName tableName = regionInfo.getTableName();
+ TableName tableName = regionInfo.getTable();
List<HRegionInfo> regionList = tableToRegionMap.get(tableName);
if (regionList == null) {
regionList = new ArrayList<HRegionInfo>();
Modified: hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.java?rev=1523142&r1=1523141&r2=1523142&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.java (original)
+++ hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.java Fri Sep 13 23:18:07 2013
@@ -148,7 +148,7 @@ public abstract class BaseLoadBalancer i
regionPerServerIndex = 0;
for (HRegionInfo region : entry.getValue()) {
- String tableName = region.getTableName().getNameAsString();
+ String tableName = region.getTable().getNameAsString();
Integer idx = tablesToIndex.get(tableName);
if (idx == null) {
tables.add(tableName);
Modified: hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/FavoredNodeLoadBalancer.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/FavoredNodeLoadBalancer.java?rev=1523142&r1=1523141&r2=1523142&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/FavoredNodeLoadBalancer.java (original)
+++ hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/FavoredNodeLoadBalancer.java Fri Sep 13 23:18:07 2013
@@ -99,7 +99,7 @@ public class FavoredNodeLoadBalancer ext
currentServer.getPort(), ServerName.NON_STARTCODE);
List<HRegionInfo> list = entry.getValue();
for (HRegionInfo region : list) {
- if(region.getTableName().getNamespaceAsString()
+ if(region.getTable().getNamespaceAsString()
.equals(NamespaceDescriptor.SYSTEM_NAMESPACE_NAME_STR)) {
continue;
}
Modified: hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/RegionLocationFinder.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/RegionLocationFinder.java?rev=1523142&r1=1523141&r2=1523142&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/RegionLocationFinder.java (original)
+++ hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/RegionLocationFinder.java Fri Sep 13 23:18:07 2013
@@ -122,7 +122,7 @@ class RegionLocationFinder {
protected List<ServerName> internalGetTopBlockLocation(HRegionInfo region) {
List<ServerName> topServerNames = null;
try {
- HTableDescriptor tableDescriptor = getTableDescriptor(region.getTableName());
+ HTableDescriptor tableDescriptor = getTableDescriptor(region.getTable());
if (tableDescriptor != null) {
HDFSBlocksDistribution blocksDistribution =
HRegion.computeHDFSBlocksDistribution(getConf(), tableDescriptor, region);
Modified: hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/ClosedRegionHandler.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/ClosedRegionHandler.java?rev=1523142&r1=1523141&r2=1523142&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/ClosedRegionHandler.java (original)
+++ hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/ClosedRegionHandler.java Fri Sep 13 23:18:07 2013
@@ -92,7 +92,7 @@ public class ClosedRegionHandler extends
LOG.debug("Handling CLOSED event for " + regionInfo.getEncodedName());
// Check if this table is being disabled or not
if (this.assignmentManager.getZKTable().
- isDisablingOrDisabledTable(this.regionInfo.getTableName())) {
+ isDisablingOrDisabledTable(this.regionInfo.getTable())) {
assignmentManager.offlineDisabledRegion(regionInfo);
return;
}
Modified: hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/EnableTableHandler.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/EnableTableHandler.java?rev=1523142&r1=1523141&r2=1523142&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/EnableTableHandler.java (original)
+++ hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/EnableTableHandler.java Fri Sep 13 23:18:07 2013
@@ -230,7 +230,7 @@ public class EnableTableHandler extends
} else {
if (LOG.isDebugEnabled()) {
LOG.debug("Skipping assign for the region " + hri + " during enable table "
- + hri.getTableName() + " because its already in tranition or assigned.");
+ + hri.getTable() + " because its already in tranition or assigned.");
}
}
}
Modified: hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/OpenedRegionHandler.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/OpenedRegionHandler.java?rev=1523142&r1=1523141&r2=1523142&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/OpenedRegionHandler.java (original)
+++ hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/OpenedRegionHandler.java Fri Sep 13 23:18:07 2013
@@ -69,7 +69,7 @@ public class OpenedRegionHandler extends
this.expectedVersion = expectedVersion;
if(regionInfo.isMetaRegion()) {
priority = OpenedPriority.META;
- } else if(regionInfo.getTableName()
+ } else if(regionInfo.getTable()
.getNamespaceAsString().equals(NamespaceDescriptor.SYSTEM_NAMESPACE_NAME_STR)) {
priority = OpenedPriority.SYSTEM;
} else {
@@ -113,8 +113,7 @@ public class OpenedRegionHandler extends
" because regions is NOT in RIT -- presuming this is because it SPLIT");
}
if (!openedNodeDeleted) {
- if (this.assignmentManager.getZKTable().isDisablingOrDisabledTable(
- regionInfo.getTableName())) {
+ if (this.assignmentManager.getZKTable().isDisablingOrDisabledTable(regionInfo.getTable())) {
debugLog(regionInfo, "Opened region "
+ regionInfo.getShortNameToLog() + " but "
+ "this table is disabled, triggering close of region");
Modified: hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/ServerShutdownHandler.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/ServerShutdownHandler.java?rev=1523142&r1=1523141&r2=1523142&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/ServerShutdownHandler.java (original)
+++ hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/ServerShutdownHandler.java Fri Sep 13 23:18:07 2013
@@ -251,7 +251,7 @@ public class ServerShutdownHandler exten
toAssignRegions.add(hri);
} else if (rit != null) {
if ((rit.isClosing() || rit.isPendingClose())
- && am.getZKTable().isDisablingOrDisabledTable(hri.getTableName())) {
+ && am.getZKTable().isDisablingOrDisabledTable(hri.getTable())) {
// If the table was partially disabled and the RS went down, we should clear the RIT
// and remove the node for the region.
// The rit that we use may be stale in case the table was in DISABLING state
@@ -324,18 +324,16 @@ public class ServerShutdownHandler exten
public static boolean processDeadRegion(HRegionInfo hri, Result result,
AssignmentManager assignmentManager, CatalogTracker catalogTracker)
throws IOException {
- boolean tablePresent = assignmentManager.getZKTable().isTablePresent(
- hri.getTableName());
+ boolean tablePresent = assignmentManager.getZKTable().isTablePresent(hri.getTable());
if (!tablePresent) {
- LOG.info("The table " + hri.getTableName()
+ LOG.info("The table " + hri.getTable()
+ " was deleted. Hence not proceeding.");
return false;
}
// If table is not disabled but the region is offlined,
- boolean disabled = assignmentManager.getZKTable().isDisabledTable(
- hri.getTableName());
+ boolean disabled = assignmentManager.getZKTable().isDisabledTable(hri.getTable());
if (disabled){
- LOG.info("The table " + hri.getTableName()
+ LOG.info("The table " + hri.getTable()
+ " was disabled. Hence not proceeding.");
return false;
}
@@ -345,10 +343,9 @@ public class ServerShutdownHandler exten
//to the dead server. We don't have to do anything.
return false;
}
- boolean disabling = assignmentManager.getZKTable().isDisablingTable(
- hri.getTableName());
+ boolean disabling = assignmentManager.getZKTable().isDisablingTable(hri.getTable());
if (disabling) {
- LOG.info("The table " + hri.getTableName()
+ LOG.info("The table " + hri.getTable()
+ " is disabled. Hence not assigning region" + hri.getEncodedName());
return false;
}
Modified: hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java?rev=1523142&r1=1523141&r2=1523142&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java (original)
+++ hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java Fri Sep 13 23:18:07 2013
@@ -3949,11 +3949,11 @@ public class HRegion implements HeapSize
final HLog hlog,
final boolean initialize, final boolean ignoreHLog)
throws IOException {
- LOG.info("creating HRegion " + info.getTableName().getNameAsString()
+ LOG.info("creating HRegion " + info.getTable().getNameAsString()
+ " HTD == " + hTableDescriptor + " RootDir = " + rootDir +
- " Table name == " + info.getTableName().getNameAsString());
+ " Table name == " + info.getTable().getNameAsString());
- Path tableDir = FSUtils.getTableDir(rootDir, info.getTableName());
+ Path tableDir = FSUtils.getTableDir(rootDir, info.getTable());
FileSystem fs = FileSystem.get(conf);
HRegionFileSystem rfs = HRegionFileSystem.createRegionOnFileSystem(conf, fs, tableDir, info);
HLog effectiveHLog = hlog;
@@ -4113,7 +4113,7 @@ public class HRegion implements HeapSize
if (LOG.isDebugEnabled()) {
LOG.debug("Opening region: " + info);
}
- Path dir = FSUtils.getTableDir(rootDir, info.getTableName());
+ Path dir = FSUtils.getTableDir(rootDir, info.getTable());
HRegion r = HRegion.newHRegion(dir, wal, fs, conf, info, htd, rsServices);
return r.openHRegion(reporter);
}
@@ -4242,8 +4242,7 @@ public class HRegion implements HeapSize
@Deprecated
public static Path getRegionDir(final Path rootdir, final HRegionInfo info) {
return new Path(
- FSUtils.getTableDir(rootdir, info.getTableName()),
- info.getEncodedName());
+ FSUtils.getTableDir(rootdir, info.getTable()), info.getEncodedName());
}
/**
@@ -4302,8 +4301,7 @@ public class HRegion implements HeapSize
* @throws IOException
*/
public static HRegion merge(final HRegion a, final HRegion b) throws IOException {
- if (!a.getRegionInfo().getTableName().equals(
- b.getRegionInfo().getTableName())) {
+ if (!a.getRegionInfo().getTable().equals(b.getRegionInfo().getTable())) {
throw new IOException("Regions do not belong to the same table");
}
@@ -5222,7 +5220,7 @@ public class HRegion implements HeapSize
public byte[] checkSplit() {
// Can't split META
if (this.getRegionInfo().isMetaTable() ||
- TableName.NAMESPACE_TABLE_NAME.equals(this.getRegionInfo().getTableName())) {
+ TableName.NAMESPACE_TABLE_NAME.equals(this.getRegionInfo().getTable())) {
if (shouldForceSplit()) {
LOG.warn("Cannot split meta region in HBase 0.20 and above");
}
Modified: hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java?rev=1523142&r1=1523141&r2=1523142&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java (original)
+++ hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java Fri Sep 13 23:18:07 2013
@@ -2326,7 +2326,7 @@ public class HRegionServer implements Cl
synchronized (this.onlineRegions) {
for (HRegion region: this.onlineRegions.values()) {
HRegionInfo regionInfo = region.getRegionInfo();
- if(regionInfo.getTableName().equals(tableName)) {
+ if(regionInfo.getTable().equals(tableName)) {
tableRegions.add(region);
}
}
@@ -3511,10 +3511,10 @@ public class HRegionServer implements Cl
}
}
LOG.info("Open " + region.getRegionNameAsString());
- htd = htds.get(region.getTableName());
+ htd = htds.get(region.getTable());
if (htd == null) {
- htd = this.tableDescriptors.get(region.getTableName());
- htds.put(region.getTableName(), htd);
+ htd = this.tableDescriptors.get(region.getTable());
+ htds.put(region.getTable(), htd);
}
final Boolean previous = this.regionsInTransitionInRS.putIfAbsent(
Modified: hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java?rev=1523142&r1=1523141&r2=1523142&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java (original)
+++ hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java Fri Sep 13 23:18:07 2013
@@ -280,7 +280,7 @@ public class HStore implements Store {
@Override
public TableName getTableName() {
- return this.getRegionInfo().getTableName();
+ return this.getRegionInfo().getTable();
}
@Override
Modified: hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionCoprocessorHost.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionCoprocessorHost.java?rev=1523142&r1=1523141&r2=1523142&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionCoprocessorHost.java (original)
+++ hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionCoprocessorHost.java Fri Sep 13 23:18:07 2013
@@ -146,7 +146,7 @@ public class RegionCoprocessorHost
loadSystemCoprocessors(conf, REGION_COPROCESSOR_CONF_KEY);
// load system default cp's for user tables from configuration.
- if (!region.getRegionInfo().getTableName().isSystemTable()) {
+ if (!region.getRegionInfo().getTable().isSystemTable()) {
loadSystemCoprocessors(conf, USER_REGION_COPROCESSOR_CONF_KEY);
}
Modified: hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.java?rev=1523142&r1=1523141&r2=1523142&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.java (original)
+++ hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.java Fri Sep 13 23:18:07 2013
@@ -433,7 +433,7 @@ public class RegionMergeTransaction {
}
// Merged region is sorted between two merging regions in META
- HRegionInfo mergedRegionInfo = new HRegionInfo(a.getTableName(), startKey,
+ HRegionInfo mergedRegionInfo = new HRegionInfo(a.getTable(), startKey,
endKey, false, rid);
return mergedRegionInfo;
}
Modified: hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/SplitTransaction.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/SplitTransaction.java?rev=1523142&r1=1523141&r2=1523142&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/SplitTransaction.java (original)
+++ hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/SplitTransaction.java Fri Sep 13 23:18:07 2013
@@ -168,8 +168,8 @@ public class SplitTransaction {
return false;
}
long rid = getDaughterRegionIdTimestamp(hri);
- this.hri_a = new HRegionInfo(hri.getTableName(), startKey, this.splitrow, false, rid);
- this.hri_b = new HRegionInfo(hri.getTableName(), this.splitrow, endKey, false, rid);
+ this.hri_a = new HRegionInfo(hri.getTable(), startKey, this.splitrow, false, rid);
+ this.hri_b = new HRegionInfo(hri.getTable(), this.splitrow, endKey, false, rid);
return true;
}
Modified: hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogSplitter.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogSplitter.java?rev=1523142&r1=1523141&r2=1523142&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogSplitter.java (original)
+++ hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogSplitter.java Fri Sep 13 23:18:07 2013
@@ -1615,7 +1615,7 @@ public class HLogSplitter {
final long pause = conf.getLong(HConstants.HBASE_CLIENT_PAUSE,
HConstants.DEFAULT_HBASE_CLIENT_PAUSE);
boolean reloadLocation = false;
- TableName tableName = loc.getRegionInfo().getTableName();
+ TableName tableName = loc.getRegionInfo().getTable();
int tries = 0;
Throwable cause = null;
while (endTime > EnvironmentEdgeManager.currentTimeMillis()) {
Modified: hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/client/RemoteHTable.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/client/RemoteHTable.java?rev=1523142&r1=1523141&r2=1523142&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/client/RemoteHTable.java (original)
+++ hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/client/RemoteHTable.java Fri Sep 13 23:18:07 2013
@@ -779,4 +779,10 @@ public class RemoteHTable implements HTa
public void setWriteBufferSize(long writeBufferSize) throws IOException {
throw new IOException("setWriteBufferSize not supported");
}
+
+ @Override
+ public long incrementColumnValue(byte[] row, byte[] family, byte[] qualifier,
+ long amount, boolean writeToWAL) throws IOException {
+ throw new IOException("incrementColumnValue not supported");
+ }
}
Modified: hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessControlLists.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessControlLists.java?rev=1523142&r1=1523141&r2=1523142&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessControlLists.java (original)
+++ hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessControlLists.java Fri Sep 13 23:18:07 2013
@@ -299,7 +299,7 @@ public class AccessControlLists {
} else if(userPerm.isGlobal()) {
row = ACL_GLOBAL_NAME;
} else {
- row = userPerm.getTable().getName();
+ row = userPerm.getTableName().getName();
}
return row;
}
@@ -502,7 +502,7 @@ public class AccessControlLists {
for (Map.Entry<String, TablePermission> entry : allPerms.entries()) {
UserPermission up = new UserPermission(Bytes.toBytes(entry.getKey()),
- entry.getValue().getTable(), entry.getValue().getFamily(),
+ entry.getValue().getTableName(), entry.getValue().getFamily(),
entry.getValue().getQualifier(), entry.getValue().getActions());
perms.add(up);
}
Modified: hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java?rev=1523142&r1=1523141&r2=1523142&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java (original)
+++ hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java Fri Sep 13 23:18:07 2013
@@ -208,7 +208,7 @@ public class AccessController extends Ba
RegionCoprocessorEnvironment e,
Map<byte [], ? extends Collection<?>> families) {
HRegionInfo hri = e.getRegion().getRegionInfo();
- TableName tableName = hri.getTableName();
+ TableName tableName = hri.getTable();
// 1. All users need read access to hbase:meta table.
// this is a very common operation, so deal with it quickly.
@@ -470,7 +470,7 @@ public class AccessController extends Ba
Map<byte[], ? extends Set<byte[]>> familyMap)
throws IOException {
HRegionInfo hri = env.getRegion().getRegionInfo();
- TableName tableName = hri.getTableName();
+ TableName tableName = hri.getTable();
if (user == null) {
return false;
@@ -702,7 +702,7 @@ public class AccessController extends Ba
@Override
public void preMove(ObserverContext<MasterCoprocessorEnvironment> c, HRegionInfo region,
ServerName srcServer, ServerName destServer) throws IOException {
- requirePermission("move", region.getTableName(), null, null, Action.ADMIN);
+ requirePermission("move", region.getTable(), null, null, Action.ADMIN);
}
@Override
@@ -713,7 +713,7 @@ public class AccessController extends Ba
@Override
public void preAssign(ObserverContext<MasterCoprocessorEnvironment> c, HRegionInfo regionInfo)
throws IOException {
- requirePermission("assign", regionInfo.getTableName(), null, null, Action.ADMIN);
+ requirePermission("assign", regionInfo.getTable(), null, null, Action.ADMIN);
}
@Override
@@ -723,7 +723,7 @@ public class AccessController extends Ba
@Override
public void preUnassign(ObserverContext<MasterCoprocessorEnvironment> c, HRegionInfo regionInfo,
boolean force) throws IOException {
- requirePermission("unassign", regionInfo.getTableName(), null, null, Action.ADMIN);
+ requirePermission("unassign", regionInfo.getTable(), null, null, Action.ADMIN);
}
@Override
@@ -733,7 +733,7 @@ public class AccessController extends Ba
@Override
public void preRegionOffline(ObserverContext<MasterCoprocessorEnvironment> c,
HRegionInfo regionInfo) throws IOException {
- requirePermission("regionOffline", regionInfo.getTableName(), null, null, Action.ADMIN);
+ requirePermission("regionOffline", regionInfo.getTable(), null, null, Action.ADMIN);
}
@Override
@@ -1264,7 +1264,7 @@ public class AccessController extends Ba
switch(request.getUserPermission().getPermission().getType()) {
case Global :
case Table :
- requirePermission("grant", perm.getTable(), perm.getFamily(),
+ requirePermission("grant", perm.getTableName(), perm.getFamily(),
perm.getQualifier(), Action.ADMIN);
break;
case Namespace :
@@ -1304,7 +1304,7 @@ public class AccessController extends Ba
switch(request.getUserPermission().getPermission().getType()) {
case Global :
case Table :
- requirePermission("revoke", perm.getTable(), perm.getFamily(),
+ requirePermission("revoke", perm.getTableName(), perm.getFamily(),
perm.getQualifier(), Action.ADMIN);
break;
case Namespace :
@@ -1380,11 +1380,11 @@ public class AccessController extends Ba
if (permission instanceof TablePermission) {
TablePermission tperm = (TablePermission) permission;
for (Permission.Action action : permission.getActions()) {
- if (!tperm.getTable().equals(tableName)) {
+ if (!tperm.getTableName().equals(tableName)) {
throw new CoprocessorException(AccessController.class, String.format("This method "
+ "can only execute at the table specified in TablePermission. " +
"Table of the region:%s , requested table:%s", tableName,
- tperm.getTable()));
+ tperm.getTableName()));
}
Map<byte[], Set<byte[]>> familyMap = Maps.newTreeMap(Bytes.BYTES_COMPARATOR);
@@ -1426,7 +1426,7 @@ public class AccessController extends Ba
if (region != null) {
HRegionInfo regionInfo = region.getRegionInfo();
if (regionInfo != null) {
- tableName = regionInfo.getTableName();
+ tableName = regionInfo.getTable();
}
}
return tableName;
@@ -1458,7 +1458,7 @@ public class AccessController extends Ba
}
private boolean isSpecialTable(HRegionInfo regionInfo) {
- TableName tableName = regionInfo.getTableName();
+ TableName tableName = regionInfo.getTable();
return tableName.equals(AccessControlLists.ACL_TABLE_NAME)
|| tableName.equals(TableName.NAMESPACE_TABLE_NAME)
|| tableName.equals(TableName.META_TABLE_NAME);