You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by na...@apache.org on 2015/01/21 08:57:17 UTC
svn commit: r1653455 - in /hive/trunk/hcatalog/src/test/e2e/templeton: ./
deployers/ drivers/ inpdir/ tests/
Author: navis
Date: Wed Jan 21 07:57:16 2015
New Revision: 1653455
URL: http://svn.apache.org/r1653455
Log:
HIVE-9429 : revert HIVE-9272 for build failure (Navis)
Removed:
hive/trunk/hcatalog/src/test/e2e/templeton/inpdir/PigJoin䶴ㄩ鼾丄狜〇work.pig"
hive/trunk/hcatalog/src/test/e2e/templeton/inpdir/artof䶴ㄩ鼾丄狜〇war.txt"
hive/trunk/hcatalog/src/test/e2e/templeton/inpdir/table1.txt
hive/trunk/hcatalog/src/test/e2e/templeton/inpdir/table3.txt
hive/trunk/hcatalog/src/test/e2e/templeton/inpdir/table3ToJoin.txt
hive/trunk/hcatalog/src/test/e2e/templeton/tests/utf8.conf
Modified:
hive/trunk/hcatalog/src/test/e2e/templeton/build.xml
hive/trunk/hcatalog/src/test/e2e/templeton/deployers/deploy_e2e_artifacts.sh
hive/trunk/hcatalog/src/test/e2e/templeton/drivers/TestDriverCurl.pm
Modified: hive/trunk/hcatalog/src/test/e2e/templeton/build.xml
URL: http://svn.apache.org/viewvc/hive/trunk/hcatalog/src/test/e2e/templeton/build.xml?rev=1653455&r1=1653454&r2=1653455&view=diff
==============================================================================
--- hive/trunk/hcatalog/src/test/e2e/templeton/build.xml (original)
+++ hive/trunk/hcatalog/src/test/e2e/templeton/build.xml Wed Jan 21 07:57:16 2015
@@ -120,7 +120,6 @@
<arg value="${basedir}/tests/ddl.conf"/>
<arg value="${basedir}/tests/jobsubmission.conf"/>
<arg value="${basedir}/tests/jobsubmission2.conf"/>
- <arg value="${basedir}/tests/utf8.conf"/>
</exec>
</target>
Modified: hive/trunk/hcatalog/src/test/e2e/templeton/deployers/deploy_e2e_artifacts.sh
URL: http://svn.apache.org/viewvc/hive/trunk/hcatalog/src/test/e2e/templeton/deployers/deploy_e2e_artifacts.sh?rev=1653455&r1=1653454&r2=1653455&view=diff
==============================================================================
--- hive/trunk/hcatalog/src/test/e2e/templeton/deployers/deploy_e2e_artifacts.sh (original)
+++ hive/trunk/hcatalog/src/test/e2e/templeton/deployers/deploy_e2e_artifacts.sh Wed Jan 21 07:57:16 2015
@@ -32,8 +32,6 @@ ${HADOOP_HOME}/bin/hdfs dfs -put ${PROJ_
#For hadoop2 there are 2 separate jars
${HADOOP_HOME}/bin/hdfs dfs -put ${HADOOP_HOME}/share/hadoop/mapreduce/hadoop-mapreduce-examples-${HADOOP_VERSION}.jar webhcate2e/hexamples.jar
-#For utf8 test(for mapreduce) we need a jar with utf-8 characters in the name
-${HADOOP_HOME}/bin/hdfs dfs -put ${HADOOP_HOME}/share/hadoop/mapreduce/hadoop-mapreduce-examples-${HADOOP_VERSION}.jar webhcate2e/hadoop_examples_䶴ã©é¼¾ä¸çã_2_2_0.jar
${HADOOP_HOME}/bin/hdfs dfs -put ${HADOOP_HOME}/share/hadoop/mapreduce/hadoop-mapreduce-client-jobclient-${HADOOP_VERSION}.jar webhcate2e/hclient.jar
${HADOOP_HOME}/bin/hdfs dfs -put ${HADOOP_HOME}/share/hadoop/tools/lib/hadoop-streaming-${HADOOP_VERSION}.jar /user/templeton/hadoop-streaming.jar
Modified: hive/trunk/hcatalog/src/test/e2e/templeton/drivers/TestDriverCurl.pm
URL: http://svn.apache.org/viewvc/hive/trunk/hcatalog/src/test/e2e/templeton/drivers/TestDriverCurl.pm?rev=1653455&r1=1653454&r2=1653455&view=diff
==============================================================================
--- hive/trunk/hcatalog/src/test/e2e/templeton/drivers/TestDriverCurl.pm (original)
+++ hive/trunk/hcatalog/src/test/e2e/templeton/drivers/TestDriverCurl.pm Wed Jan 21 07:57:16 2015
@@ -37,7 +37,6 @@ use English;
use Storable qw(dclone);
use File::Glob ':glob';
use JSON::Path;
-use utf8;
my $passedStr = 'passed';
my $failedStr = 'failed';
@@ -923,38 +922,12 @@ sub compare
$result = 0;
next;
}
- my $exp_userargsvalue;
- my $r_userargsvalue;
- if(ref($exp_userargs{$key}) eq "ARRAY"){
- my @values = $exp_userargs{$key};
- my $num_values = @values;
-
- for(my $i=0;$i<=$num_values;$i++){
- if (utf8::is_utf8($exp_userargs{$key}[$i])){
- $exp_userargs{$key}[$i] = utf8::decode($exp_userargs{$key}[$i]);
- $r_userargs{$key}[$i] = utf8::decode($r_userargs{$key}[$i]);
- }
- }
- $exp_userargsvalue = $exp_userargs{$key};
- $r_userargsvalue = $r_userargs{$key};
- }
- else {
- if (utf8::is_utf8($exp_userargs{$key}))
- {
- $exp_userargsvalue = utf8::decode($exp_userargs{$key});
- $r_userargsvalue = utf8::decode($r_userargs{$key});
- }
- else
- {
- $exp_userargsvalue = $exp_userargs{$key};
- $r_userargsvalue = $r_userargs{$key};
- }
- }
+
print $log "$0::$subName DEBUG comparing expected "
. " $key ->" . dump($exp_userargs{$key})
. " With result $key ->" . dump($r_userargs{$key}) . "\n";
- if (!Compare($exp_userargsvalue, $r_userargsvalue)) {
+ if (!Compare($exp_userargs{$key}, $r_userargs{$key})) {
print $log "$0::$subName WARN check failed:"
. " json compare failed. For field "
. "$key, regex <" . dump($r_userargs{$key})