hive git commit: HIVE-13798: Fix the unit test failure org.apache.hadoop.hive.cli.TestCliDriver.testCliDriver_ivyDownload (Aihua Xu, reviewed by Ashutosh Chauhan) (addendum)

2016-10-12 Thread aihuaxu
Repository: hive
Updated Branches:
  refs/heads/branch-2.1 4e1c0631b -> 10b866a88


HIVE-13798: Fix the unit test failure 
org.apache.hadoop.hive.cli.TestCliDriver.testCliDriver_ivyDownload (Aihua Xu, 
reviewed by Ashutosh Chauhan) (addendum)


Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/10b866a8
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/10b866a8
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/10b866a8

Branch: refs/heads/branch-2.1
Commit: 10b866a884ff01002f53d6bef67093aac3972838
Parents: 4e1c063
Author: Aihua Xu 
Authored: Wed Jun 1 11:28:14 2016 -0400
Committer: Aihua Xu 
Committed: Wed Oct 12 10:46:36 2016 -0400

--
 hbase-handler/src/test/results/negative/cascade_dbdrop.q.out | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/hive/blob/10b866a8/hbase-handler/src/test/results/negative/cascade_dbdrop.q.out
--
diff --git a/hbase-handler/src/test/results/negative/cascade_dbdrop.q.out 
b/hbase-handler/src/test/results/negative/cascade_dbdrop.q.out
index d2e0b81..f80f4a2 100644
--- a/hbase-handler/src/test/results/negative/cascade_dbdrop.q.out
+++ b/hbase-handler/src/test/results/negative/cascade_dbdrop.q.out
@@ -50,5 +50,5 @@ POSTHOOK: type: DROPDATABASE
 POSTHOOK: Input: database:hbasedb
 POSTHOOK: Output: database:hbasedb
 POSTHOOK: Output: hbasedb@hbase_table_0
-Command failed with exit code = 1
+ A masked pattern was here 
 Query returned non-zero code: 1, cause: null



hive git commit: HIVE-13798: Fix the unit test failure org.apache.hadoop.hive.cli.TestCliDriver.testCliDriver_ivyDownload (Aihua Xu, reviewed by Ashutosh Chauhan)

2016-10-11 Thread aihuaxu
Repository: hive
Updated Branches:
  refs/heads/branch-2.1 a4e8e85bf -> 4e1c0631b


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/4e1c0631
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/4e1c0631
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/4e1c0631

Branch: refs/heads/branch-2.1
Commit: 4e1c0631b671184cda15fc0fcef91183451adf89
Parents: a4e8e85
Author: Aihua Xu 
Authored: Thu May 19 20:11:01 2016 -0400
Committer: Aihua Xu 
Committed: Tue Oct 11 12:18:12 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/4e1c0631/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 @@
   
   
   
-
+
   
 
 

http://git-wip-us.apache.org/repos/asf/hive/blob/4e1c0631/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/4e1c0631/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/4e1c0631/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 



hive git commit: HIVE-13798: Fix the unit test failure org.apache.hadoop.hive.cli.TestCliDriver.testCliDriver_ivyDownload (Aihua Xu, reviewed by Ashutosh Chauhan) (addendum)

2016-06-01 Thread aihuaxu
Repository: hive
Updated Branches:
  refs/heads/master f451f20df -> 936bc30a7


HIVE-13798: Fix the unit test failure 
org.apache.hadoop.hive.cli.TestCliDriver.testCliDriver_ivyDownload (Aihua Xu, 
reviewed by Ashutosh Chauhan) (addendum)


Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/936bc30a
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/936bc30a
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/936bc30a

Branch: refs/heads/master
Commit: 936bc30a7444974a8e73d8d70193d52c55848410
Parents: f451f20
Author: Aihua Xu 
Authored: Wed Jun 1 11:28:14 2016 -0400
Committer: Aihua Xu 
Committed: Wed Jun 1 11:29:09 2016 -0400

--
 hbase-handler/src/test/results/negative/cascade_dbdrop.q.out | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/hive/blob/936bc30a/hbase-handler/src/test/results/negative/cascade_dbdrop.q.out
--
diff --git a/hbase-handler/src/test/results/negative/cascade_dbdrop.q.out 
b/hbase-handler/src/test/results/negative/cascade_dbdrop.q.out
index d2e0b81..f80f4a2 100644
--- a/hbase-handler/src/test/results/negative/cascade_dbdrop.q.out
+++ b/hbase-handler/src/test/results/negative/cascade_dbdrop.q.out
@@ -50,5 +50,5 @@ POSTHOOK: type: DROPDATABASE
 POSTHOOK: Input: database:hbasedb
 POSTHOOK: Output: database:hbasedb
 POSTHOOK: Output: hbasedb@hbase_table_0
-Command failed with exit code = 1
+ A masked pattern was here 
 Query returned non-zero code: 1, cause: null



hive git commit: HIVE-13798: Fix the unit test failure org.apache.hadoop.hive.cli.TestCliDriver.testCliDriver_ivyDownload (Aihua Xu, reviewed by Ashutosh Chauhan)

2016-06-01 Thread aihuaxu
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 
Authored: Thu May 19 20:11:01 2016 -0400
Committer: Aihua Xu 
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 @@
   
   
   
-
+
   
 
 

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