You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by gu...@apache.org on 2013/11/05 08:01:58 UTC
svn commit: r1538880 [45/46] - in /hive/branches/tez: ./ ant/
ant/src/org/apache/hadoop/hive/ant/ beeline/
beeline/src/java/org/apache/hive/beeline/ beeline/src/main/
beeline/src/test/org/apache/hive/beeline/src/test/ cli/ common/
common/src/java/conf/...
Modified: hive/branches/tez/ql/src/test/results/compiler/plan/input2.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/compiler/plan/input2.q.xml?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/compiler/plan/input2.q.xml (original)
+++ hive/branches/tez/ql/src/test/results/compiler/plan/input2.q.xml Tue Nov 5 07:01:32 2013
@@ -1685,10 +1685,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
@@ -2843,10 +2839,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
@@ -2919,10 +2911,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
Modified: hive/branches/tez/ql/src/test/results/compiler/plan/input20.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/compiler/plan/input20.q.xml?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/compiler/plan/input20.q.xml (original)
+++ hive/branches/tez/ql/src/test/results/compiler/plan/input20.q.xml Tue Nov 5 07:01:32 2013
@@ -110,10 +110,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
@@ -935,10 +931,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
@@ -1011,10 +1003,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
Modified: hive/branches/tez/ql/src/test/results/compiler/plan/input3.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/compiler/plan/input3.q.xml?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/compiler/plan/input3.q.xml (original)
+++ hive/branches/tez/ql/src/test/results/compiler/plan/input3.q.xml Tue Nov 5 07:01:32 2013
@@ -2071,10 +2071,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
@@ -3524,10 +3520,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
@@ -3600,10 +3592,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
Modified: hive/branches/tez/ql/src/test/results/compiler/plan/input4.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/compiler/plan/input4.q.xml?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/compiler/plan/input4.q.xml (original)
+++ hive/branches/tez/ql/src/test/results/compiler/plan/input4.q.xml Tue Nov 5 07:01:32 2013
@@ -257,10 +257,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
@@ -1091,10 +1087,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
@@ -1167,10 +1159,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
Modified: hive/branches/tez/ql/src/test/results/compiler/plan/input5.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/compiler/plan/input5.q.xml?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/compiler/plan/input5.q.xml (original)
+++ hive/branches/tez/ql/src/test/results/compiler/plan/input5.q.xml Tue Nov 5 07:01:32 2013
@@ -261,10 +261,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>serialization.class</string>
<string>org.apache.hadoop.hive.serde2.thrift.test.Complex</string>
</void>
@@ -1133,10 +1129,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>serialization.class</string>
<string>org.apache.hadoop.hive.serde2.thrift.test.Complex</string>
</void>
@@ -1213,10 +1205,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>serialization.class</string>
<string>org.apache.hadoop.hive.serde2.thrift.test.Complex</string>
</void>
Modified: hive/branches/tez/ql/src/test/results/compiler/plan/input6.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/compiler/plan/input6.q.xml?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/compiler/plan/input6.q.xml (original)
+++ hive/branches/tez/ql/src/test/results/compiler/plan/input6.q.xml Tue Nov 5 07:01:32 2013
@@ -636,10 +636,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
@@ -1160,10 +1156,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
@@ -1236,10 +1228,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
Modified: hive/branches/tez/ql/src/test/results/compiler/plan/input7.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/compiler/plan/input7.q.xml?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/compiler/plan/input7.q.xml (original)
+++ hive/branches/tez/ql/src/test/results/compiler/plan/input7.q.xml Tue Nov 5 07:01:32 2013
@@ -636,10 +636,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
@@ -1066,10 +1062,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
@@ -1142,10 +1134,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
Modified: hive/branches/tez/ql/src/test/results/compiler/plan/input8.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/compiler/plan/input8.q.xml?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/compiler/plan/input8.q.xml (original)
+++ hive/branches/tez/ql/src/test/results/compiler/plan/input8.q.xml Tue Nov 5 07:01:32 2013
@@ -110,10 +110,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
@@ -738,10 +734,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
@@ -814,10 +806,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
Modified: hive/branches/tez/ql/src/test/results/compiler/plan/input9.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/compiler/plan/input9.q.xml?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/compiler/plan/input9.q.xml (original)
+++ hive/branches/tez/ql/src/test/results/compiler/plan/input9.q.xml Tue Nov 5 07:01:32 2013
@@ -636,10 +636,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
@@ -1139,10 +1135,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
@@ -1215,10 +1207,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
Modified: hive/branches/tez/ql/src/test/results/compiler/plan/input_part1.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/compiler/plan/input_part1.q.xml?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/compiler/plan/input_part1.q.xml (original)
+++ hive/branches/tez/ql/src/test/results/compiler/plan/input_part1.q.xml Tue Nov 5 07:01:32 2013
@@ -115,10 +115,6 @@
<string>default.srcpart</string>
</void>
<void method="put">
- <string>numFiles</string>
- <string>4</string>
- </void>
- <void method="put">
<string>columns.types</string>
<string>string:string</string>
</void>
@@ -135,18 +131,6 @@
<string>key,value</string>
</void>
<void method="put">
- <string>rawDataSize</string>
- <string>0</string>
- </void>
- <void method="put">
- <string>numRows</string>
- <string>0</string>
- </void>
- <void method="put">
- <string>numPartitions</string>
- <string>4</string>
- </void>
- <void method="put">
<string>partition_columns</string>
<string>ds/hr</string>
</void>
@@ -163,10 +147,6 @@
<string>org.apache.hadoop.mapred.TextInputFormat</string>
</void>
<void method="put">
- <string>totalSize</string>
- <string>23248</string>
- </void>
- <void method="put">
<string>file.outputformat</string>
<string>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</string>
</void>
@@ -963,10 +943,6 @@
<string>default.srcpart</string>
</void>
<void method="put">
- <string>numFiles</string>
- <string>4</string>
- </void>
- <void method="put">
<string>columns.types</string>
<string>string:string</string>
</void>
@@ -983,18 +959,6 @@
<string>key,value</string>
</void>
<void method="put">
- <string>rawDataSize</string>
- <string>0</string>
- </void>
- <void method="put">
- <string>numRows</string>
- <string>0</string>
- </void>
- <void method="put">
- <string>numPartitions</string>
- <string>4</string>
- </void>
- <void method="put">
<string>partition_columns</string>
<string>ds/hr</string>
</void>
@@ -1011,10 +975,6 @@
<string>org.apache.hadoop.mapred.TextInputFormat</string>
</void>
<void method="put">
- <string>totalSize</string>
- <string>23248</string>
- </void>
- <void method="put">
<string>file.outputformat</string>
<string>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</string>
</void>
Modified: hive/branches/tez/ql/src/test/results/compiler/plan/input_testsequencefile.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/compiler/plan/input_testsequencefile.q.xml?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/compiler/plan/input_testsequencefile.q.xml (original)
+++ hive/branches/tez/ql/src/test/results/compiler/plan/input_testsequencefile.q.xml Tue Nov 5 07:01:32 2013
@@ -636,10 +636,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
@@ -1077,10 +1073,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
@@ -1153,10 +1145,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
Modified: hive/branches/tez/ql/src/test/results/compiler/plan/input_testxpath.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/compiler/plan/input_testxpath.q.xml?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/compiler/plan/input_testxpath.q.xml (original)
+++ hive/branches/tez/ql/src/test/results/compiler/plan/input_testxpath.q.xml Tue Nov 5 07:01:32 2013
@@ -114,10 +114,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>serialization.class</string>
<string>org.apache.hadoop.hive.serde2.thrift.test.Complex</string>
</void>
@@ -877,10 +873,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>serialization.class</string>
<string>org.apache.hadoop.hive.serde2.thrift.test.Complex</string>
</void>
@@ -957,10 +949,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>serialization.class</string>
<string>org.apache.hadoop.hive.serde2.thrift.test.Complex</string>
</void>
Modified: hive/branches/tez/ql/src/test/results/compiler/plan/input_testxpath2.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/compiler/plan/input_testxpath2.q.xml?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/compiler/plan/input_testxpath2.q.xml (original)
+++ hive/branches/tez/ql/src/test/results/compiler/plan/input_testxpath2.q.xml Tue Nov 5 07:01:32 2013
@@ -114,10 +114,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>serialization.class</string>
<string>org.apache.hadoop.hive.serde2.thrift.test.Complex</string>
</void>
@@ -975,10 +971,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>serialization.class</string>
<string>org.apache.hadoop.hive.serde2.thrift.test.Complex</string>
</void>
@@ -1055,10 +1047,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>serialization.class</string>
<string>org.apache.hadoop.hive.serde2.thrift.test.Complex</string>
</void>
Modified: hive/branches/tez/ql/src/test/results/compiler/plan/join1.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/compiler/plan/join1.q.xml?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/compiler/plan/join1.q.xml (original)
+++ hive/branches/tez/ql/src/test/results/compiler/plan/join1.q.xml Tue Nov 5 07:01:32 2013
@@ -257,10 +257,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
@@ -393,10 +389,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
@@ -1185,10 +1177,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
@@ -1261,10 +1249,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
Modified: hive/branches/tez/ql/src/test/results/compiler/plan/join2.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/compiler/plan/join2.q.xml?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/compiler/plan/join2.q.xml (original)
+++ hive/branches/tez/ql/src/test/results/compiler/plan/join2.q.xml Tue Nov 5 07:01:32 2013
@@ -268,10 +268,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
@@ -1102,10 +1098,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
@@ -1178,10 +1170,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
@@ -1847,10 +1835,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
@@ -1983,10 +1967,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
@@ -2728,10 +2708,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
@@ -2804,10 +2780,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
Modified: hive/branches/tez/ql/src/test/results/compiler/plan/join3.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/compiler/plan/join3.q.xml?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/compiler/plan/join3.q.xml (original)
+++ hive/branches/tez/ql/src/test/results/compiler/plan/join3.q.xml Tue Nov 5 07:01:32 2013
@@ -257,10 +257,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
@@ -393,10 +389,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
@@ -529,10 +521,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
@@ -1638,10 +1626,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
@@ -1714,10 +1698,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
Modified: hive/branches/tez/ql/src/test/results/compiler/plan/join4.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/compiler/plan/join4.q.xml?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/compiler/plan/join4.q.xml (original)
+++ hive/branches/tez/ql/src/test/results/compiler/plan/join4.q.xml Tue Nov 5 07:01:32 2013
@@ -110,10 +110,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
@@ -246,10 +242,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
@@ -1601,10 +1593,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
@@ -1677,10 +1665,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
Modified: hive/branches/tez/ql/src/test/results/compiler/plan/join5.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/compiler/plan/join5.q.xml?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/compiler/plan/join5.q.xml (original)
+++ hive/branches/tez/ql/src/test/results/compiler/plan/join5.q.xml Tue Nov 5 07:01:32 2013
@@ -110,10 +110,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
@@ -246,10 +242,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
@@ -1601,10 +1593,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
@@ -1677,10 +1665,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
Modified: hive/branches/tez/ql/src/test/results/compiler/plan/join6.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/compiler/plan/join6.q.xml?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/compiler/plan/join6.q.xml (original)
+++ hive/branches/tez/ql/src/test/results/compiler/plan/join6.q.xml Tue Nov 5 07:01:32 2013
@@ -110,10 +110,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
@@ -246,10 +242,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
@@ -1601,10 +1593,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
@@ -1677,10 +1665,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
Modified: hive/branches/tez/ql/src/test/results/compiler/plan/join7.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/compiler/plan/join7.q.xml?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/compiler/plan/join7.q.xml (original)
+++ hive/branches/tez/ql/src/test/results/compiler/plan/join7.q.xml Tue Nov 5 07:01:32 2013
@@ -110,10 +110,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
@@ -246,10 +242,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
@@ -382,10 +374,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
@@ -2359,10 +2347,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
@@ -2435,10 +2419,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
Modified: hive/branches/tez/ql/src/test/results/compiler/plan/join8.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/compiler/plan/join8.q.xml?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/compiler/plan/join8.q.xml (original)
+++ hive/branches/tez/ql/src/test/results/compiler/plan/join8.q.xml Tue Nov 5 07:01:32 2013
@@ -110,10 +110,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
@@ -246,10 +242,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
@@ -1683,10 +1675,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
@@ -1759,10 +1747,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
Modified: hive/branches/tez/ql/src/test/results/compiler/plan/sample1.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/compiler/plan/sample1.q.xml?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/compiler/plan/sample1.q.xml (original)
+++ hive/branches/tez/ql/src/test/results/compiler/plan/sample1.q.xml Tue Nov 5 07:01:32 2013
@@ -115,10 +115,6 @@
<string>default.srcpart</string>
</void>
<void method="put">
- <string>numFiles</string>
- <string>4</string>
- </void>
- <void method="put">
<string>columns.types</string>
<string>string:string</string>
</void>
@@ -135,18 +131,6 @@
<string>key,value</string>
</void>
<void method="put">
- <string>rawDataSize</string>
- <string>0</string>
- </void>
- <void method="put">
- <string>numRows</string>
- <string>0</string>
- </void>
- <void method="put">
- <string>numPartitions</string>
- <string>4</string>
- </void>
- <void method="put">
<string>partition_columns</string>
<string>ds/hr</string>
</void>
@@ -163,10 +147,6 @@
<string>org.apache.hadoop.mapred.TextInputFormat</string>
</void>
<void method="put">
- <string>totalSize</string>
- <string>23248</string>
- </void>
- <void method="put">
<string>file.outputformat</string>
<string>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</string>
</void>
@@ -1062,10 +1042,6 @@
<string>default.srcpart</string>
</void>
<void method="put">
- <string>numFiles</string>
- <string>4</string>
- </void>
- <void method="put">
<string>columns.types</string>
<string>string:string</string>
</void>
@@ -1082,18 +1058,6 @@
<string>key,value</string>
</void>
<void method="put">
- <string>rawDataSize</string>
- <string>0</string>
- </void>
- <void method="put">
- <string>numRows</string>
- <string>0</string>
- </void>
- <void method="put">
- <string>numPartitions</string>
- <string>4</string>
- </void>
- <void method="put">
<string>partition_columns</string>
<string>ds/hr</string>
</void>
@@ -1110,10 +1074,6 @@
<string>org.apache.hadoop.mapred.TextInputFormat</string>
</void>
<void method="put">
- <string>totalSize</string>
- <string>23248</string>
- </void>
- <void method="put">
<string>file.outputformat</string>
<string>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</string>
</void>
Modified: hive/branches/tez/ql/src/test/results/compiler/plan/sample2.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/compiler/plan/sample2.q.xml?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/compiler/plan/sample2.q.xml (original)
+++ hive/branches/tez/ql/src/test/results/compiler/plan/sample2.q.xml Tue Nov 5 07:01:32 2013
@@ -644,10 +644,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>2</string>
</void>
@@ -1277,10 +1273,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>2</string>
</void>
@@ -1357,10 +1349,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>2</string>
</void>
Modified: hive/branches/tez/ql/src/test/results/compiler/plan/sample3.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/compiler/plan/sample3.q.xml?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/compiler/plan/sample3.q.xml (original)
+++ hive/branches/tez/ql/src/test/results/compiler/plan/sample3.q.xml Tue Nov 5 07:01:32 2013
@@ -644,10 +644,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>2</string>
</void>
@@ -1287,10 +1283,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>2</string>
</void>
@@ -1367,10 +1359,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>2</string>
</void>
Modified: hive/branches/tez/ql/src/test/results/compiler/plan/sample4.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/compiler/plan/sample4.q.xml?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/compiler/plan/sample4.q.xml (original)
+++ hive/branches/tez/ql/src/test/results/compiler/plan/sample4.q.xml Tue Nov 5 07:01:32 2013
@@ -644,10 +644,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>2</string>
</void>
@@ -1277,10 +1273,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>2</string>
</void>
@@ -1357,10 +1349,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>2</string>
</void>
Modified: hive/branches/tez/ql/src/test/results/compiler/plan/sample5.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/compiler/plan/sample5.q.xml?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/compiler/plan/sample5.q.xml (original)
+++ hive/branches/tez/ql/src/test/results/compiler/plan/sample5.q.xml Tue Nov 5 07:01:32 2013
@@ -644,10 +644,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>2</string>
</void>
@@ -1274,10 +1270,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>2</string>
</void>
@@ -1354,10 +1346,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>2</string>
</void>
Modified: hive/branches/tez/ql/src/test/results/compiler/plan/sample6.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/compiler/plan/sample6.q.xml?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/compiler/plan/sample6.q.xml (original)
+++ hive/branches/tez/ql/src/test/results/compiler/plan/sample6.q.xml Tue Nov 5 07:01:32 2013
@@ -644,10 +644,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>2</string>
</void>
@@ -1277,10 +1273,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>2</string>
</void>
@@ -1357,10 +1349,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>2</string>
</void>
Modified: hive/branches/tez/ql/src/test/results/compiler/plan/sample7.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/compiler/plan/sample7.q.xml?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/compiler/plan/sample7.q.xml (original)
+++ hive/branches/tez/ql/src/test/results/compiler/plan/sample7.q.xml Tue Nov 5 07:01:32 2013
@@ -644,10 +644,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>2</string>
</void>
@@ -1322,10 +1318,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>2</string>
</void>
@@ -1402,10 +1394,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>2</string>
</void>
Modified: hive/branches/tez/ql/src/test/results/compiler/plan/subq.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/compiler/plan/subq.q.xml?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/compiler/plan/subq.q.xml (original)
+++ hive/branches/tez/ql/src/test/results/compiler/plan/subq.q.xml Tue Nov 5 07:01:32 2013
@@ -526,10 +526,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
@@ -1061,10 +1057,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
@@ -1137,10 +1129,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
Modified: hive/branches/tez/ql/src/test/results/compiler/plan/udf1.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/compiler/plan/udf1.q.xml?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/compiler/plan/udf1.q.xml (original)
+++ hive/branches/tez/ql/src/test/results/compiler/plan/udf1.q.xml Tue Nov 5 07:01:32 2013
@@ -110,10 +110,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
@@ -2035,10 +2031,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
@@ -2111,10 +2103,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
Modified: hive/branches/tez/ql/src/test/results/compiler/plan/udf6.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/compiler/plan/udf6.q.xml?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/compiler/plan/udf6.q.xml (original)
+++ hive/branches/tez/ql/src/test/results/compiler/plan/udf6.q.xml Tue Nov 5 07:01:32 2013
@@ -110,10 +110,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
@@ -658,10 +654,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
@@ -734,10 +726,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
Modified: hive/branches/tez/ql/src/test/results/compiler/plan/udf_case.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/compiler/plan/udf_case.q.xml?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/compiler/plan/udf_case.q.xml (original)
+++ hive/branches/tez/ql/src/test/results/compiler/plan/udf_case.q.xml Tue Nov 5 07:01:32 2013
@@ -110,10 +110,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
@@ -762,10 +758,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
@@ -838,10 +830,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
Modified: hive/branches/tez/ql/src/test/results/compiler/plan/udf_when.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/compiler/plan/udf_when.q.xml?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/compiler/plan/udf_when.q.xml (original)
+++ hive/branches/tez/ql/src/test/results/compiler/plan/udf_when.q.xml Tue Nov 5 07:01:32 2013
@@ -110,10 +110,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
@@ -842,10 +838,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
@@ -918,10 +910,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
Modified: hive/branches/tez/ql/src/test/results/compiler/plan/union.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/compiler/plan/union.q.xml?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/compiler/plan/union.q.xml (original)
+++ hive/branches/tez/ql/src/test/results/compiler/plan/union.q.xml Tue Nov 5 07:01:32 2013
@@ -526,10 +526,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
@@ -662,10 +658,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
@@ -1771,10 +1763,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
@@ -1847,10 +1835,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
Modified: hive/branches/tez/ql/src/test/templates/TestCliDriver.vm
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/templates/TestCliDriver.vm?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/templates/TestCliDriver.vm (original)
+++ hive/branches/tez/ql/src/test/templates/TestCliDriver.vm Tue Nov 5 07:01:32 2013
@@ -48,7 +48,7 @@ public class $className extends TestCase
System.err.println("Exception: " + e.getMessage());
e.printStackTrace();
System.err.flush();
- fail("Unexpected exception in static initialization");
+ fail("Unexpected exception in static initialization"+e.getMessage());
}
}
Modified: hive/branches/tez/service/src/java/org/apache/hive/service/cli/operation/SQLOperation.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/service/src/java/org/apache/hive/service/cli/operation/SQLOperation.java?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/service/src/java/org/apache/hive/service/cli/operation/SQLOperation.java (original)
+++ hive/branches/tez/service/src/java/org/apache/hive/service/cli/operation/SQLOperation.java Tue Nov 5 07:01:32 2013
@@ -149,7 +149,7 @@ public class SQLOperation extends Execut
SessionState ss = SessionState.get();
@Override
public void run() {
- SessionState.start(ss);
+ SessionState.setCurrentSessionState(ss);
try {
runInternal(getConfigForOperation());
} catch (HiveSQLException e) {
Modified: hive/branches/tez/service/src/java/org/apache/hive/service/cli/session/HiveSessionImpl.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/service/src/java/org/apache/hive/service/cli/session/HiveSessionImpl.java?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/service/src/java/org/apache/hive/service/cli/session/HiveSessionImpl.java (original)
+++ hive/branches/tez/service/src/java/org/apache/hive/service/cli/session/HiveSessionImpl.java Tue Nov 5 07:01:32 2013
@@ -89,6 +89,7 @@ public class HiveSessionImpl implements
hiveConf.set(ConfVars.HIVESESSIONID.varname,
sessionHandle.getHandleIdentifier().toString());
sessionState = new SessionState(hiveConf);
+ SessionState.start(sessionState);
}
public SessionManager getSessionManager() {
@@ -108,7 +109,9 @@ public class HiveSessionImpl implements
}
protected synchronized void acquire() throws HiveSQLException {
- SessionState.start(sessionState);
+ // need to make sure that the this connections session state is
+ // stored in the thread local for sessions.
+ SessionState.setCurrentSessionState(sessionState);
}
protected synchronized void release() {
@@ -312,7 +315,7 @@ public class HiveSessionImpl implements
opHandleSet.add(opHandle);
return opHandle;
} catch (HiveSQLException e) {
- operationManager.closeOperation(opHandle);
+ operationManager.closeOperation(opHandle);
throw e;
} finally {
release();
Modified: hive/branches/tez/shims/0.23/pom.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/shims/0.23/pom.xml?rev=1538880&r1=1538724&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/shims/0.23/pom.xml (original)
+++ hive/branches/tez/shims/0.23/pom.xml Tue Nov 5 07:01:32 2013
@@ -87,5 +87,70 @@
<artifactId>jetty</artifactId>
<version>${jetty.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.tez</groupId>
+ <artifactId>tez-api</artifactId>
+ <version>${tez.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tez</groupId>
+ <artifactId>tez-dag</artifactId>
+ <version>${tez.version}</version>
+ </dependency>
+ <dependency >
+ <groupId>org.apache.tez</groupId>
+ <artifactId>tez-common</artifactId>
+ <version>${tez.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tez</groupId>
+ <artifactId>tez-runtime-library</artifactId>
+ <version>${tez.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tez</groupId>
+ <artifactId>tez-mapreduce</artifactId>
+ <version>${tez.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tez</groupId>
+ <artifactId>tez-runtime-internals</artifactId>
+ <version>${tez.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-hdfs</artifactId>
+ <version>${hadoop-23.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-yarn-api</artifactId>
+ <version>${hadoop-23.version}</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-yarn-common</artifactId>
+ <version>${hadoop-23.version}</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-yarn-client</artifactId>
+ <version>${hadoop-23.version}</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tez</groupId>
+ <artifactId>tez-tests</artifactId>
+ <version>${tez.version}</version>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-yarn-server-tests</artifactId>
+ <version>${hadoop-23.version}</version>
+ <type>test-jar</type>
+ </dependency>
</dependencies>
</project>
Modified: hive/branches/tez/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java?rev=1538880&r1=1538724&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java (original)
+++ hive/branches/tez/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java Tue Nov 5 07:01:32 2013
@@ -61,13 +61,15 @@ import org.apache.hadoop.net.NetUtils;
import org.apache.hadoop.util.Progressable;
import org.apache.hadoop.mapred.lib.TotalOrderPartitioner;
import org.apache.hadoop.security.UserGroupInformation;
-
+import org.apache.tez.test.MiniTezCluster;
/**
* Implemention of shims against Hadoop 0.23.0.
*/
public class Hadoop23Shims extends HadoopShimsSecure {
+ HadoopShims.MiniDFSShim cluster = null;
+
@Override
public String getTaskAttemptLogUrl(JobConf conf,
String taskTrackerHttpAddress, String taskAttemptId)
@@ -184,7 +186,12 @@ public class Hadoop23Shims extends Hadoo
private final MiniMRCluster mr;
private final Configuration conf;
- public MiniMrShim(Configuration conf, int numberOfTaskTrackers,
+ public MiniMrShim() {
+ mr = null;
+ conf = null;
+ }
+
+ public MiniMrShim(Configuration conf, int numberOfTaskTrackers,
String nameNode, int numDir) throws IOException {
this.conf = conf;
@@ -221,6 +228,73 @@ public class Hadoop23Shims extends Hadoo
}
}
+ /**
+ * Returns a shim to wrap MiniMrTez
+ */
+ public MiniMrShim getMiniTezCluster(Configuration conf, int numberOfTaskTrackers,
+ String nameNode, int numDir) throws IOException {
+ return new MiniTezShim(conf, numberOfTaskTrackers, nameNode, numDir);
+ }
+
+ /**
+ * Shim for MiniTezCluster
+ */
+ public class MiniTezShim extends Hadoop23Shims.MiniMrShim {
+
+ private final MiniTezCluster mr;
+ private final Configuration conf;
+
+ public MiniTezShim(Configuration conf, int numberOfTaskTrackers,
+ String nameNode, int numDir) throws IOException {
+
+ mr = new MiniTezCluster("hive", numberOfTaskTrackers);
+ conf.set("fs.defaultFS", nameNode);
+ conf.set(MRJobConfig.MR_AM_STAGING_DIR, "/apps_staging_dir");
+ mr.init(conf);
+ mr.start();
+ this.conf = mr.getConfig();
+ }
+
+ @Override
+ public int getJobTrackerPort() throws UnsupportedOperationException {
+ String address = conf.get("yarn.resourcemanager.address");
+ address = StringUtils.substringAfterLast(address, ":");
+
+ if (StringUtils.isBlank(address)) {
+ throw new IllegalArgumentException("Invalid YARN resource manager port.");
+ }
+
+ return Integer.parseInt(address);
+ }
+
+ @Override
+ public void shutdown() throws IOException {
+ mr.stop();
+ }
+
+ @Override
+ public void setupConfiguration(Configuration conf) {
+ Configuration config = mr.getConfig();
+ for (Map.Entry<String, String> pair: config) {
+ conf.set(pair.getKey(), pair.getValue());
+ }
+
+ Path jarPath = new Path("hdfs:///user/hive");
+ Path hdfsPath = new Path("hdfs:///user/");
+ try {
+ FileSystem fs = cluster.getFileSystem();
+ jarPath = fs.makeQualified(jarPath);
+ conf.set("hive.jar.directory", jarPath.toString());
+ fs.mkdirs(jarPath);
+ hdfsPath = fs.makeQualified(hdfsPath);
+ conf.set("hive.user.install.directory", hdfsPath.toString());
+ fs.mkdirs(hdfsPath);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ }
+
// Don't move this code to the parent class. There's a binary
// incompatibility between hadoop 1 and 2 wrt MiniDFSCluster and we
// need to have two different shim classes even though they are
@@ -229,7 +303,8 @@ public class Hadoop23Shims extends Hadoo
int numDataNodes,
boolean format,
String[] racks) throws IOException {
- return new MiniDFSShim(new MiniDFSCluster(conf, numDataNodes, format, racks));
+ cluster = new MiniDFSShim(new MiniDFSCluster(conf, numDataNodes, format, racks));
+ return cluster;
}
/**
Modified: hive/branches/tez/testutils/ptest2/src/main/java/org/apache/hive/ptest/api/client/PTestClient.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/testutils/ptest2/src/main/java/org/apache/hive/ptest/api/client/PTestClient.java?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/testutils/ptest2/src/main/java/org/apache/hive/ptest/api/client/PTestClient.java (original)
+++ hive/branches/tez/testutils/ptest2/src/main/java/org/apache/hive/ptest/api/client/PTestClient.java Tue Nov 5 07:01:32 2013
@@ -20,6 +20,7 @@ package org.apache.hive.ptest.api.client
import java.io.File;
import java.io.FileOutputStream;
+import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.concurrent.TimeUnit;
@@ -45,10 +46,12 @@ import org.apache.http.HttpResponse;
import org.apache.http.StatusLine;
import org.apache.http.auth.AuthScope;
import org.apache.http.auth.UsernamePasswordCredentials;
+import org.apache.http.client.HttpRequestRetryHandler;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.entity.StringEntity;
import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.protocol.HttpContext;
import org.apache.http.util.EntityUtils;
import org.codehaus.jackson.map.ObjectMapper;
@@ -81,6 +84,7 @@ public class PTestClient {
private static final String OUTPUT_DIR = "outputDir";
private static final String TEST_HANDLE = "testHandle";
private static final String CLEAR_LIBRARY_CACHE = "clearLibraryCache";
+ private static final int MAX_RETRIES = 10;
private final String mApiEndPoint;
private final String mLogsEndpoint;
private final ObjectMapper mMapper;
@@ -113,7 +117,7 @@ public class PTestClient {
}
}
TestStartRequest startRequest = new TestStartRequest(profile, testHandle, jira, patch, clearLibraryCache);
- post(startRequest);
+ post(startRequest, false);
boolean result = false;
try {
result = testTailLog(testHandle);
@@ -128,7 +132,7 @@ public class PTestClient {
public boolean testList()
throws Exception {
TestListRequest testListRequest = new TestListRequest();
- TestListResponse testListResponse = post(testListRequest);
+ TestListResponse testListResponse = post(testListRequest, true);
for(TestStatus testStatus : testListResponse.getEntries()) {
System.out.println(testStatus);
}
@@ -144,7 +148,7 @@ public class PTestClient {
TestStatusResponse statusResponse;
do {
TimeUnit.SECONDS.sleep(5);
- statusResponse = post(statusRequest);
+ statusResponse = post(statusRequest, true);
} while(Status.isPending(statusResponse.getTestStatus().getStatus()));
long offset = 0;
do {
@@ -154,7 +158,7 @@ public class PTestClient {
} else {
TimeUnit.SECONDS.sleep(5);
}
- statusResponse = post(statusRequest);
+ statusResponse = post(statusRequest, true);
} while(Status.isInProgress(statusResponse.getTestStatus().getStatus()));
while(offset < statusResponse.getTestStatus().getLogFileLength()) {
offset = printLogs(testHandle, offset);
@@ -185,11 +189,11 @@ public class PTestClient {
private long printLogs(String testHandle, long offset)
throws Exception {
TestLogRequest logsRequest = new TestLogRequest(testHandle, offset, 64 * 1024);
- TestLogResponse logsResponse = post(logsRequest);
+ TestLogResponse logsResponse = post(logsRequest, true);
System.out.print(logsResponse.getBody());
return logsResponse.getOffset();
}
- private <S extends GenericResponse> S post(Object payload)
+ private <S extends GenericResponse> S post(Object payload, boolean agressiveRetry)
throws Exception {
EndPointResponsePair endPointResponse = Preconditions.
checkNotNull(REQUEST_TO_ENDPOINT.get(payload.getClass()), payload.getClass().getName());
@@ -199,10 +203,13 @@ public class PTestClient {
StringEntity params = new StringEntity(payloadString);
request.addHeader("content-type", "application/json");
request.setEntity(params);
+ if(agressiveRetry) {
+ mHttpClient.setHttpRequestRetryHandler(new PTestHttpRequestRetryHandler());
+ }
HttpResponse httpResponse = mHttpClient.execute(request);
StatusLine statusLine = httpResponse.getStatusLine();
if(statusLine.getStatusCode() != 200) {
- throw new RuntimeException(statusLine.getStatusCode() + " " + statusLine.getReasonPhrase());
+ throw new IllegalStateException(statusLine.getStatusCode() + " " + statusLine.getReasonPhrase());
}
String response = EntityUtils.toString(httpResponse.getEntity(), "UTF-8");
@SuppressWarnings("unchecked")
@@ -223,6 +230,24 @@ public class PTestClient {
request.abort();
}
}
+ private static class PTestHttpRequestRetryHandler implements HttpRequestRetryHandler {
+ @Override
+ public boolean retryRequest(IOException exception, int executionCount,
+ HttpContext context) {
+ System.err.println("LOCAL ERROR: " + exception.getMessage());
+ exception.printStackTrace();
+ if(executionCount > MAX_RETRIES) {
+ return false;
+ }
+ try {
+ Thread.sleep(30L * 1000L);
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
+ }
+ return true;
+ }
+
+ }
private static class EndPointResponsePair {
final String endpoint;
final Class<? extends GenericResponse> responseClass;
Modified: hive/branches/tez/testutils/ptest2/src/main/java/org/apache/hive/ptest/api/server/ExecutionController.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/testutils/ptest2/src/main/java/org/apache/hive/ptest/api/server/ExecutionController.java?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/testutils/ptest2/src/main/java/org/apache/hive/ptest/api/server/ExecutionController.java (original)
+++ hive/branches/tez/testutils/ptest2/src/main/java/org/apache/hive/ptest/api/server/ExecutionController.java Tue Nov 5 07:01:32 2013
@@ -150,7 +150,7 @@ public class ExecutionController {
String testHandle = stopRequest.getTestHandle();
Test test = mTests.get(testHandle);
if(result.hasErrors() ||
- Strings.emptyToNull(stopRequest.getTestHandle()).trim().isEmpty() ||
+ Strings.nullToEmpty(stopRequest.getTestHandle()).trim().isEmpty() ||
test == null) {
return new TestStopResponse(Status.illegalArgument());
}
@@ -164,7 +164,7 @@ public class ExecutionController {
String testHandle = stopRequest.getTestHandle();
Test test = mTests.get(testHandle);
if(result.hasErrors() ||
- Strings.emptyToNull(stopRequest.getTestHandle()).trim().isEmpty() ||
+ Strings.nullToEmpty(stopRequest.getTestHandle()).trim().isEmpty() ||
test == null) {
return new TestStatusResponse(Status.illegalArgument());
}
@@ -177,7 +177,7 @@ public class ExecutionController {
String testHandle = logsRequest.getTestHandle();
Test testExecution = mTests.get(testHandle);
if(result.hasErrors() ||
- Strings.emptyToNull(logsRequest.getTestHandle()).trim().isEmpty() ||
+ Strings.nullToEmpty(logsRequest.getTestHandle()).trim().isEmpty() ||
testExecution == null ||
logsRequest.getLength() > MAX_READ_SIZE) {
return new TestLogResponse(Status.illegalArgument());
Modified: hive/branches/tez/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/HostExecutor.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/HostExecutor.java?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/HostExecutor.java (original)
+++ hive/branches/tez/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/HostExecutor.java Tue Nov 5 07:01:32 2013
@@ -66,7 +66,8 @@ class HostExecutor {
private final File mSuccessfulTestLogDir;
private final File mFailedTestLogDir;
private final long mNumPollSeconds;
-
+ private volatile boolean mShutdown;
+
HostExecutor(Host host, String privateKey, ListeningExecutorService executor,
SSHCommandExecutor sshCommandExecutor,
RSyncCommandExecutor rsyncCommandExecutor,
@@ -79,6 +80,7 @@ class HostExecutor {
drones.add(new Drone(privateKey, host.getUser(), host.getName(),
index, localDirs[index % localDirs.length]));
}
+ mShutdown = false;
mHost = host;
mDrones = new CopyOnWriteArrayList<Drone>(drones);
mExecutor = executor;
@@ -116,6 +118,12 @@ class HostExecutor {
Host getHost() {
return mHost;
}
+ void shutdownNow() {
+ this.mShutdown = true;
+ }
+ boolean isShutdown() {
+ return mShutdown;
+ }
/**
* Executes parallel test until the parallel work queue is empty. Then
* executes the isolated tests on the host. During each phase if a
@@ -126,6 +134,10 @@ class HostExecutor {
private void executeTests(final BlockingQueue<TestBatch> parallelWorkQueue,
final BlockingQueue<TestBatch> isolatedWorkQueue, final Set<TestBatch> failedTestResults)
throws Exception {
+ if(mShutdown) {
+ mLogger.warn("Shutting down host " + mHost.getName());
+ return;
+ }
mLogger.info("Starting parallel execution on " + mHost.getName());
List<ListenableFuture<Void>> droneResults = Lists.newArrayList();
for(final Drone drone : ImmutableList.copyOf(mDrones)) {
@@ -136,12 +148,16 @@ class HostExecutor {
try {
do {
batch = parallelWorkQueue.poll(mNumPollSeconds, TimeUnit.SECONDS);
+ if(mShutdown) {
+ mLogger.warn("Shutting down host " + mHost.getName());
+ return null;
+ }
if(batch != null) {
if(!executeTestBatch(drone, batch, failedTestResults)) {
failedTestResults.add(batch);
}
}
- } while(!parallelWorkQueue.isEmpty());
+ } while(!mShutdown && !parallelWorkQueue.isEmpty());
} catch(AbortDroneException ex) {
mDrones.remove(drone); // return value not checked due to concurrent access
mLogger.error("Aborting drone during parallel execution", ex);
@@ -154,6 +170,10 @@ class HostExecutor {
}
}));
}
+ if(mShutdown) {
+ mLogger.warn("Shutting down host " + mHost.getName());
+ return;
+ }
Futures.allAsList(droneResults).get();
mLogger.info("Starting isolated execution on " + mHost.getName());
for(Drone drone : ImmutableList.copyOf(mDrones)) {
@@ -166,7 +186,7 @@ class HostExecutor {
failedTestResults.add(batch);
}
}
- } while(!isolatedWorkQueue.isEmpty());
+ } while(!mShutdown && !isolatedWorkQueue.isEmpty());
} catch(AbortDroneException ex) {
mDrones.remove(drone); // return value not checked due to concurrent access
mLogger.error("Aborting drone during isolated execution", ex);
@@ -208,6 +228,10 @@ class HostExecutor {
throw new AbortDroneException("Drone " + drone.toString() + " exited with " +
Constants.EXIT_CODE_UNKNOWN + ": " + sshResult);
}
+ if(mShutdown) {
+ mLogger.warn("Shutting down host " + mHost.getName());
+ return false;
+ }
boolean result;
if(sshResult.getExitCode() != 0 || sshResult.getException() != null) {
result = false;
Modified: hive/branches/tez/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/JIRAService.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/JIRAService.java?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/JIRAService.java (original)
+++ hive/branches/tez/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/JIRAService.java Tue Nov 5 07:01:32 2013
@@ -25,6 +25,7 @@ import java.util.List;
import java.util.Map;
import java.util.SortedSet;
+import org.apache.commons.io.FilenameUtils;
import org.apache.hive.ptest.api.server.TestLogger;
import org.apache.hive.ptest.execution.conf.Context;
import org.apache.hive.ptest.execution.conf.TestConfiguration;
@@ -58,6 +59,8 @@ import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
class JIRAService {
+ static final int MAX_MESSAGES = 200;
+ static final String TRIMMED_MESSAGE = "**** This message was trimmed, see log for full details ****";
private final Logger mLogger;
private final String mName;
private final String mBuildTag;
@@ -78,7 +81,7 @@ class JIRAService {
mJenkinsURL = configuration.getJenkinsURL();
}
- void postComment(boolean error, int numExecutesTests, SortedSet<String> failedTests,
+ void postComment(boolean error, int numTestsExecuted, SortedSet<String> failedTests,
List<String> messages) {
DefaultHttpClient httpClient = new DefaultHttpClient();
try {
@@ -88,7 +91,7 @@ class JIRAService {
comments.add("");
if(!failedTests.isEmpty()) {
comments.add("{color:red}Overall{color}: -1 at least one tests failed");
- } else if(numExecutesTests == 0) {
+ } else if(numTestsExecuted == 0) {
comments.add("{color:red}Overall{color}: -1 no tests executed");
} else if (error) {
comments.add("{color:red}Overall{color}: -1 build exited with an error");
@@ -101,12 +104,12 @@ class JIRAService {
comments.add(mPatch);
}
comments.add("");
- if(numExecutesTests > 0) {
+ if(numTestsExecuted > 0) {
if (failedTests.isEmpty()) {
- comments.add(formatSuccess("+1 "+ numExecutesTests + " tests passed"));
+ comments.add(formatSuccess("+1 "+ numTestsExecuted + " tests passed"));
} else {
comments.add(formatError("-1 due to " + failedTests.size()
- + " failed/errored test(s), " + numExecutesTests + " tests executed"));
+ + " failed/errored test(s), " + numTestsExecuted + " tests executed"));
comments.add("*Failed tests:*");
comments.add("{noformat}");
comments.addAll(failedTests);
@@ -120,11 +123,16 @@ class JIRAService {
if(!messages.isEmpty()) {
comments.add("Messages:");
comments.add("{noformat}");
- comments.addAll(messages);
+ comments.addAll(trimMessages(messages));
comments.add("{noformat}");
comments.add("");
}
comments.add("This message is automatically generated.");
+ String attachmentId = parseAttachementId(mPatch);
+ if(!attachmentId.isEmpty()) {
+ comments.add("");
+ comments.add("ATTACHMENT ID: " + attachmentId);
+ }
mLogger.info("Comment: " + Joiner.on("\n").join(comments));
String body = Joiner.on("\n").join(comments);
String url = String.format("%s/rest/api/2/issue/%s/comment", mUrl, mName);
@@ -156,7 +164,14 @@ class JIRAService {
httpClient.getConnectionManager().shutdown();
}
}
-
+ static List<String> trimMessages(List<String> messages) {
+ int size = messages.size();
+ if(size > MAX_MESSAGES) {
+ messages = messages.subList(size - MAX_MESSAGES, size);
+ messages.add(0, TRIMMED_MESSAGE);
+ }
+ return messages;
+ }
@SuppressWarnings("unused")
private static class Body {
private String body;
@@ -216,7 +231,20 @@ class JIRAService {
}
}
}
-
+ private static String parseAttachementId(String patch) {
+ if(patch == null) {
+ return "";
+ }
+ String result = FilenameUtils.getPathNoEndSeparator(patch.trim());
+ if(result == null) {
+ return "";
+ }
+ result = FilenameUtils.getName(result.trim());
+ if(result == null) {
+ return "";
+ }
+ return result.trim();
+ }
public static void main(String[] args) throws Exception {
TestLogger logger = new TestLogger(System.err, TestLogger.LEVEL.TRACE);
Map<String, String> context = Maps.newHashMap();
Modified: hive/branches/tez/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/LocalCommand.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/LocalCommand.java?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/LocalCommand.java (original)
+++ hive/branches/tez/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/LocalCommand.java Tue Nov 5 07:01:32 2013
@@ -48,6 +48,12 @@ public class LocalCommand {
return exitCode;
}
}
+
+ public void kill() {
+ synchronized (process) {
+ process.destroy();
+ }
+ }
public static interface OutputPolicy {
public void handleOutput(String line);
Modified: hive/branches/tez/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/LocalCommandFactory.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/LocalCommandFactory.java?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/LocalCommandFactory.java (original)
+++ hive/branches/tez/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/LocalCommandFactory.java Tue Nov 5 07:01:32 2013
@@ -24,7 +24,6 @@ import org.slf4j.Logger;
public class LocalCommandFactory {
-
private final Logger mLogger;
public LocalCommandFactory(Logger logger) {