Repository: hbase Updated Branches: refs/heads/0.94 56befcb90 -> 30b0c9824
HBASE-15054 Allow 0.94 to compile with JDK8. Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/30b0c982 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/30b0c982 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/30b0c982 Branch: refs/heads/0.94 Commit: 30b0c98245b16a8d8e44b94d24aa3f5f35977b8e Parents: 56befcb Author: Lars Hofhansl <la...@apache.org> Authored: Wed Dec 30 14:09:34 2015 -0800 Committer: Lars Hofhansl <la...@apache.org> Committed: Wed Dec 30 14:09:34 2015 -0800 ---------------------------------------------------------------------- .../src/main/java/org/apache/hadoop/hbase/ipc/SecureClient.java | 2 +- src/main/java/org/apache/hadoop/hbase/client/HTablePool.java | 2 +- src/main/java/org/apache/hadoop/hbase/ipc/HBaseClient.java | 2 +- .../hadoop/hbase/mapreduce/hadoopbackport/InputSampler.java | 2 +- src/main/java/org/apache/hadoop/hbase/util/PoolMap.java | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/30b0c982/security/src/main/java/org/apache/hadoop/hbase/ipc/SecureClient.java ---------------------------------------------------------------------- diff --git a/security/src/main/java/org/apache/hadoop/hbase/ipc/SecureClient.java b/security/src/main/java/org/apache/hadoop/hbase/ipc/SecureClient.java index 721e462..70fe4b7 100644 --- a/security/src/main/java/org/apache/hadoop/hbase/ipc/SecureClient.java +++ b/security/src/main/java/org/apache/hadoop/hbase/ipc/SecureClient.java @@ -444,7 +444,7 @@ public class SecureClient extends HBaseClient { // release the resources // first thing to do;take the connection out of the connection list synchronized (connections) { - connections.remove(remoteId, this); + connections.removeValue(remoteId, this); } // close the streams and therefore the socket http://git-wip-us.apache.org/repos/asf/hbase/blob/30b0c982/src/main/java/org/apache/hadoop/hbase/client/HTablePool.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/hadoop/hbase/client/HTablePool.java b/src/main/java/org/apache/hadoop/hbase/client/HTablePool.java index 01e6bbd..05016e5 100755 --- a/src/main/java/org/apache/hadoop/hbase/client/HTablePool.java +++ b/src/main/java/org/apache/hadoop/hbase/client/HTablePool.java @@ -255,7 +255,7 @@ public class HTablePool implements Closeable { String tableName = Bytes.toString(table.getTableName()); if (tables.size(tableName) >= maxSize) { // release table instance since we're not reusing it - this.tables.remove(tableName, table); + this.tables.removeValue(tableName, table); this.tableFactory.releaseHTableInterface(table); return; } http://git-wip-us.apache.org/repos/asf/hbase/blob/30b0c982/src/main/java/org/apache/hadoop/hbase/ipc/HBaseClient.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/hadoop/hbase/ipc/HBaseClient.java b/src/main/java/org/apache/hadoop/hbase/ipc/HBaseClient.java index a74abdb..5c33cc6 100644 --- a/src/main/java/org/apache/hadoop/hbase/ipc/HBaseClient.java +++ b/src/main/java/org/apache/hadoop/hbase/ipc/HBaseClient.java @@ -721,7 +721,7 @@ public class HBaseClient { // release the resources // first thing to do;take the connection out of the connection list synchronized (connections) { - connections.remove(remoteId, this); + connections.removeValue(remoteId, this); } // close the streams and therefore the socket http://git-wip-us.apache.org/repos/asf/hbase/blob/30b0c982/src/main/java/org/apache/hadoop/hbase/mapreduce/hadoopbackport/InputSampler.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/hadoop/hbase/mapreduce/hadoopbackport/InputSampler.java b/src/main/java/org/apache/hadoop/hbase/mapreduce/hadoopbackport/InputSampler.java index c998c1a..586af67 100644 --- a/src/main/java/org/apache/hadoop/hbase/mapreduce/hadoopbackport/InputSampler.java +++ b/src/main/java/org/apache/hadoop/hbase/mapreduce/hadoopbackport/InputSampler.java @@ -351,7 +351,7 @@ public class InputSampler<K,V> extends Configured implements Tool { final InputFormat inf = ReflectionUtils.newInstance(job.getInputFormatClass(), conf); int numPartitions = job.getNumReduceTasks(); - K[] samples = sampler.getSample(inf, job); + K[] samples = (K[])sampler.getSample(inf, job); LOG.info("Using " + samples.length + " samples"); RawComparator<K> comparator = (RawComparator<K>) job.getSortComparator(); http://git-wip-us.apache.org/repos/asf/hbase/blob/30b0c982/src/main/java/org/apache/hadoop/hbase/util/PoolMap.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/hadoop/hbase/util/PoolMap.java b/src/main/java/org/apache/hadoop/hbase/util/PoolMap.java index 1956e6b..1b6e1c8 100644 --- a/src/main/java/org/apache/hadoop/hbase/util/PoolMap.java +++ b/src/main/java/org/apache/hadoop/hbase/util/PoolMap.java @@ -86,12 +86,12 @@ public class PoolMap<K, V> implements Map<K, V> { public V remove(Object key) { Pool<V> pool = pools.remove(key); if (pool != null) { - remove((K) key, pool.get()); + removeValue((K) key, pool.get()); } return null; } - public boolean remove(K key, V value) { + public boolean removeValue(K key, V value) { Pool<V> pool = pools.get(key); boolean res = false; if (pool != null) {
