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/08/08 07:49:29 UTC
svn commit: r1511587 - in /hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/util: TestMergeTable.java TestMergeTool.java

Author: stack
Date: Thu Aug  8 05:49:29 2013
New Revision: 1511587

URL: http://svn.apache.org/r1511587
Log:
HBASE-8408 Implement namespace; ADDENDUM

Modified:
    hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestMergeTable.java
    hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestMergeTool.java

Modified: hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestMergeTable.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestMergeTable.java?rev=1511587&r1=1511586&r2=1511587&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestMergeTable.java (original)
+++ hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestMergeTable.java Thu Aug  8 05:49:29 2013
@@ -66,7 +66,7 @@ public class TestMergeTable {
    */
   @Test (timeout=300000) public void testMergeTable() throws Exception {
     // Table we are manually creating offline.
-    HTableDescriptor desc = new HTableDescriptor(TableName.valueOf(Bytes.toBytes("test")));
+    HTableDescriptor desc = new HTableDescriptor(org.apache.hadoop.hbase.TableName.valueOf(Bytes.toBytes("test")));
     desc.addFamily(new HColumnDescriptor(COLUMN_NAME));
 
     // Set maximum regionsize down.

Modified: hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestMergeTool.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestMergeTool.java?rev=1511587&r1=1511586&r2=1511587&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestMergeTool.java (original)
+++ hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestMergeTool.java Thu Aug  8 05:49:29 2013
@@ -67,7 +67,7 @@ public class TestMergeTool extends HBase
     this.conf.set("hbase.hstore.compactionThreshold", "2");
 
     // Create table description
-    this.desc = new HTableDescriptor(TableName.valueOf("TestMergeTool"));
+    this.desc = new HTableDescriptor(org.apache.hadoop.hbase.TableName.valueOf("TestMergeTool"));
     this.desc.addFamily(new HColumnDescriptor(FAMILY));
 
     /*
@@ -268,9 +268,9 @@ public class TestMergeTool extends HBase
       + System.currentTimeMillis();
     LOG.info("Creating log " + logPath.toString() + "/" + logName);
 
-    HLog log = HLogFactory.createHLog(this.fs, logPath, 
+    HLog log = HLogFactory.createHLog(this.fs, logPath,
         logName, this.conf);
-    
+
     try {
        // Merge Region 0 and Region 1
       HRegion merged = mergeAndVerify("merging regions 0 and 1 ",