From d5eebc6b021cec1dbc1c358fb05da923419409b3 Mon Sep 17 00:00:00 2001 From: Michael Stack Date: Thu, 8 Aug 2013 05:49:29 +0000 Subject: [PATCH] HBASE-8408 Implement namespace; ADDENDUM git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1511587 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/org/apache/hadoop/hbase/util/TestMergeTable.java | 2 +- .../java/org/apache/hadoop/hbase/util/TestMergeTool.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestMergeTable.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestMergeTable.java index 8ee234932fa..c0bb5c84b81 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestMergeTable.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestMergeTable.java @@ -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. diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestMergeTool.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestMergeTool.java index 9e780b3d663..6fed35f8492 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestMergeTool.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestMergeTool.java @@ -67,7 +67,7 @@ public class TestMergeTool extends HBaseTestCase { 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 HBaseTestCase { + 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 ",