Modified: hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestSeekTo.java URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestSeekTo.java?rev=1585945&r1=1585944&r2=1585945&view=diff ============================================================================== --- hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestSeekTo.java (original) +++ hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestSeekTo.java Wed Apr 9 11:46:14 2014 @@ -22,9 +22,11 @@ import java.io.IOException; import org.apache.hadoop.fs.FSDataOutputStream; import org.apache.hadoop.fs.Path; +import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.HBaseTestCase; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.KeyValue; +import org.apache.hadoop.hbase.KeyValueUtil; import org.apache.hadoop.hbase.SmallTests; import org.apache.hadoop.hbase.Tag; import org.apache.hadoop.hbase.util.Bytes; @@ -63,8 +65,8 @@ public class TestSeekTo extends HBaseTes } } } - static String toRowStr(KeyValue kv) { - return Bytes.toString(kv.getRow()); + static String toRowStr(Cell kv) { + return Bytes.toString(KeyValueUtil.ensureKeyValue(kv).getRow()); } Path makeNewFile(TagUsage tagUsage) throws IOException {
Modified: hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHFileOutputFormat.java URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHFileOutputFormat.java?rev=1585945&r1=1585944&r2=1585945&view=diff ============================================================================== --- hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHFileOutputFormat.java (original) +++ hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHFileOutputFormat.java Wed Apr 9 11:46:14 2014 @@ -33,7 +33,9 @@ import java.util.Map.Entry; import java.util.Random; import java.util.Set; import java.util.concurrent.Callable; + import junit.framework.Assert; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; @@ -196,7 +198,7 @@ public class TestHFileOutputFormat { writer.write(new ImmutableBytesWritable(), kv); assertFalse(original.equals(kv)); assertTrue(Bytes.equals(original.getRow(), kv.getRow())); - assertTrue(original.matchingColumn(kv.getFamily(), kv.getQualifier())); + assertTrue(CellUtil.matchingColumn(original, kv.getFamily(), kv.getQualifier())); assertNotSame(original.getTimestamp(), kv.getTimestamp()); assertNotSame(HConstants.LATEST_TIMESTAMP, kv.getTimestamp()); Modified: hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/DataBlockEncodingTool.java URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/DataBlockEncodingTool.java?rev=1585945&r1=1585944&r2=1585945&view=diff ============================================================================== --- hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/DataBlockEncodingTool.java (original) +++ hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/DataBlockEncodingTool.java Wed Apr 9 11:46:14 2014 @@ -180,7 +180,7 @@ public class DataBlockEncodingTool { new ByteArrayOutputStream(); int j = 0; - while ((currentKV = scanner.next()) != null && j < kvLimit) { + while ((currentKV = KeyValueUtil.ensureKeyValue(scanner.next())) != null && j < kvLimit) { // Iterates through key/value pairs j++; currentKey = currentKV.getKey(); @@ -242,7 +242,7 @@ public class DataBlockEncodingTool { } int j = 0; - while ((currentKv = scanner.next()) != null && j < kvLimit) { + while ((currentKv = KeyValueUtil.ensureKeyValue(scanner.next())) != null && j < kvLimit) { // Iterates through key/value pairs ++j; for (Iterator<Cell> it : codecIterators) { Modified: hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/EncodedSeekPerformanceTest.java URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/EncodedSeekPerformanceTest.java?rev=1585945&r1=1585944&r2=1585945&view=diff ============================================================================== --- hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/EncodedSeekPerformanceTest.java (original) +++ hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/EncodedSeekPerformanceTest.java Wed Apr 9 11:46:14 2014 @@ -23,9 +23,11 @@ import java.util.Random; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; +import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.KeyValue; +import org.apache.hadoop.hbase.KeyValueUtil; import org.apache.hadoop.hbase.io.encoding.DataBlockEncoding; import org.apache.hadoop.hbase.io.hfile.CacheConfig; import org.apache.hadoop.hbase.io.hfile.LruBlockCache; @@ -53,8 +55,8 @@ public class EncodedSeekPerformanceTest numberOfSeeks = DEFAULT_NUMBER_OF_SEEKS; } - private List<KeyValue> prepareListOfTestSeeks(Path path) throws IOException { - List<KeyValue> allKeyValues = new ArrayList<KeyValue>(); + private List<Cell> prepareListOfTestSeeks(Path path) throws IOException { + List<Cell> allKeyValues = new ArrayList<Cell>(); // read all of the key values StoreFile storeFile = new StoreFile(testingUtility.getTestFileSystem(), @@ -62,7 +64,7 @@ public class EncodedSeekPerformanceTest StoreFile.Reader reader = storeFile.createReader(); StoreFileScanner scanner = reader.getStoreFileScanner(true, false); - KeyValue current; + Cell current; scanner.seek(KeyValue.LOWESTKEY); while (null != (current = scanner.next())) { @@ -72,9 +74,9 @@ public class EncodedSeekPerformanceTest storeFile.closeReader(cacheConf.shouldEvictOnClose()); // pick seeks by random - List<KeyValue> seeks = new ArrayList<KeyValue>(); + List<Cell> seeks = new ArrayList<Cell>(); for (int i = 0; i < numberOfSeeks; ++i) { - KeyValue keyValue = allKeyValues.get( + Cell keyValue = allKeyValues.get( randomizer.nextInt(allKeyValues.size())); seeks.add(keyValue); } @@ -85,7 +87,7 @@ public class EncodedSeekPerformanceTest } private void runTest(Path path, DataBlockEncoding blockEncoding, - List<KeyValue> seeks) throws IOException { + List<Cell> seeks) throws IOException { // read all of the key values StoreFile storeFile = new StoreFile(testingUtility.getTestFileSystem(), path, configuration, cacheConf, BloomType.NONE); @@ -96,25 +98,25 @@ public class EncodedSeekPerformanceTest StoreFileScanner scanner = reader.getStoreFileScanner(true, false); long startReadingTime = System.nanoTime(); - KeyValue current; + Cell current; scanner.seek(KeyValue.LOWESTKEY); while (null != (current = scanner.next())) { // just iterate it! - if (current.getLength() < 0) { + if (KeyValueUtil.ensureKeyValue(current).getLength() < 0) { throw new IOException("Negative KV size: " + current); } - totalSize += current.getLength(); + totalSize += KeyValueUtil.ensureKeyValue(current).getLength(); } long finishReadingTime = System.nanoTime(); // do seeks long startSeeksTime = System.nanoTime(); - for (KeyValue keyValue : seeks) { + for (Cell keyValue : seeks) { scanner.seek(keyValue); - KeyValue toVerify = scanner.next(); + Cell toVerify = scanner.next(); if (!keyValue.equals(toVerify)) { - System.out.println(String.format("KeyValue doesn't match:\n" + - "Orig key: %s\n" + - "Ret key: %s", keyValue.getKeyString(), toVerify.getKeyString())); + System.out.println(String.format("KeyValue doesn't match:\n" + "Orig key: %s\n" + + "Ret key: %s", KeyValueUtil.ensureKeyValue(keyValue).getKeyString(), KeyValueUtil + .ensureKeyValue(toVerify).getKeyString())); break; } } @@ -146,7 +148,7 @@ public class EncodedSeekPerformanceTest */ public void runTests(Path path, DataBlockEncoding[] encodings) throws IOException { - List<KeyValue> seeks = prepareListOfTestSeeks(path); + List<Cell> seeks = prepareListOfTestSeeks(path); for (DataBlockEncoding blockEncoding : encodings) { runTest(path, blockEncoding, seeks); Modified: hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/HFileReadWriteTest.java URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/HFileReadWriteTest.java?rev=1585945&r1=1585944&r2=1585945&view=diff ============================================================================== --- hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/HFileReadWriteTest.java (original) +++ hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/HFileReadWriteTest.java Wed Apr 9 11:46:14 2014 @@ -574,7 +574,7 @@ public class HFileReadWriteTest { return false; } for (int i = 0; i < rand.nextInt(10) + 1; ++i) { - KeyValue kv = scanner.next(); + Cell kv = scanner.next(); numKV.incrementAndGet(); if (i == 0 && kv == null) { error("scanner.next() returned null at the first iteration for " + @@ -584,9 +584,10 @@ public class HFileReadWriteTest { if (kv == null) break; - String keyHashStr = MD5Hash.getMD5AsHex(kv.getKey()); + KeyValue keyv = KeyValueUtil.ensureKeyValue(kv); + String keyHashStr = MD5Hash.getMD5AsHex(keyv.getKey()); keysRead.add(keyHashStr); - totalBytes.addAndGet(kv.getLength()); + totalBytes.addAndGet(keyv.getLength()); } } Modified: hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestDefaultMemStore.java URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestDefaultMemStore.java?rev=1585945&r1=1585944&r2=1585945&view=diff ============================================================================== --- hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestDefaultMemStore.java (original) +++ hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestDefaultMemStore.java Wed Apr 9 11:46:14 2014 @@ -41,6 +41,7 @@ import org.apache.hadoop.hbase.HColumnDe import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.KeyValueTestUtil; +import org.apache.hadoop.hbase.KeyValueUtil; import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.client.Scan; import org.apache.hadoop.hbase.util.Bytes; @@ -204,7 +205,7 @@ public class TestDefaultMemStore extends List<KeyValueScanner> memstorescanners = this.memstore.getScanners(mvcc.memstoreReadPoint()); assertEquals(1, memstorescanners.size()); final KeyValueScanner scanner = memstorescanners.get(0); - scanner.seek(KeyValue.createFirstOnRow(HConstants.EMPTY_START_ROW)); + scanner.seek(KeyValueUtil.createFirstOnRow(HConstants.EMPTY_START_ROW)); assertEquals(kv1, scanner.next()); assertEquals(kv2, scanner.next()); assertNull(scanner.next()); @@ -212,11 +213,11 @@ public class TestDefaultMemStore extends private void assertScannerResults(KeyValueScanner scanner, KeyValue[] expected) throws IOException { - scanner.seek(KeyValue.createFirstOnRow(new byte[]{})); + scanner.seek(KeyValueUtil.createFirstOnRow(new byte[]{})); List<Cell> returned = Lists.newArrayList(); while (true) { - KeyValue next = scanner.next(); + Cell next = scanner.next(); if (next == null) break; returned.add(next); } @@ -417,7 +418,7 @@ public class TestDefaultMemStore extends KeyValueScanner s = this.memstore.getScanners(mvcc.memstoreReadPoint()).get(0); s.seek(kv); - KeyValue ret = s.next(); + Cell ret = s.next(); assertNotNull("Didnt find own write at all", ret); assertEquals("Didnt read own writes", kv.getTimestamp(), ret.getTimestamp()); @@ -1009,7 +1010,7 @@ public class TestDefaultMemStore extends static void doScan(MemStore ms, int iteration) throws IOException { long nanos = System.nanoTime(); KeyValueScanner s = ms.getScanners(0).get(0); - s.seek(KeyValue.createFirstOnRow(new byte[]{})); + s.seek(KeyValueUtil.createFirstOnRow(new byte[]{})); System.out.println(iteration + " create/seek took: " + (System.nanoTime() - nanos)/1000); int cnt=0; Modified: hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestKeyValueHeap.java URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestKeyValueHeap.java?rev=1585945&r1=1585944&r2=1585945&view=diff ============================================================================== --- hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestKeyValueHeap.java (original) +++ hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestKeyValueHeap.java Wed Apr 9 11:46:14 2014 @@ -21,11 +21,13 @@ package org.apache.hadoop.hbase.regionse import java.io.IOException; import java.util.ArrayList; -import java.util.Collections; import java.util.Iterator; import java.util.List; -import org.apache.hadoop.hbase.*; +import org.apache.hadoop.hbase.Cell; +import org.apache.hadoop.hbase.HBaseTestCase; +import org.apache.hadoop.hbase.KeyValue; +import org.apache.hadoop.hbase.SmallTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.CollectionBackedScanner; import org.junit.experimental.categories.Category; @@ -103,7 +105,7 @@ public class TestKeyValueHeap extends HB KeyValueHeap kvh = new KeyValueHeap(scanners, KeyValue.COMPARATOR); - List<KeyValue> actual = new ArrayList<KeyValue>(); + List<Cell> actual = new ArrayList<Cell>(); while(kvh.peek() != null){ actual.add(kvh.next()); } @@ -159,7 +161,7 @@ public class TestKeyValueHeap extends HB KeyValue seekKv = new KeyValue(row2, fam1, null, null); kvh.seek(seekKv); - List<KeyValue> actual = new ArrayList<KeyValue>(); + List<Cell> actual = new ArrayList<Cell>(); actual.add(kvh.peek()); assertEquals(expected.size(), actual.size()); @@ -209,7 +211,7 @@ public class TestKeyValueHeap extends HB } private static class Scanner extends CollectionBackedScanner { - private Iterator<KeyValue> iter; + private Iterator<Cell> iter; private KeyValue current; private boolean closed = false; Modified: hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestKeyValueScanFixture.java URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestKeyValueScanFixture.java?rev=1585945&r1=1585944&r2=1585945&view=diff ============================================================================== --- hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestKeyValueScanFixture.java (original) +++ hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestKeyValueScanFixture.java Wed Apr 9 11:46:14 2014 @@ -22,7 +22,12 @@ package org.apache.hadoop.hbase.regionse import java.io.IOException; import junit.framework.TestCase; -import org.apache.hadoop.hbase.*; + +import org.apache.hadoop.hbase.Cell; +import org.apache.hadoop.hbase.KeyValue; +import org.apache.hadoop.hbase.KeyValueTestUtil; +import org.apache.hadoop.hbase.KeyValueUtil; +import org.apache.hadoop.hbase.SmallTests; import org.apache.hadoop.hbase.util.Bytes; import org.junit.experimental.categories.Category; @@ -42,19 +47,19 @@ public class TestKeyValueScanFixture ext KeyValueScanner scan = new KeyValueScanFixture( KeyValue.COMPARATOR, kvs); - KeyValue kv = KeyValue.createFirstOnRow(Bytes.toBytes("RowA")); + KeyValue kv = KeyValueUtil.createFirstOnRow(Bytes.toBytes("RowA")); // should seek to this: assertTrue(scan.seek(kv)); - KeyValue res = scan.peek(); + Cell res = scan.peek(); assertEquals(kvs[0], res); - kv = KeyValue.createFirstOnRow(Bytes.toBytes("RowB")); + kv = KeyValueUtil.createFirstOnRow(Bytes.toBytes("RowB")); assertTrue(scan.seek(kv)); res = scan.peek(); assertEquals(kvs[2], res); // ensure we pull things out properly: - kv = KeyValue.createFirstOnRow(Bytes.toBytes("RowA")); + kv = KeyValueUtil.createFirstOnRow(Bytes.toBytes("RowA")); assertTrue(scan.seek(kv)); assertEquals(kvs[0], scan.peek()); assertEquals(kvs[0], scan.next()); Modified: hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestReversibleScanners.java URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestReversibleScanners.java?rev=1585945&r1=1585944&r2=1585945&view=diff ============================================================================== --- hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestReversibleScanners.java (original) +++ hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestReversibleScanners.java Wed Apr 9 11:46:14 2014 @@ -39,6 +39,7 @@ import org.apache.hadoop.hbase.HBaseConf import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.KeyValue; +import org.apache.hadoop.hbase.KeyValueUtil; import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.client.Durability; import org.apache.hadoop.hbase.client.Put; @@ -176,7 +177,7 @@ public class TestReversibleScanners { for (int i = startRowNum; i >= 0; i--) { if (i - 2 < 0) break; i = i - 2; - kvHeap.seekToPreviousRow(KeyValue.createFirstOnRow(ROWS[i + 1])); + kvHeap.seekToPreviousRow(KeyValueUtil.createFirstOnRow(ROWS[i + 1])); Pair<Integer, Integer> nextReadableNum = getNextReadableNumWithBackwardScan( i, 0, readPoint); if (nextReadableNum == null) break; @@ -457,7 +458,7 @@ public class TestReversibleScanners { for (int i = startRowNum; i >= 0; i--) { if (i % 2 == 1 && i - 2 >= 0) { i = i - 2; - kvHeap.seekToPreviousRow(KeyValue.createFirstOnRow(ROWS[i + 1])); + kvHeap.seekToPreviousRow(KeyValueUtil.createFirstOnRow(ROWS[i + 1])); } for (int j = 0; j < QUALSIZE; j++) { if (j % 2 == 1 && (j + 1) < QUALSIZE) { @@ -499,7 +500,7 @@ public class TestReversibleScanners { scanner.seekToLastRow(); } } else { - KeyValue startKey = KeyValue.createFirstOnRow(startRow); + KeyValue startKey = KeyValueUtil.createFirstOnRow(startRow); for (KeyValueScanner scanner : scanners) { scanner.backwardSeek(startKey); } @@ -525,17 +526,17 @@ public class TestReversibleScanners { // Case2: seek to the previous row in backwardSeek int seekRowNum = ROWSIZE - 2; - assertTrue(scanner.backwardSeek(KeyValue.createLastOnRow(ROWS[seekRowNum]))); + assertTrue(scanner.backwardSeek(KeyValueUtil.createLastOnRow(ROWS[seekRowNum]))); KeyValue expectedKey = makeKV(seekRowNum - 1, 0); assertEquals(expectedKey, scanner.peek()); // Case3: unable to backward seek - assertFalse(scanner.backwardSeek(KeyValue.createLastOnRow(ROWS[0]))); + assertFalse(scanner.backwardSeek(KeyValueUtil.createLastOnRow(ROWS[0]))); assertEquals(null, scanner.peek()); // Test seek to previous row seekRowNum = ROWSIZE - 4; - assertTrue(scanner.seekToPreviousRow(KeyValue + assertTrue(scanner.seekToPreviousRow(KeyValueUtil .createFirstOnRow(ROWS[seekRowNum]))); expectedKey = makeKV(seekRowNum - 1, 0); assertEquals(expectedKey, scanner.peek()); @@ -566,7 +567,7 @@ public class TestReversibleScanners { // Case2: seek to the previous row in backwardSeek int seekRowNum = ROWSIZE - 3; - KeyValue seekKey = KeyValue.createLastOnRow(ROWS[seekRowNum]); + KeyValue seekKey = KeyValueUtil.createLastOnRow(ROWS[seekRowNum]); expectedKey = getNextReadableKeyValueWithBackwardScan(seekRowNum - 1, 0, readPoint); assertEquals(expectedKey != null, scanner.backwardSeek(seekKey)); @@ -576,7 +577,7 @@ public class TestReversibleScanners { seekRowNum = ROWSIZE - 4; expectedKey = getNextReadableKeyValueWithBackwardScan(seekRowNum - 1, 0, readPoint); - assertEquals(expectedKey != null, scanner.seekToPreviousRow(KeyValue + assertEquals(expectedKey != null, scanner.seekToPreviousRow(KeyValueUtil .createFirstOnRow(ROWS[seekRowNum]))); assertEquals(expectedKey, scanner.peek()); } Modified: hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFile.java URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFile.java?rev=1585945&r1=1585944&r2=1585945&view=diff ============================================================================== --- hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFile.java (original) +++ hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFile.java Wed Apr 9 11:46:14 2014 @@ -33,11 +33,13 @@ import org.apache.commons.logging.LogFac import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; +import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.HBaseTestCase; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.KeyValue; +import org.apache.hadoop.hbase.KeyValueUtil; import org.apache.hadoop.hbase.SmallTests; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Scan; @@ -590,7 +592,7 @@ public class TestStoreFile extends HBase // Now do reseek with empty KV to position to the beginning of the file - KeyValue k = KeyValue.createFirstOnRow(HConstants.EMPTY_BYTE_ARRAY); + KeyValue k = KeyValueUtil.createFirstOnRow(HConstants.EMPTY_BYTE_ARRAY); StoreFileScanner s = reader.getStoreFileScanner(false, false); s.reseek(k); @@ -882,14 +884,16 @@ public class TestStoreFile extends HBase readerTwo.loadFileInfo(); StoreFileScanner scannerTwo = readerTwo.getStoreFileScanner(true, true); scannerTwo.seek(KeyValue.LOWESTKEY); - KeyValue kv1 = null; - KeyValue kv2 = null; + Cell kv1 = null; + Cell kv2 = null; while ((kv1 = scannerOne.next()) != null) { kv2 = scannerTwo.next(); assertTrue(kv1.equals(kv2)); + KeyValue keyv1 = KeyValueUtil.ensureKeyValue(kv1); + KeyValue keyv2 = KeyValueUtil.ensureKeyValue(kv2); assertTrue(Bytes.compareTo( - kv1.getBuffer(), kv1.getKeyOffset(), kv1.getKeyLength(), - kv2.getBuffer(), kv2.getKeyOffset(), kv2.getKeyLength()) == 0); + keyv1.getBuffer(), keyv1.getKeyOffset(), keyv1.getKeyLength(), + keyv2.getBuffer(), keyv2.getKeyOffset(), keyv2.getKeyLength()) == 0); assertTrue(Bytes.compareTo( kv1.getValueArray(), kv1.getValueOffset(), kv1.getValueLength(), kv2.getValueArray(), kv2.getValueOffset(), kv2.getValueLength()) == 0); Modified: hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFileScannerWithTagCompression.java URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFileScannerWithTagCompression.java?rev=1585945&r1=1585944&r2=1585945&view=diff ============================================================================== --- hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFileScannerWithTagCompression.java (original) +++ hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFileScannerWithTagCompression.java Wed Apr 9 11:46:14 2014 @@ -27,8 +27,10 @@ import java.util.List; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; +import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.KeyValue; +import org.apache.hadoop.hbase.KeyValueUtil; import org.apache.hadoop.hbase.SmallTests; import org.apache.hadoop.hbase.Tag; import org.apache.hadoop.hbase.io.encoding.DataBlockEncoding; @@ -73,15 +75,15 @@ public class TestStoreFileScannerWithTag StoreFileScanner s = reader.getStoreFileScanner(false, false); try { // Now do reseek with empty KV to position to the beginning of the file - KeyValue k = KeyValue.createFirstOnRow(Bytes.toBytes("k2")); + KeyValue k = KeyValueUtil.createFirstOnRow(Bytes.toBytes("k2")); s.reseek(k); - KeyValue kv = s.next(); + Cell kv = s.next(); kv = s.next(); kv = s.next(); byte[] key5 = Bytes.toBytes("k5"); assertTrue(Bytes.equals(key5, 0, key5.length, kv.getRowArray(), kv.getRowOffset(), kv.getRowLength())); - List<Tag> tags = kv.getTags(); + List<Tag> tags = KeyValueUtil.ensureKeyValue(kv).getTags(); assertEquals(1, tags.size()); assertEquals("tag3", Bytes.toString(tags.get(0).getValue())); } finally {
