Repository: hive Updated Branches: refs/heads/spark 81175e3fd -> 08683fa59
HIVE-11099: Add support for running negative q-tests [Spark Branch] (Mohit via Xuefu) Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/08683fa5 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/08683fa5 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/08683fa5 Branch: refs/heads/spark Commit: 08683fa592e6db10fe69bad7d90bc9fb84a930c6 Parents: 81175e3 Author: xzhang <xzhang@xzdt> Authored: Thu Jun 25 13:39:31 2015 -0700 Committer: xzhang <xzhang@xzdt> Committed: Thu Jun 25 13:39:31 2015 -0700 ---------------------------------------------------------------------- itests/qtest-spark/pom.xml | 24 ++++++++++++++++++++ .../test/resources/testconfiguration.properties | 2 ++ .../groupby2_map_skew_multi_distinct.q.out | 9 ++++++++ 3 files changed, 35 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/08683fa5/itests/qtest-spark/pom.xml ---------------------------------------------------------------------- diff --git a/itests/qtest-spark/pom.xml b/itests/qtest-spark/pom.xml index dcb7623..05a3c9f 100644 --- a/itests/qtest-spark/pom.xml +++ b/itests/qtest-spark/pom.xml @@ -333,6 +333,10 @@ classpath="${test.classpath}" /> <mkdir dir="${project.build.directory}/qfile-results/clientpositive/spark" /> <mkdir dir="${project.build.directory}/qfile-results/clientpositive/miniSparkOnYarn" /> + <mkdir dir="${project.build.directory}/qfile-results/clientnegative/spark" /> + <mkdir dir="${project.build.directory}/qfile-results/clientnegative/miniSparkOnYarn" /> + + <!-- Cli with Spark standalone mode --> <qtestgen hiveRootDirectory="${basedir}/${hive.path.to.root}/" outputDirectory="${project.build.directory}/generated-test-sources/java/org/apache/hadoop/hive/cli/" templatePath="${basedir}/${hive.path.to.root}/ql/src/test/templates/" template="TestCliDriver.vm" @@ -349,6 +353,8 @@ logDirectory="${project.build.directory}/qfile-results/clientpositive/spark" initScript="q_test_init.sql" cleanupScript="q_test_cleanup.sql"/> + + <!-- Cli with Spark on YARN --> <qtestgen hiveRootDirectory="${basedir}/${hive.path.to.root}/" outputDirectory="${project.build.directory}/generated-test-sources/java/org/apache/hadoop/hive/cli/" templatePath="${basedir}/${hive.path.to.root}/ql/src/test/templates/" template="TestCliDriver.vm" @@ -365,6 +371,24 @@ logDirectory="${project.build.directory}/qfile-results/clientpositive/spark" initScript="q_test_init.sql" cleanupScript="q_test_cleanup.sql"/> + + <!-- Negative Cli with Spark standalone mode --> + <qtestgen hiveRootDirectory="${basedir}/${hive.path.to.root}/" + outputDirectory="${project.build.directory}/generated-test-sources/java/org/apache/hadoop/hive/cli/" + templatePath="${basedir}/${hive.path.to.root}/ql/src/test/templates/" template="TestNegativeCliDriver.vm" + queryDirectory="${basedir}/${hive.path.to.root}/ql/src/test/queries/clientnegative/" + queryFile="${qfile}" + queryFileRegex="${qfile_regex}" + clusterMode="spark" + includeQueryFile="${spark.query.negative.files}" + runDisabled="${run_disabled}" + hiveConfDir="${basedir}/${hive.path.to.root}/data/conf/spark/standalone" + resultsDirectory="${basedir}/${hive.path.to.root}/ql/src/test/results/clientnegative/spark" className="TestSparkNegativeCliDriver" + logFile="${project.build.directory}/testsparknegativeclidrivergen.log" + logDirectory="${project.build.directory}/qfile-results/clientnegative/spark" + initScript="q_test_init.sql" + cleanupScript="q_test_cleanup.sql"/> + </target> </configuration> <goals> http://git-wip-us.apache.org/repos/asf/hive/blob/08683fa5/itests/src/test/resources/testconfiguration.properties ---------------------------------------------------------------------- diff --git a/itests/src/test/resources/testconfiguration.properties b/itests/src/test/resources/testconfiguration.properties index 7b7559a..acca68d 100644 --- a/itests/src/test/resources/testconfiguration.properties +++ b/itests/src/test/resources/testconfiguration.properties @@ -1131,3 +1131,5 @@ miniSparkOnYarn.query.files=auto_sortmerge_join_16.q,\ temp_table_external.q,\ truncate_column_buckets.q,\ uber_reduce.q + +spark.query.negative.files=groupby2_map_skew_multi_distinct.q http://git-wip-us.apache.org/repos/asf/hive/blob/08683fa5/ql/src/test/results/clientnegative/spark/groupby2_map_skew_multi_distinct.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientnegative/spark/groupby2_map_skew_multi_distinct.q.out b/ql/src/test/results/clientnegative/spark/groupby2_map_skew_multi_distinct.q.out new file mode 100644 index 0000000..fdf4428 --- /dev/null +++ b/ql/src/test/results/clientnegative/spark/groupby2_map_skew_multi_distinct.q.out @@ -0,0 +1,9 @@ +PREHOOK: query: CREATE TABLE dest1(key STRING, c1 INT, c2 STRING, c3 INT, c4 INT) STORED AS TEXTFILE +PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default +PREHOOK: Output: default@dest1 +POSTHOOK: query: CREATE TABLE dest1(key STRING, c1 INT, c2 STRING, c3 INT, c4 INT) STORED AS TEXTFILE +POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default +POSTHOOK: Output: default@dest1 +FAILED: SemanticException [Error 10022]: DISTINCT on different columns not supported with skew in data
