hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From li...@apache.org
Subject svn commit: r1576888 - in /hbase/branches/0.89-fb/src: main/java/org/apache/hadoop/hbase/client/Scan.java test/java/org/apache/hadoop/hbase/client/TestFromClientSide4.java
Date Wed, 12 Mar 2014 20:34:47 GMT
Author: liyin
Date: Wed Mar 12 20:34:46 2014
New Revision: 1576888

URL: http://svn.apache.org/r1576888
Log:
[HBASE-9930] Scan constuctor was incorrectly merged while swift merge

Author: manukranthk

Summary: Scan constructor missed preloadBlocks during the swift merge.

Test Plan: run TestFromClientSide4

Reviewers: gauravm

Reviewed By: gauravm

CC: hbase-eng@

Differential Revision: https://phabricator.fb.com/D1207336

Task ID: 3873538

Modified:
    hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/client/Scan.java
    hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide4.java

Modified: hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/client/Scan.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/client/Scan.java?rev=1576888&r1=1576887&r2=1576888&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/client/Scan.java (original)
+++ hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/client/Scan.java Wed Mar
12 20:34:46 2014
@@ -244,6 +244,7 @@ public class Scan extends Operation impl
    * @param maxStamp maximum timestamp value, exclusive
    * @throws IOException if invalid time range
    * @see #setMaxVersions()
+    this.preloadBlocks = preloadBlocks;
    * @see #setMaxVersions(int)
    * @return this
    */

Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide4.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide4.java?rev=1576888&r1=1576887&r2=1576888&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide4.java
(original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide4.java
Wed Mar 12 20:34:46 2014
@@ -327,7 +327,7 @@ public class TestFromClientSide4 {
     // All the three values should be positive
     assertTrue(misses + hits > 0);
     // Check that the cache hit ratio is at most 1/10
-    assertTrue(hits * 10 <= hits + misses);
+    assertTrue("hists : " + hits + " misses : " + misses, hits * 9 <= misses);
   }
 
   private void verifyResult(Result result, List<KeyValue> kvList,



Mime
View raw message