svn commit: r1569878 - in /hbase/branches/0.89-fb: pom.xml src/main/java/org/apache/hadoop/hbase/regionserver/KeyValueSkipListSet.java

[li...@apache.org]

Author: liyin
Date: Wed Feb 19 19:18:33 2014
New Revision: 1569878

URL: http://svn.apache.org/r1569878
Log:
[HBASE-10568] Fixing TestKeyValueSkipListSet and TestOperation.

Author: manukranthk

Summary: Checking for null in KeyValueSkipListTest, since TestKeyValueSkipListSet can create such a case. Change in the pom.xml in the previous revision was intended for a different branch.

Test Plan: Unit test

Reviewers: liyintang

Reviewed By: liyintang

CC: hbase-eng@

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

Task ID: 3761763

Modified:
    hbase/branches/0.89-fb/pom.xml
    hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/KeyValueSkipListSet.java

Modified: hbase/branches/0.89-fb/pom.xml
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/pom.xml?rev=1569878&r1=1569877&r2=1569878&view=diff
==============================================================================
--- hbase/branches/0.89-fb/pom.xml (original)
+++ hbase/branches/0.89-fb/pom.xml Wed Feb 19 19:18:33 2014
@@ -905,7 +905,7 @@
     <dependency>
       <groupId>org.codehaus.jackson</groupId>
       <artifactId>jackson-core-asl</artifactId>
-      <version>1.9.4</version>
+      <version>1.8.3</version>
     </dependency>
     <dependency>
       <groupId>org.codehaus.jackson</groupId>

Modified: hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/KeyValueSkipListSet.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/KeyValueSkipListSet.java?rev=1569878&r1=1569877&r2=1569878&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/KeyValueSkipListSet.java (original)
+++ hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/KeyValueSkipListSet.java Wed Feb 19 19:18:33 2014
@@ -162,7 +162,7 @@ class KeyValueSkipListSet implements Nav
   }
 
   public boolean add(KeyValue e) {
-    this.bloomFilterContainer.add(e);
+    if (this.bloomFilterContainer != null) this.bloomFilterContainer.add(e);
     return this.delegatee.put(e, e) == null;
   }
 
@@ -212,6 +212,9 @@ class KeyValueSkipListSet implements Nav
   }
 
   public boolean containsRowPrefixForKeyValue(KeyValue kv) {
-    return this.bloomFilterContainer.containsRowPrefixForKeyValue(kv);
+    if (this.bloomFilterContainer != null)
+      return this.bloomFilterContainer.containsRowPrefixForKeyValue(kv);
+    else
+      return true;
   }
 }