Return-Path: X-Original-To: apmail-hbase-commits-archive@www.apache.org Delivered-To: apmail-hbase-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B1C9010BAD for ; Fri, 13 Sep 2013 23:18:36 +0000 (UTC) Received: (qmail 32544 invoked by uid 500); 13 Sep 2013 23:18:36 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 32514 invoked by uid 500); 13 Sep 2013 23:18:36 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 32506 invoked by uid 99); 13 Sep 2013 23:18:36 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 13 Sep 2013 23:18:36 +0000 X-ASF-Spam-Status: No, hits=-1998.0 required=5.0 tests=ALL_TRUSTED,FB_GET_MEDS X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 13 Sep 2013 23:18:32 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 6AD2F2388860; Fri, 13 Sep 2013 23:18:12 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1523142 [2/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/... Date: Fri, 13 Sep 2013 23:18:09 -0000 To: commits@hbase.apache.org From: stack@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130913231812.6AD2F2388860@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java?rev=1523142&r1=1523141&r2=1523142&view=diff ============================================================================== --- hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java (original) +++ hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java Fri Sep 13 23:18:07 2013 @@ -1269,7 +1269,7 @@ public class HBaseFsck extends Configure * Check if the specified region's table is disabled. */ private boolean isTableDisabled(HRegionInfo regionInfo) { - return disabledTables.contains(regionInfo.getTableName()); + return disabledTables.contains(regionInfo.getTable()); } /** @@ -1819,7 +1819,7 @@ public class HBaseFsck extends Configure if (hbi.deployedOn.size() == 0) continue; // We should be safe here - TableName tableName = hbi.metaEntry.getTableName(); + TableName tableName = hbi.metaEntry.getTable(); TableInfo modTInfo = tablesInfo.get(tableName); if (modTInfo == null) { modTInfo = new TableInfo(tableName); @@ -2459,7 +2459,7 @@ public class HBaseFsck extends Configure // pick only those tables that were not modified in the last few milliseconds. if (info != null && info.getStartKey().length == 0 && !info.isMetaRegion()) { if (info.modTime + timelag < now) { - tableNames.add(info.getTableName()); + tableNames.add(info.getTable()); } else { numSkipped.incrementAndGet(); // one more in-flux table } @@ -2583,7 +2583,7 @@ public class HBaseFsck extends Configure sn = pair.getSecond(); } HRegionInfo hri = pair.getFirst(); - if (!(isTableIncluded(hri.getTableName()) + if (!(isTableIncluded(hri.getTable()) || hri.isMetaRegion())) { return true; } @@ -2660,7 +2660,7 @@ public class HBaseFsck extends Configure hash ^= Arrays.hashCode(getStartKey()); hash ^= Arrays.hashCode(getEndKey()); hash ^= Boolean.valueOf(isOffline()).hashCode(); - hash ^= getTableName().hashCode(); + hash ^= getTable().hashCode(); if (regionServer != null) { hash ^= regionServer.hashCode(); } @@ -2751,7 +2751,7 @@ public class HBaseFsck extends Configure public TableName getTableName() { if (this.metaEntry != null) { - return this.metaEntry.getTableName(); + return this.metaEntry.getTable(); } else if (this.hdfsEntry != null) { // we are only guaranteed to have a path and not an HRI for hdfsEntry, // so we get the name from the Path @@ -3107,7 +3107,7 @@ public class HBaseFsck extends Configure List ret = Lists.newArrayList(); for (HRegionInfo hri : regions) { if (hri.isMetaTable() || (!hbck.checkMetaOnly - && hbck.isTableIncluded(hri.getTableName()))) { + && hbck.isTableIncluded(hri.getTable()))) { ret.add(hri); } } Modified: hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HMerge.java URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HMerge.java?rev=1523142&r1=1523141&r2=1523142&view=diff ============================================================================== --- hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HMerge.java (original) +++ hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HMerge.java Fri Sep 13 23:18:07 2013 @@ -254,7 +254,7 @@ class HMerge { Bytes.toString(HConstants.CATALOG_FAMILY) + ":" + Bytes.toString(HConstants.REGIONINFO_QUALIFIER)); } - if (!region.getTableName().equals(this.tableName)) { + if (!region.getTable().equals(this.tableName)) { return null; } return region; @@ -283,7 +283,7 @@ class HMerge { continue; } HRegionInfo region = HRegionInfo.getHRegionInfo(currentRow); - if (!region.getTableName().equals(this.tableName)) { + if (!region.getTable().equals(this.tableName)) { currentRow = metaScanner.next(); continue; } Modified: hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java?rev=1523142&r1=1523141&r2=1523142&view=diff ============================================================================== --- hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java (original) +++ hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java Fri Sep 13 23:18:07 2013 @@ -1915,7 +1915,7 @@ public class HBaseTestingUtility extends continue; } - if (info.getTableName().equals(tableName)) { + if (info.getTable().equals(tableName)) { LOG.info("getMetaTableRows: row -> " + Bytes.toStringBinary(result.getRow()) + info); rows.add(result.getRow()); @@ -2657,7 +2657,7 @@ public class HBaseTestingUtility extends while ((r = s.next()) != null) { byte [] b = r.getValue(HConstants.CATALOG_FAMILY, HConstants.REGIONINFO_QUALIFIER); HRegionInfo info = HRegionInfo.parseFromOrNull(b); - if (info != null && info.getTableName().equals(tableName)) { + if (info != null && info.getTable().equals(tableName)) { b = r.getValue(HConstants.CATALOG_FAMILY, HConstants.SERVER_QUALIFIER); allRegionsAssigned &= (b != null); } Modified: hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java?rev=1523142&r1=1523141&r2=1523142&view=diff ============================================================================== --- hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java (original) +++ hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java Fri Sep 13 23:18:07 2013 @@ -1332,7 +1332,7 @@ public class TestAdmin { HRegionServer rs = TEST_UTIL.getRSForFirstRegionInTable(TABLENAME); List onlineRegions = ProtobufUtil.getOnlineRegions(rs); for (HRegionInfo regionInfo : onlineRegions) { - if (!regionInfo.getTableName().isSystemTable()) { + if (!regionInfo.getTable().isSystemTable()) { info = regionInfo; admin.closeRegionWithEncodedRegionName(regionInfo.getEncodedName(), rs .getServerName().getServerName()); Modified: hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMetaScanner.java URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMetaScanner.java?rev=1523142&r1=1523141&r2=1523142&view=diff ============================================================================== --- hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMetaScanner.java (original) +++ hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMetaScanner.java Fri Sep 13 23:18:07 2013 @@ -142,7 +142,7 @@ public class TestMetaScanner { //select a random region HRegionInfo parent = regions.get(random.nextInt(regions.size())); - if (parent == null || !TABLENAME.equals(parent.getTableName())) { + if (parent == null || !TABLENAME.equals(parent.getTable())) { continue; } Modified: hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/SampleRegionWALObserver.java URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/SampleRegionWALObserver.java?rev=1523142&r1=1523141&r2=1523142&view=diff ============================================================================== --- hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/SampleRegionWALObserver.java (original) +++ hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/SampleRegionWALObserver.java Fri Sep 13 23:18:07 2013 @@ -87,7 +87,7 @@ implements WALObserver { HRegionInfo info, HLogKey logKey, WALEdit logEdit) throws IOException { boolean bypass = false; // check table name matches or not. - if (!Bytes.equals(info.getTableName().getName(), this.tableName)) { + if (!Bytes.equals(info.getTableName(), this.tableName)) { return bypass; } preWALWriteCalled = true; Modified: hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionObserverInterface.java URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionObserverInterface.java?rev=1523142&r1=1523141&r2=1523142&view=diff ============================================================================== --- hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionObserverInterface.java (original) +++ hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionObserverInterface.java Fri Sep 13 23:18:07 2013 @@ -493,7 +493,7 @@ public class TestRegionObserverInterface try { for (JVMClusterUtil.RegionServerThread t : cluster.getRegionServerThreads()) { for (HRegionInfo r : ProtobufUtil.getOnlineRegions(t.getRegionServer())) { - if (!r.getTableName().equals(tableName)) { + if (!r.getTable().equals(tableName)) { continue; } RegionCoprocessorHost cph = t.getRegionServer().getOnlineRegion(r.getRegionName()). Modified: hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionServerCoprocessorExceptionWithAbort.java URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionServerCoprocessorExceptionWithAbort.java?rev=1523142&r1=1523141&r2=1523142&view=diff ============================================================================== --- hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionServerCoprocessorExceptionWithAbort.java (original) +++ hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionServerCoprocessorExceptionWithAbort.java Fri Sep 13 23:18:07 2013 @@ -104,7 +104,7 @@ public class TestRegionServerCoprocessor final Put put, final WALEdit edit, final Durability durability) { TableName tableName = - c.getEnvironment().getRegion().getRegionInfo().getTableName(); + c.getEnvironment().getRegion().getRegionInfo().getTable(); if (TABLE_NAME.equals(tableName) && Bytes.equals(put.getRow(), ROW)) { throw new NullPointerException("Buggy coprocessor: " + put); } Modified: hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionServerCoprocessorExceptionWithRemove.java URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionServerCoprocessorExceptionWithRemove.java?rev=1523142&r1=1523141&r2=1523142&view=diff ============================================================================== --- hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionServerCoprocessorExceptionWithRemove.java (original) +++ hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionServerCoprocessorExceptionWithRemove.java Fri Sep 13 23:18:07 2013 @@ -53,8 +53,7 @@ public class TestRegionServerCoprocessor final Put put, final WALEdit edit, final Durability durability) { String tableName = - c.getEnvironment().getRegion().getRegionInfo() - .getTableName().getNameAsString(); + c.getEnvironment().getRegion().getRegionInfo().getTable().getNameAsString(); if (tableName.equals("observed_table")) { Integer i = null; i = i + 1; Modified: hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestWALObserver.java URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestWALObserver.java?rev=1523142&r1=1523141&r2=1523142&view=diff ============================================================================== --- hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestWALObserver.java (original) +++ hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestWALObserver.java Fri Sep 13 23:18:07 2013 @@ -186,7 +186,7 @@ public class TestWALObserver { // it's where WAL write cp should occur. long now = EnvironmentEdgeManager.currentTimeMillis(); - log.append(hri, hri.getTableName(), edit, now, htd); + log.append(hri, hri.getTable(), edit, now, htd); // the edit shall have been change now by the coprocessor. foundFamily0 = false; Modified: hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestLoadIncrementalHFilesSplitRecovery.java URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestLoadIncrementalHFilesSplitRecovery.java?rev=1523142&r1=1523141&r2=1523142&view=diff ============================================================================== --- hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestLoadIncrementalHFilesSplitRecovery.java (original) +++ hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestLoadIncrementalHFilesSplitRecovery.java Fri Sep 13 23:18:07 2013 @@ -158,7 +158,7 @@ public class TestLoadIncrementalHFilesSp .toBytes(table)); for (HRegionInfo hri : ProtobufUtil.getOnlineRegions(hrs)) { - if (Bytes.equals(hri.getTableName().getName(), Bytes.toBytes(table))) { + if (Bytes.equals(hri.getTable().getName(), Bytes.toBytes(table))) { // splitRegion doesn't work if startkey/endkey are null ProtobufUtil.split(hrs, hri, rowkey(ROWCOUNT / 2)); // hard code split } @@ -169,7 +169,7 @@ public class TestLoadIncrementalHFilesSp do { regions = 0; for (HRegionInfo hri : ProtobufUtil.getOnlineRegions(hrs)) { - if (Bytes.equals(hri.getTableName().getName(), Bytes.toBytes(table))) { + if (Bytes.equals(hri.getTable().getName(), Bytes.toBytes(table))) { regions++; } } Modified: hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManager.java URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManager.java?rev=1523142&r1=1523141&r2=1523142&view=diff ============================================================================== --- hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManager.java (original) +++ hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManager.java Fri Sep 13 23:18:07 2013 @@ -501,7 +501,7 @@ public class TestAssignmentManager { // adding region in pending close. am.getRegionStates().updateRegionState( REGIONINFO, State.SPLITTING, SERVERNAME_A); - am.getZKTable().setEnabledTable(REGIONINFO.getTableName()); + am.getZKTable().setEnabledTable(REGIONINFO.getTable()); RegionTransition data = RegionTransition.createRegionTransition(EventType.RS_ZK_REGION_SPLITTING, REGIONINFO.getRegionName(), SERVERNAME_A); String node = ZKAssign.getNodeName(this.watcher, REGIONINFO.getEncodedName()); @@ -550,9 +550,9 @@ public class TestAssignmentManager { // adding region in pending close. am.getRegionStates().updateRegionState(REGIONINFO, State.PENDING_CLOSE); if (state == Table.State.DISABLING) { - am.getZKTable().setDisablingTable(REGIONINFO.getTableName()); + am.getZKTable().setDisablingTable(REGIONINFO.getTable()); } else { - am.getZKTable().setDisabledTable(REGIONINFO.getTableName()); + am.getZKTable().setDisabledTable(REGIONINFO.getTable()); } RegionTransition data = RegionTransition.createRegionTransition(EventType.M_ZK_REGION_CLOSING, REGIONINFO.getRegionName(), SERVERNAME_A); @@ -576,7 +576,7 @@ public class TestAssignmentManager { am.getRegionStates().isRegionsInTransition()); } } finally { - am.setEnabledTable(REGIONINFO.getTableName()); + am.setEnabledTable(REGIONINFO.getTable()); executor.shutdown(); am.shutdown(); // Clean up all znodes @@ -888,7 +888,7 @@ public class TestAssignmentManager { } try{ // set table in disabling state. - am.getZKTable().setDisablingTable(REGIONINFO.getTableName()); + am.getZKTable().setDisablingTable(REGIONINFO.getTable()); am.joinCluster(); // should not call retainAssignment if we get empty regions in assignAllUserRegions. assertFalse( @@ -896,12 +896,12 @@ public class TestAssignmentManager { gate.get()); // need to change table state from disabling to disabled. assertTrue("Table should be disabled.", - am.getZKTable().isDisabledTable(REGIONINFO.getTableName())); + am.getZKTable().isDisabledTable(REGIONINFO.getTable())); } finally { this.server.getConfiguration().setClass( HConstants.HBASE_MASTER_LOADBALANCER_CLASS, DefaultLoadBalancer.class, LoadBalancer.class); - am.getZKTable().setEnabledTable(REGIONINFO.getTableName()); + am.getZKTable().setEnabledTable(REGIONINFO.getTable()); am.shutdown(); } } @@ -927,17 +927,17 @@ public class TestAssignmentManager { this.serverManager); try { // set table in enabling state. - am.getZKTable().setEnablingTable(REGIONINFO.getTableName()); - new EnableTableHandler(server, REGIONINFO.getTableName(), + am.getZKTable().setEnablingTable(REGIONINFO.getTable()); + new EnableTableHandler(server, REGIONINFO.getTable(), am.getCatalogTracker(), am, new NullTableLockManager(), true).prepare() .process(); assertEquals("Number of assignments should be 1.", 1, assignmentCount); assertTrue("Table should be enabled.", - am.getZKTable().isEnabledTable(REGIONINFO.getTableName())); + am.getZKTable().isEnabledTable(REGIONINFO.getTable())); } finally { enabling = false; assignmentCount = 0; - am.getZKTable().setEnabledTable(REGIONINFO.getTableName()); + am.getZKTable().setEnabledTable(REGIONINFO.getTable()); am.shutdown(); ZKAssign.deleteAllNodes(this.watcher); } @@ -964,7 +964,7 @@ public class TestAssignmentManager { // adding region plan am.regionPlans.put(REGIONINFO.getEncodedName(), new RegionPlan(REGIONINFO, SERVERNAME_B, SERVERNAME_A)); - am.getZKTable().setEnabledTable(REGIONINFO.getTableName()); + am.getZKTable().setEnabledTable(REGIONINFO.getTable()); try { am.assignInvoked = false; Modified: hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestCatalogJanitor.java URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestCatalogJanitor.java?rev=1523142&r1=1523141&r2=1523142&view=diff ============================================================================== --- hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestCatalogJanitor.java (original) +++ hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestCatalogJanitor.java Fri Sep 13 23:18:07 2013 @@ -833,7 +833,7 @@ public class TestCatalogJanitor { // archive directory. Otherwise, it just seems to pick the first root directory it can find (so // the single test passes, but when the full suite is run, things get borked). FSUtils.setRootDir(fs.getConf(), rootdir); - Path tabledir = FSUtils.getTableDir(rootdir, parent.getTableName()); + Path tabledir = FSUtils.getTableDir(rootdir, parent.getTable()); Path storedir = HStore.getStoreHomedir(tabledir, parent, htd.getColumnFamilies()[0].getName()); System.out.println("Old root:" + rootdir); System.out.println("Old table:" + tabledir); @@ -915,7 +915,7 @@ public class TestCatalogJanitor { final HRegionInfo daughter, final byte [] midkey, final boolean top) throws IOException { Path rootdir = services.getMasterFileSystem().getRootDir(); - Path tabledir = FSUtils.getTableDir(rootdir, parent.getTableName()); + Path tabledir = FSUtils.getTableDir(rootdir, parent.getTable()); Path storedir = HStore.getStoreHomedir(tabledir, daughter, htd.getColumnFamilies()[0].getName()); Reference ref = Modified: hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java?rev=1523142&r1=1523141&r2=1523142&view=diff ============================================================================== --- hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java (original) +++ hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java Fri Sep 13 23:18:07 2013 @@ -208,7 +208,7 @@ public class TestDistributedLogSplitting hrs = rsts.get(i).getRegionServer(); regions = ProtobufUtil.getOnlineRegions(hrs); for (HRegionInfo region : regions) { - if (region.getTableName().getNameAsString().equalsIgnoreCase("table")) { + if (region.getTable().getNameAsString().equalsIgnoreCase("table")) { foundRs = true; break; } @@ -222,7 +222,7 @@ public class TestDistributedLogSplitting Iterator it = regions.iterator(); while (it.hasNext()) { HRegionInfo region = it.next(); - if (region.getTableName().getNamespaceAsString() + if (region.getTable().getNamespaceAsString() .equals(NamespaceDescriptor.SYSTEM_NAMESPACE_NAME_STR)) { it.remove(); } @@ -664,12 +664,12 @@ public class TestDistributedLogSplitting break; } if (tableName != null && - !tableName.equalsIgnoreCase(region.getTableName().getNameAsString())) { + !tableName.equalsIgnoreCase(region.getTable().getNameAsString())) { // make sure that we find a RS has online regions for both "table" and "disableTable" hasRegionsForBothTables = true; break; } else if (tableName == null) { - tableName = region.getTableName().getNameAsString(); + tableName = region.getTable().getNameAsString(); } } if (isCarryingMeta) { @@ -1123,7 +1123,7 @@ public class TestDistributedLogSplitting HRegionServer hrs = rst.getRegionServer(); List hris = ProtobufUtil.getOnlineRegions(hrs); for (HRegionInfo hri : hris) { - if (hri.getTableName().isSystemTable()) { + if (hri.getTable().isSystemTable()) { continue; } LOG.debug("adding data to rs = " + rst.getName() + @@ -1148,7 +1148,7 @@ public class TestDistributedLogSplitting for(Iterator iter = regions.iterator(); iter.hasNext(); ) { HRegionInfo regionInfo = iter.next(); - if(regionInfo.getTableName().isSystemTable()) { + if(regionInfo.getTable().isSystemTable()) { iter.remove(); } } @@ -1157,7 +1157,7 @@ public class TestDistributedLogSplitting List hris = new ArrayList(); for (HRegionInfo region : regions) { - if (!region.getTableName().getNameAsString().equalsIgnoreCase(tname)) { + if (!region.getTable().getNameAsString().equalsIgnoreCase(tname)) { continue; } hris.add(region); @@ -1330,7 +1330,7 @@ public class TestDistributedLogSplitting if (region.isMetaRegion()) { isCarryingMeta = true; } - if (tableName == null || region.getTableName().getNameAsString().equals(tableName)) { + if (tableName == null || region.getTable().getNameAsString().equals(tableName)) { foundTableRegion = true; } if (foundTableRegion && (isCarryingMeta || !hasMetaRegion)) { Modified: hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterTransitions.java URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterTransitions.java?rev=1523142&r1=1523141&r2=1523142&view=diff ============================================================================== --- hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterTransitions.java (original) +++ hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterTransitions.java Fri Sep 13 23:18:07 2013 @@ -489,12 +489,12 @@ public class TestMasterTransitions { for (Result r = null; (r = s.next()) != null;) { HRegionInfo hri = HRegionInfo.getHRegionInfo(r); if (hri == null) break; - if (!hri.getTableName().getNameAsString().equals(TABLENAME)) { + if (!hri.getTable().getNameAsString().equals(TABLENAME)) { continue; } // If start key, add 'aaa'. - if(!hri.getTableName().getNameAsString().equals(TABLENAME)) { + if(!hri.getTable().getNameAsString().equals(TABLENAME)) { continue; } byte [] row = getStartKey(hri); @@ -512,24 +512,6 @@ public class TestMasterTransitions { } /* - * @return Count of rows in TABLENAME - * @throws IOException - */ - private static int count() throws IOException { - HTable t = new HTable(TEST_UTIL.getConfiguration(), TABLENAME); - int rows = 0; - Scan scan = new Scan(); - ResultScanner s = t.getScanner(scan); - for (Result r = null; (r = s.next()) != null;) { - rows++; - } - s.close(); - LOG.info("Counted=" + rows); - t.close(); - return rows; - } - - /* * @param hri * @return Start key for hri (If start key is '', then return 'aaa'. */ @@ -545,6 +527,4 @@ public class TestMasterTransitions { private static byte [] getTestQualifier() { return getTestFamily(); } - -} - +} \ No newline at end of file Modified: hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRegionPlacement.java URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRegionPlacement.java?rev=1523142&r1=1523141&r2=1523142&view=diff ============================================================================== --- hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRegionPlacement.java (original) +++ hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRegionPlacement.java Fri Sep 13 23:18:07 2013 @@ -64,8 +64,6 @@ import org.apache.hadoop.hbase.regionser import org.apache.hadoop.hbase.regionserver.HRegionServer; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.Pair; -import org.apache.hadoop.hbase.zookeeper.ZKAssign; -import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher; import org.apache.zookeeper.KeeperException; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -307,7 +305,7 @@ public class TestRegionPlacement { TEST_UTIL.getHBaseCluster().getRegionServer(killIndex).getOnlineRegionsLocalContext(); isNamespaceServer = false; for (HRegion r : regs) { - if (r.getRegionInfo().getTableName().getNamespaceAsString() + if (r.getRegionInfo().getTable().getNamespaceAsString() .equals(NamespaceDescriptor.SYSTEM_NAMESPACE_NAME_STR)) { isNamespaceServer = true; break; @@ -606,7 +604,7 @@ public class TestRegionPlacement { public boolean processRow(Result result) throws IOException { try { HRegionInfo info = MetaScanner.getHRegionInfo(result); - if(info.getTableName().getNamespaceAsString() + if(info.getTable().getNamespaceAsString() .equals(NamespaceDescriptor.SYSTEM_NAMESPACE_NAME_STR)) { return true; } Modified: hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestZKBasedOpenCloseRegion.java URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestZKBasedOpenCloseRegion.java?rev=1523142&r1=1523141&r2=1523142&view=diff ============================================================================== --- hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestZKBasedOpenCloseRegion.java (original) +++ hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestZKBasedOpenCloseRegion.java Fri Sep 13 23:18:07 2013 @@ -283,7 +283,7 @@ public class TestZKBasedOpenCloseRegion for (Result r = null; (r = s.next()) != null;) { HRegionInfo hri = HRegionInfo.getHRegionInfo(r); if (hri == null) break; - if(!hri.getTableName().equals(TABLENAME)) { + if(!hri.getTable().equals(TABLENAME)) { continue; } // If start key, add 'aaa'. Modified: hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEndToEndSplitTransaction.java URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEndToEndSplitTransaction.java?rev=1523142&r1=1523141&r2=1523142&view=diff ============================================================================== --- hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEndToEndSplitTransaction.java (original) +++ hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEndToEndSplitTransaction.java Fri Sep 13 23:18:07 2013 @@ -480,7 +480,7 @@ public class TestEndToEndSplitTransactio throws IOException, InterruptedException { log("blocking until region is opened for reading:" + hri.getRegionNameAsString()); long start = System.currentTimeMillis(); - HTable table = new HTable(conf, hri.getTableName()); + HTable table = new HTable(conf, hri.getTable()); try { byte [] row = hri.getStartKey(); Modified: hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionFileSystem.java URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionFileSystem.java?rev=1523142&r1=1523141&r2=1523142&view=diff ============================================================================== --- hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionFileSystem.java (original) +++ hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionFileSystem.java Fri Sep 13 23:18:07 2013 @@ -60,7 +60,7 @@ public class TestHRegionFileSystem { // Create a Region HRegionInfo hri = new HRegionInfo(TableName.valueOf("TestTable")); HRegionFileSystem regionFs = HRegionFileSystem.createRegionOnFileSystem(conf, fs, - FSUtils.getTableDir(rootDir, hri.getTableName()), hri); + FSUtils.getTableDir(rootDir, hri.getTable()), hri); // Verify if the region is on disk Path regionDir = regionFs.getRegionDir(); @@ -72,12 +72,12 @@ public class TestHRegionFileSystem { // Open the region regionFs = HRegionFileSystem.openRegionFromFileSystem(conf, fs, - FSUtils.getTableDir(rootDir, hri.getTableName()), hri, false); + FSUtils.getTableDir(rootDir, hri.getTable()), hri, false); assertEquals(regionDir, regionFs.getRegionDir()); // Delete the region HRegionFileSystem.deleteRegionFromFileSystem(conf, fs, - FSUtils.getTableDir(rootDir, hri.getTableName()), hri); + FSUtils.getTableDir(rootDir, hri.getTable()), hri); assertFalse("The region folder should be removed", fs.exists(regionDir)); fs.delete(rootDir, true); Modified: hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionInfo.java URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionInfo.java?rev=1523142&r1=1523141&r2=1523142&view=diff ============================================================================== --- hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionInfo.java (original) +++ hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionInfo.java Fri Sep 13 23:18:07 2013 @@ -20,7 +20,6 @@ package org.apache.hadoop.hbase.regionse import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -28,12 +27,12 @@ import java.io.IOException; import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.Path; -import org.apache.hadoop.hbase.TableName; -import org.apache.hadoop.hbase.exceptions.DeserializationException; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.TableName; +import org.apache.hadoop.hbase.exceptions.DeserializationException; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.MD5Hash; import org.junit.Test; Modified: hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.java URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.java?rev=1523142&r1=1523141&r2=1523142&view=diff ============================================================================== --- hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.java (original) +++ hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.java Fri Sep 13 23:18:07 2013 @@ -185,7 +185,7 @@ public class TestRegionMergeTransactionO FileSystem fs = master.getMasterFileSystem().getFileSystem(); Path rootDir = master.getMasterFileSystem().getRootDir(); - Path tabledir = FSUtils.getTableDir(rootDir, mergedRegionInfo.getTableName()); + Path tabledir = FSUtils.getTableDir(rootDir, mergedRegionInfo.getTable()); Path regionAdir = new Path(tabledir, regionA.getEncodedName()); Path regionBdir = new Path(tabledir, regionB.getEncodedName()); assertTrue(fs.exists(regionAdir)); Modified: hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerNoMaster.java URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerNoMaster.java?rev=1523142&r1=1523141&r2=1523142&view=diff ============================================================================== --- hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerNoMaster.java (original) +++ hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerNoMaster.java Fri Sep 13 23:18:07 2013 @@ -307,7 +307,7 @@ public class TestRegionServerNoMaster { hri.getEncodedNameAsBytes())); // Let's start the open handler - HTableDescriptor htd = getRS().tableDescriptors.get(hri.getTableName()); + HTableDescriptor htd = getRS().tableDescriptors.get(hri.getTable()); getRS().service.submit(new OpenRegionHandler(getRS(), getRS(), hri, htd, 0)); // The open handler should have removed the region from RIT but kept the region closed @@ -361,7 +361,7 @@ public class TestRegionServerNoMaster { // 1) There is no ZK node // 2) The region in RIT was changed. // The order is more or less implementation dependant. - HTableDescriptor htd = getRS().tableDescriptors.get(hri.getTableName()); + HTableDescriptor htd = getRS().tableDescriptors.get(hri.getTable()); getRS().service.submit(new OpenRegionHandler(getRS(), getRS(), hri, htd, 0)); // The open handler should have removed the region from RIT but kept the region closed Modified: hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java?rev=1523142&r1=1523141&r2=1523142&view=diff ============================================================================== --- hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java (original) +++ hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java Fri Sep 13 23:18:07 2013 @@ -214,11 +214,11 @@ public class TestSplitTransactionOnClust RegionStates regionStates = cluster.getMaster().getAssignmentManager().getRegionStates(); Map rit = regionStates.getRegionsInTransition(); - for (int i=0; rit.containsKey(hri.getTableName()) && i<100; i++) { + for (int i=0; rit.containsKey(hri.getTable()) && i<100; i++) { Thread.sleep(100); } assertFalse("region still in transition", rit.containsKey( - rit.containsKey(hri.getTableName()))); + rit.containsKey(hri.getTable()))); List onlineRegions = regionServer.getOnlineRegions(tableName); // Region server side split is successful. @@ -891,7 +891,7 @@ public class TestSplitTransactionOnClust @Override void transitionZKNode(Server server, RegionServerServices services, HRegion a, HRegion b) throws IOException { - if (this.currentRegion.getRegionInfo().getTableName().getNameAsString() + if (this.currentRegion.getRegionInfo().getTable().getNameAsString() .equals("testShouldFailSplitIfZNodeDoesNotExistDueToPrevRollBack")) { try { if (!secondSplit){ @@ -903,14 +903,14 @@ public class TestSplitTransactionOnClust } super.transitionZKNode(server, services, a, b); - if (this.currentRegion.getRegionInfo().getTableName().getNameAsString() + if (this.currentRegion.getRegionInfo().getTable().getNameAsString() .equals("testShouldFailSplitIfZNodeDoesNotExistDueToPrevRollBack")) { firstSplitCompleted = true; } } @Override public boolean rollback(Server server, RegionServerServices services) throws IOException { - if (this.currentRegion.getRegionInfo().getTableName().getNameAsString() + if (this.currentRegion.getRegionInfo().getTable().getNameAsString() .equals("testShouldFailSplitIfZNodeDoesNotExistDueToPrevRollBack")) { if(secondSplit){ super.rollback(server, services); Modified: hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFile.java URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFile.java?rev=1523142&r1=1523141&r2=1523142&view=diff ============================================================================== --- hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFile.java (original) +++ hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFile.java Fri Sep 13 23:18:07 2013 @@ -93,7 +93,7 @@ public class TestStoreFile extends HBase final HRegionInfo hri = new HRegionInfo(TableName.valueOf("testBasicHalfMapFileTb")); HRegionFileSystem regionFs = HRegionFileSystem.createRegionOnFileSystem( - conf, fs, new Path(this.testDir, hri.getTableName().getNameAsString()), hri); + conf, fs, new Path(this.testDir, hri.getTable().getNameAsString()), hri); StoreFile.Writer writer = new StoreFile.WriterBuilder(conf, cacheConf, this.fs, 2 * 1024) .withFilePath(regionFs.createTempName()) @@ -142,7 +142,7 @@ public class TestStoreFile extends HBase public void testReference() throws IOException { final HRegionInfo hri = new HRegionInfo(TableName.valueOf("testReferenceTb")); HRegionFileSystem regionFs = HRegionFileSystem.createRegionOnFileSystem( - conf, fs, new Path(this.testDir, hri.getTableName().getNameAsString()), hri); + conf, fs, new Path(this.testDir, hri.getTable().getNameAsString()), hri); // Make a store file and write data to it. StoreFile.Writer writer = new StoreFile.WriterBuilder(conf, cacheConf, this.fs, 8 * 1024) @@ -162,7 +162,7 @@ public class TestStoreFile extends HBase kv = KeyValue.createKeyValueFromKey(reader.getLastKey()); byte [] finalRow = kv.getRow(); // Make a reference - HRegionInfo splitHri = new HRegionInfo(hri.getTableName(), null, midRow); + HRegionInfo splitHri = new HRegionInfo(hri.getTable(), null, midRow); Path refPath = splitStoreFile(regionFs, splitHri, TEST_FAMILY, hsf, midRow, true); StoreFile refHsf = new StoreFile(this.fs, refPath, conf, cacheConf, BloomType.NONE, NoOpDataBlockEncoder.INSTANCE); @@ -186,7 +186,7 @@ public class TestStoreFile extends HBase Configuration testConf = new Configuration(this.conf); FSUtils.setRootDir(testConf, this.testDir); HRegionFileSystem regionFs = HRegionFileSystem.createRegionOnFileSystem( - testConf, fs, FSUtils.getTableDir(this.testDir, hri.getTableName()), hri); + testConf, fs, FSUtils.getTableDir(this.testDir, hri.getTable()), hri); // Make a store file and write data to it. StoreFile.Writer writer = new StoreFile.WriterBuilder(testConf, cacheConf, this.fs, 8 * 1024) @@ -228,7 +228,7 @@ public class TestStoreFile extends HBase // adding legal table name chars to verify regex handles it. HRegionInfo hri = new HRegionInfo(TableName.valueOf("_original-evil-name")); HRegionFileSystem regionFs = HRegionFileSystem.createRegionOnFileSystem( - testConf, fs, FSUtils.getTableDir(this.testDir, hri.getTableName()), hri); + testConf, fs, FSUtils.getTableDir(this.testDir, hri.getTable()), hri); // Make a store file and write data to it. //// StoreFile.Writer writer = new StoreFile.WriterBuilder(testConf, cacheConf, this.fs, 8 * 1024) @@ -240,7 +240,7 @@ public class TestStoreFile extends HBase // create link to store file. /clone/region//-- HRegionInfo hriClone = new HRegionInfo(TableName.valueOf("clone")); HRegionFileSystem cloneRegionFs = HRegionFileSystem.createRegionOnFileSystem( - testConf, fs, FSUtils.getTableDir(this.testDir, hri.getTableName()), + testConf, fs, FSUtils.getTableDir(this.testDir, hri.getTable()), hriClone); Path dstPath = cloneRegionFs.getStoreDir(TEST_FAMILY); HFileLink.create(testConf, this.fs, dstPath, hri, storeFilePath.getName()); @@ -250,8 +250,8 @@ public class TestStoreFile extends HBase // create splits of the link. // /clone/splitA//, // /clone/splitB// - HRegionInfo splitHriA = new HRegionInfo(hri.getTableName(), null, SPLITKEY); - HRegionInfo splitHriB = new HRegionInfo(hri.getTableName(), SPLITKEY, null); + HRegionInfo splitHriA = new HRegionInfo(hri.getTable(), null, SPLITKEY); + HRegionInfo splitHriB = new HRegionInfo(hri.getTable(), SPLITKEY, null); StoreFile f = new StoreFile(fs, linkFilePath, testConf, cacheConf, BloomType.NONE, NoOpDataBlockEncoder.INSTANCE); Path pathA = splitStoreFile(cloneRegionFs, splitHriA, TEST_FAMILY, f, SPLITKEY, true); // top @@ -300,11 +300,11 @@ public class TestStoreFile extends HBase KeyValue midKV = KeyValue.createKeyValueFromKey(midkey); byte [] midRow = midKV.getRow(); // Create top split. - HRegionInfo topHri = new HRegionInfo(regionFs.getRegionInfo().getTableName(), + HRegionInfo topHri = new HRegionInfo(regionFs.getRegionInfo().getTable(), null, midRow); Path topPath = splitStoreFile(regionFs, topHri, TEST_FAMILY, f, midRow, true); // Create bottom split. - HRegionInfo bottomHri = new HRegionInfo(regionFs.getRegionInfo().getTableName(), + HRegionInfo bottomHri = new HRegionInfo(regionFs.getRegionInfo().getTable(), midRow, null); Path bottomPath = splitStoreFile(regionFs, bottomHri, TEST_FAMILY, f, midRow, false); // Make readers on top and bottom. Modified: hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/HLogPerformanceEvaluation.java URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/HLogPerformanceEvaluation.java?rev=1523142&r1=1523141&r2=1523142&view=diff ============================================================================== --- hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/HLogPerformanceEvaluation.java (original) +++ hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/HLogPerformanceEvaluation.java Fri Sep 13 23:18:07 2013 @@ -103,10 +103,10 @@ public final class HLogPerformanceEvalua addFamilyMapToWALEdit(put.getFamilyCellMap(), walEdit); HRegionInfo hri = region.getRegionInfo(); if (this.noSync) { - hlog.appendNoSync(hri, hri.getTableName(), walEdit, + hlog.appendNoSync(hri, hri.getTable(), walEdit, new ArrayList(), now, htd); } else { - hlog.append(hri, hri.getTableName(), walEdit, now, htd); + hlog.append(hri, hri.getTable(), walEdit, now, htd); } } long totalTime = (System.currentTimeMillis() - startTime); Modified: hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestTablePermissions.java URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestTablePermissions.java?rev=1523142&r1=1523141&r2=1523142&view=diff ============================================================================== --- hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestTablePermissions.java (original) +++ hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestTablePermissions.java Fri Sep 13 23:18:07 2013 @@ -191,7 +191,7 @@ public class TestTablePermissions { assertEquals("Should have 1 permission for george", 1, userPerms.size()); TablePermission permission = userPerms.get(0); assertEquals("Permission should be for " + TEST_TABLE, - TEST_TABLE, permission.getTable()); + TEST_TABLE, permission.getTableName()); assertNull("Column family should be empty", permission.getFamily()); // check actions @@ -206,7 +206,7 @@ public class TestTablePermissions { assertEquals("Should have 1 permission for hubert", 1, userPerms.size()); permission = userPerms.get(0); assertEquals("Permission should be for " + TEST_TABLE, - TEST_TABLE, permission.getTable()); + TEST_TABLE, permission.getTableName()); assertNull("Column family should be empty", permission.getFamily()); // check actions @@ -221,7 +221,7 @@ public class TestTablePermissions { assertEquals("Should have 1 permission for humphrey", 1, userPerms.size()); permission = userPerms.get(0); assertEquals("Permission should be for " + TEST_TABLE, - TEST_TABLE, permission.getTable()); + TEST_TABLE, permission.getTableName()); assertTrue("Permission should be for family " + TEST_FAMILY, Bytes.equals(TEST_FAMILY, permission.getFamily())); assertTrue("Permission should be for qualifier " + TEST_QUALIFIER, @@ -249,7 +249,7 @@ public class TestTablePermissions { assertNotNull(userPerms); assertEquals(1, userPerms.size()); permission = userPerms.get(0); - assertEquals(TEST_TABLE, permission.getTable()); + assertEquals(TEST_TABLE, permission.getTableName()); assertEquals(1, permission.getActions().length); assertEquals(TablePermission.Action.READ, permission.getActions()[0]); @@ -257,7 +257,7 @@ public class TestTablePermissions { assertNotNull(userPerms); assertEquals(1, userPerms.size()); permission = userPerms.get(0); - assertEquals(TEST_TABLE2, permission.getTable()); + assertEquals(TEST_TABLE2, permission.getTableName()); assertEquals(2, permission.getActions().length); actions = Arrays.asList(permission.getActions()); assertTrue(actions.contains(TablePermission.Action.READ)); Modified: hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestExportSnapshot.java URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestExportSnapshot.java?rev=1523142&r1=1523141&r2=1523142&view=diff ============================================================================== --- hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestExportSnapshot.java (original) +++ hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestExportSnapshot.java Fri Sep 13 23:18:07 2013 @@ -37,17 +37,16 @@ import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.FileUtil; import org.apache.hadoop.fs.Path; -import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.MediumTests; -import org.apache.hadoop.hbase.master.snapshot.SnapshotManager; +import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.HBaseAdmin; import org.apache.hadoop.hbase.client.HTable; -import org.apache.hadoop.hbase.protobuf.ProtobufUtil; +import org.apache.hadoop.hbase.master.snapshot.SnapshotManager; import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription; import org.apache.hadoop.hbase.regionserver.HRegionFileSystem; import org.apache.hadoop.hbase.util.Bytes; @@ -202,7 +201,7 @@ public class TestExportSnapshot { // First region, simple with one plain hfile. HRegionInfo hri = new HRegionInfo(tableWithRefsName); HRegionFileSystem r0fs = HRegionFileSystem.createRegionOnFileSystem(conf, - fs, FSUtils.getTableDir(archiveDir, hri.getTableName()), hri); + fs, FSUtils.getTableDir(archiveDir, hri.getTable()), hri); Path storeFile = new Path(rootDir, TEST_HFILE); FSDataOutputStream out = fs.create(storeFile); out.write(Bytes.toBytes("Test Data")); @@ -213,7 +212,7 @@ public class TestExportSnapshot { // This region contains a reference to the hfile in the first region. hri = new HRegionInfo(tableWithRefsName); HRegionFileSystem r1fs = HRegionFileSystem.createRegionOnFileSystem(conf, - fs, new Path(archiveDir, hri.getTableName().getNameAsString()), hri); + fs, new Path(archiveDir, hri.getTable().getNameAsString()), hri); storeFile = new Path(rootDir, TEST_HFILE + '.' + r0fs.getRegionInfo().getEncodedName()); out = fs.create(storeFile); out.write(Bytes.toBytes("Test Data")); Modified: hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestRestoreSnapshotHelper.java URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestRestoreSnapshotHelper.java?rev=1523142&r1=1523141&r2=1523142&view=diff ============================================================================== --- hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestRestoreSnapshotHelper.java (original) +++ hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestRestoreSnapshotHelper.java Fri Sep 13 23:18:07 2013 @@ -43,7 +43,6 @@ import org.apache.hadoop.hbase.catalog.C import org.apache.hadoop.hbase.errorhandling.ForeignExceptionDispatcher; import org.apache.hadoop.hbase.io.HFileLink; import org.apache.hadoop.hbase.monitoring.MonitoredTask; -import org.apache.hadoop.hbase.protobuf.ProtobufUtil; import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription; import org.apache.hadoop.hbase.regionserver.HRegionFileSystem; import org.apache.hadoop.hbase.regionserver.StoreFileInfo; @@ -160,7 +159,7 @@ public class TestRestoreSnapshotHelper { // First region, simple with one plain hfile. HRegionInfo hri = new HRegionInfo(htd.getTableName()); HRegionFileSystem r0fs = HRegionFileSystem.createRegionOnFileSystem(conf, - fs, FSUtils.getTableDir(archiveDir, hri.getTableName()), hri); + fs, FSUtils.getTableDir(archiveDir, hri.getTable()), hri); Path storeFile = new Path(rootDir, TEST_HFILE); fs.createNewFile(storeFile); r0fs.commitStoreFile(TEST_FAMILY, storeFile); @@ -169,7 +168,7 @@ public class TestRestoreSnapshotHelper { // This region contains a reference to the hfile in the first region. hri = new HRegionInfo(htd.getTableName()); HRegionFileSystem r1fs = HRegionFileSystem.createRegionOnFileSystem(conf, - fs, FSUtils.getTableDir(archiveDir, hri.getTableName()), hri); + fs, FSUtils.getTableDir(archiveDir, hri.getTable()), hri); storeFile = new Path(rootDir, TEST_HFILE + '.' + r0fs.getRegionInfo().getEncodedName()); fs.createNewFile(storeFile); r1fs.commitStoreFile(TEST_FAMILY, storeFile); Modified: hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java?rev=1523142&r1=1523141&r2=1523142&view=diff ============================================================================== --- hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java (original) +++ hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java Fri Sep 13 23:18:07 2013 @@ -1868,7 +1868,7 @@ public class TestHBaseFsck { @Override public boolean processRow(Result rowResult) throws IOException { - if(!MetaScanner.getHRegionInfo(rowResult).getTableName().isSystemTable()) { + if(!MetaScanner.getHRegionInfo(rowResult).getTable().isSystemTable()) { Delete delete = new Delete(rowResult.getRow()); delete.deleteColumn(HConstants.CATALOG_FAMILY, HConstants.REGIONINFO_QUALIFIER); deletes.add(delete); Modified: hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/util/hbck/OfflineMetaRebuildTestCore.java URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/util/hbck/OfflineMetaRebuildTestCore.java?rev=1523142&r1=1523141&r2=1523142&view=diff ============================================================================== --- hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/util/hbck/OfflineMetaRebuildTestCore.java (original) +++ hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/util/hbck/OfflineMetaRebuildTestCore.java Fri Sep 13 23:18:07 2013 @@ -235,8 +235,7 @@ public class OfflineMetaRebuildTestCore for (Result r : scanner) { HRegionInfo info = HRegionInfo.getHRegionInfo(r); - if(info != null && - !info.getTableName().getNamespaceAsString() + if(info != null && !info.getTable().getNamespaceAsString() .equals(NamespaceDescriptor.SYSTEM_NAMESPACE_NAME_STR)) { Delete d = new Delete(r.getRow()); dels.add(d);