hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From te...@apache.org
Subject svn commit: r1178263 - /hbase/branches/0.92/src/test/java/org/apache/hadoop/hbase/regionserver/TestBlocksRead.java
Date Sun, 02 Oct 2011 22:21:49 GMT
Author: tedyu
Date: Sun Oct  2 22:21:49 2011
New Revision: 1178263

URL: http://svn.apache.org/viewvc?rev=1178263&view=rev
Log:
HBASE-4496 Addendum for TestBlocksRead

Modified:
    hbase/branches/0.92/src/test/java/org/apache/hadoop/hbase/regionserver/TestBlocksRead.java

Modified: hbase/branches/0.92/src/test/java/org/apache/hadoop/hbase/regionserver/TestBlocksRead.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.92/src/test/java/org/apache/hadoop/hbase/regionserver/TestBlocksRead.java?rev=1178263&r1=1178262&r2=1178263&view=diff
==============================================================================
--- hbase/branches/0.92/src/test/java/org/apache/hadoop/hbase/regionserver/TestBlocksRead.java
(original)
+++ hbase/branches/0.92/src/test/java/org/apache/hadoop/hbase/regionserver/TestBlocksRead.java
Sun Oct  2 22:21:49 2011
@@ -137,7 +137,7 @@ public class TestBlocksRead extends HBas
     KeyValue[] kvs = region.get(get, null).raw();
     long blocksEnd = getBlkAccessCount(cf);
     if (expBlocks != -1) {
-	assertEquals("Blocks Read Check", expBlocks, blocksEnd - blocksStart);
+      assertEquals("Blocks Read Check", expBlocks, blocksEnd - blocksStart);
     }
     System.out.println("Blocks Read = " + (blocksEnd - blocksStart) +
                        "Expected = " + expBlocks);
@@ -206,14 +206,14 @@ public class TestBlocksRead extends HBas
     assertEquals(1, kvs.length);
     verifyData(kvs[0], "row", "col1", 1);
 
-    // Expected block reads: 3
-    kvs = getData(FAMILY, "row", Arrays.asList("col1", "col2"), 3);
+    // Expected block reads: 2
+    kvs = getData(FAMILY, "row", Arrays.asList("col1", "col2"), 2);
     assertEquals(2, kvs.length);
     verifyData(kvs[0], "row", "col1", 1);
     verifyData(kvs[1], "row", "col2", 2);
 
-    // Expected block reads: 5
-    kvs = getData(FAMILY, "row", Arrays.asList("col2", "col3"), 5);
+    // Expected block reads: 3
+    kvs = getData(FAMILY, "row", Arrays.asList("col2", "col3"), 3);
     assertEquals(2, kvs.length);
     verifyData(kvs[0], "row", "col2", 2);
     verifyData(kvs[1], "row", "col3", 3);
@@ -253,11 +253,8 @@ public class TestBlocksRead extends HBas
     assertEquals(1, kvs.length);
     verifyData(kvs[0], "row", "col1", 3);
 
-    // Baseline expected blocks read: 6
-    // This increase is a minor glitch due to: HBASE-4466. Once that
-    // is fixed this will drop back. The extra access will be a cache
-    // hit.
-    kvs = getData(FAMILY, "row", Arrays.asList("col1", "col2"), 6);
+    // Baseline expected blocks read: 4
+    kvs = getData(FAMILY, "row", Arrays.asList("col1", "col2"), 4);
     assertEquals(2, kvs.length);
     verifyData(kvs[0], "row", "col1", 3);
     verifyData(kvs[1], "row", "col2", 4);
@@ -312,11 +309,8 @@ public class TestBlocksRead extends HBas
     putData(FAMILY, "row", "col3", 13);
     region.flushcache();
 
-    // Baseline expected blocks read: 21
-    // This increase is a minor glitch due to: HBASE-4466. Once that
-    // is fixed this will drop back. The extra access will be a cache
-    // hit. The test case only has 13 blocks altogther!
-    kvs = getData(FAMILY, "row", Arrays.asList("col1", "col2", "col3"), 21);
+    // Baseline expected blocks read: 13
+    kvs = getData(FAMILY, "row", Arrays.asList("col1", "col2", "col3"), 13);
     assertEquals(3, kvs.length);
     verifyData(kvs[0], "row", "col1", 11);
     verifyData(kvs[1], "row", "col2", 12);



Mime
View raw message