You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by li...@apache.org on 2014/05/14 02:27:04 UTC
svn commit: r1594423 [12/17] - in /hbase/branches/0.89-fb: ./ bin/
src/main/java/org/apache/hadoop/hbase/rest/
src/main/java/org/apache/hadoop/hbase/rest/client/
src/main/java/org/apache/hadoop/hbase/rest/metrics/
src/main/java/org/apache/hadoop/hbase/...
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFile.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFile.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFile.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFile.java Wed May 14 00:26:57 2014
@@ -35,11 +35,13 @@ import org.apache.hadoop.hbase.HBaseTest
import org.apache.hadoop.hbase.HBaseTestingUtility;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.KeyValue.KeyComparator;
+import org.apache.hadoop.hbase.MediumTests;
import org.apache.hadoop.hbase.io.hfile.HFile.Reader;
import org.apache.hadoop.hbase.io.hfile.HFile.Writer;
import org.apache.hadoop.hbase.regionserver.metrics.SchemaMetrics;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.io.Writable;
+import org.junit.experimental.categories.Category;
/**
* test hfile features.
@@ -49,6 +51,7 @@ import org.apache.hadoop.io.Writable;
* Remove after tfile is committed and use the tfile version of this class
* instead.</p>
*/
+@Category(MediumTests.class)
public class TestHFile extends HBaseTestCase {
static final Log LOG = LogFactory.getLog(TestHFile.class);
@@ -308,4 +311,4 @@ public class TestHFile extends HBaseTest
writer.close();
}
-}
\ No newline at end of file
+}
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileBlock.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileBlock.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileBlock.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileBlock.java Wed May 14 00:26:57 2014
@@ -702,4 +702,4 @@ public class TestHFileBlock {
}
}
-}
\ No newline at end of file
+}
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileBlockIndex.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileBlockIndex.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileBlockIndex.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileBlockIndex.java Wed May 14 00:26:57 2014
@@ -47,6 +47,8 @@ import org.apache.hadoop.hbase.HBaseTest
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.KeyValue;
import org.apache.hadoop.hbase.KeyValueContext;
+import org.apache.hadoop.hbase.MediumTests;
+import org.apache.hadoop.hbase.SmallTests;
import org.apache.hadoop.hbase.io.encoding.DataBlockEncoding;
import org.apache.hadoop.hbase.io.hfile.HFileBlockIndex.BlockIndexChunk;
import org.apache.hadoop.hbase.io.hfile.HFileBlockIndex.BlockIndexReader;
@@ -54,10 +56,12 @@ import org.apache.hadoop.hbase.util.Byte
import org.apache.hadoop.hbase.util.ClassSize;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized.Parameters;
import org.junit.runners.Parameterized;
+@Category(MediumTests.class)
@RunWith(Parameterized.class)
public class TestHFileBlockIndex {
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileInlineToRootChunkConversion.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileInlineToRootChunkConversion.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileInlineToRootChunkConversion.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileInlineToRootChunkConversion.java Wed May 14 00:26:57 2014
@@ -24,8 +24,10 @@ import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.HBaseTestingUtility;
import org.apache.hadoop.hbase.HConstants;
+import org.apache.hadoop.hbase.MediumTests;
import org.apache.hadoop.hbase.util.Bytes;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
/**
* Test a case when an inline index chunk is converted to a root one. This reproduces the bug in
@@ -38,6 +40,7 @@ import org.junit.Test;
* another entry to the root-level block, and that would prevent us from upgrading the leaf-level
* chunk to the root chunk, thus not triggering the bug.
*/
+@Category(MediumTests.class)
public class TestHFileInlineToRootChunkConversion {
private final HBaseTestingUtility testUtil = new HBaseTestingUtility();
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFilePerformance.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFilePerformance.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFilePerformance.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFilePerformance.java Wed May 14 00:26:57 2014
@@ -35,11 +35,13 @@ import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.HBaseTestingUtility;
import org.apache.hadoop.hbase.HConstants;
+import org.apache.hadoop.hbase.MediumTests;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.io.BytesWritable;
import org.apache.hadoop.io.SequenceFile;
import org.apache.hadoop.io.compress.CompressionCodec;
import org.apache.hadoop.io.compress.GzipCodec;
+import org.junit.experimental.categories.Category;
class RawKeyValue implements Comparable<RawKeyValue> {
private final byte[] key;
@@ -73,6 +75,7 @@ class RawKeyValue implements Comparable<
* Remove after tfile is committed and use the tfile version of this class
* instead.</p>
*/
+@Category(MediumTests.class)
public class TestHFilePerformance extends TestCase {
private static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
private static String ROOT_DIR =
@@ -449,4 +452,4 @@ public class TestHFilePerformance extend
" the same method several times and flood cache every time and average it to get a" +
" better number.");
}
-}
\ No newline at end of file
+}
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileReaderV1.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileReaderV1.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileReaderV1.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileReaderV1.java Wed May 14 00:26:57 2014
@@ -29,15 +29,18 @@ import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.HBaseTestingUtility;
import org.apache.hadoop.hbase.HConstants;
+import org.apache.hadoop.hbase.MediumTests;
import org.apache.hadoop.hbase.regionserver.metrics.SchemaMetrics;
import org.apache.hadoop.hbase.util.Bytes;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import static org.junit.Assert.*;
+@Category(MediumTests.class)
public class TestHFileReaderV1 {
private static final HBaseTestingUtility TEST_UTIL =
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileSeek.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileSeek.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileSeek.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileSeek.java Wed May 14 00:26:57 2014
@@ -39,9 +39,11 @@ import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.HBaseTestingUtility;
import org.apache.hadoop.hbase.HConstants;
+import org.apache.hadoop.hbase.MediumTests;
import org.apache.hadoop.hbase.io.hfile.HFile.Reader;
import org.apache.hadoop.hbase.io.hfile.HFile.Writer;
import org.apache.hadoop.io.BytesWritable;
+import org.junit.experimental.categories.Category;
/**
* test the performance for seek.
@@ -51,6 +53,7 @@ import org.apache.hadoop.io.BytesWritabl
* Remove after tfile is committed and use the tfile version of this class
* instead.</p>
*/
+@Category(MediumTests.class)
public class TestHFileSeek extends TestCase {
private MyOptions options;
private Configuration conf;
@@ -499,4 +502,4 @@ public class TestHFileSeek extends TestC
testCase.testSeeks();
testCase.tearDown();
}
-}
\ No newline at end of file
+}
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileWriterV2.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileWriterV2.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileWriterV2.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileWriterV2.java Wed May 14 00:26:57 2014
@@ -38,6 +38,7 @@ import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.HBaseTestingUtility;
import org.apache.hadoop.hbase.KeyValue;
+import org.apache.hadoop.hbase.MediumTests;
import org.apache.hadoop.hbase.io.hfile.HFile.FileInfo;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.io.RawComparator;
@@ -45,11 +46,13 @@ import org.apache.hadoop.io.Text;
import org.apache.hadoop.io.WritableUtils;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
/**
* Testing writing a version 2 {@link HFile}. This is a low-level test written
* during the development of {@link HFileWriterV2}.
*/
+@Category(MediumTests.class)
public class TestHFileWriterV2 {
private static final Log LOG = LogFactory.getLog(TestHFileWriterV2.class);
@@ -302,4 +305,4 @@ public class TestHFileWriterV2 {
randomValue(rand));
}
-}
\ No newline at end of file
+}
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/TestIncrementalEncoding.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/TestIncrementalEncoding.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/TestIncrementalEncoding.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/TestIncrementalEncoding.java Wed May 14 00:26:57 2014
@@ -27,10 +27,13 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.KeyValue;
+import org.apache.hadoop.hbase.SmallTests;
import org.apache.hadoop.hbase.io.encoding.DataBlockEncoding;
import org.apache.hadoop.hbase.util.Bytes;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(SmallTests.class)
public class TestIncrementalEncoding {
private static final Log LOG = LogFactory.getLog(TestIncrementalEncoding.class);
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/TestL2BucketCache.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/TestL2BucketCache.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/TestL2BucketCache.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/TestL2BucketCache.java Wed May 14 00:26:57 2014
@@ -37,6 +37,7 @@ import org.apache.hadoop.hbase.util.Bloo
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@@ -49,6 +50,7 @@ import static org.junit.Assert.*;
/**
* Tests L2 bucket cache for correctness
*/
+@Category(MediumTests.class)
@RunWith(Parameterized.class)
public class TestL2BucketCache {
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/TestLruBlockCache.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/TestLruBlockCache.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/TestLruBlockCache.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/TestLruBlockCache.java Wed May 14 00:26:57 2014
@@ -23,6 +23,7 @@ import java.util.Collection;
import java.util.Map;
import java.util.Random;
+import org.apache.hadoop.hbase.SmallTests;
import org.apache.hadoop.hbase.io.HeapSize;
import org.apache.hadoop.hbase.regionserver.metrics.SchemaMetrics;
import org.apache.hadoop.hbase.regionserver.metrics.TestSchemaMetrics;
@@ -30,6 +31,7 @@ import org.apache.hadoop.hbase.util.Clas
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
@@ -43,6 +45,7 @@ import static org.junit.Assert.*;
* evictions run when they're supposed to and do what they should,
* and that cached blocks are accessible when expected to be.
*/
+@Category(SmallTests.class)
@RunWith(Parameterized.class)
public class TestLruBlockCache {
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/TestReseekTo.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/TestReseekTo.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/TestReseekTo.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/TestReseekTo.java Wed May 14 00:26:57 2014
@@ -30,12 +30,15 @@ import org.apache.hadoop.fs.FSDataOutput
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.HBaseTestingUtility;
import org.apache.hadoop.hbase.HConstants;
+import org.apache.hadoop.hbase.MediumTests;
import org.apache.hadoop.hbase.util.Bytes;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
/**
* Test {@link HFileScanner#reseekTo(byte[])}
*/
+@Category(MediumTests.class)
public class TestReseekTo {
private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
@@ -89,4 +92,4 @@ public class TestReseekTo {
}
}
-}
\ No newline at end of file
+}
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/TestScannerSelectionUsingTTL.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/TestScannerSelectionUsingTTL.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/TestScannerSelectionUsingTTL.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/TestScannerSelectionUsingTTL.java Wed May 14 00:26:57 2014
@@ -32,6 +32,7 @@ import org.apache.hadoop.hbase.HColumnDe
import org.apache.hadoop.hbase.HRegionInfo;
import org.apache.hadoop.hbase.HTableDescriptor;
import org.apache.hadoop.hbase.KeyValue;
+import org.apache.hadoop.hbase.MediumTests;
import org.apache.hadoop.hbase.client.Put;
import org.apache.hadoop.hbase.client.Scan;
import org.apache.hadoop.hbase.io.hfile.BlockType.BlockCategory;
@@ -42,6 +43,7 @@ import org.apache.hadoop.hbase.regionser
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.Threads;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
@@ -50,6 +52,7 @@ import org.junit.runners.Parameterized.P
* Test the optimization that does not scan files where all timestamps are
* expired.
*/
+@Category(MediumTests.class)
@RunWith(Parameterized.class)
public class TestScannerSelectionUsingTTL {
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/TestSeekTo.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/TestSeekTo.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/TestSeekTo.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/TestSeekTo.java Wed May 14 00:26:57 2014
@@ -229,4 +229,4 @@ public class TestSeekTo extends HBaseTes
assertEquals(1, blockIndexReader.rootBlockContainingKey(
toKV("l").getKey(), 0, klen));
}
-}
\ No newline at end of file
+}
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/bucket/TestBucketCache.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/bucket/TestBucketCache.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/bucket/TestBucketCache.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/bucket/TestBucketCache.java Wed May 14 00:26:57 2014
@@ -24,6 +24,7 @@ import org.apache.commons.logging.LogFac
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.MultithreadedTestUtil;
+import org.apache.hadoop.hbase.SmallTests;
import org.apache.hadoop.hbase.io.hfile.BlockCacheKey;
import org.apache.hadoop.hbase.io.hfile.BlockType;
import org.apache.hadoop.hbase.io.hfile.CacheConfig;
@@ -31,6 +32,7 @@ import org.apache.hadoop.hbase.io.hfile.
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@@ -47,6 +49,7 @@ import static org.junit.Assert.assertArr
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
+@Category(SmallTests.class)
@RunWith(Parameterized.class)
public class TestBucketCache {
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/bucket/TestByteBufferIOEngine.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/bucket/TestByteBufferIOEngine.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/bucket/TestByteBufferIOEngine.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/bucket/TestByteBufferIOEngine.java Wed May 14 00:26:57 2014
@@ -19,7 +19,9 @@ package org.apache.hadoop.hbase.io.hfile
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.hbase.SmallTests;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@@ -32,6 +34,7 @@ import static org.junit.Assert.assertTru
/**
* Test for {@link ByteBufferIOEngine}
*/
+@Category(SmallTests.class)
@RunWith(Parameterized.class)
public class TestByteBufferIOEngine {
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/histogram/TestConversionUtils.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/histogram/TestConversionUtils.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/histogram/TestConversionUtils.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/histogram/TestConversionUtils.java Wed May 14 00:26:57 2014
@@ -22,11 +22,15 @@ package org.apache.hadoop.hbase.io.hfile
import java.util.Random;
+import org.apache.hadoop.hbase.SmallTests;
import org.apache.hadoop.hbase.util.Bytes;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import static org.apache.hadoop.hbase.io.hfile.histogram.UniformSplitHFileHistogram.*;
import static org.junit.Assert.*;
+@Category(SmallTests.class)
public class TestConversionUtils {
@Test
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/histogram/TestHiveBasedNumericHistogram.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/histogram/TestHiveBasedNumericHistogram.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/histogram/TestHiveBasedNumericHistogram.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/hfile/histogram/TestHiveBasedNumericHistogram.java Wed May 14 00:26:57 2014
@@ -4,11 +4,14 @@ import static org.junit.Assert.*;
import java.util.Random;
+import org.apache.hadoop.hbase.SmallTests;
import org.apache.hadoop.hbase.io.hfile.histogram.HiveBasedNumericHistogram.Coord;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(SmallTests.class)
public class TestHiveBasedNumericHistogram {
private HiveBasedNumericHistogram hist;
double min = 0;
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/ipc/TestPerRequestProfiling.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/ipc/TestPerRequestProfiling.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/ipc/TestPerRequestProfiling.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/ipc/TestPerRequestProfiling.java Wed May 14 00:26:57 2014
@@ -11,6 +11,7 @@ import org.apache.commons.logging.LogFac
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HBaseConfiguration;
import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.MediumTests;
import org.apache.hadoop.hbase.client.Get;
import org.apache.hadoop.hbase.client.HTable;
import org.apache.hadoop.hbase.client.Put;
@@ -21,7 +22,9 @@ import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(MediumTests.class)
public class TestPerRequestProfiling {
final Log LOG = LogFactory.getLog(getClass());
private static HBaseTestingUtility TEST_UTIL;
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/ipc/TestRPCCompression.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/ipc/TestRPCCompression.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/ipc/TestRPCCompression.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/ipc/TestRPCCompression.java Wed May 14 00:26:57 2014
@@ -13,6 +13,7 @@ import org.apache.hadoop.conf.Configurat
import org.apache.hadoop.hbase.HBaseConfiguration;
import org.apache.hadoop.hbase.HBaseTestingUtility;
import org.apache.hadoop.hbase.HConstants;
+import org.apache.hadoop.hbase.MediumTests;
import org.apache.hadoop.hbase.client.Get;
import org.apache.hadoop.hbase.client.HTable;
import org.apache.hadoop.hbase.client.Put;
@@ -24,7 +25,9 @@ import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(MediumTests.class)
public class TestRPCCompression {
final Log LOG = LogFactory.getLog(getClass());
private static HBaseTestingUtility TEST_UTIL;
@@ -64,30 +67,30 @@ public class TestRPCCompression {
public void tearDown() throws Exception {
// Nothing to do.
}
-
+
@Test
public void testCompressedRPC() throws Exception {
byte[] TABLE = Bytes.toBytes("testRPCCompression");
byte[][] FAMILIES = new byte[][] { Bytes.toBytes("foo") };
- byte [] QUALIFIER = Bytes.toBytes("testQualifier");
- byte [] VALUE = Bytes.toBytes("testValue");
+ byte[] QUALIFIER = Bytes.toBytes("testQualifier");
+ byte[] VALUE = Bytes.toBytes("testValue");
// create a table
TEST_UTIL.createTable(TABLE, FAMILIES);
LOG.debug("Created table " + new String(TABLE));
-
+
// open the table with compressed RPC
Configuration conf = HBaseConfiguration.create();
String zkPortStr = TEST_UTIL.getConfiguration().get(
"hbase.zookeeper.property.clientPort");
- conf.setInt("hbase.zookeeper.property.clientPort",
+ conf.setInt("hbase.zookeeper.property.clientPort",
Integer.parseInt(zkPortStr));
- conf.set(HConstants.HBASE_RPC_COMPRESSION_KEY,
+ conf.set(HConstants.HBASE_RPC_COMPRESSION_KEY,
Compression.Algorithm.GZ.getName());
HTable table = new HTable(conf, TABLE);
// put some values
- byte [][] ROWS = { Bytes.toBytes("a"), Bytes.toBytes("b") };
+ byte[][] ROWS = { Bytes.toBytes("a"), Bytes.toBytes("b") };
for (int i = 0; i < ROWS.length; i++) {
Put put = new Put(ROWS[i]);
put.add(FAMILIES[0], QUALIFIER, VALUE);
@@ -104,9 +107,9 @@ public class TestRPCCompression {
Get get = new Get(ROWS[i]);
get.addColumn(FAMILIES[0], QUALIFIER);
Result result = table.get(get);
-
- assertEquals(new String(VALUE),
- new String(result.getValue(FAMILIES[0], QUALIFIER)));
+
+ assertEquals(new String(VALUE),
+ new String(result.getValue(FAMILIES[0], QUALIFIER)));
}
LOG.debug("Read and verified from table " + new String(TABLE));
}
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/loadtest/ColumnFamilyProperties.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/loadtest/ColumnFamilyProperties.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/loadtest/ColumnFamilyProperties.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/loadtest/ColumnFamilyProperties.java Wed May 14 00:26:57 2014
@@ -135,4 +135,4 @@ CF3_CompressionType=GZ
*
*
-*/
\ No newline at end of file
+*/
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/loadtest/LoadTester.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/loadtest/LoadTester.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/loadtest/LoadTester.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/loadtest/LoadTester.java Wed May 14 00:26:57 2014
@@ -448,4 +448,4 @@ public class LoadTester {
helpFormatter.setWidth(80);
helpFormatter.printHelp(USAGE, HEADER, options, FOOTER);
}
-}
\ No newline at end of file
+}
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/mapred/TestLegacyTableMapReduce.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/mapred/TestLegacyTableMapReduce.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/mapred/TestLegacyTableMapReduce.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/mapred/TestLegacyTableMapReduce.java Wed May 14 00:26:57 2014
@@ -1,251 +0,0 @@
-/**
- * Copyright 2010 The Apache Software Foundation
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.hadoop.hbase.mapred;
-
-import java.io.IOException;
-import java.util.Map;
-import java.util.NavigableMap;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
-import org.apache.hadoop.hbase.HColumnDescriptor;
-import org.apache.hadoop.hbase.HConstants;
-import org.apache.hadoop.hbase.HTableDescriptor;
-import org.apache.hadoop.hbase.KeyValue;
-import org.apache.hadoop.hbase.MultiRegionTable;
-import org.apache.hadoop.hbase.client.HTable;
-import org.apache.hadoop.hbase.client.Put;
-import org.apache.hadoop.hbase.client.Result;
-import org.apache.hadoop.hbase.client.ResultScanner;
-import org.apache.hadoop.hbase.client.Scan;
-import org.apache.hadoop.hbase.io.ImmutableBytesWritable;
-import org.apache.hadoop.hbase.util.Bytes;
-import org.apache.hadoop.mapred.JobClient;
-import org.apache.hadoop.mapred.JobConf;
-import org.apache.hadoop.mapred.MapReduceBase;
-import org.apache.hadoop.mapred.MiniMRCluster;
-import org.apache.hadoop.mapred.OutputCollector;
-import org.apache.hadoop.mapred.Reporter;
-
-/**
- * Test Map/Reduce job over HBase tables. The map/reduce process we're testing
- * on our tables is simple - take every row in the table, reverse the value of
- * a particular cell, and write it back to the table.
- * <p>
- * This is an old version of the test, kept around for historical reasons.
- * Please consider making further improvements to
- * {@link org.apache.hadoop.hbase.mapreduce.TestTableMapReduce} instead of
- * modifying this test.
- */
-@Deprecated
-public class TestLegacyTableMapReduce extends MultiRegionTable {
- private static final Log LOG =
- LogFactory.getLog(TestLegacyTableMapReduce.class.getName());
-
- static final String MULTI_REGION_TABLE_NAME = "mrtest";
- static final byte[] INPUT_FAMILY = Bytes.toBytes("contents");
- static final byte[] OUTPUT_FAMILY = Bytes.toBytes("text");
-
- private static final byte [][] columns = new byte [][] {
- INPUT_FAMILY,
- OUTPUT_FAMILY
- };
-
- /** constructor */
- public TestLegacyTableMapReduce() {
- super(Bytes.toString(INPUT_FAMILY));
- desc = new HTableDescriptor(MULTI_REGION_TABLE_NAME);
- desc.addFamily(new HColumnDescriptor(INPUT_FAMILY));
- desc.addFamily(new HColumnDescriptor(OUTPUT_FAMILY));
- }
-
- /**
- * Pass the given key and processed record reduce
- */
- public static class ProcessContentsMapper
- extends MapReduceBase
- implements TableMap<ImmutableBytesWritable, Put> {
- /**
- * Pass the key, and reversed value to reduce
- * @param key
- * @param value
- * @param output
- * @param reporter
- * @throws IOException
- */
- public void map(ImmutableBytesWritable key, Result value,
- OutputCollector<ImmutableBytesWritable, Put> output,
- Reporter reporter)
- throws IOException {
- if (value.size() != 1) {
- throw new IOException("There should only be one input column");
- }
- Map<byte[], NavigableMap<byte[], NavigableMap<Long, byte[]>>>
- cf = value.getMap();
- if(!cf.containsKey(INPUT_FAMILY)) {
- throw new IOException("Wrong input columns. Missing: '" +
- Bytes.toString(INPUT_FAMILY) + "'.");
- }
-
- // Get the original value and reverse it
-
- String originalValue = new String(value.getValue(INPUT_FAMILY, null),
- HConstants.UTF8_ENCODING);
- StringBuilder newValue = new StringBuilder(originalValue);
- newValue.reverse();
-
- // Now set the value to be collected
-
- Put outval = new Put(key.get());
- outval.add(OUTPUT_FAMILY, null, Bytes.toBytes(newValue.toString()));
- output.collect(key, outval);
- }
- }
-
- /**
- * Test a map/reduce against a multi-region table
- * @throws IOException
- */
- public void testMultiRegionTable() throws IOException {
- runTestOnTable(new HTable(conf, MULTI_REGION_TABLE_NAME));
- }
-
- private void runTestOnTable(HTable table) throws IOException {
- HBaseTestingUtility testUtil = new HBaseTestingUtility();
- testUtil.setupClusterTestBuildDir();
- MiniMRCluster mrCluster = testUtil.startMiniMapReduceCluster();
-
- JobConf jobConf = null;
- try {
- LOG.info("Before map/reduce startup");
- jobConf = new JobConf(conf, TestLegacyTableMapReduce.class);
- jobConf.setJobName("process column contents");
- jobConf.setNumReduceTasks(1);
- TableMapReduceUtil.initTableMapJob(Bytes.toString(table.getTableName()),
- Bytes.toString(INPUT_FAMILY), ProcessContentsMapper.class,
- ImmutableBytesWritable.class, Put.class, jobConf);
- TableMapReduceUtil.initTableReduceJob(Bytes.toString(table.getTableName()),
- IdentityTableReduce.class, jobConf);
-
- LOG.info("Started " + Bytes.toString(table.getTableName()));
- JobClient.runJob(jobConf);
- LOG.info("After map/reduce completion");
-
- // verify map-reduce results
- verify(Bytes.toString(table.getTableName()));
- } finally {
- mrCluster.shutdown();
- }
- }
-
- private void verify(String tableName) throws IOException {
- HTable table = new HTable(conf, tableName);
- boolean verified = false;
- long pause = conf.getLong("hbase.client.pause", 5 * 1000);
- int numRetries = conf.getInt("hbase.client.retries.number", 5);
- for (int i = 0; i < numRetries; i++) {
- try {
- LOG.info("Verification attempt #" + i);
- verifyAttempt(table);
- verified = true;
- break;
- } catch (NullPointerException e) {
- // If here, a cell was empty. Presume its because updates came in
- // after the scanner had been opened. Wait a while and retry.
- LOG.debug("Verification attempt failed: " + e.getMessage());
- }
- try {
- Thread.sleep(pause);
- } catch (InterruptedException e) {
- // continue
- }
- }
- assertTrue(verified);
- }
-
- /**
- * Looks at every value of the mapreduce output and verifies that indeed
- * the values have been reversed.
- * @param table Table to scan.
- * @throws IOException
- * @throws NullPointerException if we failed to find a cell value
- */
- private void verifyAttempt(final HTable table) throws IOException, NullPointerException {
- Scan scan = new Scan();
- scan.addColumns(columns);
- ResultScanner scanner = table.getScanner(scan);
- try {
- for (Result r : scanner) {
- if (LOG.isDebugEnabled()) {
- if (r.size() > 2 ) {
- throw new IOException("Too many results, expected 2 got " +
- r.size());
- }
- }
- byte[] firstValue = null;
- byte[] secondValue = null;
- int count = 0;
- for(KeyValue kv : r.list()) {
- if (count == 0) {
- firstValue = kv.getValue();
- }
- if (count == 1) {
- secondValue = kv.getValue();
- }
- count++;
- if (count == 2) {
- break;
- }
- }
-
-
- String first = "";
- if (firstValue == null) {
- throw new NullPointerException(Bytes.toString(r.getRow()) +
- ": first value is null");
- }
- first = new String(firstValue, HConstants.UTF8_ENCODING);
-
- String second = "";
- if (secondValue == null) {
- throw new NullPointerException(Bytes.toString(r.getRow()) +
- ": second value is null");
- }
- byte[] secondReversed = new byte[secondValue.length];
- for (int i = 0, j = secondValue.length - 1; j >= 0; j--, i++) {
- secondReversed[i] = secondValue[j];
- }
- second = new String(secondReversed, HConstants.UTF8_ENCODING);
-
- if (first.compareTo(second) != 0) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("second key is not the reverse of first. row=" +
- r.getRow() + ", first value=" + first + ", second value=" +
- second);
- }
- fail();
- }
- }
- } finally {
- scanner.close();
- }
- }
-}
\ No newline at end of file
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/mapred/TestTableMapReduce.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/mapred/TestTableMapReduce.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/mapred/TestTableMapReduce.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/mapred/TestTableMapReduce.java Wed May 14 00:26:57 2014
@@ -1,245 +0,0 @@
-/**
- * Copyright 2010 The Apache Software Foundation
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.hadoop.hbase.mapred;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Map;
-import java.util.NavigableMap;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.hadoop.fs.FileUtil;
-import org.apache.hadoop.hbase.*;
-import org.apache.hadoop.hbase.client.HTable;
-import org.apache.hadoop.hbase.client.Result;
-import org.apache.hadoop.hbase.client.Scan;
-import org.apache.hadoop.hbase.client.ResultScanner;
-import org.apache.hadoop.hbase.client.Put;
-import org.apache.hadoop.hbase.io.ImmutableBytesWritable;
-import org.apache.hadoop.hbase.client.Result;
-import org.apache.hadoop.hbase.util.Bytes;
-import org.apache.hadoop.mapred.JobClient;
-import org.apache.hadoop.mapred.JobConf;
-import org.apache.hadoop.mapred.MapReduceBase;
-import org.apache.hadoop.mapred.MiniMRCluster;
-import org.apache.hadoop.mapred.OutputCollector;
-import org.apache.hadoop.mapred.Reporter;
-
-/**
- * Test Map/Reduce job over HBase tables. The map/reduce process we're testing
- * on our tables is simple - take every row in the table, reverse the value of
- * a particular cell, and write it back to the table.
- */
-@Deprecated
-public class TestTableMapReduce extends MultiRegionTable {
- private static final Log LOG =
- LogFactory.getLog(TestTableMapReduce.class.getName());
-
- static final String MULTI_REGION_TABLE_NAME = "mrtest";
- static final byte[] INPUT_FAMILY = Bytes.toBytes("contents");
- static final byte[] OUTPUT_FAMILY = Bytes.toBytes("text");
-
- private static final byte [][] columns = new byte [][] {
- INPUT_FAMILY,
- OUTPUT_FAMILY
- };
-
- /** constructor */
- public TestTableMapReduce() {
- super(Bytes.toString(INPUT_FAMILY));
- desc = new HTableDescriptor(MULTI_REGION_TABLE_NAME);
- desc.addFamily(new HColumnDescriptor(INPUT_FAMILY));
- desc.addFamily(new HColumnDescriptor(OUTPUT_FAMILY));
- }
-
- /**
- * Pass the given key and processed record reduce
- */
- public static class ProcessContentsMapper
- extends MapReduceBase
- implements TableMap<ImmutableBytesWritable, Put> {
- /**
- * Pass the key, and reversed value to reduce
- * @param key
- * @param value
- * @param output
- * @param reporter
- * @throws IOException
- */
- public void map(ImmutableBytesWritable key, Result value,
- OutputCollector<ImmutableBytesWritable, Put> output,
- Reporter reporter)
- throws IOException {
- if (value.size() != 1) {
- throw new IOException("There should only be one input column");
- }
- Map<byte[], NavigableMap<byte[], NavigableMap<Long, byte[]>>>
- cf = value.getMap();
- if(!cf.containsKey(INPUT_FAMILY)) {
- throw new IOException("Wrong input columns. Missing: '" +
- Bytes.toString(INPUT_FAMILY) + "'.");
- }
-
- // Get the original value and reverse it
-
- String originalValue = new String(value.getValue(INPUT_FAMILY, null),
- HConstants.UTF8_ENCODING);
- StringBuilder newValue = new StringBuilder(originalValue);
- newValue.reverse();
-
- // Now set the value to be collected
-
- Put outval = new Put(key.get());
- outval.add(OUTPUT_FAMILY, null, Bytes.toBytes(newValue.toString()));
- output.collect(key, outval);
- }
- }
-
- /**
- * Test a map/reduce against a multi-region table
- * @throws IOException
- */
- public void testMultiRegionTable() throws IOException {
- runTestOnTable(new HTable(conf, MULTI_REGION_TABLE_NAME));
- }
-
- private void runTestOnTable(HTable table) throws IOException {
- MiniMRCluster mrCluster = new MiniMRCluster(2, fs.getUri().toString(), 1);
-
- JobConf jobConf = null;
- try {
- LOG.info("Before map/reduce startup");
- jobConf = new JobConf(conf, TestTableMapReduce.class);
- jobConf.setJobName("process column contents");
- jobConf.setNumReduceTasks(1);
- TableMapReduceUtil.initTableMapJob(Bytes.toString(table.getTableName()),
- Bytes.toString(INPUT_FAMILY), ProcessContentsMapper.class,
- ImmutableBytesWritable.class, Put.class, jobConf);
- TableMapReduceUtil.initTableReduceJob(Bytes.toString(table.getTableName()),
- IdentityTableReduce.class, jobConf);
-
- LOG.info("Started " + Bytes.toString(table.getTableName()));
- JobClient.runJob(jobConf);
- LOG.info("After map/reduce completion");
-
- // verify map-reduce results
- verify(Bytes.toString(table.getTableName()));
- } finally {
- mrCluster.shutdown();
- if (jobConf != null) {
- FileUtil.fullyDelete(new File(jobConf.get("hadoop.tmp.dir")));
- }
- }
- }
-
- private void verify(String tableName) throws IOException {
- HTable table = new HTable(conf, tableName);
- boolean verified = false;
- long pause = conf.getLong("hbase.client.pause", 5 * 1000);
- int numRetries = conf.getInt("hbase.client.retries.number", 5);
- for (int i = 0; i < numRetries; i++) {
- try {
- LOG.info("Verification attempt #" + i);
- verifyAttempt(table);
- verified = true;
- break;
- } catch (NullPointerException e) {
- // If here, a cell was empty. Presume its because updates came in
- // after the scanner had been opened. Wait a while and retry.
- LOG.debug("Verification attempt failed: " + e.getMessage());
- }
- try {
- Thread.sleep(pause);
- } catch (InterruptedException e) {
- // continue
- }
- }
- assertTrue(verified);
- }
-
- /**
- * Looks at every value of the mapreduce output and verifies that indeed
- * the values have been reversed.
- * @param table Table to scan.
- * @throws IOException
- * @throws NullPointerException if we failed to find a cell value
- */
- private void verifyAttempt(final HTable table) throws IOException, NullPointerException {
- Scan scan = new Scan();
- scan.addColumns(columns);
- ResultScanner scanner = table.getScanner(scan);
- try {
- for (Result r : scanner) {
- if (LOG.isDebugEnabled()) {
- if (r.size() > 2 ) {
- throw new IOException("Too many results, expected 2 got " +
- r.size());
- }
- }
- byte[] firstValue = null;
- byte[] secondValue = null;
- int count = 0;
- for(KeyValue kv : r.list()) {
- if (count == 0) {
- firstValue = kv.getValue();
- }
- if (count == 1) {
- secondValue = kv.getValue();
- }
- count++;
- if (count == 2) {
- break;
- }
- }
-
-
- String first = "";
- if (firstValue == null) {
- throw new NullPointerException(Bytes.toString(r.getRow()) +
- ": first value is null");
- }
- first = new String(firstValue, HConstants.UTF8_ENCODING);
-
- String second = "";
- if (secondValue == null) {
- throw new NullPointerException(Bytes.toString(r.getRow()) +
- ": second value is null");
- }
- byte[] secondReversed = new byte[secondValue.length];
- for (int i = 0, j = secondValue.length - 1; j >= 0; j--, i++) {
- secondReversed[i] = secondValue[j];
- }
- second = new String(secondReversed, HConstants.UTF8_ENCODING);
-
- if (first.compareTo(second) != 0) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("second key is not the reverse of first. row=" +
- r.getRow() + ", first value=" + first + ", second value=" +
- second);
- }
- fail();
- }
- }
- } finally {
- scanner.close();
- }
- }
-}
\ No newline at end of file
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHFileOutputFormat.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHFileOutputFormat.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHFileOutputFormat.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHFileOutputFormat.java Wed May 14 00:26:57 2014
@@ -48,8 +48,10 @@ import org.apache.hadoop.hbase.HConstant
import org.apache.hadoop.hbase.HServerAddress;
import org.apache.hadoop.hbase.HTableDescriptor;
import org.apache.hadoop.hbase.KeyValue;
+import org.apache.hadoop.hbase.LargeTests;
import org.apache.hadoop.hbase.MiniHBaseCluster;
import org.apache.hadoop.hbase.PerformanceEvaluation;
+import org.apache.hadoop.hbase.UnstableTests;
import org.apache.hadoop.hbase.client.Delete;
import org.apache.hadoop.hbase.client.HBaseAdmin;
import org.apache.hadoop.hbase.client.HTable;
@@ -73,8 +75,6 @@ import org.apache.hadoop.hbase.regionser
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.Pair;
import org.apache.hadoop.hbase.util.StringBytes;
-import org.apache.hadoop.hbase.util.TagRunner;
-import org.apache.hadoop.hbase.util.TestTag;
import org.apache.hadoop.hdfs.protocol.DatanodeInfo;
import org.apache.hadoop.hdfs.protocol.LocatedBlock;
import org.apache.hadoop.hdfs.protocol.LocatedBlocks;
@@ -88,7 +88,7 @@ import org.apache.hadoop.mapreduce.TaskA
import org.apache.hadoop.mapreduce.lib.output.FileOutputCommitter;
import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat;
import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.experimental.categories.Category;
import org.mockito.Mockito;
import com.google.common.collect.Lists;
@@ -100,7 +100,7 @@ import com.google.common.collect.Lists;
* emits keys and values like those of {@link PerformanceEvaluation}. Makes
* as many splits as "mapred.map.tasks" maps.
*/
-@RunWith(TagRunner.class)
+@Category(LargeTests.class)
public class TestHFileOutputFormat {
private final static int ROWSPERSPLIT = 1024;
@@ -1085,7 +1085,7 @@ public class TestHFileOutputFormat {
}
// Marked as unstable, recorded in #3297517
- @TestTag({ "unstable" })
+ @Category(UnstableTests.class)
@Test
public void testFavoredNodes() throws Exception {
Random rand = new Random();
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportTsv.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportTsv.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportTsv.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportTsv.java Wed May 14 00:26:57 2014
@@ -22,6 +22,7 @@ package org.apache.hadoop.hbase.mapreduc
import java.util.ArrayList;
import org.apache.hadoop.hbase.HConstants;
+import org.apache.hadoop.hbase.SmallTests;
import org.apache.hadoop.hbase.mapreduce.ImportTsv.TsvParser;
import org.apache.hadoop.hbase.mapreduce.ImportTsv.TsvParser.BadTsvLineException;
import org.apache.hadoop.hbase.mapreduce.ImportTsv.TsvParser.ParsedLine;
@@ -31,9 +32,11 @@ import org.junit.Test;
import com.google.common.base.Joiner;
import com.google.common.base.Splitter;
import com.google.common.collect.Iterables;
+import org.junit.experimental.categories.Category;
import static org.junit.Assert.*;
+@Category(SmallTests.class)
public class TestImportTsv {
@Test
public void testTsvParser() throws BadTsvLineException {
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/mapreduce/TestLoadIncrementalHFiles.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/mapreduce/TestLoadIncrementalHFiles.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/mapreduce/TestLoadIncrementalHFiles.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/mapreduce/TestLoadIncrementalHFiles.java Wed May 14 00:26:57 2014
@@ -33,6 +33,8 @@ import org.apache.hadoop.hbase.HBaseTest
import org.apache.hadoop.hbase.HColumnDescriptor;
import org.apache.hadoop.hbase.HTableDescriptor;
import org.apache.hadoop.hbase.KeyValue;
+import org.apache.hadoop.hbase.LargeTests;
+import org.apache.hadoop.hbase.MediumTests;
import org.apache.hadoop.hbase.client.Get;
import org.apache.hadoop.hbase.client.HBaseAdmin;
import org.apache.hadoop.hbase.client.HTable;
@@ -49,6 +51,7 @@ import org.apache.hadoop.hbase.regionser
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.io.WritableUtils;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.mortbay.log.Log;
/**
@@ -56,6 +59,7 @@ import org.mortbay.log.Log;
* functionality. These tests run faster than the full MR cluster
* tests in TestHFileOutputFormat
*/
+@Category(LargeTests.class)
public class TestLoadIncrementalHFiles {
private static final byte[] TABLE = Bytes.toBytes("mytable");
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/mapreduce/TestRPCCallOptimization.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/mapreduce/TestRPCCallOptimization.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/mapreduce/TestRPCCallOptimization.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/mapreduce/TestRPCCallOptimization.java Wed May 14 00:26:57 2014
@@ -20,6 +20,7 @@ import org.apache.commons.logging.LogFac
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileUtil;
import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.MediumTests;
import org.apache.hadoop.hbase.client.HTable;
import org.apache.hadoop.hbase.io.ImmutableBytesWritable;
import org.apache.hadoop.hbase.util.Bytes;
@@ -30,11 +31,13 @@ import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
/**
* Tests various scan start and stop row scenarios. This is set in a scan and tested in a MapReduce
* job to see if that is handed over and done properly too.
*/
+@Category(MediumTests.class)
public class TestRPCCallOptimization {
static final Log LOG = LogFactory.getLog(TestTableInputFormatScan.class);
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/mapreduce/TestSimpleTotalOrderPartitioner.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/mapreduce/TestSimpleTotalOrderPartitioner.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/mapreduce/TestSimpleTotalOrderPartitioner.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/mapreduce/TestSimpleTotalOrderPartitioner.java Wed May 14 00:26:57 2014
@@ -21,12 +21,15 @@ package org.apache.hadoop.hbase.mapreduc
import org.apache.hadoop.hbase.HBaseTestCase;
import org.apache.hadoop.hbase.HConstants;
+import org.apache.hadoop.hbase.SmallTests;
import org.apache.hadoop.hbase.io.ImmutableBytesWritable;
import org.apache.hadoop.hbase.util.Bytes;
+import org.junit.experimental.categories.Category;
/**
* Test of simple partitioner.
*/
+@Category(SmallTests.class)
public class TestSimpleTotalOrderPartitioner extends HBaseTestCase {
public void testSplit() throws Exception {
String start = "a";
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableInputFormatNMappersPerRegion.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableInputFormatNMappersPerRegion.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableInputFormatNMappersPerRegion.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableInputFormatNMappersPerRegion.java Wed May 14 00:26:57 2014
@@ -28,6 +28,7 @@ import org.apache.hadoop.conf.Configurat
import org.apache.hadoop.fs.FileUtil;
import org.apache.hadoop.hbase.HBaseTestingUtility;
import org.apache.hadoop.hbase.KeyValue;
+import org.apache.hadoop.hbase.LargeTests;
import org.apache.hadoop.hbase.client.HTable;
import org.apache.hadoop.hbase.client.Result;
import org.apache.hadoop.hbase.client.Scan;
@@ -43,10 +44,12 @@ import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
/**
* Tests TableInputFormat with varying numbers of mappers per region.
*/
+@Category(LargeTests.class)
public class TestTableInputFormatNMappersPerRegion {
static final String SPECULATIVE_EXECUTION = "mapred.map.tasks.speculative.execution";
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableInputFormatScan.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableInputFormatScan.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableInputFormatScan.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableInputFormatScan.java Wed May 14 00:26:57 2014
@@ -30,6 +30,7 @@ import org.apache.hadoop.conf.Configurat
import org.apache.hadoop.fs.FileUtil;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.LargeTests;
import org.apache.hadoop.hbase.client.HTable;
import org.apache.hadoop.hbase.client.Result;
import org.apache.hadoop.hbase.client.Scan;
@@ -45,12 +46,14 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
/**
* Tests various scan start and stop row scenarios. This is set in a scan and
* tested in a MapReduce job to see if that is handed over and done properly
* too.
*/
+@Category(LargeTests.class)
public class TestTableInputFormatScan {
static final Log LOG = LogFactory.getLog(TestTableInputFormatScan.class);
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableInputFormatWithHFileOutputFormat.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableInputFormatWithHFileOutputFormat.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableInputFormatWithHFileOutputFormat.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableInputFormatWithHFileOutputFormat.java Wed May 14 00:26:57 2014
@@ -9,6 +9,7 @@ import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.HBaseTestingUtility;
import org.apache.hadoop.hbase.KeyValue;
+import org.apache.hadoop.hbase.MediumTests;
import org.apache.hadoop.hbase.client.HTable;
import org.apache.hadoop.hbase.client.Put;
import org.apache.hadoop.hbase.client.Result;
@@ -20,7 +21,9 @@ import org.apache.hadoop.mapreduce.Job;
import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(MediumTests.class)
public class TestTableInputFormatWithHFileOutputFormat {
static final Log LOG = LogFactory.getLog(TestTableInputFormatScan.class);
static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableMapReduce.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableMapReduce.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableMapReduce.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableMapReduce.java Wed May 14 00:26:57 2014
@@ -19,20 +19,19 @@
*/
package org.apache.hadoop.hbase.mapreduce;
-import java.io.File;
import java.io.IOException;
import java.util.Map;
import java.util.NavigableMap;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.hadoop.fs.FileUtil;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.HBaseTestingUtility;
import org.apache.hadoop.hbase.HColumnDescriptor;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.HTableDescriptor;
import org.apache.hadoop.hbase.KeyValue;
+import org.apache.hadoop.hbase.LargeTests;
import org.apache.hadoop.hbase.MultiRegionTable;
import org.apache.hadoop.hbase.client.HTable;
import org.apache.hadoop.hbase.client.Put;
@@ -45,12 +44,14 @@ import org.apache.hadoop.hbase.zookeeper
import org.apache.hadoop.mapred.MiniMRCluster;
import org.apache.hadoop.mapreduce.Job;
import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat;
+import org.junit.experimental.categories.Category;
/**
* Test Map/Reduce job over HBase tables. The map/reduce process we're testing
* on our tables is simple - take every row in the table, reverse the value of
* a particular cell, and write it back to the table.
*/
+@Category(LargeTests.class)
public class TestTableMapReduce extends MultiRegionTable {
private static final Log LOG = LogFactory.getLog(TestTableMapReduce.class);
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTimeRangeMapRed.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTimeRangeMapRed.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTimeRangeMapRed.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTimeRangeMapRed.java Wed May 14 00:26:57 2014
@@ -37,6 +37,7 @@ import org.apache.hadoop.hbase.HBaseConf
import org.apache.hadoop.hbase.HColumnDescriptor;
import org.apache.hadoop.hbase.HTableDescriptor;
import org.apache.hadoop.hbase.KeyValue;
+import org.apache.hadoop.hbase.LargeTests;
import org.apache.hadoop.hbase.client.HBaseAdmin;
import org.apache.hadoop.hbase.client.HTable;
import org.apache.hadoop.hbase.client.Put;
@@ -50,7 +51,9 @@ import org.apache.hadoop.io.Text;
import org.apache.hadoop.mapred.MiniMRCluster;
import org.apache.hadoop.mapreduce.Job;
import org.apache.hadoop.mapreduce.lib.output.NullOutputFormat;
+import org.junit.experimental.categories.Category;
+@Category(LargeTests.class)
public class TestTimeRangeMapRed extends HBaseClusterTestCase {
private final static Log log = LogFactory.getLog(TestTimeRangeMapRed.class);
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestAlterTableLocking.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestAlterTableLocking.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestAlterTableLocking.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestAlterTableLocking.java Wed May 14 00:26:57 2014
@@ -4,6 +4,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.hbase.HBaseTestingUtility;
import org.apache.hadoop.hbase.MasterNotRunningException;
+import org.apache.hadoop.hbase.MediumTests;
import org.apache.hadoop.hbase.client.HBaseAdmin;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.Pair;
@@ -12,9 +13,11 @@ import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import java.io.IOException;
+@Category(MediumTests.class)
public class TestAlterTableLocking {
private final Log LOG = LogFactory.getLog(TestAlterTableLocking.class);
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestClusterStartupDetection.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestClusterStartupDetection.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestClusterStartupDetection.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestClusterStartupDetection.java Wed May 14 00:26:57 2014
@@ -22,10 +22,13 @@ import static org.junit.Assert.assertTru
import java.io.IOException;
+import org.apache.hadoop.hbase.MediumTests;
import org.apache.hadoop.hbase.zookeeper.ZooKeeperWrapper;
import org.apache.zookeeper.KeeperException;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(MediumTests.class)
public class TestClusterStartupDetection extends MultiMasterTest {
/**
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java Wed May 14 00:26:57 2014
@@ -49,7 +49,9 @@ import org.apache.hadoop.hbase.HBaseTest
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.HRegionInfo;
import org.apache.hadoop.hbase.HTableDescriptor;
+import org.apache.hadoop.hbase.LargeTests;
import org.apache.hadoop.hbase.MiniHBaseCluster;
+import org.apache.hadoop.hbase.UnstableTests;
import org.apache.hadoop.hbase.client.HTable;
import org.apache.hadoop.hbase.client.Put;
import org.apache.hadoop.hbase.master.SplitLogManager.TaskBatch;
@@ -60,17 +62,16 @@ import org.apache.hadoop.hbase.util.Byte
import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;
import org.apache.hadoop.hbase.util.FSUtils;
import org.apache.hadoop.hbase.util.JVMClusterUtil.RegionServerThread;
-import org.apache.hadoop.hbase.util.TagRunner;
-import org.apache.hadoop.hbase.util.TestTag;
import org.apache.hadoop.hbase.zookeeper.ZKSplitLog;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.experimental.categories.Category;
-@RunWith(TagRunner.class)
+
+@Category(LargeTests.class)
public class TestDistributedLogSplitting {
private static final Log LOG = LogFactory.getLog(TestDistributedLogSplitting.class);
static {
@@ -122,7 +123,7 @@ public class TestDistributedLogSplitting
}
// Marked as unstable and recorded in #4053598
- @TestTag({ "unstable" })
+ @Category(UnstableTests.class)
@Test
public void testThreeRSAbort() throws Exception {
LOG.info("testThreeRSAbort");
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestKillingServersFromMaster.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestKillingServersFromMaster.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestKillingServersFromMaster.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestKillingServersFromMaster.java Wed May 14 00:26:57 2014
@@ -27,6 +27,7 @@ import java.io.IOException;
import org.apache.hadoop.hbase.HBaseTestingUtility;
import org.apache.hadoop.hbase.HServerAddress;
import org.apache.hadoop.hbase.HServerInfo;
+import org.apache.hadoop.hbase.MediumTests;
import org.apache.hadoop.hbase.MiniHBaseCluster;
import org.apache.hadoop.hbase.MiniHBaseCluster.MiniHBaseClusterRegionServer;
import org.apache.hadoop.hbase.YouAreDeadException;
@@ -35,7 +36,9 @@ import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(MediumTests.class)
public class TestKillingServersFromMaster {
private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
private static MiniHBaseCluster cluster;
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestLogSplitOnMasterFailover.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestLogSplitOnMasterFailover.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestLogSplitOnMasterFailover.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestLogSplitOnMasterFailover.java Wed May 14 00:26:57 2014
@@ -39,6 +39,8 @@ import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.HBaseTestingUtility;
import org.apache.hadoop.hbase.HConstants;
+import org.apache.hadoop.hbase.MediumTests;
+import org.apache.hadoop.hbase.UnstableTests;
import org.apache.hadoop.hbase.client.Get;
import org.apache.hadoop.hbase.client.HTable;
import org.apache.hadoop.hbase.client.Put;
@@ -50,12 +52,10 @@ import org.apache.hadoop.hbase.util.Byte
import org.apache.hadoop.hbase.util.FSUtils;
import org.apache.hadoop.hbase.util.InjectionEvent;
import org.apache.hadoop.hbase.util.InjectionHandler;
-import org.apache.hadoop.hbase.util.TagRunner;
-import org.apache.hadoop.hbase.util.TestTag;
import org.apache.hadoop.hbase.util.Threads;
import org.apache.hadoop.hbase.zookeeper.ZooKeeperWrapper;
import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.experimental.categories.Category;
/**
* Tests that the master splits the logs of dead regionservers on startup and
@@ -63,7 +63,7 @@ import org.junit.runner.RunWith;
* regionserver to create a need to split logs, and quickly killing a master to
* cause master failover.
*/
-@RunWith(TagRunner.class)
+@Category(MediumTests.class)
public class TestLogSplitOnMasterFailover extends MultiMasterTest {
private static final Log LOG =
@@ -248,7 +248,7 @@ public class TestLogSplitOnMasterFailove
}
// Marked as unstable and recored in 3376780
- @TestTag({ "unstable" })
+ @Category(org.apache.hadoop.hbase.UnstableTests.class)
@Test(timeout = 300000)
public void testWithDistributedLogSplitting() throws Exception {
ZooKeeperWrapper.setNamespaceForTesting();
@@ -257,7 +257,7 @@ public class TestLogSplitOnMasterFailove
}
// Marked as unstable and recored in 3376780
- @TestTag({ "unstable" })
+ @Category(UnstableTests.class)
@Test(timeout = 300000)
public void testWithDistributedLogSplittingAndErrors() throws Exception {
// add a split log worker to handle InjectionEvent.SPLITLOGWORKER_SPLIT_LOG_START.
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestMaster.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestMaster.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestMaster.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestMaster.java Wed May 14 00:26:57 2014
@@ -22,6 +22,7 @@ package org.apache.hadoop.hbase.master;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.hbase.HConstants;
+import org.apache.hadoop.hbase.MediumTests;
import org.apache.hadoop.hbase.MiniHBaseCluster;
import org.apache.hadoop.hbase.HBaseTestingUtility;
import org.apache.hadoop.hbase.HRegionInfo;
@@ -44,9 +45,11 @@ import org.junit.BeforeClass;
import org.junit.Test;
import com.google.common.base.Joiner;
+import org.junit.experimental.categories.Category;
import static org.junit.Assert.*;
+@Category(MediumTests.class)
public class TestMaster {
private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
private static final Log LOG = LogFactory.getLog(TestMasterWithDisabling.class);
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestMasterFailover.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestMasterFailover.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestMasterFailover.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestMasterFailover.java Wed May 14 00:26:57 2014
@@ -24,9 +24,12 @@ import static org.junit.Assert.assertTru
import java.util.List;
+import org.apache.hadoop.hbase.MediumTests;
import org.apache.hadoop.hbase.zookeeper.ZooKeeperWrapper;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(MediumTests.class)
public class TestMasterFailover extends MultiMasterTest {
/**
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestMasterTransitions.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestMasterTransitions.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestMasterTransitions.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestMasterTransitions.java Wed May 14 00:26:57 2014
@@ -38,6 +38,7 @@ import org.apache.hadoop.hbase.HMsg;
import org.apache.hadoop.hbase.HRegionInfo;
import org.apache.hadoop.hbase.HServerAddress;
import org.apache.hadoop.hbase.HServerInfo;
+import org.apache.hadoop.hbase.MediumTests;
import org.apache.hadoop.hbase.MiniHBaseCluster;
import org.apache.hadoop.hbase.MiniHBaseCluster.MiniHBaseClusterRegionServer;
import org.apache.hadoop.hbase.client.Get;
@@ -55,11 +56,13 @@ import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
/**
* Test transitions of state across the master. Sets up the cluster once and
* then runs a couple of tests.
*/
+@Category(MediumTests.class)
public class TestMasterTransitions {
private static final Log LOG = LogFactory.getLog(TestMasterTransitions.class);
private static final String TABLENAME = "master_transitions";
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestMasterWithDisabling.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestMasterWithDisabling.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestMasterWithDisabling.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestMasterWithDisabling.java Wed May 14 00:26:57 2014
@@ -26,6 +26,7 @@ import org.apache.hadoop.hbase.HColumnDe
import org.apache.hadoop.hbase.HMsg;
import org.apache.hadoop.hbase.HServerInfo;
import org.apache.hadoop.hbase.HTableDescriptor;
+import org.apache.hadoop.hbase.MediumTests;
import org.apache.hadoop.hbase.MiniHBaseCluster;
import org.apache.hadoop.hbase.client.HBaseAdmin;
import org.apache.hadoop.hbase.client.HTable;
@@ -33,6 +34,8 @@ import org.apache.hadoop.hbase.util.Byte
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import static org.junit.Assert.fail;
import static org.junit.Assert.assertEquals;
@@ -41,6 +44,7 @@ import java.io.IOException;
/**
* Disabling is tricky. This class tests how the Master behaves during those
*/
+@Category(MediumTests.class)
public class TestMasterWithDisabling {
private static final Log LOG = LogFactory.getLog(TestMasterWithDisabling.class);
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestMinimumServerCount.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestMinimumServerCount.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestMinimumServerCount.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestMinimumServerCount.java Wed May 14 00:26:57 2014
@@ -24,11 +24,14 @@ import java.io.IOException;
import org.apache.hadoop.hbase.HBaseClusterTestCase;
import org.apache.hadoop.hbase.HConstants;
+import org.apache.hadoop.hbase.MediumTests;
import org.apache.hadoop.hbase.client.HBaseAdmin;
import org.apache.hadoop.hbase.client.HTable;
import org.apache.hadoop.hbase.client.Result;
import org.apache.hadoop.hbase.client.ResultScanner;
+import org.junit.experimental.categories.Category;
+@Category(MediumTests.class)
public class TestMinimumServerCount extends HBaseClusterTestCase {
static final String TABLE_NAME = "TestTable";
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestMultiRegionServerShutDown.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestMultiRegionServerShutDown.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestMultiRegionServerShutDown.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestMultiRegionServerShutDown.java Wed May 14 00:26:57 2014
@@ -29,6 +29,7 @@ import org.apache.hadoop.hbase.HBaseTest
import org.apache.hadoop.hbase.HMsg;
import org.apache.hadoop.hbase.HServerAddress;
import org.apache.hadoop.hbase.HServerInfo;
+import org.apache.hadoop.hbase.MediumTests;
import org.apache.hadoop.hbase.MiniHBaseCluster;
import org.apache.hadoop.hbase.master.ProcessServerShutdown.LogSplitResult;
import org.apache.hadoop.hbase.regionserver.HRegionServer;
@@ -36,10 +37,12 @@ import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
/**
* Test issues when RegionServer is shut down
*/
+@Category(MediumTests.class)
public class TestMultiRegionServerShutDown {
private static final Log LOG = LogFactory
.getLog(TestMultiRegionServerShutDown.class);
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestOldLogsCleaner.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestOldLogsCleaner.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestOldLogsCleaner.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestOldLogsCleaner.java Wed May 14 00:26:57 2014
@@ -22,6 +22,7 @@ package org.apache.hadoop.hbase.master;
import static org.junit.Assert.assertEquals;
import org.apache.hadoop.fs.FileStatus;
+import org.apache.hadoop.hbase.MediumTests;
import org.apache.hadoop.hbase.regionserver.wal.HLog;
import org.junit.After;
import org.junit.AfterClass;
@@ -35,10 +36,12 @@ import org.apache.hadoop.hbase.Stoppable
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.conf.Configuration;
+import org.junit.experimental.categories.Category;
import java.net.URLEncoder;
import java.util.Calendar;
+@Category(MediumTests.class)
public class TestOldLogsCleaner {
private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestROOTAssignment.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestROOTAssignment.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestROOTAssignment.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestROOTAssignment.java Wed May 14 00:26:57 2014
@@ -29,6 +29,7 @@ import org.apache.hadoop.hbase.HBaseTest
import org.apache.hadoop.hbase.HMsg;
import org.apache.hadoop.hbase.HServerAddress;
import org.apache.hadoop.hbase.HServerInfo;
+import org.apache.hadoop.hbase.MediumTests;
import org.apache.hadoop.hbase.MiniHBaseCluster;
import org.apache.hadoop.hbase.client.HTable;
import org.apache.hadoop.hbase.regionserver.HRegionServer;
@@ -39,10 +40,12 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
/**
* Test issues assigning ROOT.
*/
+@Category(MediumTests.class)
public class TestROOTAssignment {
private static final Log LOG = LogFactory.getLog(TestROOTAssignment.class);
private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestRSLivenessOnMasterFailover.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestRSLivenessOnMasterFailover.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestRSLivenessOnMasterFailover.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestRSLivenessOnMasterFailover.java Wed May 14 00:26:57 2014
@@ -22,23 +22,23 @@ import java.io.IOException;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.HServerAddress;
-import org.apache.hadoop.hbase.util.TagRunner;
-import org.apache.hadoop.hbase.util.TestTag;
+import org.apache.hadoop.hbase.MediumTests;
+import org.apache.hadoop.hbase.UnstableTests;
import org.apache.hadoop.hbase.util.Threads;
import org.apache.hadoop.hbase.zookeeper.ZooKeeperWrapper;
import org.apache.zookeeper.KeeperException;
import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.experimental.categories.Category;
/**
* Tests that the regionserver correctly picks up the new master location and
* does not get stuck in a retry loop trying to contact the old master.
*/
-@RunWith(TagRunner.class)
+@Category(MediumTests.class)
public class TestRSLivenessOnMasterFailover extends MultiMasterTest {
// Marked as unstable and recorded in 3921469
- @TestTag({ "unstable" })
+ @Category(UnstableTests.class)
@Test(timeout=60000)
public void testAgainstRSDeadlock() throws IOException,
InterruptedException, KeeperException {
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestRegionChecker.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestRegionChecker.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestRegionChecker.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestRegionChecker.java Wed May 14 00:26:57 2014
@@ -4,6 +4,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HRegionInfo;
+import org.apache.hadoop.hbase.LargeTests;
import org.apache.hadoop.hbase.MiniHBaseCluster;
import org.apache.hadoop.hbase.client.HTable;
import org.apache.hadoop.hbase.master.RegionChecker.RegionAvailabilityInfo;
@@ -11,6 +12,7 @@ import org.apache.hadoop.hbase.regionser
import org.apache.hadoop.hbase.util.Bytes;
import org.junit.After;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import java.io.IOException;
import java.util.ArrayList;
@@ -22,6 +24,7 @@ import static org.junit.Assert.assertEqu
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+@Category(LargeTests.class)
public class TestRegionChecker {
final static Log LOG = LogFactory.getLog(TestRegionChecker.class);
private final static RegionMovementTestHelper TEST_UTIL = new RegionMovementTestHelper();
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestRegionManager.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestRegionManager.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestRegionManager.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestRegionManager.java Wed May 14 00:26:57 2014
@@ -25,9 +25,12 @@ import org.apache.hadoop.hbase.HConstant
import org.apache.hadoop.hbase.HRegionInfo;
import org.apache.hadoop.hbase.HServerAddress;
import org.apache.hadoop.hbase.HTableDescriptor;
+import org.apache.hadoop.hbase.MediumTests;
import org.apache.hadoop.hbase.client.HTable;
import org.apache.hadoop.hbase.util.Bytes;
+import org.junit.experimental.categories.Category;
+@Category(MediumTests.class)
public class TestRegionManager extends HBaseClusterTestCase {
public void testGetFirstMetaRegionForRegionAfterMetaSplit()
throws Exception {