hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject hbase git commit: HBASE-15150 Fix TestDurablity in branch-1.1 (Yu Li)
Date Thu, 21 Jan 2016 22:37:41 GMT
Repository: hbase
Updated Branches:
  refs/heads/branch-1.0 886c70d0d -> 64e22626a


HBASE-15150 Fix TestDurablity in branch-1.1 (Yu Li)


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

Branch: refs/heads/branch-1.0
Commit: 64e22626adc20162cfb5da71f0fc68797a888fa4
Parents: 886c70d
Author: stack <stack@apache.org>
Authored: Thu Jan 21 14:37:36 2016 -0800
Committer: stack <stack@apache.org>
Committed: Thu Jan 21 14:37:36 2016 -0800

----------------------------------------------------------------------
 .../main/java/org/apache/hadoop/hbase/regionserver/HRegion.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/64e22626/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
index 8df37ff..4b8f3b6 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
@@ -6074,7 +6074,7 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver
{ //
     }
     // Request a cache flush.  Do it outside update lock.
     if (isFlushSize(this.addAndGetGlobalMemstoreSize(accumulatedResultSize))) requestFlush();
-    return Result.create(allKVs);
+    return increment.isReturnResults() ? Result.create(allKVs) : null;
   }
 
   /**


Mime
View raw message