Repository: hive Updated Branches: refs/heads/master c57a1272f -> 5c9d99b85
HIVE-13798: Fix the unit test failure org.apache.hadoop.hive.cli.TestCliDriver.testCliDriver_ivyDownload (Aihua Xu, reviewed by Ashutosh Chauhan) Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/5c9d99b8 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/5c9d99b8 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/5c9d99b8 Branch: refs/heads/master Commit: 5c9d99b85a46233bb52aac0277913eef17c8903d Parents: c57a127 Author: Aihua Xu <aihu...@apache.org> Authored: Thu May 19 20:11:01 2016 -0400 Committer: Aihua Xu <aihu...@apache.org> Committed: Wed Jun 1 09:08:23 2016 -0400 ---------------------------------------------------------------------- conf/ivysettings.xml | 2 +- .../org/apache/hadoop/hive/ql/processors/DfsProcessor.java | 2 +- ql/src/test/queries/clientpositive/ivyDownload.q | 6 +++++- ql/src/test/results/clientpositive/ivyDownload.q.out | 5 +++-- 4 files changed, 10 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/5c9d99b8/conf/ivysettings.xml ---------------------------------------------------------------------- diff --git a/conf/ivysettings.xml b/conf/ivysettings.xml index aa10f43..bee8eb6 100644 --- a/conf/ivysettings.xml +++ b/conf/ivysettings.xml @@ -37,7 +37,7 @@ </url> <!-- File resolver to add jars from the local system. --> <filesystem name="test" checkmodified="true"> - <artifact pattern="/tmp/[module]-[revision](-[classifier]).jar"/> + <artifact pattern="${test.tmp.dir}/[module]-[revision](-[classifier]).jar"/> </filesystem> </chain> http://git-wip-us.apache.org/repos/asf/hive/blob/5c9d99b8/ql/src/java/org/apache/hadoop/hive/ql/processors/DfsProcessor.java ---------------------------------------------------------------------- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/processors/DfsProcessor.java b/ql/src/java/org/apache/hadoop/hive/ql/processors/DfsProcessor.java index 3899d2c..19f5bde 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/processors/DfsProcessor.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/processors/DfsProcessor.java @@ -90,7 +90,7 @@ public class DfsProcessor implements CommandProcessor { int ret = dfs.run(tokens); if (ret != 0) { - console.printError("Command failed with exit code = " + ret); + console.printError("Command " + command + " failed with exit code = " + ret); } System.setOut(oldOut); http://git-wip-us.apache.org/repos/asf/hive/blob/5c9d99b8/ql/src/test/queries/clientpositive/ivyDownload.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/ivyDownload.q b/ql/src/test/queries/clientpositive/ivyDownload.q index 86ab648..2d3c25e 100644 --- a/ql/src/test/queries/clientpositive/ivyDownload.q +++ b/ql/src/test/queries/clientpositive/ivyDownload.q @@ -1,6 +1,8 @@ +dfs -cp ${system:hive.root}/contrib/target/hive-contrib-${system:hive.version}.jar ${system:test.tmp.dir}/udfexampleadd-1.0.jar; + ADD JAR ivy://:udfexampleadd:1.0; -CREATE TEMPORARY FUNCTION example_add AS 'UDFExampleAdd'; +CREATE TEMPORARY FUNCTION example_add AS 'org.apache.hadoop.hive.contrib.udf.example.UDFExampleAdd'; EXPLAIN SELECT example_add(1, 2), @@ -24,3 +26,5 @@ FROM src LIMIT 1; DROP TEMPORARY FUNCTION example_add; DELETE JAR ivy://:udfexampleadd:1.0; + +dfs -rm ${system:test.tmp.dir}/udfexampleadd-1.0.jar; http://git-wip-us.apache.org/repos/asf/hive/blob/5c9d99b8/ql/src/test/results/clientpositive/ivyDownload.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/ivyDownload.q.out b/ql/src/test/results/clientpositive/ivyDownload.q.out index 23cc124..6bc9cb1 100644 --- a/ql/src/test/results/clientpositive/ivyDownload.q.out +++ b/ql/src/test/results/clientpositive/ivyDownload.q.out @@ -1,7 +1,7 @@ -PREHOOK: query: CREATE TEMPORARY FUNCTION example_add AS 'UDFExampleAdd' +PREHOOK: query: CREATE TEMPORARY FUNCTION example_add AS 'org.apache.hadoop.hive.contrib.udf.example.UDFExampleAdd' PREHOOK: type: CREATEFUNCTION PREHOOK: Output: example_add -POSTHOOK: query: CREATE TEMPORARY FUNCTION example_add AS 'UDFExampleAdd' +POSTHOOK: query: CREATE TEMPORARY FUNCTION example_add AS 'org.apache.hadoop.hive.contrib.udf.example.UDFExampleAdd' POSTHOOK: type: CREATEFUNCTION POSTHOOK: Output: example_add PREHOOK: query: EXPLAIN @@ -73,3 +73,4 @@ PREHOOK: Output: example_add POSTHOOK: query: DROP TEMPORARY FUNCTION example_add POSTHOOK: type: DROPFUNCTION POSTHOOK: Output: example_add +#### A masked pattern was here ####
