diff --git shims/0.20S/src/main/java/org/apache/hadoop/hive/shims/Hadoop20SShims.java shims/0.20S/src/main/java/org/apache/hadoop/hive/shims/Hadoop20SShims.java index f7a741c..f881a7a 100644 --- shims/0.20S/src/main/java/org/apache/hadoop/hive/shims/Hadoop20SShims.java +++ shims/0.20S/src/main/java/org/apache/hadoop/hive/shims/Hadoop20SShims.java @@ -537,11 +537,6 @@ public void mergeCredentials(JobConf dest, JobConf src) throws IOException { } @Override - public String getCounterGroupName(String group, String defaultValue) { - return defaultValue; - } - - @Override public String getPassword(Configuration conf, String name) { // No password API, just retrieve value from conf return conf.get(name); diff --git shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java index 032a110..78ef3c0 100644 --- shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java +++ shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java @@ -793,11 +793,6 @@ public void mergeCredentials(JobConf dest, JobConf src) throws IOException { dest.getCredentials().mergeAll(src.getCredentials()); } - @Override - public String getCounterGroupName(String group, String defaultValue) { - return ResourceBundles.getCounterGroupName(group, defaultValue); - } - protected static final Method accessMethod; protected static final Method getPasswordMethod; diff --git shims/common/src/main/java/org/apache/hadoop/hive/shims/HadoopShims.java shims/common/src/main/java/org/apache/hadoop/hive/shims/HadoopShims.java index afc71e3..8853e44 100644 --- shims/common/src/main/java/org/apache/hadoop/hive/shims/HadoopShims.java +++ shims/common/src/main/java/org/apache/hadoop/hive/shims/HadoopShims.java @@ -17,8 +17,6 @@ */ package org.apache.hadoop.hive.shims; -import java.io.DataInput; -import java.io.DataOutput; import java.io.IOException; import java.net.InetSocketAddress; import java.net.MalformedURLException; @@ -42,7 +40,6 @@ import org.apache.hadoop.fs.permission.FsPermission; import org.apache.hadoop.io.LongWritable; import org.apache.hadoop.mapred.ClusterStatus; -import org.apache.hadoop.mapred.InputSplit; import org.apache.hadoop.mapred.JobConf; import org.apache.hadoop.mapred.JobProfile; import org.apache.hadoop.mapred.JobStatus; @@ -475,14 +472,6 @@ public void setFullFileStatus(Configuration conf, HdfsFileStatus sourceStatus, public void mergeCredentials(JobConf dest, JobConf src) throws IOException; /** - * Get the counter group display name - * @param group the group name to lookup - * @param defaultValue of the group - * @return the group display name - */ - public String getCounterGroupName(String group, String defaultValue); - - /** * Check if the configured UGI has access to the path for the given file system action. * Method will return successfully if action is permitted. AccessControlExceptoin will * be thrown if user does not have access to perform the action. Other exceptions may diff --git spark-client/src/main/java/org/apache/hive/spark/counter/SparkCounterGroup.java spark-client/src/main/java/org/apache/hive/spark/counter/SparkCounterGroup.java index ea1b7ee..57d5289 100644 --- spark-client/src/main/java/org/apache/hive/spark/counter/SparkCounterGroup.java +++ spark-client/src/main/java/org/apache/hive/spark/counter/SparkCounterGroup.java @@ -21,7 +21,6 @@ import java.util.HashMap; import java.util.Map; -import org.apache.hadoop.hive.shims.ShimLoader; import org.apache.spark.api.java.JavaSparkContext; /** @@ -47,8 +46,7 @@ public SparkCounterGroup( } public void createCounter(String name, long initValue) { - String displayName = ShimLoader.getHadoopShims().getCounterGroupName(groupName, groupName); - SparkCounter counter = new SparkCounter(name, displayName, groupName, initValue, javaSparkContext); + SparkCounter counter = new SparkCounter(name, name, groupName, initValue, javaSparkContext); sparkCounters.put(name, counter); } diff --git spark-client/src/main/java/org/apache/hive/spark/counter/SparkCounters.java spark-client/src/main/java/org/apache/hive/spark/counter/SparkCounters.java index 95b8f0b..955538e 100644 --- spark-client/src/main/java/org/apache/hive/spark/counter/SparkCounters.java +++ spark-client/src/main/java/org/apache/hive/spark/counter/SparkCounters.java @@ -107,9 +107,7 @@ public SparkCounter getCounter(Enum key) { private SparkCounterGroup getGroup(String groupName) { SparkCounterGroup group = sparkCounterGroups.get(groupName); if (group == null) { - String groupDisplayName = - ShimLoader.getHadoopShims().getCounterGroupName(groupName, groupName); - group = new SparkCounterGroup(groupName, groupDisplayName, javaSparkContext); + group = new SparkCounterGroup(groupName, groupName, javaSparkContext); sparkCounterGroups.put(groupName, group); } return group;