You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by jm...@apache.org on 2013/08/30 22:31:48 UTC
svn commit: r1519076 [4/6] - in /hbase/branches/0.95:
hbase-client/src/main/java/org/apache/hadoop/hbase/
hbase-client/src/main/java/org/apache/hadoop/hbase/client/
hbase-client/src/main/java/org/apache/hadoop/hbase/client/coprocessor/
hbase-client/src...
Modified: hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java?rev=1519076&r1=1519075&r2=1519076&view=diff
==============================================================================
--- hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java (original)
+++ hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java Fri Aug 30 20:31:44 2013
@@ -48,6 +48,8 @@ import org.apache.commons.logging.LogFac
import org.apache.commons.logging.impl.Log4JLogger;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.Abortable;
+import org.apache.hadoop.hbase.Cell;
+import org.apache.hadoop.hbase.CellUtil;
import org.apache.hadoop.hbase.DoNotRetryIOException;
import org.apache.hadoop.hbase.HBaseTestingUtility;
import org.apache.hadoop.hbase.HColumnDescriptor;
@@ -205,9 +207,9 @@ public class TestFromClientSide {
s.setTimeRange(0, ts+3);
s.setMaxVersions();
ResultScanner scanner = h.getScanner(s);
- KeyValue[] kvs = scanner.next().raw();
- assertArrayEquals(T2, kvs[0].getValue());
- assertArrayEquals(T1, kvs[1].getValue());
+ Cell[] kvs = scanner.next().raw();
+ assertArrayEquals(T2, CellUtil.getValueArray(kvs[0]));
+ assertArrayEquals(T1, CellUtil.getValueArray(kvs[1]));
scanner.close();
s = new Scan(T1);
@@ -215,11 +217,11 @@ public class TestFromClientSide {
s.setMaxVersions();
scanner = h.getScanner(s);
kvs = scanner.next().raw();
- assertTrue(kvs[0].isDeleteFamily());
- assertArrayEquals(T3, kvs[1].getValue());
- assertTrue(kvs[2].isDelete());
- assertArrayEquals(T2, kvs[3].getValue());
- assertArrayEquals(T1, kvs[4].getValue());
+ assertTrue(CellUtil.isDeleteFamily(kvs[0]));
+ assertArrayEquals(T3, CellUtil.getValueArray(kvs[1]));
+ assertTrue(CellUtil.isDelete(kvs[2]));
+ assertArrayEquals(T2, CellUtil.getValueArray(kvs[3]));
+ assertArrayEquals(T1, CellUtil.getValueArray(kvs[4]));
scanner.close();
h.close();
}
@@ -475,9 +477,9 @@ public class TestFromClientSide {
while (scanner.hasNext()) {
Result result = scanner.next();
System.out.println("Got back key: " + Bytes.toString(result.getRow()));
- for (KeyValue kv : result.raw()) {
+ for (Cell kv : result.raw()) {
System.out.println("kv=" + kv.toString() + ", "
- + Bytes.toString(kv.getValue()));
+ + Bytes.toString(CellUtil.getValueArray(kv)));
}
numberOfResults++;
}
@@ -746,8 +748,8 @@ public class TestFromClientSide {
int expectedIndex = 1;
for(Result result : ht.getScanner(scan)) {
assertEquals(result.size(), 1);
- assertTrue(Bytes.equals(result.raw()[0].getRow(), ROWS[expectedIndex]));
- assertTrue(Bytes.equals(result.raw()[0].getQualifier(),
+ assertTrue(Bytes.equals(CellUtil.getRowArray(result.raw()[0]), ROWS[expectedIndex]));
+ assertTrue(Bytes.equals(CellUtil.getQualifierArray(result.raw()[0]),
QUALIFIERS[expectedIndex]));
expectedIndex++;
}
@@ -782,7 +784,7 @@ public class TestFromClientSide {
for(Result result : ht.getScanner(scan)) {
assertEquals(result.size(), 1);
assertEquals(result.raw()[0].getValueLength(), Bytes.SIZEOF_INT);
- assertEquals(Bytes.toInt(result.raw()[0].getValue()), VALUE.length);
+ assertEquals(Bytes.toInt(CellUtil.getValueArray(result.raw()[0])), VALUE.length);
count++;
}
assertEquals(count, 10);
@@ -2133,15 +2135,15 @@ public class TestFromClientSide {
result = scanner.next();
assertTrue("Expected 1 key but received " + result.size(),
result.size() == 1);
- assertTrue(Bytes.equals(result.raw()[0].getRow(), ROWS[3]));
- assertTrue(Bytes.equals(result.raw()[0].getValue(), VALUES[0]));
+ assertTrue(Bytes.equals(CellUtil.getRowArray(result.raw()[0]), ROWS[3]));
+ assertTrue(Bytes.equals(CellUtil.getValueArray(result.raw()[0]), VALUES[0]));
result = scanner.next();
assertTrue("Expected 2 keys but received " + result.size(),
result.size() == 2);
- assertTrue(Bytes.equals(result.raw()[0].getRow(), ROWS[4]));
- assertTrue(Bytes.equals(result.raw()[1].getRow(), ROWS[4]));
- assertTrue(Bytes.equals(result.raw()[0].getValue(), VALUES[1]));
- assertTrue(Bytes.equals(result.raw()[1].getValue(), VALUES[2]));
+ assertTrue(Bytes.equals(CellUtil.getRowArray(result.raw()[0]), ROWS[4]));
+ assertTrue(Bytes.equals(CellUtil.getRowArray(result.raw()[1]), ROWS[4]));
+ assertTrue(Bytes.equals(CellUtil.getValueArray(result.raw()[0]), VALUES[1]));
+ assertTrue(Bytes.equals(CellUtil.getValueArray(result.raw()[1]), VALUES[2]));
scanner.close();
// Add test of bulk deleting.
@@ -2269,7 +2271,7 @@ public class TestFromClientSide {
Get get = new Get(ROWS[numRows-1]);
Result result = ht.get(get);
assertNumKeys(result, numColsPerRow);
- KeyValue [] keys = result.raw();
+ Cell [] keys = result.raw();
for(int i=0;i<result.size();i++) {
assertKey(keys[i], ROWS[numRows-1], FAMILY, QUALIFIERS[i], QUALIFIERS[i]);
}
@@ -2280,7 +2282,7 @@ public class TestFromClientSide {
int rowCount = 0;
while((result = scanner.next()) != null) {
assertNumKeys(result, numColsPerRow);
- KeyValue [] kvs = result.raw();
+ Cell [] kvs = result.raw();
for(int i=0;i<numColsPerRow;i++) {
assertKey(kvs[i], ROWS[rowCount], FAMILY, QUALIFIERS[i], QUALIFIERS[i]);
}
@@ -2309,7 +2311,7 @@ public class TestFromClientSide {
rowCount = 0;
while((result = scanner.next()) != null) {
assertNumKeys(result, numColsPerRow);
- KeyValue [] kvs = result.raw();
+ Cell [] kvs = result.raw();
for(int i=0;i<numColsPerRow;i++) {
assertKey(kvs[i], ROWS[rowCount], FAMILY, QUALIFIERS[i], QUALIFIERS[i]);
}
@@ -3082,38 +3084,38 @@ public class TestFromClientSide {
// Verifiers
//
- private void assertKey(KeyValue key, byte [] row, byte [] family,
+ private void assertKey(Cell key, byte [] row, byte [] family,
byte [] qualifier, byte [] value)
throws Exception {
assertTrue("Expected row [" + Bytes.toString(row) + "] " +
- "Got row [" + Bytes.toString(key.getRow()) +"]",
- equals(row, key.getRow()));
+ "Got row [" + Bytes.toString(CellUtil.getRowArray(key)) +"]",
+ equals(row, CellUtil.getRowArray(key)));
assertTrue("Expected family [" + Bytes.toString(family) + "] " +
- "Got family [" + Bytes.toString(key.getFamily()) + "]",
- equals(family, key.getFamily()));
+ "Got family [" + Bytes.toString(CellUtil.getFamilyArray(key)) + "]",
+ equals(family, CellUtil.getFamilyArray(key)));
assertTrue("Expected qualifier [" + Bytes.toString(qualifier) + "] " +
- "Got qualifier [" + Bytes.toString(key.getQualifier()) + "]",
- equals(qualifier, key.getQualifier()));
+ "Got qualifier [" + Bytes.toString(CellUtil.getQualifierArray(key)) + "]",
+ equals(qualifier, CellUtil.getQualifierArray(key)));
assertTrue("Expected value [" + Bytes.toString(value) + "] " +
- "Got value [" + Bytes.toString(key.getValue()) + "]",
- equals(value, key.getValue()));
+ "Got value [" + Bytes.toString(CellUtil.getValueArray(key)) + "]",
+ equals(value, CellUtil.getValueArray(key)));
}
- private void assertIncrementKey(KeyValue key, byte [] row, byte [] family,
+ private void assertIncrementKey(Cell key, byte [] row, byte [] family,
byte [] qualifier, long value)
throws Exception {
assertTrue("Expected row [" + Bytes.toString(row) + "] " +
- "Got row [" + Bytes.toString(key.getRow()) +"]",
- equals(row, key.getRow()));
+ "Got row [" + Bytes.toString(CellUtil.getRowArray(key)) +"]",
+ equals(row, CellUtil.getRowArray(key)));
assertTrue("Expected family [" + Bytes.toString(family) + "] " +
- "Got family [" + Bytes.toString(key.getFamily()) + "]",
- equals(family, key.getFamily()));
+ "Got family [" + Bytes.toString(CellUtil.getFamilyArray(key)) + "]",
+ equals(family, CellUtil.getFamilyArray(key)));
assertTrue("Expected qualifier [" + Bytes.toString(qualifier) + "] " +
- "Got qualifier [" + Bytes.toString(key.getQualifier()) + "]",
- equals(qualifier, key.getQualifier()));
+ "Got qualifier [" + Bytes.toString(CellUtil.getQualifierArray(key)) + "]",
+ equals(qualifier, CellUtil.getQualifierArray(key)));
assertTrue("Expected value [" + value + "] " +
- "Got value [" + Bytes.toLong(key.getValue()) + "]",
- Bytes.toLong(key.getValue()) == value);
+ "Got value [" + Bytes.toLong(CellUtil.getValueArray(key)) + "]",
+ Bytes.toLong(CellUtil.getValueArray(key)) == value);
}
private void assertNumKeys(Result result, int n) throws Exception {
@@ -3131,23 +3133,26 @@ public class TestFromClientSide {
assertTrue("Expected " + idxs.length + " keys but result contains "
+ result.size(), result.size() == idxs.length);
- KeyValue [] keys = result.raw();
+ Cell [] keys = result.raw();
for(int i=0;i<keys.length;i++) {
byte [] family = families[idxs[i][0]];
byte [] qualifier = qualifiers[idxs[i][1]];
byte [] value = values[idxs[i][2]];
- KeyValue key = keys[i];
+ Cell key = keys[i];
+ byte[] famb = CellUtil.getFamilyArray(key);
+ byte[] qualb = CellUtil.getQualifierArray(key);
+ byte[] valb = CellUtil.getValueArray(key);
assertTrue("(" + i + ") Expected family [" + Bytes.toString(family)
- + "] " + "Got family [" + Bytes.toString(key.getFamily()) + "]",
- equals(family, key.getFamily()));
+ + "] " + "Got family [" + Bytes.toString(famb) + "]",
+ equals(family, famb));
assertTrue("(" + i + ") Expected qualifier [" + Bytes.toString(qualifier)
- + "] " + "Got qualifier [" + Bytes.toString(key.getQualifier()) + "]",
- equals(qualifier, key.getQualifier()));
+ + "] " + "Got qualifier [" + Bytes.toString(qualb) + "]",
+ equals(qualifier, qualb));
assertTrue("(" + i + ") Expected value [" + Bytes.toString(value) + "] "
- + "Got value [" + Bytes.toString(key.getValue()) + "]",
- equals(value, key.getValue()));
+ + "Got value [" + Bytes.toString(valb) + "]",
+ equals(value, valb));
}
}
@@ -3161,24 +3166,24 @@ public class TestFromClientSide {
int expectedResults = end - start + 1;
assertEquals(expectedResults, result.size());
- KeyValue [] keys = result.raw();
+ Cell[] keys = result.raw();
for (int i=0; i<keys.length; i++) {
byte [] value = values[end-i];
long ts = stamps[end-i];
- KeyValue key = keys[i];
+ Cell key = keys[i];
assertTrue("(" + i + ") Expected family [" + Bytes.toString(family)
- + "] " + "Got family [" + Bytes.toString(key.getFamily()) + "]",
- equals(family, key.getFamily()));
+ + "] " + "Got family [" + Bytes.toString(CellUtil.getFamilyArray(key)) + "]",
+ CellUtil.matchingFamily(key, family));
assertTrue("(" + i + ") Expected qualifier [" + Bytes.toString(qualifier)
- + "] " + "Got qualifier [" + Bytes.toString(key.getQualifier()) + "]",
- equals(qualifier, key.getQualifier()));
+ + "] " + "Got qualifier [" + Bytes.toString(CellUtil.getQualifierArray(key))+ "]",
+ CellUtil.matchingQualifier(key, qualifier));
assertTrue("Expected ts [" + ts + "] " +
"Got ts [" + key.getTimestamp() + "]", ts == key.getTimestamp());
assertTrue("(" + i + ") Expected value [" + Bytes.toString(value) + "] "
- + "Got value [" + Bytes.toString(key.getValue()) + "]",
- equals(value, key.getValue()));
+ + "Got value [" + Bytes.toString(CellUtil.getValueArray(key)) + "]",
+ CellUtil.matchingValue(key, value));
}
}
@@ -3195,27 +3200,27 @@ public class TestFromClientSide {
equals(row, result.getRow()));
assertTrue("Expected two keys but result contains " + result.size(),
result.size() == 2);
- KeyValue [] kv = result.raw();
- KeyValue kvA = kv[0];
+ Cell [] kv = result.raw();
+ Cell kvA = kv[0];
assertTrue("(A) Expected family [" + Bytes.toString(familyA) + "] " +
- "Got family [" + Bytes.toString(kvA.getFamily()) + "]",
- equals(familyA, kvA.getFamily()));
+ "Got family [" + Bytes.toString(CellUtil.getFamilyArray(kvA)) + "]",
+ equals(familyA, CellUtil.getFamilyArray(kvA)));
assertTrue("(A) Expected qualifier [" + Bytes.toString(qualifierA) + "] " +
- "Got qualifier [" + Bytes.toString(kvA.getQualifier()) + "]",
- equals(qualifierA, kvA.getQualifier()));
+ "Got qualifier [" + Bytes.toString(CellUtil.getQualifierArray(kvA)) + "]",
+ equals(qualifierA, CellUtil.getQualifierArray(kvA)));
assertTrue("(A) Expected value [" + Bytes.toString(valueA) + "] " +
- "Got value [" + Bytes.toString(kvA.getValue()) + "]",
- equals(valueA, kvA.getValue()));
- KeyValue kvB = kv[1];
+ "Got value [" + Bytes.toString(CellUtil.getValueArray(kvA)) + "]",
+ equals(valueA, CellUtil.getValueArray(kvA)));
+ Cell kvB = kv[1];
assertTrue("(B) Expected family [" + Bytes.toString(familyB) + "] " +
- "Got family [" + Bytes.toString(kvB.getFamily()) + "]",
- equals(familyB, kvB.getFamily()));
+ "Got family [" + Bytes.toString(CellUtil.getFamilyArray(kvB)) + "]",
+ equals(familyB, CellUtil.getFamilyArray(kvB)));
assertTrue("(B) Expected qualifier [" + Bytes.toString(qualifierB) + "] " +
- "Got qualifier [" + Bytes.toString(kvB.getQualifier()) + "]",
- equals(qualifierB, kvB.getQualifier()));
+ "Got qualifier [" + Bytes.toString(CellUtil.getQualifierArray(kvB)) + "]",
+ equals(qualifierB, CellUtil.getQualifierArray(kvB)));
assertTrue("(B) Expected value [" + Bytes.toString(valueB) + "] " +
- "Got value [" + Bytes.toString(kvB.getValue()) + "]",
- equals(valueB, kvB.getValue()));
+ "Got value [" + Bytes.toString(CellUtil.getValueArray(kvB)) + "]",
+ equals(valueB, CellUtil.getValueArray(kvB)));
}
private void assertSingleResult(Result result, byte [] row, byte [] family,
@@ -3226,16 +3231,16 @@ public class TestFromClientSide {
equals(row, result.getRow()));
assertTrue("Expected a single key but result contains " + result.size(),
result.size() == 1);
- KeyValue kv = result.raw()[0];
+ Cell kv = result.raw()[0];
assertTrue("Expected family [" + Bytes.toString(family) + "] " +
- "Got family [" + Bytes.toString(kv.getFamily()) + "]",
- equals(family, kv.getFamily()));
+ "Got family [" + Bytes.toString(CellUtil.getFamilyArray(kv)) + "]",
+ equals(family, CellUtil.getFamilyArray(kv)));
assertTrue("Expected qualifier [" + Bytes.toString(qualifier) + "] " +
- "Got qualifier [" + Bytes.toString(kv.getQualifier()) + "]",
- equals(qualifier, kv.getQualifier()));
+ "Got qualifier [" + Bytes.toString(CellUtil.getQualifierArray(kv)) + "]",
+ equals(qualifier, CellUtil.getQualifierArray(kv)));
assertTrue("Expected value [" + Bytes.toString(value) + "] " +
- "Got value [" + Bytes.toString(kv.getValue()) + "]",
- equals(value, kv.getValue()));
+ "Got value [" + Bytes.toString(CellUtil.getValueArray(kv)) + "]",
+ equals(value, CellUtil.getValueArray(kv)));
}
private void assertSingleResult(Result result, byte [] row, byte [] family,
@@ -3246,18 +3251,18 @@ public class TestFromClientSide {
equals(row, result.getRow()));
assertTrue("Expected a single key but result contains " + result.size(),
result.size() == 1);
- KeyValue kv = result.raw()[0];
+ Cell kv = result.raw()[0];
assertTrue("Expected family [" + Bytes.toString(family) + "] " +
- "Got family [" + Bytes.toString(kv.getFamily()) + "]",
- equals(family, kv.getFamily()));
+ "Got family [" + Bytes.toString(CellUtil.getFamilyArray(kv)) + "]",
+ equals(family, CellUtil.getFamilyArray(kv)));
assertTrue("Expected qualifier [" + Bytes.toString(qualifier) + "] " +
- "Got qualifier [" + Bytes.toString(kv.getQualifier()) + "]",
- equals(qualifier, kv.getQualifier()));
+ "Got qualifier [" + Bytes.toString(CellUtil.getQualifierArray(kv)) + "]",
+ equals(qualifier, CellUtil.getQualifierArray(kv)));
assertTrue("Expected ts [" + ts + "] " +
"Got ts [" + kv.getTimestamp() + "]", ts == kv.getTimestamp());
assertTrue("Expected value [" + Bytes.toString(value) + "] " +
- "Got value [" + Bytes.toString(kv.getValue()) + "]",
- equals(value, kv.getValue()));
+ "Got value [" + Bytes.toString(CellUtil.getValueArray(kv)) + "]",
+ equals(value, CellUtil.getValueArray(kv)));
}
private void assertEmptyResult(Result result) throws Exception {
@@ -3809,7 +3814,7 @@ public class TestFromClientSide {
scan.addColumn(CONTENTS_FAMILY, null);
ResultScanner scanner = table.getScanner(scan);
for (Result r : scanner) {
- for(KeyValue key : r.raw()) {
+ for(Cell key : r.raw()) {
System.out.println(Bytes.toString(r.getRow()) + ": " + key.toString());
}
}
@@ -4011,7 +4016,7 @@ public class TestFromClientSide {
int index = 0;
Result r = null;
while ((r = s.next()) != null) {
- for(KeyValue key : r.raw()) {
+ for(Cell key : r.raw()) {
times[index++] = key.getTimestamp();
}
}
@@ -4045,7 +4050,7 @@ public class TestFromClientSide {
int index = 0;
Result r = null;
while ((r = s.next()) != null) {
- for(KeyValue key : r.raw()) {
+ for(Cell key : r.raw()) {
times[index++] = key.getTimestamp();
}
}
@@ -4172,7 +4177,7 @@ public class TestFromClientSide {
for (Result r : s) {
put = new Put(r.getRow());
put.setDurability(Durability.SKIP_WAL);
- for (KeyValue kv : r.raw()) {
+ for (Cell kv : r.raw()) {
put.add(kv);
}
b.put(put);
@@ -4521,7 +4526,7 @@ public class TestFromClientSide {
// Verify expected results
Result r = ht.get(new Get(ROW));
- KeyValue [] kvs = r.raw();
+ Cell [] kvs = r.raw();
assertEquals(5, kvs.length);
assertIncrementKey(kvs[0], ROW, FAMILY, QUALIFIERS[0], 1);
assertIncrementKey(kvs[1], ROW, FAMILY, QUALIFIERS[1], 3);
Modified: hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestIntraRowPagination.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestIntraRowPagination.java?rev=1519076&r1=1519075&r2=1519076&view=diff
==============================================================================
--- hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestIntraRowPagination.java (original)
+++ hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestIntraRowPagination.java Fri Aug 30 20:31:44 2013
@@ -19,6 +19,7 @@ package org.apache.hadoop.hbase.client;
import java.util.ArrayList;
import java.util.List;
+import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.HBaseTestingUtility;
import org.apache.hadoop.hbase.HColumnDescriptor;
import org.apache.hadoop.hbase.HRegionInfo;
@@ -66,7 +67,7 @@ public class TestIntraRowPagination {
Result result;
boolean toLog = true;
- List<KeyValue> kvListExp = new ArrayList<KeyValue>();
+ List<Cell> kvListExp = new ArrayList<Cell>();
int storeOffset = 1;
int storeLimit = 3;
@@ -89,8 +90,8 @@ public class TestIntraRowPagination {
scan.setRowOffsetPerColumnFamily(storeOffset);
scan.setMaxResultsPerColumnFamily(storeLimit);
RegionScanner scanner = region.getScanner(scan);
- List<KeyValue> kvListScan = new ArrayList<KeyValue>();
- List<KeyValue> results = new ArrayList<KeyValue>();
+ List<Cell> kvListScan = new ArrayList<Cell>();
+ List<Cell> results = new ArrayList<Cell>();
while (scanner.next(results) || !results.isEmpty()) {
kvListScan.addAll(results);
results.clear();
Modified: hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMultiParallel.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMultiParallel.java?rev=1519076&r1=1519075&r2=1519076&view=diff
==============================================================================
--- hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMultiParallel.java (original)
+++ hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMultiParallel.java Fri Aug 30 20:31:44 2013
@@ -32,8 +32,9 @@ import java.util.concurrent.ThreadPoolEx
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.commons.logging.impl.Log4JLogger;
+import org.apache.hadoop.hbase.Cell;
+import org.apache.hadoop.hbase.CellUtil;
import org.apache.hadoop.hbase.HBaseTestingUtility;
-import org.apache.hadoop.hbase.KeyValue;
import org.apache.hadoop.hbase.MediumTests;
import org.apache.hadoop.hbase.Waiter;
import org.apache.hadoop.hbase.ipc.RpcClient;
@@ -183,12 +184,12 @@ public class TestMultiParallel {
Assert.assertEquals(singleRes.size(), multiRes.length);
for (int i = 0; i < singleRes.size(); i++) {
Assert.assertTrue(singleRes.get(i).containsColumn(BYTES_FAMILY, QUALIFIER));
- KeyValue[] singleKvs = singleRes.get(i).raw();
- KeyValue[] multiKvs = multiRes[i].raw();
+ Cell[] singleKvs = singleRes.get(i).raw();
+ Cell[] multiKvs = multiRes[i].raw();
for (int j = 0; j < singleKvs.length; j++) {
Assert.assertEquals(singleKvs[j], multiKvs[j]);
- Assert.assertEquals(0, Bytes.compareTo(singleKvs[j].getValue(), multiKvs[j]
- .getValue()));
+ Assert.assertEquals(0, Bytes.compareTo(CellUtil.getValueArray(singleKvs[j]),
+ CellUtil.getValueArray(multiKvs[j])));
}
}
table.close();
Modified: hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMultipleTimestamps.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMultipleTimestamps.java?rev=1519076&r1=1519075&r2=1519076&view=diff
==============================================================================
--- hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMultipleTimestamps.java (original)
+++ hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMultipleTimestamps.java Fri Aug 30 20:31:44 2013
@@ -105,7 +105,7 @@ public class TestMultipleTimestamps {
ResultScanner scanner = scan(ht, FAMILY, scanRows, scanColumns,
scanTimestamps, scanMaxVersions);
- KeyValue[] kvs;
+ Cell [] kvs;
kvs = scanner.next().raw();
assertEquals(2, kvs.length);
@@ -147,7 +147,7 @@ public class TestMultipleTimestamps {
ResultScanner scanner = scan(ht, FAMILY, scanRows, scanColumns,
scanTimestamps, scanMaxVersions);
- KeyValue[] kvs;
+ Cell[] kvs;
kvs = scanner.next().raw();
assertEquals(1, kvs.length);
@@ -194,7 +194,7 @@ public class TestMultipleTimestamps {
}
scanner = scan(ht, FAMILY, scanRows, scanColumns, scanTimestamps, scanMaxVersions);
- KeyValue[] kvs;
+ Cell[] kvs;
// This looks like wrong answer. Should be 2. Even then we are returning wrong result,
// timestamps that are 3 whereas should be 2 since min is inclusive.
@@ -252,7 +252,7 @@ public class TestMultipleTimestamps {
ResultScanner scanner = scan(ht, FAMILY, scanRows, scanColumns,
scanTimestamps, scanMaxVersions);
- KeyValue[] kvs;
+ Cell[] kvs;
kvs = scanner.next().raw();
assertEquals(2, kvs.length);
@@ -307,7 +307,7 @@ public class TestMultipleTimestamps {
// request a bunch of versions including the deleted version. We should
// only get back entries for the versions that exist.
- KeyValue kvs[] = getNVersions(ht, FAMILY, 0, 0,
+ Cell kvs[] = getNVersions(ht, FAMILY, 0, 0,
Arrays.asList(2L, 3L, 4L, 5L));
assertEquals(3, kvs.length);
checkOneCell(kvs[0], FAMILY, 0, 0, 5);
@@ -339,7 +339,7 @@ public class TestMultipleTimestamps {
// request a bunch of versions including the deleted version. We should
// only get back entries for the versions that exist.
- KeyValue kvs[] = getNVersions(ht, FAMILY, 0, 0, Arrays.asList(2L, 3L));
+ Cell kvs[] = getNVersions(ht, FAMILY, 0, 0, Arrays.asList(2L, 3L));
assertEquals(0, kvs.length);
ht.close();
@@ -365,7 +365,7 @@ public class TestMultipleTimestamps {
// request a bunch of versions including the deleted version. We should
// only get back entries for the versions that exist.
- KeyValue kvs[] = getNVersions(ht, FAMILY, 0, 0, Arrays.asList(2L, 3L));
+ Cell kvs[] = getNVersions(ht, FAMILY, 0, 0, Arrays.asList(2L, 3L));
assertEquals(0, kvs.length);
ht.close();
@@ -391,7 +391,7 @@ public class TestMultipleTimestamps {
// request a bunch of versions including the deleted version. We should
// only get back entries for the versions that exist.
- KeyValue kvs[] = getNVersions(ht, FAMILY, 0, 0, Arrays.asList(2L, 3L));
+ Cell kvs[] = getNVersions(ht, FAMILY, 0, 0, Arrays.asList(2L, 3L));
assertEquals(0, kvs.length);
ht.close();
@@ -401,26 +401,26 @@ public class TestMultipleTimestamps {
* Assert that the passed in KeyValue has expected contents for the
* specified row, column & timestamp.
*/
- private void checkOneCell(KeyValue kv, byte[] cf,
+ private void checkOneCell(Cell kv, byte[] cf,
int rowIdx, int colIdx, long ts) {
String ctx = "rowIdx=" + rowIdx + "; colIdx=" + colIdx + "; ts=" + ts;
assertEquals("Row mismatch which checking: " + ctx,
- "row:"+ rowIdx, Bytes.toString(kv.getRow()));
+ "row:"+ rowIdx, Bytes.toString(CellUtil.getRowArray(kv)));
assertEquals("ColumnFamily mismatch while checking: " + ctx,
- Bytes.toString(cf), Bytes.toString(kv.getFamily()));
+ Bytes.toString(cf), Bytes.toString(CellUtil.getFamilyArray(kv)));
assertEquals("Column qualifier mismatch while checking: " + ctx,
"column:" + colIdx,
- Bytes.toString(kv.getQualifier()));
+ Bytes.toString(CellUtil.getQualifierArray(kv)));
assertEquals("Timestamp mismatch while checking: " + ctx,
ts, kv.getTimestamp());
assertEquals("Value mismatch while checking: " + ctx,
- "value-version-" + ts, Bytes.toString(kv.getValue()));
+ "value-version-" + ts, Bytes.toString(CellUtil.getValueArray(kv)));
}
/**
@@ -428,7 +428,7 @@ public class TestMultipleTimestamps {
* versions for the row/column specified by rowIdx & colIdx.
*
*/
- private KeyValue[] getNVersions(HTable ht, byte[] cf, int rowIdx,
+ private Cell[] getNVersions(HTable ht, byte[] cf, int rowIdx,
int colIdx, List<Long> versions)
throws IOException {
byte row[] = Bytes.toBytes("row:" + rowIdx);
Modified: hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestResult.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestResult.java?rev=1519076&r1=1519075&r2=1519076&view=diff
==============================================================================
--- hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestResult.java (original)
+++ hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestResult.java Fri Aug 30 20:31:44 2013
@@ -19,22 +19,23 @@
package org.apache.hadoop.hbase.client;
+import static org.apache.hadoop.hbase.HBaseTestCase.assertByteEquals;
+
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import java.util.List;
+
import junit.framework.TestCase;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.hbase.Cell;
+import org.apache.hadoop.hbase.CellUtil;
import org.apache.hadoop.hbase.KeyValue;
import org.apache.hadoop.hbase.SmallTests;
import org.apache.hadoop.hbase.util.Bytes;
import org.junit.experimental.categories.Category;
-import static org.apache.hadoop.hbase.HBaseTestCase.assertByteEquals;
-
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.NavigableMap;
-
@Category(SmallTests.class)
public class TestResult extends TestCase {
@@ -69,9 +70,9 @@ public class TestResult extends TestCase
for (int i = 0; i < 100; ++i) {
final byte[] qf = Bytes.toBytes(i);
- List<KeyValue> ks = r.getColumn(family, qf);
+ List<Cell> ks = r.getColumn(family, qf);
assertEquals(1, ks.size());
- assertByteEquals(qf, ks.get(0).getQualifier());
+ assertTrue(CellUtil.matchingQualifier(ks.get(0), qf));
assertEquals(ks.get(0), r.getColumnLatest(family, qf));
}
}
@@ -90,9 +91,9 @@ public class TestResult extends TestCase
for (int i = 0; i < 100; ++i) {
final byte[] qf = Bytes.toBytes(i);
- List<KeyValue> ks = r.getColumn(family, qf);
+ List<Cell> ks = r.getColumn(family, qf);
assertEquals(2, ks.size());
- assertByteEquals(qf, ks.get(0).getQualifier());
+ assertTrue(CellUtil.matchingQualifier(ks.get(0), qf));
assertEquals(200, ks.get(0).getTimestamp());
assertEquals(ks.get(0), r.getColumnLatest(family, qf));
}
Modified: hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestScannersFromClientSide.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestScannersFromClientSide.java?rev=1519076&r1=1519075&r2=1519076&view=diff
==============================================================================
--- hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestScannersFromClientSide.java (original)
+++ hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestScannersFromClientSide.java Fri Aug 30 20:31:44 2013
@@ -24,6 +24,7 @@ import java.util.List;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.HBaseTestingUtility;
import org.apache.hadoop.hbase.HTestConst;
import org.apache.hadoop.hbase.KeyValue;
@@ -101,7 +102,7 @@ public class TestScannersFromClientSide
Result result;
ResultScanner scanner;
boolean toLog = true;
- List<KeyValue> kvListExp;
+ List<Cell> kvListExp;
// table: row, family, c0:0, c1:1, ... , c7:7
put = new Put(ROW);
@@ -128,7 +129,7 @@ public class TestScannersFromClientSide
scanner = ht.getScanner(scan);
// c4:4, c5:5, c6:6, c7:7
- kvListExp = new ArrayList<KeyValue>();
+ kvListExp = new ArrayList<Cell>();
kvListExp.add(new KeyValue(ROW, FAMILY, QUALIFIERS[4], 4, VALUE));
kvListExp.add(new KeyValue(ROW, FAMILY, QUALIFIERS[5], 5, VALUE));
kvListExp.add(new KeyValue(ROW, FAMILY, QUALIFIERS[6], 6, VALUE));
@@ -143,14 +144,14 @@ public class TestScannersFromClientSide
scanner = ht.getScanner(scan);
// First batch: c4:4, c5:5
- kvListExp = new ArrayList<KeyValue>();
+ kvListExp = new ArrayList<Cell>();
kvListExp.add(new KeyValue(ROW, FAMILY, QUALIFIERS[4], 4, VALUE));
kvListExp.add(new KeyValue(ROW, FAMILY, QUALIFIERS[5], 5, VALUE));
result = scanner.next();
verifyResult(result, kvListExp, toLog, "Testing first batch of scan");
// Second batch: c6:6, c7:7
- kvListExp = new ArrayList<KeyValue>();
+ kvListExp = new ArrayList<Cell>();
kvListExp.add(new KeyValue(ROW, FAMILY, QUALIFIERS[6], 6, VALUE));
kvListExp.add(new KeyValue(ROW, FAMILY, QUALIFIERS[7], 7, VALUE));
result = scanner.next();
@@ -175,9 +176,9 @@ public class TestScannersFromClientSide
Put put;
Result result;
boolean toLog = true;
- List<KeyValue> kvListExp;
+ List<Cell> kvListExp;
- kvListExp = new ArrayList<KeyValue>();
+ kvListExp = new ArrayList<Cell>();
// Insert one CF for row[0]
put = new Put(ROW);
for (int i=0; i < 10; i++) {
@@ -194,7 +195,7 @@ public class TestScannersFromClientSide
get = new Get(ROW);
get.setMaxResultsPerColumnFamily(2);
result = ht.get(get);
- kvListExp = new ArrayList<KeyValue>();
+ kvListExp = new ArrayList<Cell>();
kvListExp.add(new KeyValue(ROW, FAMILIES[0], QUALIFIERS[0], 1, VALUE));
kvListExp.add(new KeyValue(ROW, FAMILIES[0], QUALIFIERS[1], 1, VALUE));
verifyResult(result, kvListExp, toLog, "Testing basic setMaxResults");
@@ -205,7 +206,7 @@ public class TestScannersFromClientSide
get.setFilter(new ColumnRangeFilter(QUALIFIERS[2], true, QUALIFIERS[5],
true));
result = ht.get(get);
- kvListExp = new ArrayList<KeyValue>();
+ kvListExp = new ArrayList<Cell>();
kvListExp.add(new KeyValue(ROW, FAMILIES[0], QUALIFIERS[2], 1, VALUE));
kvListExp.add(new KeyValue(ROW, FAMILIES[0], QUALIFIERS[3], 1, VALUE));
kvListExp.add(new KeyValue(ROW, FAMILIES[0], QUALIFIERS[4], 1, VALUE));
@@ -233,7 +234,7 @@ public class TestScannersFromClientSide
get.addFamily(FAMILIES[1]);
get.addFamily(FAMILIES[2]);
result = ht.get(get);
- kvListExp = new ArrayList<KeyValue>();
+ kvListExp = new ArrayList<Cell>();
//Exp: CF1:q0, ..., q9, CF2: q0, q1, q10, q11, ..., q19
for (int i=0; i < 10; i++) {
kvListExp.add(new KeyValue(ROW, FAMILIES[1], QUALIFIERS[i], 1, VALUE));
@@ -251,7 +252,7 @@ public class TestScannersFromClientSide
get.setMaxResultsPerColumnFamily(3);
get.setFilter(new ColumnRangeFilter(QUALIFIERS[2], true, null, true));
result = ht.get(get);
- kvListExp = new ArrayList<KeyValue>();
+ kvListExp = new ArrayList<Cell>();
for (int i=2; i < 5; i++) {
kvListExp.add(new KeyValue(ROW, FAMILIES[0], QUALIFIERS[i], 1, VALUE));
}
@@ -267,7 +268,7 @@ public class TestScannersFromClientSide
get.setMaxResultsPerColumnFamily(7);
get.setFilter(new ColumnPrefixFilter(QUALIFIERS[1]));
result = ht.get(get);
- kvListExp = new ArrayList<KeyValue>();
+ kvListExp = new ArrayList<Cell>();
kvListExp.add(new KeyValue(ROW, FAMILIES[0], QUALIFIERS[1], 1, VALUE));
kvListExp.add(new KeyValue(ROW, FAMILIES[1], QUALIFIERS[1], 1, VALUE));
kvListExp.add(new KeyValue(ROW, FAMILIES[2], QUALIFIERS[1], 1, VALUE));
@@ -296,9 +297,9 @@ public class TestScannersFromClientSide
Scan scan;
Result result;
boolean toLog = true;
- List<KeyValue> kvListExp, kvListScan;
+ List<Cell> kvListExp, kvListScan;
- kvListExp = new ArrayList<KeyValue>();
+ kvListExp = new ArrayList<Cell>();
for (int r=0; r < ROWS.length; r++) {
put = new Put(ROWS[r]);
@@ -317,9 +318,9 @@ public class TestScannersFromClientSide
scan = new Scan();
scan.setMaxResultsPerColumnFamily(4);
ResultScanner scanner = ht.getScanner(scan);
- kvListScan = new ArrayList<KeyValue>();
+ kvListScan = new ArrayList<Cell>();
while ((result = scanner.next()) != null) {
- for (KeyValue kv : result.list()) {
+ for (Cell kv : result.list()) {
kvListScan.add(kv);
}
}
@@ -345,10 +346,10 @@ public class TestScannersFromClientSide
Put put;
Result result;
boolean toLog = true;
- List<KeyValue> kvListExp;
+ List<Cell> kvListExp;
// Insert one CF for row
- kvListExp = new ArrayList<KeyValue>();
+ kvListExp = new ArrayList<Cell>();
put = new Put(ROW);
for (int i=0; i < 10; i++) {
KeyValue kv = new KeyValue(ROW, FAMILIES[0], QUALIFIERS[i], 1, VALUE);
@@ -369,7 +370,7 @@ public class TestScannersFromClientSide
get = new Get(ROW);
get.setRowOffsetPerColumnFamily(20);
result = ht.get(get);
- kvListExp = new ArrayList<KeyValue>();
+ kvListExp = new ArrayList<Cell>();
verifyResult(result, kvListExp, toLog, "Testing offset > #kvs");
//offset + maxResultPerCF
@@ -377,7 +378,7 @@ public class TestScannersFromClientSide
get.setRowOffsetPerColumnFamily(4);
get.setMaxResultsPerColumnFamily(5);
result = ht.get(get);
- kvListExp = new ArrayList<KeyValue>();
+ kvListExp = new ArrayList<Cell>();
for (int i=4; i < 9; i++) {
kvListExp.add(new KeyValue(ROW, FAMILIES[0], QUALIFIERS[i], 1, VALUE));
}
@@ -390,7 +391,7 @@ public class TestScannersFromClientSide
get.setFilter(new ColumnRangeFilter(QUALIFIERS[2], true, QUALIFIERS[5],
true));
result = ht.get(get);
- kvListExp = new ArrayList<KeyValue>();
+ kvListExp = new ArrayList<Cell>();
kvListExp.add(new KeyValue(ROW, FAMILIES[0], QUALIFIERS[3], 1, VALUE));
kvListExp.add(new KeyValue(ROW, FAMILIES[0], QUALIFIERS[4], 1, VALUE));
kvListExp.add(new KeyValue(ROW, FAMILIES[0], QUALIFIERS[5], 1, VALUE));
@@ -413,7 +414,7 @@ public class TestScannersFromClientSide
get.addFamily(FAMILIES[1]);
get.addFamily(FAMILIES[2]);
result = ht.get(get);
- kvListExp = new ArrayList<KeyValue>();
+ kvListExp = new ArrayList<Cell>();
//Exp: CF1:q4, q5, CF2: q4, q5
kvListExp.add(new KeyValue(ROW, FAMILIES[1], QUALIFIERS[4], 1, VALUE));
kvListExp.add(new KeyValue(ROW, FAMILIES[1], QUALIFIERS[5], 1, VALUE));
@@ -423,7 +424,7 @@ public class TestScannersFromClientSide
"Testing offset + multiple CFs + maxResults");
}
- static void verifyResult(Result result, List<KeyValue> expKvList, boolean toLog,
+ static void verifyResult(Result result, List<Cell> expKvList, boolean toLog,
String msg) {
LOG.info(msg);
@@ -433,12 +434,12 @@ public class TestScannersFromClientSide
return;
int i = 0;
- for (KeyValue kv : result.raw()) {
+ for (Cell kv : result.raw()) {
if (i >= expKvList.size()) {
break; // we will check the size later
}
- KeyValue kvExp = expKvList.get(i++);
+ Cell kvExp = expKvList.get(i++);
if (toLog) {
LOG.info("get kv is: " + kv.toString());
LOG.info("exp kv is: " + kvExp.toString());
Modified: hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestTimestampsFilter.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestTimestampsFilter.java?rev=1519076&r1=1519075&r2=1519076&view=diff
==============================================================================
--- hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestTimestampsFilter.java (original)
+++ hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestTimestampsFilter.java Fri Aug 30 20:31:44 2013
@@ -93,7 +93,7 @@ public class TestTimestampsFilter {
byte [] TABLE = Bytes.toBytes("testTimestampsFilter");
byte [] FAMILY = Bytes.toBytes("event_log");
byte [][] FAMILIES = new byte[][] { FAMILY };
- KeyValue kvs[];
+ Cell kvs[];
// create table; set versions to max...
HTable ht = TEST_UTIL.createTable(TABLE, FAMILIES, Integer.MAX_VALUE);
@@ -169,7 +169,6 @@ public class TestTimestampsFilter {
byte [] TABLE = Bytes.toBytes("testTimestampsFilterMultiColumns");
byte [] FAMILY = Bytes.toBytes("event_log");
byte [][] FAMILIES = new byte[][] { FAMILY };
- KeyValue kvs[];
// create table; set versions to max...
HTable ht = TEST_UTIL.createTable(TABLE, FAMILIES, Integer.MAX_VALUE);
@@ -186,7 +185,7 @@ public class TestTimestampsFilter {
p.add(FAMILY, Bytes.toBytes("column4"), 3, Bytes.toBytes("value4-3"));
ht.put(p);
- ArrayList timestamps = new ArrayList();
+ ArrayList<Long> timestamps = new ArrayList<Long>();
timestamps.add(new Long(3));
TimestampsFilter filter = new TimestampsFilter(timestamps);
@@ -197,17 +196,15 @@ public class TestTimestampsFilter {
g.addColumn(FAMILY, Bytes.toBytes("column4"));
Result result = ht.get(g);
- for (KeyValue kv : result.list()) {
- System.out.println("found row " + Bytes.toString(kv.getRow()) +
- ", column " + Bytes.toString(kv.getQualifier()) + ", value "
- + Bytes.toString(kv.getValue()));
+ for (Cell kv : result.list()) {
+ System.out.println("found row " + Bytes.toString(CellUtil.getRowArray(kv)) +
+ ", column " + Bytes.toString(CellUtil.getQualifierArray(kv)) + ", value "
+ + Bytes.toString(CellUtil.getValueArray(kv)));
}
assertEquals(result.list().size(), 2);
- assertEquals(Bytes.toString(result.list().get(0).getValue()),
- "value2-3");
- assertEquals(Bytes.toString(result.list().get(1).getValue()),
- "value4-3");
+ assertTrue(CellUtil.matchingValue(result.list().get(0), Bytes.toBytes("value2-3")));
+ assertTrue(CellUtil.matchingValue(result.list().get(1), Bytes.toBytes("value4-3")));
ht.close();
}
@@ -248,7 +245,7 @@ public class TestTimestampsFilter {
// request a bunch of versions including the deleted version. We should
// only get back entries for the versions that exist.
- KeyValue kvs[] = getNVersions(ht, FAMILY, 0, 0, Arrays.asList(2L, 3L, 4L, 5L));
+ Cell kvs[] = getNVersions(ht, FAMILY, 0, 0, Arrays.asList(2L, 3L, 4L, 5L));
assertEquals(3, kvs.length);
checkOneCell(kvs[0], FAMILY, 0, 0, 5);
checkOneCell(kvs[1], FAMILY, 0, 0, 3);
@@ -261,7 +258,7 @@ public class TestTimestampsFilter {
for (int rowIdx = 0; rowIdx < 5; rowIdx++) {
for (int colIdx = 0; colIdx < 5; colIdx++) {
// ask for versions that exist.
- KeyValue[] kvs = getNVersions(ht, cf, rowIdx, colIdx,
+ Cell[] kvs = getNVersions(ht, cf, rowIdx, colIdx,
Arrays.asList(5L, 300L, 6L, 80L));
assertEquals(4, kvs.length);
checkOneCell(kvs[0], cf, rowIdx, colIdx, 300);
@@ -289,26 +286,26 @@ public class TestTimestampsFilter {
* Assert that the passed in KeyValue has expected contents for the
* specified row, column & timestamp.
*/
- private void checkOneCell(KeyValue kv, byte[] cf,
+ private void checkOneCell(Cell kv, byte[] cf,
int rowIdx, int colIdx, long ts) {
String ctx = "rowIdx=" + rowIdx + "; colIdx=" + colIdx + "; ts=" + ts;
assertEquals("Row mismatch which checking: " + ctx,
- "row:"+ rowIdx, Bytes.toString(kv.getRow()));
+ "row:"+ rowIdx, Bytes.toString(CellUtil.getRowArray(kv)));
assertEquals("ColumnFamily mismatch while checking: " + ctx,
- Bytes.toString(cf), Bytes.toString(kv.getFamily()));
+ Bytes.toString(cf), Bytes.toString(CellUtil.getFamilyArray(kv)));
assertEquals("Column qualifier mismatch while checking: " + ctx,
"column:" + colIdx,
- Bytes.toString(kv.getQualifier()));
+ Bytes.toString(CellUtil.getQualifierArray(kv)));
assertEquals("Timestamp mismatch while checking: " + ctx,
ts, kv.getTimestamp());
assertEquals("Value mismatch while checking: " + ctx,
- "value-version-" + ts, Bytes.toString(kv.getValue()));
+ "value-version-" + ts, Bytes.toString(CellUtil.getValueArray(kv)));
}
/**
@@ -316,7 +313,7 @@ public class TestTimestampsFilter {
* versions for the row/column specified by rowIdx & colIdx.
*
*/
- private KeyValue[] getNVersions(HTable ht, byte[] cf, int rowIdx,
+ private Cell[] getNVersions(HTable ht, byte[] cf, int rowIdx,
int colIdx, List<Long> versions)
throws IOException {
byte row[] = Bytes.toBytes("row:" + rowIdx);
Modified: hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/ColumnAggregationEndpoint.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/ColumnAggregationEndpoint.java?rev=1519076&r1=1519075&r2=1519076&view=diff
==============================================================================
--- hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/ColumnAggregationEndpoint.java (original)
+++ hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/ColumnAggregationEndpoint.java Fri Aug 30 20:31:44 2013
@@ -24,6 +24,8 @@ import java.util.List;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.hbase.Cell;
+import org.apache.hadoop.hbase.CellUtil;
import org.apache.hadoop.hbase.Coprocessor;
import org.apache.hadoop.hbase.CoprocessorEnvironment;
import org.apache.hadoop.hbase.KeyValue;
@@ -83,14 +85,14 @@ implements Coprocessor, CoprocessorServi
InternalScanner scanner = null;
try {
scanner = this.env.getRegion().getScanner(scan);
- List<KeyValue> curVals = new ArrayList<KeyValue>();
+ List<Cell> curVals = new ArrayList<Cell>();
boolean hasMore = false;
do {
curVals.clear();
hasMore = scanner.next(curVals);
- for (KeyValue kv : curVals) {
- if (Bytes.equals(qualifier, kv.getQualifier())) {
- sumResult += Bytes.toInt(kv.getBuffer(), kv.getValueOffset());
+ for (Cell kv : curVals) {
+ if (CellUtil.matchingQualifier(kv, qualifier)) {
+ sumResult += Bytes.toInt(kv.getValueArray(), kv.getValueOffset());
}
}
} while (hasMore);
Modified: hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/SimpleRegionObserver.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/SimpleRegionObserver.java?rev=1519076&r1=1519075&r2=1519076&view=diff
==============================================================================
--- hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/SimpleRegionObserver.java (original)
+++ hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/SimpleRegionObserver.java Fri Aug 30 20:31:44 2013
@@ -34,6 +34,7 @@ import com.google.common.collect.Immutab
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.hbase.Cell;
+import org.apache.hadoop.hbase.CellUtil;
import org.apache.hadoop.hbase.CoprocessorEnvironment;
import org.apache.hadoop.hbase.KeyValue;
import org.apache.hadoop.hbase.client.Get;
@@ -270,8 +271,8 @@ public class SimpleRegionObserver extend
}
@Override
- public void preGet(final ObserverContext<RegionCoprocessorEnvironment> c, final Get get,
- final List<KeyValue> results) throws IOException {
+ public void preGetOp(final ObserverContext<RegionCoprocessorEnvironment> c, final Get get,
+ final List<Cell> results) throws IOException {
RegionCoprocessorEnvironment e = c.getEnvironment();
assertNotNull(e);
assertNotNull(e.getRegion());
@@ -281,8 +282,8 @@ public class SimpleRegionObserver extend
}
@Override
- public void postGet(final ObserverContext<RegionCoprocessorEnvironment> c, final Get get,
- final List<KeyValue> results) {
+ public void postGetOp(final ObserverContext<RegionCoprocessorEnvironment> c, final Get get,
+ final List<Cell> results) {
RegionCoprocessorEnvironment e = c.getEnvironment();
assertNotNull(e);
assertNotNull(e.getRegion());
@@ -293,14 +294,14 @@ public class SimpleRegionObserver extend
boolean foundA = false;
boolean foundB = false;
boolean foundC = false;
- for (KeyValue kv: results) {
- if (Bytes.equals(kv.getFamily(), TestRegionObserverInterface.A)) {
+ for (Cell kv: results) {
+ if (CellUtil.matchingFamily(kv, TestRegionObserverInterface.A)) {
foundA = true;
}
- if (Bytes.equals(kv.getFamily(), TestRegionObserverInterface.B)) {
+ if (CellUtil.matchingFamily(kv, TestRegionObserverInterface.B)) {
foundB = true;
}
- if (Bytes.equals(kv.getFamily(), TestRegionObserverInterface.C)) {
+ if (CellUtil.matchingFamily(kv, TestRegionObserverInterface.C)) {
foundC = true;
}
}
Modified: hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestCoprocessorInterface.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestCoprocessorInterface.java?rev=1519076&r1=1519075&r2=1519076&view=diff
==============================================================================
--- hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestCoprocessorInterface.java (original)
+++ hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestCoprocessorInterface.java Fri Aug 30 20:31:44 2013
@@ -39,6 +39,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.Coprocessor;
import org.apache.hadoop.hbase.CoprocessorEnvironment;
import org.apache.hadoop.hbase.HBaseTestCase;
@@ -47,7 +48,6 @@ import org.apache.hadoop.hbase.HColumnDe
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.HRegionInfo;
import org.apache.hadoop.hbase.HTableDescriptor;
-import org.apache.hadoop.hbase.KeyValue;
import org.apache.hadoop.hbase.Server;
import org.apache.hadoop.hbase.SmallTests;
import org.apache.hadoop.hbase.TableName;
@@ -84,23 +84,23 @@ public class TestCoprocessorInterface {
}
@Override
- public boolean next(List<KeyValue> results) throws IOException {
+ public boolean next(List<Cell> results) throws IOException {
return delegate.next(results);
}
@Override
- public boolean next(List<KeyValue> result, int limit) throws IOException {
+ public boolean next(List<Cell> result, int limit) throws IOException {
return delegate.next(result, limit);
}
@Override
- public boolean nextRaw(List<KeyValue> result)
+ public boolean nextRaw(List<Cell> result)
throws IOException {
return delegate.nextRaw(result);
}
@Override
- public boolean nextRaw(List<KeyValue> result, int limit)
+ public boolean nextRaw(List<Cell> result, int limit)
throws IOException {
return delegate.nextRaw(result, limit);
}
@@ -261,8 +261,8 @@ public class TestCoprocessorInterface {
sharedData = null;
}
@Override
- public void preGet(final ObserverContext<RegionCoprocessorEnvironment> e,
- final Get get, final List<KeyValue> results) throws IOException {
+ public void preGetOp(final ObserverContext<RegionCoprocessorEnvironment> e,
+ final Get get, final List<Cell> results) throws IOException {
if (1/0 == 1) {
e.complete();
}
@@ -382,7 +382,7 @@ public class TestCoprocessorInterface {
RegionScanner scanner = regions[0].getCoprocessorHost().postScannerOpen(s, regions[0].getScanner(s));
assertTrue(scanner instanceof CustomScanner);
// this would throw an exception before HBASE-4197
- scanner.next(new ArrayList<KeyValue>());
+ scanner.next(new ArrayList<Cell>());
assertTrue("Coprocessor not started", ((CoprocessorImpl)c).wasStarted());
assertTrue("Coprocessor not stopped", ((CoprocessorImpl)c).wasStopped());
Modified: hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionObserverInterface.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionObserverInterface.java?rev=1519076&r1=1519075&r2=1519076&view=diff
==============================================================================
--- hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionObserverInterface.java (original)
+++ hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionObserverInterface.java Fri Aug 30 20:31:44 2013
@@ -34,6 +34,8 @@ 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.CellUtil;
import org.apache.hadoop.hbase.Coprocessor;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.HBaseTestingUtility;
@@ -333,19 +335,19 @@ public class TestRegionObserverInterface
Store store, final InternalScanner scanner, final ScanType scanType) {
return new InternalScanner() {
@Override
- public boolean next(List<KeyValue> results) throws IOException {
+ public boolean next(List<Cell> results) throws IOException {
return next(results, -1);
}
@Override
- public boolean next(List<KeyValue> results, int limit)
+ public boolean next(List<Cell> results, int limit)
throws IOException{
- List<KeyValue> internalResults = new ArrayList<KeyValue>();
+ List<Cell> internalResults = new ArrayList<Cell>();
boolean hasMore;
do {
hasMore = scanner.next(internalResults, limit);
if (!internalResults.isEmpty()) {
- long row = Bytes.toLong(internalResults.get(0).getRow());
+ long row = Bytes.toLong(CellUtil.getValueArray(internalResults.get(0)));
if (row % 2 == 0) {
// return this row
break;
Modified: hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionObserverScannerOpenHook.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionObserverScannerOpenHook.java?rev=1519076&r1=1519075&r2=1519076&view=diff
==============================================================================
--- hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionObserverScannerOpenHook.java (original)
+++ hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionObserverScannerOpenHook.java Fri Aug 30 20:31:44 2013
@@ -31,6 +31,7 @@ import java.util.concurrent.CountDownLat
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.Coprocessor;
import org.apache.hadoop.hbase.HBaseConfiguration;
import org.apache.hadoop.hbase.HBaseTestingUtility;
@@ -38,7 +39,6 @@ import org.apache.hadoop.hbase.HColumnDe
import org.apache.hadoop.hbase.HConstants;
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.TableName;
import org.apache.hadoop.hbase.client.Get;
@@ -70,7 +70,7 @@ public class TestRegionObserverScannerOp
public static class NoDataFilter extends FilterBase {
@Override
- public ReturnCode filterKeyValue(KeyValue ignored) throws IOException {
+ public ReturnCode filterKeyValue(Cell ignored) throws IOException {
return ReturnCode.SKIP;
}
Modified: hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRowProcessorEndpoint.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRowProcessorEndpoint.java?rev=1519076&r1=1519075&r2=1519076&view=diff
==============================================================================
--- hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRowProcessorEndpoint.java (original)
+++ hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRowProcessorEndpoint.java Fri Aug 30 20:31:44 2013
@@ -34,6 +34,8 @@ import java.util.concurrent.atomic.Atomi
import java.util.concurrent.atomic.AtomicLong;
import org.apache.hadoop.hbase.MediumTests;
import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hbase.Cell;
+import org.apache.hadoop.hbase.CellUtil;
import org.apache.hadoop.hbase.HBaseTestingUtility;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.KeyValue;
@@ -329,12 +331,12 @@ public class TestRowProcessorEndpoint {
public void process(long now, HRegion region,
List<KeyValue> mutations, WALEdit walEdit) throws IOException {
// Scan current counter
- List<KeyValue> kvs = new ArrayList<KeyValue>();
+ List<Cell> kvs = new ArrayList<Cell>();
Scan scan = new Scan(row, row);
scan.addColumn(FAM, COUNTER);
doScan(region, scan, kvs);
counter = kvs.size() == 0 ? 0 :
- Bytes.toInt(kvs.iterator().next().getValue());
+ Bytes.toInt(CellUtil.getValueArray(kvs.iterator().next()));
// Assert counter value
assertEquals(expectedCounter, counter);
@@ -410,7 +412,7 @@ public class TestRowProcessorEndpoint {
@Override
public void process(long now, HRegion region,
List<KeyValue> mutations, WALEdit walEdit) throws IOException {
- List<KeyValue> kvs = new ArrayList<KeyValue>();
+ List<Cell> kvs = new ArrayList<Cell>();
{ // First scan to get friends of the person
Scan scan = new Scan(row, row);
scan.addColumn(FAM, person);
@@ -419,8 +421,8 @@ public class TestRowProcessorEndpoint {
// Second scan to get friends of friends
Scan scan = new Scan(row, row);
- for (KeyValue kv : kvs) {
- byte[] friends = kv.getValue();
+ for (Cell kv : kvs) {
+ byte[] friends = CellUtil.getValueArray(kv);
for (byte f : friends) {
scan.addColumn(FAM, new byte[]{f});
}
@@ -429,8 +431,8 @@ public class TestRowProcessorEndpoint {
// Collect result
result.clear();
- for (KeyValue kv : kvs) {
- for (byte b : kv.getValue()) {
+ for (Cell kv : kvs) {
+ for (byte b : CellUtil.getValueArray(kv)) {
result.add((char)b + "");
}
}
@@ -500,8 +502,8 @@ public class TestRowProcessorEndpoint {
now = myTimer.getAndIncrement();
// Scan both rows
- List<KeyValue> kvs1 = new ArrayList<KeyValue>();
- List<KeyValue> kvs2 = new ArrayList<KeyValue>();
+ List<Cell> kvs1 = new ArrayList<Cell>();
+ List<Cell> kvs2 = new ArrayList<Cell>();
doScan(region, new Scan(row1, row1), kvs1);
doScan(region, new Scan(row2, row2), kvs2);
@@ -516,19 +518,19 @@ public class TestRowProcessorEndpoint {
swapped = !swapped;
// Add and delete keyvalues
- List<List<KeyValue>> kvs = new ArrayList<List<KeyValue>>();
+ List<List<Cell>> kvs = new ArrayList<List<Cell>>();
kvs.add(kvs1);
kvs.add(kvs2);
byte[][] rows = new byte[][]{row1, row2};
for (int i = 0; i < kvs.size(); ++i) {
- for (KeyValue kv : kvs.get(i)) {
+ for (Cell kv : kvs.get(i)) {
// Delete from the current row and add to the other row
KeyValue kvDelete =
- new KeyValue(rows[i], kv.getFamily(), kv.getQualifier(),
+ new KeyValue(rows[i], CellUtil.getFamilyArray(kv), CellUtil.getQualifierArray(kv),
kv.getTimestamp(), KeyValue.Type.Delete);
KeyValue kvAdd =
- new KeyValue(rows[1 - i], kv.getFamily(), kv.getQualifier(),
- now, kv.getValue());
+ new KeyValue(rows[1 - i], CellUtil.getFamilyArray(kv), CellUtil.getQualifierArray(kv),
+ now, CellUtil.getValueArray(kv));
mutations.add(kvDelete);
walEdit.add(kvDelete);
mutations.add(kvAdd);
@@ -616,7 +618,7 @@ public class TestRowProcessorEndpoint {
}
public static void doScan(
- HRegion region, Scan scan, List<KeyValue> result) throws IOException {
+ HRegion region, Scan scan, List<Cell> result) throws IOException {
InternalScanner scanner = null;
try {
scan.setIsolationLevel(IsolationLevel.READ_UNCOMMITTED);
@@ -629,13 +631,13 @@ public class TestRowProcessorEndpoint {
}
}
- static String stringifyKvs(Collection<KeyValue> kvs) {
+ static String stringifyKvs(Collection<Cell> kvs) {
StringBuilder out = new StringBuilder();
out.append("[");
if (kvs != null) {
- for (KeyValue kv : kvs) {
- byte[] col = kv.getQualifier();
- byte[] val = kv.getValue();
+ for (Cell kv : kvs) {
+ byte[] col = CellUtil.getQualifierArray(kv);
+ byte[] val = CellUtil.getValueArray(kv);
if (Bytes.equals(col, COUNTER)) {
out.append(Bytes.toStringBinary(col) + ":" +
Bytes.toInt(val) + " ");
Modified: hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestColumnPrefixFilter.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestColumnPrefixFilter.java?rev=1519076&r1=1519075&r2=1519076&view=diff
==============================================================================
--- hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestColumnPrefixFilter.java (original)
+++ hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestColumnPrefixFilter.java Fri Aug 30 20:31:44 2013
@@ -56,13 +56,13 @@ public class TestColumnPrefixFilter {
List<String> columns = generateRandomWords(10000, "column");
long maxTimestamp = 2;
- List<KeyValue> kvList = new ArrayList<KeyValue>();
+ List<Cell> kvList = new ArrayList<Cell>();
- Map<String, List<KeyValue>> prefixMap = new HashMap<String,
- List<KeyValue>>();
+ Map<String, List<Cell>> prefixMap = new HashMap<String,
+ List<Cell>>();
- prefixMap.put("p", new ArrayList<KeyValue>());
- prefixMap.put("s", new ArrayList<KeyValue>());
+ prefixMap.put("p", new ArrayList<Cell>());
+ prefixMap.put("s", new ArrayList<Cell>());
String valueString = "ValueString";
@@ -94,7 +94,7 @@ public class TestColumnPrefixFilter {
scan.setFilter(filter);
InternalScanner scanner = region.getScanner(scan);
- List<KeyValue> results = new ArrayList<KeyValue>();
+ List<Cell> results = new ArrayList<Cell>();
while(scanner.next(results));
assertEquals(prefixMap.get(s).size(), results.size());
}
@@ -118,13 +118,13 @@ public class TestColumnPrefixFilter {
List<String> columns = generateRandomWords(10000, "column");
long maxTimestamp = 2;
- List<KeyValue> kvList = new ArrayList<KeyValue>();
+ List<Cell> kvList = new ArrayList<Cell>();
- Map<String, List<KeyValue>> prefixMap = new HashMap<String,
- List<KeyValue>>();
+ Map<String, List<Cell>> prefixMap = new HashMap<String,
+ List<Cell>>();
- prefixMap.put("p", new ArrayList<KeyValue>());
- prefixMap.put("s", new ArrayList<KeyValue>());
+ prefixMap.put("p", new ArrayList<Cell>());
+ prefixMap.put("s", new ArrayList<Cell>());
String valueString = "ValueString";
@@ -159,7 +159,7 @@ public class TestColumnPrefixFilter {
scan.setFilter(filterList);
InternalScanner scanner = region.getScanner(scan);
- List<KeyValue> results = new ArrayList<KeyValue>();
+ List<Cell> results = new ArrayList<Cell>();
while(scanner.next(results));
assertEquals(prefixMap.get(s).size(), results.size());
}
Modified: hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestColumnRangeFilter.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestColumnRangeFilter.java?rev=1519076&r1=1519075&r2=1519076&view=diff
==============================================================================
--- hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestColumnRangeFilter.java (original)
+++ hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestColumnRangeFilter.java Fri Aug 30 20:31:44 2013
@@ -213,13 +213,13 @@ public class TestColumnRangeFilter {
s.isEndInclusive());
scan.setFilter(filter);
ResultScanner scanner = ht.getScanner(scan);
- List<KeyValue> results = new ArrayList<KeyValue>();
+ List<Cell> results = new ArrayList<Cell>();
LOG.info("scan column range: " + s.toString());
long timeBeforeScan = System.currentTimeMillis();
Result result;
while ((result = scanner.next()) != null) {
- for (KeyValue kv : result.list()) {
+ for (Cell kv : result.list()) {
results.add(kv);
}
}
Modified: hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestDependentColumnFilter.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestDependentColumnFilter.java?rev=1519076&r1=1519075&r2=1519076&view=diff
==============================================================================
--- hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestDependentColumnFilter.java (original)
+++ hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestDependentColumnFilter.java Fri Aug 30 20:31:44 2013
@@ -139,7 +139,7 @@ public class TestDependentColumnFilter {
private void verifyScan(Scan s, long expectedRows, long expectedCells)
throws IOException {
InternalScanner scanner = this.region.getScanner(s);
- List<KeyValue> results = new ArrayList<KeyValue>();
+ List<Cell> results = new ArrayList<Cell>();
int i = 0;
int cells = 0;
for (boolean done = true; done; i++) {
@@ -223,15 +223,15 @@ public class TestDependentColumnFilter {
@Test
public void testFilterDropping() throws Exception {
Filter filter = new DependentColumnFilter(FAMILIES[0], QUALIFIER);
- List<KeyValue> accepted = new ArrayList<KeyValue>();
- for(KeyValue val : testVals) {
+ List<Cell> accepted = new ArrayList<Cell>();
+ for(Cell val : testVals) {
if(filter.filterKeyValue(val) == ReturnCode.INCLUDE) {
accepted.add(val);
}
}
assertEquals("check all values accepted from filterKeyValue", 5, accepted.size());
- filter.filterRow(accepted);
+ filter.filterRowCells(accepted);
assertEquals("check filterRow(List<KeyValue>) dropped cell without corresponding column entry", 4, accepted.size());
// start do it again with dependent column dropping on
@@ -244,7 +244,7 @@ public class TestDependentColumnFilter {
}
assertEquals("check the filtering column cells got dropped", 2, accepted.size());
- filter.filterRow(accepted);
+ filter.filterRowCells(accepted);
assertEquals("check cell retention", 2, accepted.size());
}
Modified: hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestFilter.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestFilter.java?rev=1519076&r1=1519075&r2=1519076&view=diff
==============================================================================
--- hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestFilter.java (original)
+++ hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestFilter.java Fri Aug 30 20:31:44 2013
@@ -30,6 +30,8 @@ import java.util.List;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.hbase.Cell;
+import org.apache.hadoop.hbase.CellUtil;
import org.apache.hadoop.hbase.HBaseTestingUtility;
import org.apache.hadoop.hbase.HColumnDescriptor;
import org.apache.hadoop.hbase.HConstants;
@@ -39,9 +41,9 @@ import org.apache.hadoop.hbase.KeyValue;
import org.apache.hadoop.hbase.SmallTests;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.Delete;
+import org.apache.hadoop.hbase.client.Durability;
import org.apache.hadoop.hbase.client.Put;
import org.apache.hadoop.hbase.client.Scan;
-import org.apache.hadoop.hbase.client.Durability;
import org.apache.hadoop.hbase.filter.CompareFilter.CompareOp;
import org.apache.hadoop.hbase.filter.FilterList.Operator;
import org.apache.hadoop.hbase.regionserver.HRegion;
@@ -267,22 +269,22 @@ public class TestFilter {
// reseek to row three.
scanner.reseek(ROWS_THREE[1]);
- List<KeyValue> results = new ArrayList<KeyValue>();
+ List<Cell> results = new ArrayList<Cell>();
// the results should belong to ROWS_THREE[1]
scanner.next(results);
- for (KeyValue keyValue : results) {
- assertEquals("The rows with ROWS_TWO as row key should be appearing.",
- Bytes.toString(keyValue.getRow()), Bytes.toString(ROWS_THREE[1]));
+ for (Cell keyValue : results) {
+ assertTrue("The rows with ROWS_TWO as row key should be appearing.",
+ CellUtil.matchingRow(keyValue, ROWS_THREE[1]));
}
// again try to reseek to a value before ROWS_THREE[1]
scanner.reseek(ROWS_ONE[1]);
- results = new ArrayList<KeyValue>();
+ results = new ArrayList<Cell>();
// This time no seek would have been done to ROWS_ONE[1]
scanner.next(results);
- for (KeyValue keyValue : results) {
+ for (Cell keyValue : results) {
assertFalse("Cannot rewind back to a value less than previous reseek.",
- Bytes.toString(keyValue.getRow()).contains("testRowOne"));
+ Bytes.toString(CellUtil.getRowArray(keyValue)).contains("testRowOne"));
}
}
@@ -419,7 +421,7 @@ public class TestFilter {
InternalScanner scanner = this.region.getScanner(s);
int scannerCounter = 0;
while (true) {
- boolean isMoreResults = scanner.next(new ArrayList<KeyValue>());
+ boolean isMoreResults = scanner.next(new ArrayList<Cell>());
scannerCounter++;
if (scannerCounter >= pageSize) {
@@ -450,9 +452,9 @@ public class TestFilter {
InternalScanner scanner = this.region.getScanner(s);
while (true) {
- ArrayList<KeyValue> values = new ArrayList<KeyValue>();
+ ArrayList<Cell> values = new ArrayList<Cell>();
boolean isMoreResults = scanner.next(values);
- if (!isMoreResults || !Bytes.toString(values.get(0).getRow()).startsWith(prefix)) {
+ if (!isMoreResults || !Bytes.toString(CellUtil.getRowArray(values.get(0))).startsWith(prefix)) {
assertTrue("The WhileMatchFilter should now filter all remaining", filter.filterAllRemaining());
}
if (!isMoreResults) {
@@ -480,7 +482,7 @@ public class TestFilter {
InternalScanner scanner = this.region.getScanner(s);
while (true) {
- ArrayList<KeyValue> values = new ArrayList<KeyValue>();
+ ArrayList<Cell> values = new ArrayList<Cell>();
boolean isMoreResults = scanner.next(values);
assertTrue("The WhileMatchFilter should now filter all remaining", filter.filterAllRemaining());
if (!isMoreResults) {
@@ -1375,7 +1377,7 @@ public class TestFilter {
private void verifyScan(Scan s, long expectedRows, long expectedKeys)
throws IOException {
InternalScanner scanner = this.region.getScanner(s);
- List<KeyValue> results = new ArrayList<KeyValue>();
+ List<Cell> results = new ArrayList<Cell>();
int i = 0;
for (boolean done = true; done; i++) {
done = scanner.next(results);
@@ -1397,7 +1399,7 @@ public class TestFilter {
long expectedKeys)
throws IOException {
InternalScanner scanner = this.region.getScanner(s);
- List<KeyValue> results = new ArrayList<KeyValue>();
+ List<Cell> results = new ArrayList<Cell>();
int i = 0;
for (boolean done = true; done; i++) {
done = scanner.next(results);
@@ -1418,7 +1420,7 @@ public class TestFilter {
private void verifyScanFull(Scan s, KeyValue [] kvs)
throws IOException {
InternalScanner scanner = this.region.getScanner(s);
- List<KeyValue> results = new ArrayList<KeyValue>();
+ List<Cell> results = new ArrayList<Cell>();
int row = 0;
int idx = 0;
for (boolean done = true; done; row++) {
@@ -1430,17 +1432,13 @@ public class TestFilter {
" total but already scanned " + (results.size() + idx) +
(results.isEmpty() ? "" : "(" + results.get(0).toString() + ")"),
kvs.length >= idx + results.size());
- for (KeyValue kv : results) {
+ for (Cell kv : results) {
LOG.info("row=" + row + ", result=" + kv.toString() +
", match=" + kvs[idx].toString());
- assertTrue("Row mismatch",
- Bytes.equals(kv.getRow(), kvs[idx].getRow()));
- assertTrue("Family mismatch",
- Bytes.equals(kv.getFamily(), kvs[idx].getFamily()));
- assertTrue("Qualifier mismatch",
- Bytes.equals(kv.getQualifier(), kvs[idx].getQualifier()));
- assertTrue("Value mismatch",
- Bytes.equals(kv.getValue(), kvs[idx].getValue()));
+ assertTrue("Row mismatch", CellUtil.matchingRow(kv, kvs[idx]));
+ assertTrue("Family mismatch", CellUtil.matchingFamily(kv, kvs[idx]));
+ assertTrue("Qualifier mismatch", CellUtil.matchingQualifier(kv, kvs[idx]));
+ assertTrue("Value mismatch", CellUtil.matchingValue(kv, kvs[idx]));
idx++;
}
results.clear();
@@ -1453,7 +1451,7 @@ public class TestFilter {
private void verifyScanFullNoValues(Scan s, KeyValue [] kvs, boolean useLen)
throws IOException {
InternalScanner scanner = this.region.getScanner(s);
- List<KeyValue> results = new ArrayList<KeyValue>();
+ List<Cell> results = new ArrayList<Cell>();
int row = 0;
int idx = 0;
for (boolean more = true; more; row++) {
@@ -1465,28 +1463,24 @@ public class TestFilter {
" total but already scanned " + (results.size() + idx) +
(results.isEmpty() ? "" : "(" + results.get(0).toString() + ")"),
kvs.length >= idx + results.size());
- for(KeyValue kv : results) {
+ for(Cell kv : results) {
LOG.info("row=" + row + ", result=" + kv.toString() +
", match=" + kvs[idx].toString());
- assertTrue("Row mismatch",
- Bytes.equals(kv.getRow(), kvs[idx].getRow()));
- assertTrue("Family mismatch",
- Bytes.equals(kv.getFamily(), kvs[idx].getFamily()));
- assertTrue("Qualifier mismatch",
- Bytes.equals(kv.getQualifier(), kvs[idx].getQualifier()));
- assertFalse("Should not have returned whole value",
- Bytes.equals(kv.getValue(), kvs[idx].getValue()));
+
+ assertTrue("Row mismatch", CellUtil.matchingRow(kv, kvs[idx]));
+ assertTrue("Family mismatch", CellUtil.matchingFamily(kv, kvs[idx]));
+ assertTrue("Qualifier mismatch", CellUtil.matchingQualifier(kv, kvs[idx]));
+ assertFalse("Should not have returned whole value", CellUtil.matchingValue(kv, kvs[idx]));
if (useLen) {
assertEquals("Value in result is not SIZEOF_INT",
- kv.getValue().length, Bytes.SIZEOF_INT);
+ kv.getValueLength(), Bytes.SIZEOF_INT);
LOG.info("idx = " + idx + ", len=" + kvs[idx].getValueLength()
- + ", actual=" + Bytes.toInt(kv.getValue()));
+ + ", actual=" + Bytes.toInt(CellUtil.getValueArray(kv)));
assertEquals("Scan value should be the length of the actual value. ",
- kvs[idx].getValueLength(), Bytes.toInt(kv.getValue()) );
+ kvs[idx].getValueLength(), Bytes.toInt(CellUtil.getValueArray(kv)) );
LOG.info("good");
} else {
- assertEquals("Value in result is not empty",
- kv.getValue().length, 0);
+ assertEquals("Value in result is not empty", kv.getValueLength(), 0);
}
idx++;
}
@@ -1788,12 +1782,12 @@ public class TestFilter {
Scan s1 = new Scan();
s1.setFilter(rowFilter);
InternalScanner scanner = testRegion.getScanner(s1);
- List<KeyValue> results = new ArrayList<KeyValue>();
+ List<Cell> results = new ArrayList<Cell>();
int i = 5;
for (boolean done = true; done; i++) {
done = scanner.next(results);
- assertTrue(Bytes.equals(results.get(0).getRow(), Bytes.toBytes("row" + i)));
- assertEquals(Bytes.toInt(results.get(0).getValue()), i%2);
+ assertTrue(CellUtil.matchingRow(results.get(0), Bytes.toBytes("row" + i)));
+ assertEquals(Bytes.toInt(CellUtil.getValueArray(results.get(0))), i%2);
results.clear();
}
// 2. got rows <= "row4" and S=
@@ -1807,11 +1801,11 @@ public class TestFilter {
s1 = new Scan();
s1.setFilter(subFilterList);
scanner = testRegion.getScanner(s1);
- results = new ArrayList<KeyValue>();
+ results = new ArrayList<Cell>();
for (i=0; i<=4; i+=2) {
scanner.next(results);
- assertTrue(Bytes.equals(results.get(0).getRow(), Bytes.toBytes("row" + i)));
- assertEquals(Bytes.toInt(results.get(0).getValue()), i%2);
+ assertTrue(CellUtil.matchingRow(results.get(0), Bytes.toBytes("row" + i)));
+ assertEquals(Bytes.toInt(CellUtil.getValueArray(results.get(0))), i%2);
results.clear();
}
assertFalse(scanner.next(results));
@@ -1823,17 +1817,17 @@ public class TestFilter {
s1 = new Scan();
s1.setFilter(filterList);
scanner = testRegion.getScanner(s1);
- results = new ArrayList<KeyValue>();
+ results = new ArrayList<Cell>();
for (i=0; i<=4; i+=2) {
scanner.next(results);
- assertTrue(Bytes.equals(results.get(0).getRow(), Bytes.toBytes("row" + i)));
- assertEquals(Bytes.toInt(results.get(0).getValue()), i%2);
+ assertTrue(CellUtil.matchingRow(results.get(0), Bytes.toBytes("row" + i)));
+ assertEquals(Bytes.toInt(CellUtil.getValueArray(results.get(0))), i%2);
results.clear();
}
for (i=5; i<=9; i++) {
scanner.next(results);
- assertTrue(Bytes.equals(results.get(0).getRow(), Bytes.toBytes("row" + i)));
- assertEquals(Bytes.toInt(results.get(0).getValue()), i%2);
+ assertTrue(CellUtil.matchingRow(results.get(0), Bytes.toBytes("row" + i)));
+ assertEquals(Bytes.toInt(CellUtil.getValueArray(results.get(0))), i%2);
results.clear();
}
assertFalse(scanner.next(results));
@@ -1844,17 +1838,17 @@ public class TestFilter {
s1 = new Scan();
s1.setFilter(filterList);
scanner = testRegion.getScanner(s1);
- results = new ArrayList<KeyValue>();
+ results = new ArrayList<Cell>();
for (i=0; i<=4; i+=2) {
scanner.next(results);
- assertTrue(Bytes.equals(results.get(0).getRow(), Bytes.toBytes("row" + i)));
- assertEquals(Bytes.toInt(results.get(0).getValue()), i%2);
+ assertTrue(CellUtil.matchingRow(results.get(0), Bytes.toBytes("row" + i)));
+ assertEquals(Bytes.toInt(CellUtil.getValueArray(results.get(0))), i%2);
results.clear();
}
for (i=5; i<=9; i++) {
scanner.next(results);
- assertTrue(Bytes.equals(results.get(0).getRow(), Bytes.toBytes("row" + i)));
- assertEquals(Bytes.toInt(results.get(0).getValue()), i%2);
+ assertTrue(CellUtil.matchingRow(results.get(0), Bytes.toBytes("row" + i)));
+ assertEquals(Bytes.toInt(CellUtil.getValueArray(results.get(0))), i%2);
results.clear();
}
assertFalse(scanner.next(results));
Modified: hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestFilterList.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestFilterList.java?rev=1519076&r1=1519075&r2=1519076&view=diff
==============================================================================
--- hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestFilterList.java (original)
+++ hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestFilterList.java Fri Aug 30 20:31:44 2013
@@ -35,7 +35,9 @@ import static org.junit.Assert.assertNot
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertNull;
+import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.KeyValue;
+import org.apache.hadoop.hbase.KeyValueUtil;
import org.apache.hadoop.hbase.SmallTests;
import org.apache.hadoop.hbase.filter.CompareFilter.CompareOp;
import org.apache.hadoop.hbase.filter.FilterList.Operator;
@@ -289,7 +291,7 @@ public class TestFilterList {
public void testFilterKeyValue() throws Exception {
Filter includeFilter = new FilterBase() {
@Override
- public Filter.ReturnCode filterKeyValue(KeyValue v) {
+ public Filter.ReturnCode filterKeyValue(Cell v) {
return Filter.ReturnCode.INCLUDE;
}
};
@@ -298,7 +300,7 @@ public class TestFilterList {
boolean returnInclude = true;
@Override
- public Filter.ReturnCode filterKeyValue(KeyValue v) {
+ public Filter.ReturnCode filterKeyValue(Cell v) {
Filter.ReturnCode returnCode = returnInclude ? Filter.ReturnCode.INCLUDE :
Filter.ReturnCode.SKIP;
returnInclude = !returnInclude;
@@ -310,7 +312,7 @@ public class TestFilterList {
boolean returnIncludeOnly = false;
@Override
- public Filter.ReturnCode filterKeyValue(KeyValue v) {
+ public Filter.ReturnCode filterKeyValue(Cell v) {
Filter.ReturnCode returnCode = returnIncludeOnly ? Filter.ReturnCode.INCLUDE :
Filter.ReturnCode.INCLUDE_AND_NEXT_COL;
returnIncludeOnly = !returnIncludeOnly;
@@ -352,12 +354,12 @@ public class TestFilterList {
Filter filterMinHint = new FilterBase() {
@Override
- public ReturnCode filterKeyValue(KeyValue ignored) {
+ public ReturnCode filterKeyValue(Cell ignored) {
return ReturnCode.SEEK_NEXT_USING_HINT;
}
@Override
- public KeyValue getNextKeyHint(KeyValue currentKV) {
+ public Cell getNextCellHint(Cell currentKV) {
return minKeyValue;
}
@@ -367,12 +369,12 @@ public class TestFilterList {
Filter filterMaxHint = new FilterBase() {
@Override
- public ReturnCode filterKeyValue(KeyValue ignored) {
+ public ReturnCode filterKeyValue(Cell ignored) {
return ReturnCode.SEEK_NEXT_USING_HINT;
}
@Override
- public KeyValue getNextKeyHint(KeyValue currentKV) {
+ public Cell getNextCellHint(Cell currentKV) {
return new KeyValue(Bytes.toBytes(Long.MAX_VALUE), null, null);
}
@@ -466,12 +468,12 @@ public class TestFilterList {
// Value for fam:qual1 should be stripped:
assertEquals(Filter.ReturnCode.INCLUDE, flist.filterKeyValue(kvQual1));
- final KeyValue transformedQual1 = flist.transform(kvQual1);
+ final KeyValue transformedQual1 = KeyValueUtil.ensureKeyValue(flist.transform(kvQual1));
assertEquals(0, transformedQual1.getValue().length);
// Value for fam:qual2 should not be stripped:
assertEquals(Filter.ReturnCode.INCLUDE, flist.filterKeyValue(kvQual2));
- final KeyValue transformedQual2 = flist.transform(kvQual2);
+ final KeyValue transformedQual2 = KeyValueUtil.ensureKeyValue(flist.transform(kvQual2));
assertEquals("value", Bytes.toString(transformedQual2.getValue()));
// Other keys should be skipped:
Modified: hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestFilterWithScanLimits.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestFilterWithScanLimits.java?rev=1519076&r1=1519075&r2=1519076&view=diff
==============================================================================
--- hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestFilterWithScanLimits.java (original)
+++ hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestFilterWithScanLimits.java Fri Aug 30 20:31:44 2013
@@ -19,6 +19,11 @@
*/
package org.apache.hadoop.hbase.filter;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
@@ -27,17 +32,16 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.commons.logging.impl.Log4JLogger;
import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.HBaseConfiguration;
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.TableName;
import org.apache.hadoop.hbase.MasterNotRunningException;
+import org.apache.hadoop.hbase.MediumTests;
+import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.ZooKeeperConnectionException;
-import org.apache.hadoop.hbase.ipc.RpcClient;
-import org.apache.hadoop.hbase.ipc.RpcServer;
import org.apache.hadoop.hbase.client.HBaseAdmin;
import org.apache.hadoop.hbase.client.HTable;
import org.apache.hadoop.hbase.client.Put;
@@ -45,14 +49,13 @@ import org.apache.hadoop.hbase.client.Re
import org.apache.hadoop.hbase.client.ResultScanner;
import org.apache.hadoop.hbase.client.Scan;
import org.apache.hadoop.hbase.client.ScannerCallable;
+import org.apache.hadoop.hbase.ipc.RpcClient;
+import org.apache.hadoop.hbase.ipc.RpcServer;
import org.apache.hadoop.hbase.util.Bytes;
-
+import org.apache.log4j.Level;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
-import static org.junit.Assert.*;
-import org.apache.hadoop.hbase.MediumTests;
-import org.apache.log4j.Level;
import org.junit.experimental.categories.Category;
/**
@@ -90,7 +93,7 @@ public class TestFilterWithScanLimits {
// row2 => <f1:c5, 2_c5>
for (Result result : scanner) {
- for (KeyValue kv : result.list()) {
+ for (Cell kv : result.list()) {
kv_number++;
LOG.debug(kv_number + ". kv: " + kv);
}
Modified: hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestFilterWrapper.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestFilterWrapper.java?rev=1519076&r1=1519075&r2=1519076&view=diff
==============================================================================
--- hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestFilterWrapper.java (original)
+++ hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestFilterWrapper.java Fri Aug 30 20:31:44 2013
@@ -26,6 +26,8 @@ import java.util.List;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hbase.Cell;
+import org.apache.hadoop.hbase.CellUtil;
import org.apache.hadoop.hbase.HBaseConfiguration;
import org.apache.hadoop.hbase.HBaseTestingUtility;
import org.apache.hadoop.hbase.HColumnDescriptor;
@@ -87,10 +89,10 @@ public class TestFilterWrapper {
// row2 (c1-c4) and row3(c1-c4) are returned
for (Result result : scanner) {
row_number++;
- for (KeyValue kv : result.list()) {
+ for (Cell kv : result.list()) {
LOG.debug(kv_number + ". kv: " + kv);
kv_number++;
- assertEquals("Returned row is not correct", new String(kv.getRow()),
+ assertEquals("Returned row is not correct", new String(CellUtil.getRowArray(kv)),
"row" + ( row_number + 1 ));
}
}