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 @@ - + 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 CommandProcessorResponse run(String command) { 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); 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; 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 ####