svn commit: r1549921 - /hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java

[la...@apache.org]

Author: larsh
Date: Tue Dec 10 18:25:00 2013
New Revision: 1549921

URL: http://svn.apache.org/r1549921
Log:
HBASE-10117 Avoid synchronization in HRegionScannerImpl.isFilterDone

Modified:
    hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java

Modified: hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java?rev=1549921&r1=1549920&r2=1549921&view=diff
==============================================================================
--- hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java (original)
+++ hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java Tue Dec 10 18:25:00 2013
@@ -3526,7 +3526,7 @@ public class HRegion implements HeapSize
     // KeyValue indicating that limit is reached when scanning
     private final KeyValue KV_LIMIT = new KeyValue();
     protected final byte[] stopRow;
-    private Filter filter;
+    private final Filter filter;
     private int batch;
     protected int isScan;
     private boolean filterClosed = false;
@@ -3666,7 +3666,7 @@ public class HRegion implements HeapSize
         outResults.addAll(tmpList);
       }
       resetFilters();
-      if (isFilterDone()) {
+      if (isFilterDoneInternal()) {
         return false;
       }
       if (region != null && region.metricsRegion != null) {
@@ -3726,6 +3726,10 @@ public class HRegion implements HeapSize
      */
     @Override
     public synchronized boolean isFilterDone() throws IOException {
+      return isFilterDoneInternal();
+    }
+
+    private boolean isFilterDoneInternal() throws IOException {
       return this.filter != null && this.filter.filterAllRemaining();
     }