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/12/27 18:29:28 UTC

svn commit: r1426261 - in /hive/trunk/ql/src/test: queries/clientpositive/combine2.q queries/clientpositive/combine2_hadoop20.q results/clientpositive/combine2.q.out results/clientpositive/combine2_hadoop20.q.out

Author: hashutosh
Date: Thu Dec 27 17:29:28 2012
New Revision: 1426261

URL: http://svn.apache.org/viewvc?rev=1426261&view=rev
Log:
HIVE-3800 : testCliDriver_combine2 fails on hadoop-1 (Gunther Hagleitner via Ashutosh Chauhan)

Modified:
    hive/trunk/ql/src/test/queries/clientpositive/combine2.q
    hive/trunk/ql/src/test/queries/clientpositive/combine2_hadoop20.q
    hive/trunk/ql/src/test/results/clientpositive/combine2.q.out
    hive/trunk/ql/src/test/results/clientpositive/combine2_hadoop20.q.out

Modified: hive/trunk/ql/src/test/queries/clientpositive/combine2.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/combine2.q?rev=1426261&r1=1426260&r2=1426261&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/combine2.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/combine2.q Thu Dec 27 17:29:28 2012
@@ -17,7 +17,7 @@ set hive.merge.smallfiles.avgsize=0;
 
 create table combine2(key string) partitioned by (value string);
 
--- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.20)
+-- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.20, 0.20S)
 -- This test sets mapred.max.split.size=256 and hive.merge.smallfiles.avgsize=0
 -- in an attempt to force the generation of multiple splits and multiple output files.
 -- However, Hadoop 0.20 is incapable of generating splits smaller than the block size

Modified: hive/trunk/ql/src/test/queries/clientpositive/combine2_hadoop20.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/combine2_hadoop20.q?rev=1426261&r1=1426260&r2=1426261&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/combine2_hadoop20.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/combine2_hadoop20.q Thu Dec 27 17:29:28 2012
@@ -16,7 +16,7 @@ set hive.merge.smallfiles.avgsize=0;
 
 create table combine2(key string) partitioned by (value string);
 
--- INCLUDE_HADOOP_MAJOR_VERSIONS(0.20)
+-- INCLUDE_HADOOP_MAJOR_VERSIONS(0.20, 0.20S)
 -- This test sets mapred.max.split.size=256 and hive.merge.smallfiles.avgsize=0
 -- in an attempt to force the generation of multiple splits and multiple output files.
 -- However, Hadoop 0.20 is incapable of generating splits smaller than the block size

Modified: hive/trunk/ql/src/test/results/clientpositive/combine2.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/combine2.q.out?rev=1426261&r1=1426260&r2=1426261&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/combine2.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/combine2.q.out Thu Dec 27 17:29:28 2012
@@ -17,7 +17,7 @@ POSTHOOK: query: -- EXCLUDE_OS_WINDOWS
 create table combine2(key string) partitioned by (value string)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: default@combine2
-PREHOOK: query: -- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.20)
+PREHOOK: query: -- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.20, 0.20S)
 -- This test sets mapred.max.split.size=256 and hive.merge.smallfiles.avgsize=0
 -- in an attempt to force the generation of multiple splits and multiple output files.
 -- However, Hadoop 0.20 is incapable of generating splits smaller than the block size
@@ -35,7 +35,7 @@ select * from (
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 PREHOOK: Output: default@combine2
-POSTHOOK: query: -- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.20)
+POSTHOOK: query: -- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.20, 0.20S)
 -- This test sets mapred.max.split.size=256 and hive.merge.smallfiles.avgsize=0
 -- in an attempt to force the generation of multiple splits and multiple output files.
 -- However, Hadoop 0.20 is incapable of generating splits smaller than the block size

Modified: hive/trunk/ql/src/test/results/clientpositive/combine2_hadoop20.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/combine2_hadoop20.q.out?rev=1426261&r1=1426260&r2=1426261&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/combine2_hadoop20.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/combine2_hadoop20.q.out Thu Dec 27 17:29:28 2012
@@ -15,7 +15,7 @@ POSTHOOK: query: -- EXCLUDE_OS_WINDOWS
 create table combine2(key string) partitioned by (value string)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: default@combine2
-PREHOOK: query: -- INCLUDE_HADOOP_MAJOR_VERSIONS(0.20)
+PREHOOK: query: -- INCLUDE_HADOOP_MAJOR_VERSIONS(0.20, 0.20S)
 -- This test sets mapred.max.split.size=256 and hive.merge.smallfiles.avgsize=0
 -- in an attempt to force the generation of multiple splits and multiple output files.
 -- However, Hadoop 0.20 is incapable of generating splits smaller than the block size
@@ -33,7 +33,7 @@ select * from (
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 PREHOOK: Output: default@combine2
-POSTHOOK: query: -- INCLUDE_HADOOP_MAJOR_VERSIONS(0.20)
+POSTHOOK: query: -- INCLUDE_HADOOP_MAJOR_VERSIONS(0.20, 0.20S)
 -- This test sets mapred.max.split.size=256 and hive.merge.smallfiles.avgsize=0
 -- in an attempt to force the generation of multiple splits and multiple output files.
 -- However, Hadoop 0.20 is incapable of generating splits smaller than the block size