You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by en...@apache.org on 2013/08/02 09:28:04 UTC
svn commit: r1509572 - in
/hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase: ./ coprocessor/
mapreduce/ regionserver/
Author: enis
Date: Fri Aug 2 07:28:03 2013
New Revision: 1509572
URL: http://svn.apache.org/r1509572
Log:
HBASE-9075 [0.94] Backport HBASE-5760 Unit tests should write only under /target to 0.94
Modified:
hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/coprocessor/TestCoprocessorInterface.java
hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionObserverInterface.java
hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionObserverStacking.java
hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHFileOutputFormat.java
hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionInfo.java
Modified: hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java?rev=1509572&r1=1509571&r2=1509572&view=diff
==============================================================================
--- hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java (original)
+++ hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java Fri Aug 2 07:28:03 2013
@@ -1420,6 +1420,9 @@ public class HBaseTestingUtility {
*/
public void startMiniMapReduceCluster(final int servers) throws IOException {
LOG.info("Starting mini mapreduce cluster...");
+ if (dataTestDir == null) {
+ setupDataTestDir();
+ }
// These are needed for the new and improved Map/Reduce framework
Configuration c = getConfiguration();
String logDir = c.get("hadoop.log.dir");
@@ -1434,8 +1437,10 @@ public class HBaseTestingUtility {
// we up the VM usable so that processes don't get killed.
conf.setFloat("yarn.nodemanager.vmem-pmem-ratio", 8.0f);
- mrCluster = new MiniMRCluster(servers,
- FileSystem.get(conf).getUri().toString(), 1);
+ mrCluster = new MiniMRCluster(0, 0, servers,
+ FileSystem.get(conf).getUri().toString(), 1, null, null, null, new JobConf(conf));
+ mrCluster.getJobTrackerRunner().getJobTracker().getConf().set("mapred.local.dir",
+ conf.get("mapred.local.dir")); //Hadoop MiniMR overwrites this while it should not
LOG.info("Mini mapreduce cluster started");
JobConf mrClusterJobConf = mrCluster.createJobConf();
c.set("mapred.job.tracker", mrClusterJobConf.get("mapred.job.tracker"));
Modified: hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/coprocessor/TestCoprocessorInterface.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/coprocessor/TestCoprocessorInterface.java?rev=1509572&r1=1509571&r2=1509572&view=diff
==============================================================================
--- hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/coprocessor/TestCoprocessorInterface.java (original)
+++ hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/coprocessor/TestCoprocessorInterface.java Fri Aug 2 07:28:03 2013
@@ -20,6 +20,8 @@
package org.apache.hadoop.hbase.coprocessor;
+import static org.mockito.Mockito.when;
+
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
@@ -45,14 +47,12 @@ import org.apache.hadoop.hbase.util.Pair
import org.junit.experimental.categories.Category;
import org.mockito.Mockito;
-import static org.mockito.Mockito.when;
-
@Category(SmallTests.class)
public class TestCoprocessorInterface extends HBaseTestCase {
static final Log LOG = LogFactory.getLog(TestCoprocessorInterface.class);
- static final String DIR = "test/build/data/TestCoprocessorInterface/";
private static final HBaseTestingUtility TEST_UTIL =
new HBaseTestingUtility();
+ static final Path DIR = TEST_UTIL.getDataTestDir();
private static class CustomScanner implements RegionScanner {
@@ -66,9 +66,9 @@ public class TestCoprocessorInterface ex
public boolean next(List<KeyValue> results) throws IOException {
return delegate.next(results);
}
-
+
@Override
- public boolean next(List<KeyValue> results, String metric)
+ public boolean next(List<KeyValue> results, String metric)
throws IOException {
return delegate.next(results, metric);
}
@@ -77,9 +77,9 @@ public class TestCoprocessorInterface ex
public boolean next(List<KeyValue> result, int limit) throws IOException {
return delegate.next(result, limit);
}
-
+
@Override
- public boolean next(List<KeyValue> result, int limit, String metric)
+ public boolean next(List<KeyValue> result, int limit, String metric)
throws IOException {
return delegate.next(result, limit, metric);
}
Modified: hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionObserverInterface.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionObserverInterface.java?rev=1509572&r1=1509571&r2=1509572&view=diff
==============================================================================
--- hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionObserverInterface.java (original)
+++ hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionObserverInterface.java Fri Aug 2 07:28:03 2013
@@ -20,6 +20,11 @@
package org.apache.hadoop.hbase.coprocessor;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import java.io.IOException;
import java.lang.reflect.Method;
import java.util.ArrayList;
@@ -44,18 +49,14 @@ import org.apache.hadoop.hbase.regionser
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;
import org.apache.hadoop.hbase.util.JVMClusterUtil;
-
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import static org.junit.Assert.*;
-
@Category(MediumTests.class)
public class TestRegionObserverInterface {
static final Log LOG = LogFactory.getLog(TestRegionObserverInterface.class);
- static final String DIR = "test/build/data/TestRegionObserver/";
public static final byte[] TEST_TABLE = Bytes.toBytes("TestTable");
public final static byte[] A = Bytes.toBytes("a");
@@ -304,21 +305,21 @@ public class TestRegionObserverInterface
public boolean next(List<KeyValue> results) throws IOException {
return next(results, -1);
}
-
+
@Override
- public boolean next(List<KeyValue> results, String metric)
+ public boolean next(List<KeyValue> results, String metric)
throws IOException {
return next(results, -1, metric);
}
@Override
- public boolean next(List<KeyValue> results, int limit)
+ public boolean next(List<KeyValue> results, int limit)
throws IOException{
return next(results, limit, null);
}
@Override
- public boolean next(List<KeyValue> results, int limit, String metric)
+ public boolean next(List<KeyValue> results, int limit, String metric)
throws IOException {
List<KeyValue> internalResults = new ArrayList<KeyValue>();
boolean hasMore;
Modified: hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionObserverStacking.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionObserverStacking.java?rev=1509572&r1=1509571&r2=1509572&view=diff
==============================================================================
--- hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionObserverStacking.java (original)
+++ hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionObserverStacking.java Fri Aug 2 07:28:03 2013
@@ -21,24 +21,30 @@
package org.apache.hadoop.hbase.coprocessor;
import java.io.IOException;
-import java.util.List;
-import java.util.Map;
+
+import junit.framework.TestCase;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.hbase.*;
+import org.apache.hadoop.hbase.Coprocessor;
+import org.apache.hadoop.hbase.HBaseConfiguration;
+import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HColumnDescriptor;
+import org.apache.hadoop.hbase.HRegionInfo;
+import org.apache.hadoop.hbase.HTableDescriptor;
+import org.apache.hadoop.hbase.SmallTests;
import org.apache.hadoop.hbase.client.Put;
+import org.apache.hadoop.hbase.regionserver.HRegion;
import org.apache.hadoop.hbase.regionserver.RegionCoprocessorHost;
import org.apache.hadoop.hbase.regionserver.wal.WALEdit;
-import org.apache.hadoop.hbase.regionserver.HRegion;
import org.apache.hadoop.hbase.util.Bytes;
-
-import junit.framework.TestCase;
import org.junit.experimental.categories.Category;
@Category(SmallTests.class)
public class TestRegionObserverStacking extends TestCase {
- static final String DIR = "test/build/data/TestRegionObserverStacking/";
+ private static HBaseTestingUtility TEST_UTIL
+ = new HBaseTestingUtility();
+ static final Path DIR = TEST_UTIL.getDataTestDir();
public static class ObserverA extends BaseRegionObserver {
long id;
Modified: hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHFileOutputFormat.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHFileOutputFormat.java?rev=1509572&r1=1509571&r2=1509572&view=diff
==============================================================================
--- hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHFileOutputFormat.java (original)
+++ hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHFileOutputFormat.java Fri Aug 2 07:28:03 2013
@@ -275,7 +275,7 @@ public class TestHFileOutputFormat {
// verify that the file has the proper FileInfo.
writer.close(context);
- // the generated file lives 1 directory down from the attempt directory
+ // the generated file lives 1 directory down from the attempt directory
// and is the only file, e.g.
// _attempt__0000_r_000000_0/b/1979617994050536795
FileSystem fs = FileSystem.get(conf);
@@ -344,7 +344,8 @@ public class TestHFileOutputFormat {
@Test
public void testJobConfiguration() throws Exception {
- Job job = new Job();
+ Job job = new Job(util.getConfiguration());
+ job.setWorkingDirectory(util.getDataTestDir("testJobConfiguration"));
HTable table = Mockito.mock(HTable.class);
setupMockStartKeys(table);
HFileOutputFormat.configureIncrementalLoad(job, table);
@@ -469,6 +470,7 @@ public class TestHFileOutputFormat {
Configuration conf, HTable table, Path outDir)
throws Exception {
Job job = new Job(conf, "testLocalMRIncrementalLoad");
+ job.setWorkingDirectory(util.getDataTestDir("runIncrementalPELoad"));
setupRandomGeneratorMapper(job);
HFileOutputFormat.configureIncrementalLoad(job, table);
FileOutputFormat.setOutputPath(job, outDir);
@@ -583,6 +585,7 @@ public class TestHFileOutputFormat {
// pollutes the GZip codec pool with an incompatible compressor.
conf.set("io.seqfile.compression.type", "NONE");
Job job = new Job(conf, "testLocalMRIncrementalLoad");
+ job.setWorkingDirectory(util.getDataTestDir("testColumnFamilyCompression"));
setupRandomGeneratorMapper(job);
HFileOutputFormat.configureIncrementalLoad(job, table);
FileOutputFormat.setOutputPath(job, dir);
Modified: hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionInfo.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionInfo.java?rev=1509572&r1=1509571&r2=1509572&view=diff
==============================================================================
--- hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionInfo.java (original)
+++ hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionInfo.java Fri Aug 2 07:28:03 2013
@@ -21,16 +21,13 @@ 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;
-import java.io.IOException;
-
-import org.apache.hadoop.hbase.*;
+import org.apache.hadoop.hbase.HRegionInfo;
+import org.apache.hadoop.hbase.HTableDescriptor;
+import org.apache.hadoop.hbase.SmallTests;
import org.apache.hadoop.hbase.util.Bytes;
-import org.apache.hadoop.hbase.util.FSTableDescriptors;
-import org.apache.hadoop.hbase.util.FSUtils;
import org.apache.hadoop.hbase.util.MD5Hash;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -60,32 +57,7 @@ public class TestHRegionInfo {
+ id + "." + md5HashInHex + ".",
nameStr);
}
-
- @Test
- public void testGetSetOfHTD() throws IOException {
- HBaseTestingUtility HTU = new HBaseTestingUtility();
- final String tablename = "testGetSetOfHTD";
-
- // Delete the temporary table directory that might still be there from the
- // previous test run.
- FSTableDescriptors.deleteTableDescriptorIfExists(tablename,
- HTU.getConfiguration());
-
- HTableDescriptor htd = new HTableDescriptor(tablename);
- FSTableDescriptors.createTableDescriptor(htd, HTU.getConfiguration());
- HRegionInfo hri = new HRegionInfo(Bytes.toBytes("testGetSetOfHTD"),
- HConstants.EMPTY_START_ROW, HConstants.EMPTY_END_ROW);
- HTableDescriptor htd2 = hri.getTableDesc();
- assertTrue(htd.equals(htd2));
- final String key = "SOME_KEY";
- assertNull(htd.getValue(key));
- final String value = "VALUE";
- htd.setValue(key, value);
- hri.setTableDesc(htd);
- HTableDescriptor htd3 = hri.getTableDesc();
- assertTrue(htd.equals(htd3));
- }
-
+
@Test
public void testContainsRange() {
HTableDescriptor tableDesc = new HTableDescriptor("testtable");
@@ -105,7 +77,7 @@ public class TestHRegionInfo {
assertFalse(hri.containsRange(Bytes.toBytes("g"), Bytes.toBytes("g")));
// Single row range entirely outside
assertFalse(hri.containsRange(Bytes.toBytes("z"), Bytes.toBytes("z")));
-
+
// Degenerate range
try {
hri.containsRange(Bytes.toBytes("z"), Bytes.toBytes("a"));
@@ -134,14 +106,14 @@ public class TestHRegionInfo {
public void testComparator() {
byte[] tablename = Bytes.toBytes("comparatorTablename");
byte[] empty = new byte[0];
- HRegionInfo older = new HRegionInfo(tablename, empty, empty, false, 0L);
- HRegionInfo newer = new HRegionInfo(tablename, empty, empty, false, 1L);
+ HRegionInfo older = new HRegionInfo(tablename, empty, empty, false, 0L);
+ HRegionInfo newer = new HRegionInfo(tablename, empty, empty, false, 1L);
assertTrue(older.compareTo(newer) < 0);
assertTrue(newer.compareTo(older) > 0);
assertTrue(older.compareTo(older) == 0);
assertTrue(newer.compareTo(newer) == 0);
}
-
+
@org.junit.Rule
public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();