You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by xu...@apache.org on 2014/12/05 15:36:08 UTC
svn commit: r1643295 - in /hive/branches/spark:
shims/0.20S/src/main/java/org/apache/hadoop/hive/shims/
shims/0.23/src/main/java/org/apache/hadoop/hive/shims/
shims/common/src/main/java/org/apache/hadoop/hive/shims/
spark-client/src/main/java/org/apach...
Author: xuefu
Date: Fri Dec 5 14:36:07 2014
New Revision: 1643295
URL: http://svn.apache.org/r1643295
Log:
HIVE-9016: SparkCounter display name is not set correctly[Spark Branch] (Chengxiang via Xuefu)
Modified:
hive/branches/spark/shims/0.20S/src/main/java/org/apache/hadoop/hive/shims/Hadoop20SShims.java
hive/branches/spark/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java
hive/branches/spark/shims/common/src/main/java/org/apache/hadoop/hive/shims/HadoopShims.java
hive/branches/spark/spark-client/src/main/java/org/apache/hive/spark/counter/SparkCounterGroup.java
hive/branches/spark/spark-client/src/main/java/org/apache/hive/spark/counter/SparkCounters.java
Modified: hive/branches/spark/shims/0.20S/src/main/java/org/apache/hadoop/hive/shims/Hadoop20SShims.java
URL: http://svn.apache.org/viewvc/hive/branches/spark/shims/0.20S/src/main/java/org/apache/hadoop/hive/shims/Hadoop20SShims.java?rev=1643295&r1=1643294&r2=1643295&view=diff
==============================================================================
--- hive/branches/spark/shims/0.20S/src/main/java/org/apache/hadoop/hive/shims/Hadoop20SShims.java (original)
+++ hive/branches/spark/shims/0.20S/src/main/java/org/apache/hadoop/hive/shims/Hadoop20SShims.java Fri Dec 5 14:36:07 2014
@@ -537,11 +537,6 @@ public class Hadoop20SShims extends Hado
}
@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);
Modified: hive/branches/spark/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java
URL: http://svn.apache.org/viewvc/hive/branches/spark/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java?rev=1643295&r1=1643294&r2=1643295&view=diff
==============================================================================
--- hive/branches/spark/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java (original)
+++ hive/branches/spark/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java Fri Dec 5 14:36:07 2014
@@ -793,11 +793,6 @@ public class Hadoop23Shims extends Hadoo
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;
Modified: hive/branches/spark/shims/common/src/main/java/org/apache/hadoop/hive/shims/HadoopShims.java
URL: http://svn.apache.org/viewvc/hive/branches/spark/shims/common/src/main/java/org/apache/hadoop/hive/shims/HadoopShims.java?rev=1643295&r1=1643294&r2=1643295&view=diff
==============================================================================
--- hive/branches/spark/shims/common/src/main/java/org/apache/hadoop/hive/shims/HadoopShims.java (original)
+++ hive/branches/spark/shims/common/src/main/java/org/apache/hadoop/hive/shims/HadoopShims.java Fri Dec 5 14:36:07 2014
@@ -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.F
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 interface HadoopShims {
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
Modified: hive/branches/spark/spark-client/src/main/java/org/apache/hive/spark/counter/SparkCounterGroup.java
URL: http://svn.apache.org/viewvc/hive/branches/spark/spark-client/src/main/java/org/apache/hive/spark/counter/SparkCounterGroup.java?rev=1643295&r1=1643294&r2=1643295&view=diff
==============================================================================
--- hive/branches/spark/spark-client/src/main/java/org/apache/hive/spark/counter/SparkCounterGroup.java (original)
+++ hive/branches/spark/spark-client/src/main/java/org/apache/hive/spark/counter/SparkCounterGroup.java Fri Dec 5 14:36:07 2014
@@ -21,7 +21,6 @@ import java.io.Serializable;
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 class SparkCounterGroup implement
}
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);
}
Modified: hive/branches/spark/spark-client/src/main/java/org/apache/hive/spark/counter/SparkCounters.java
URL: http://svn.apache.org/viewvc/hive/branches/spark/spark-client/src/main/java/org/apache/hive/spark/counter/SparkCounters.java?rev=1643295&r1=1643294&r2=1643295&view=diff
==============================================================================
--- hive/branches/spark/spark-client/src/main/java/org/apache/hive/spark/counter/SparkCounters.java (original)
+++ hive/branches/spark/spark-client/src/main/java/org/apache/hive/spark/counter/SparkCounters.java Fri Dec 5 14:36:07 2014
@@ -107,9 +107,7 @@ public class SparkCounters implements Se
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;