Repository: hbase Updated Branches: refs/heads/master f2fc311b1 -> e952e7362
HBASE-12199 Make TestAtomicOperation and TestEncodedSeekers faster Signed-off-by: Elliott Clark <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/e952e736 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/e952e736 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/e952e736 Branch: refs/heads/master Commit: e952e736242cd79f9eae523773ab3b9ce788341c Parents: f2fc311 Author: manukranthk <[email protected]> Authored: Tue Oct 7 17:07:19 2014 -0700 Committer: Elliott Clark <[email protected]> Committed: Wed Oct 8 08:46:29 2014 -0700 ---------------------------------------------------------------------- .../hadoop/hbase/io/encoding/TestEncodedSeekers.java | 2 ++ .../hadoop/hbase/regionserver/TestAtomicOperation.java | 11 ++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/e952e736/hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestEncodedSeekers.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestEncodedSeekers.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestEncodedSeekers.java index 86c210d..e087457 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestEncodedSeekers.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestEncodedSeekers.java @@ -30,6 +30,7 @@ import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.Tag; +import org.apache.hadoop.hbase.client.Durability; import org.apache.hadoop.hbase.client.Get; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.Result; @@ -143,6 +144,7 @@ public class TestEncodedSeekers { byte[] key = LoadTestKVGenerator.md5PrefixedKey(i).getBytes(); for (int j = 0; j < NUM_COLS_PER_ROW; ++j) { Put put = new Put(key); + put.setDurability(Durability.ASYNC_WAL); byte[] col = Bytes.toBytes(String.valueOf(j)); byte[] value = dataGenerator.generateRandomSizeValue(key, col); if (includeTags) { http://git-wip-us.apache.org/repos/asf/hbase/blob/e952e736/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestAtomicOperation.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestAtomicOperation.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestAtomicOperation.java index 6af8716..86cca00 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestAtomicOperation.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestAtomicOperation.java @@ -71,7 +71,6 @@ import org.junit.Test; import org.junit.experimental.categories.Category; import org.junit.rules.TestName; - /** * Testing of HRegion.incrementColumnValue, HRegion.increment, * and HRegion.append @@ -238,6 +237,7 @@ public class TestAtomicOperation { inc.addColumn(fam1, qual1, amount); inc.addColumn(fam1, qual2, amount*2); inc.addColumn(fam2, qual3, amount*3); + inc.setDurability(Durability.ASYNC_WAL); region.increment(inc); // verify: Make sure we only see completed increments @@ -275,6 +275,7 @@ public class TestAtomicOperation { a.add(fam1, qual1, val); a.add(fam1, qual2, val); a.add(fam2, qual3, val); + a.setDurability(Durability.ASYNC_WAL); region.append(a); Get g = new Get(row); @@ -350,16 +351,20 @@ public class TestAtomicOperation { if (op) { Put p = new Put(row, ts); p.add(fam1, qual1, value1); + p.setDurability(Durability.ASYNC_WAL); rm.add(p); Delete d = new Delete(row); d.deleteColumns(fam1, qual2, ts); + d.setDurability(Durability.ASYNC_WAL); rm.add(d); } else { Delete d = new Delete(row); d.deleteColumns(fam1, qual1, ts); + d.setDurability(Durability.ASYNC_WAL); rm.add(d); Put p = new Put(row, ts); p.add(fam1, qual2, value2); + p.setDurability(Durability.ASYNC_WAL); rm.add(p); } region.mutateRow(rm); @@ -439,15 +444,19 @@ public class TestAtomicOperation { if (op) { Put p = new Put(row2, ts); p.add(fam1, qual1, value1); + p.setDurability(Durability.ASYNC_WAL); mrm.add(p); Delete d = new Delete(row); d.deleteColumns(fam1, qual1, ts); + d.setDurability(Durability.ASYNC_WAL); mrm.add(d); } else { Delete d = new Delete(row2); d.deleteColumns(fam1, qual1, ts); + d.setDurability(Durability.ASYNC_WAL); mrm.add(d); Put p = new Put(row, ts); + p.setDurability(Durability.ASYNC_WAL); p.add(fam1, qual1, value2); mrm.add(p); }
