hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject [1/2] hbase git commit: Revert "HBASE-12270 A bug in the bucket cache, with cache blocks on write enabled (Liu Shaohui) -- ADDENDUM" Revert for now since it is failing often on 0.98
Date Fri, 02 Jan 2015 17:27:39 GMT
Repository: hbase
Updated Branches:
  refs/heads/0.98 efc49a745 -> 9b25e850d


Revert "HBASE-12270 A bug in the bucket cache, with cache blocks on write enabled (Liu Shaohui)
-- ADDENDUM"
Revert for now since it is failing often on 0.98

This reverts commit 99acd66a95257424f13839effa0d6cf18d34b95f.


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/bb7074b3
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/bb7074b3
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/bb7074b3

Branch: refs/heads/0.98
Commit: bb7074b3d83a87b1e0dd4c8cfe0702e621f23ea6
Parents: efc49a7
Author: stack <stack@apache.org>
Authored: Fri Jan 2 09:24:21 2015 -0800
Committer: stack <stack@apache.org>
Committed: Fri Jan 2 09:24:21 2015 -0800

----------------------------------------------------------------------
 .../org/apache/hadoop/hbase/io/hfile/TestCacheOnWrite.java     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/bb7074b3/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestCacheOnWrite.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestCacheOnWrite.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestCacheOnWrite.java
index 35714b7..e85bee6 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestCacheOnWrite.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestCacheOnWrite.java
@@ -223,7 +223,7 @@ public class TestCacheOnWrite {
     cacheConf =
         new CacheConfig(blockCache, true, true, cowType.shouldBeCached(BlockType.DATA),
         cowType.shouldBeCached(BlockType.LEAF_INDEX),
-        cowType.shouldBeCached(BlockType.BLOOM_CHUNK), false, cacheCompressedData, true);
+        cowType.shouldBeCached(BlockType.BLOOM_CHUNK), false, cacheCompressedData, true,
false);
   }
 
   @After
@@ -422,7 +422,7 @@ public class TestCacheOnWrite {
     final String cf = "myCF";
     final byte[] cfBytes = Bytes.toBytes(cf);
     final int maxVersions = 3;
-    HRegion region = TEST_UTIL.createTestRegion(table,
+    HRegion region = TEST_UTIL.createTestRegion(table, 
         new HColumnDescriptor(cf)
             .setCompressionType(compress)
             .setBloomFilterType(BLOOM_TYPE)
@@ -433,7 +433,7 @@ public class TestCacheOnWrite {
     long ts = EnvironmentEdgeManager.currentTimeMillis();
     for (int iFile = 0; iFile < 5; ++iFile) {
       for (int iRow = 0; iRow < 500; ++iRow) {
-        String rowStr = "" + (rowIdx * rowIdx * rowIdx) + "row" + iFile + "_" +
+        String rowStr = "" + (rowIdx * rowIdx * rowIdx) + "row" + iFile + "_" + 
             iRow;
         Put p = new Put(Bytes.toBytes(rowStr));
         ++rowIdx;


Mime
View raw message