You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ha...@apache.org on 2012/07/27 01:23:50 UTC
svn commit: r1366233 - in /hive/trunk:
ql/src/java/org/apache/hadoop/hive/ql/exec/errors/
shims/src/0.20/java/org/apache/hadoop/hive/shims/
shims/src/common-secure/java/org/apache/hadoop/hive/shims/
shims/src/common/java/org/apache/hadoop/hive/shims/
Author: hashutosh
Date: Thu Jul 26 23:23:50 2012
New Revision: 1366233
URL: http://svn.apache.org/viewvc?rev=1366233&view=rev
Log:
HIVE-3301 : Fix quote printing bug in mapreduce_stack_trace.q testcase failure when running hive on hadoop23 (Zhenxiao Luo via Ashutosh Chauhan)
Modified:
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/errors/TaskLogProcessor.java
hive/trunk/shims/src/0.20/java/org/apache/hadoop/hive/shims/Hadoop20Shims.java
hive/trunk/shims/src/common-secure/java/org/apache/hadoop/hive/shims/HadoopShimsSecure.java
hive/trunk/shims/src/common/java/org/apache/hadoop/hive/shims/HadoopShims.java
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/errors/TaskLogProcessor.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/errors/TaskLogProcessor.java?rev=1366233&r1=1366232&r2=1366233&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/errors/TaskLogProcessor.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/errors/TaskLogProcessor.java Thu Jul 26 23:23:50 2012
@@ -31,6 +31,7 @@ import java.util.Map.Entry;
import java.util.regex.Pattern;
import org.apache.hadoop.hive.conf.HiveConf;
+import org.apache.hadoop.hive.shims.ShimLoader;
import org.apache.hadoop.mapred.JobConf;
/**
@@ -201,7 +202,8 @@ public class TaskLogProcessor {
Pattern endStackTracePattern =
Pattern.compile("^\t... [0-9]+ more.*", Pattern.CASE_INSENSITIVE);
- while ((inputLine = in.readLine()) != null) {
+ while ((inputLine =
+ ShimLoader.getHadoopShims().unquoteHtmlChars(in.readLine())) != null) {
if (stackTracePattern.matcher(inputLine).matches() ||
endStackTracePattern.matcher(inputLine).matches()) {
Modified: hive/trunk/shims/src/0.20/java/org/apache/hadoop/hive/shims/Hadoop20Shims.java
URL: http://svn.apache.org/viewvc/hive/trunk/shims/src/0.20/java/org/apache/hadoop/hive/shims/Hadoop20Shims.java?rev=1366233&r1=1366232&r2=1366233&view=diff
==============================================================================
--- hive/trunk/shims/src/0.20/java/org/apache/hadoop/hive/shims/Hadoop20Shims.java (original)
+++ hive/trunk/shims/src/0.20/java/org/apache/hadoop/hive/shims/Hadoop20Shims.java Thu Jul 26 23:23:50 2012
@@ -545,6 +545,12 @@ public class Hadoop20Shims implements Ha
}
@Override
+ public String unquoteHtmlChars(String item) {
+ return item;
+ }
+
+
+ @Override
public org.apache.hadoop.mapreduce.TaskAttemptContext newTaskAttemptContext(Configuration conf, final Progressable progressable) {
return new org.apache.hadoop.mapreduce.TaskAttemptContext(conf, new TaskAttemptID()) {
@Override
Modified: hive/trunk/shims/src/common-secure/java/org/apache/hadoop/hive/shims/HadoopShimsSecure.java
URL: http://svn.apache.org/viewvc/hive/trunk/shims/src/common-secure/java/org/apache/hadoop/hive/shims/HadoopShimsSecure.java?rev=1366233&r1=1366232&r2=1366233&view=diff
==============================================================================
--- hive/trunk/shims/src/common-secure/java/org/apache/hadoop/hive/shims/HadoopShimsSecure.java (original)
+++ hive/trunk/shims/src/common-secure/java/org/apache/hadoop/hive/shims/HadoopShimsSecure.java Thu Jul 26 23:23:50 2012
@@ -33,6 +33,7 @@ import org.apache.hadoop.fs.PathFilter;
import org.apache.hadoop.hdfs.MiniDFSCluster;
import org.apache.hadoop.hive.io.HiveIOExceptionHandlerUtil;
import org.apache.hadoop.hive.thrift.DelegationTokenSelector;
+import org.apache.hadoop.http.HtmlQuoting;
import org.apache.hadoop.io.Text;
import org.apache.hadoop.mapred.ClusterStatus;
import org.apache.hadoop.mapred.FileInputFormat;
@@ -78,6 +79,11 @@ public abstract class HadoopShimsSecure
// gone in 0.18+
}
+ @Override
+ public String unquoteHtmlChars(String item) {
+ return HtmlQuoting.unquoteHtmlChars(item);
+ }
+
public boolean isJobPreparing(RunningJob job) throws IOException {
return job.getJobState() == JobStatus.PREP;
}
Modified: hive/trunk/shims/src/common/java/org/apache/hadoop/hive/shims/HadoopShims.java
URL: http://svn.apache.org/viewvc/hive/trunk/shims/src/common/java/org/apache/hadoop/hive/shims/HadoopShims.java?rev=1366233&r1=1366232&r2=1366233&view=diff
==============================================================================
--- hive/trunk/shims/src/common/java/org/apache/hadoop/hive/shims/HadoopShims.java (original)
+++ hive/trunk/shims/src/common/java/org/apache/hadoop/hive/shims/HadoopShims.java Thu Jul 26 23:23:50 2012
@@ -158,6 +158,14 @@ public interface HadoopShims {
void prepareJobOutput(JobConf conf);
/**
+ * Used by TaskLogProcessor to Remove HTML quoting from a string
+ * @param item the string to unquote
+ * @return the unquoted string
+ *
+ */
+ public String unquoteHtmlChars(String item);
+
+ /**
* Get the UGI that the given job configuration will run as.
*
* In secure versions of Hadoop, this simply returns the current