hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e...@apache.org
Subject hbase git commit: HBASE-12637 Compilation with Hadoop-2.4- is broken
Date Fri, 05 Dec 2014 02:20:02 GMT
Repository: hbase
Updated Branches:
  refs/heads/master e690a83d4 -> 08754f2c4


HBASE-12637 Compilation with Hadoop-2.4- is broken


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

Branch: refs/heads/master
Commit: 08754f2c431b829b0d6269bdb23284dd679ed8ca
Parents: e690a83
Author: Enis Soztutar <enis@apache.org>
Authored: Thu Dec 4 18:14:59 2014 -0800
Committer: Enis Soztutar <enis@apache.org>
Committed: Thu Dec 4 18:14:59 2014 -0800

----------------------------------------------------------------------
 .../hbase/master/balancer/TestBaseLoadBalancer.java    | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/08754f2c/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestBaseLoadBalancer.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestBaseLoadBalancer.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestBaseLoadBalancer.java
index 73ae11e..b9d9dbd 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestBaseLoadBalancer.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestBaseLoadBalancer.java
@@ -51,7 +51,6 @@ import org.apache.hadoop.hbase.master.balancer.BaseLoadBalancer.Cluster.MoveRegi
 import org.apache.hadoop.hbase.testclassification.MasterTests;
 import org.apache.hadoop.hbase.testclassification.MediumTests;
 import org.apache.hadoop.net.DNSToSwitchMapping;
-import org.apache.hadoop.net.ScriptBasedMapping;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
@@ -77,12 +76,12 @@ public class TestBaseLoadBalancer extends BalancerTestBase {
       new int[] { 2, 10 }, new int[] { 2, 100 }, new int[] { 12, 10 }, new int[] { 12, 100
}, };
 
   // This class is introduced because IP to rack resolution can be lengthy.
-  public static class MockMapping extends ScriptBasedMapping {
+  public static class MockMapping implements DNSToSwitchMapping {
     public MockMapping(Configuration conf) {
     }
 
     private static String RACK = "rack";
-    @Override
+
     public List<String> resolve(List<String> names) {
       List<String> ret = new ArrayList<String>(names.size());
       for (String name : names) {
@@ -90,6 +89,14 @@ public class TestBaseLoadBalancer extends BalancerTestBase {
       }
       return ret;
     }
+
+    // do not add @Override annotations here. It mighty break compilation with earlier Hadoops
+    public void reloadCachedMappings() {
+    }
+
+    // do not add @Override annotations here. It mighty break compilation with earlier Hadoops
+    public void reloadCachedMappings(List<String> arg0) {
+    }
   }
 
   @BeforeClass


Mime
View raw message