hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From apurt...@apache.org
Subject hbase git commit: HBASE-13383 TestRegionServerObserver.testCoprocessorHooksInRegionsMerge zombie after HBASE-12975
Date Thu, 02 Apr 2015 04:46:20 GMT
Repository: hbase
Updated Branches:
  refs/heads/master a609e5e10 -> 2688e831e


HBASE-13383 TestRegionServerObserver.testCoprocessorHooksInRegionsMerge zombie after HBASE-12975


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

Branch: refs/heads/master
Commit: 2688e831e5ece1961752aed10240e4ab2506fda5
Parents: a609e5e
Author: Andrew Purtell <apurtell@apache.org>
Authored: Wed Apr 1 21:46:08 2015 -0700
Committer: Andrew Purtell <apurtell@apache.org>
Committed: Wed Apr 1 21:46:08 2015 -0700

----------------------------------------------------------------------
 .../hbase/regionserver/RegionMergeTransactionImpl.java    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/2688e831/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.java
index bf69534..cd05425 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.java
@@ -121,14 +121,14 @@ public class RegionMergeTransactionImpl implements RegionMergeTransaction
{
    * @param b region b to merge
    * @param forcible if false, we will only merge adjacent regions
    */
-  public RegionMergeTransactionImpl(final HRegion a, final HRegion b,
+  public RegionMergeTransactionImpl(final Region a, final Region b,
       final boolean forcible) {
     if (a.getRegionInfo().compareTo(b.getRegionInfo()) <= 0) {
-      this.region_a = a;
-      this.region_b = b;
+      this.region_a = (HRegion)a;
+      this.region_b = (HRegion)b;
     } else {
-      this.region_a = b;
-      this.region_b = a;
+      this.region_a = (HRegion)b;
+      this.region_b = (HRegion)a;
     }
     this.forcible = forcible;
     this.mergesdir = region_a.getRegionFileSystem().getMergesDir();


Mime
View raw message