You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ha...@apache.org on 2015/03/11 22:50:24 UTC
svn commit: r1666021 [7/7] - in /hive/branches/cbo: ./
common/src/java/org/apache/hadoop/hive/conf/
contrib/src/test/queries/clientnegative/
contrib/src/test/queries/clientpositive/
contrib/src/test/results/clientnegative/ contrib/src/test/results/clie...
Modified: hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_18.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_18.q.out?rev=1666021&r1=1666020&r2=1666021&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_18.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_18.q.out Wed Mar 11 21:50:22 2015
@@ -30,11 +30,11 @@ create table inputTbl1(key string, ds st
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@inputTbl1
-PREHOOK: query: create table outputTbl1(key string, values bigint) partitioned by (ds string) stored as textfile
+PREHOOK: query: create table outputTbl1(key string, `values` bigint) partitioned by (ds string) stored as textfile
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@outputTbl1
-POSTHOOK: query: create table outputTbl1(key string, values bigint) partitioned by (ds string) stored as textfile
+POSTHOOK: query: create table outputTbl1(key string, `values` bigint) partitioned by (ds string) stored as textfile
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@outputTbl1
@@ -50,18 +50,18 @@ PREHOOK: query: explain
insert overwrite table outputTbl1 partition (ds)
SELECT *
FROM (
- SELECT key, count(1) as values, ds from inputTbl1 group by key, ds
+ SELECT key, count(1) as `values`, ds from inputTbl1 group by key, ds
UNION ALL
- SELECT key, count(1) as values, ds from inputTbl1 group by key, ds
+ SELECT key, count(1) as `values`, ds from inputTbl1 group by key, ds
) a
PREHOOK: type: QUERY
POSTHOOK: query: explain
insert overwrite table outputTbl1 partition (ds)
SELECT *
FROM (
- SELECT key, count(1) as values, ds from inputTbl1 group by key, ds
+ SELECT key, count(1) as `values`, ds from inputTbl1 group by key, ds
UNION ALL
- SELECT key, count(1) as values, ds from inputTbl1 group by key, ds
+ SELECT key, count(1) as `values`, ds from inputTbl1 group by key, ds
) a
POSTHOOK: type: QUERY
STAGE DEPENDENCIES:
@@ -169,9 +169,9 @@ STAGE PLANS:
PREHOOK: query: insert overwrite table outputTbl1 partition (ds)
SELECT *
FROM (
- SELECT key, count(1) as values, ds from inputTbl1 group by key, ds
+ SELECT key, count(1) as `values`, ds from inputTbl1 group by key, ds
UNION ALL
- SELECT key, count(1) as values, ds from inputTbl1 group by key, ds
+ SELECT key, count(1) as `values`, ds from inputTbl1 group by key, ds
) a
PREHOOK: type: QUERY
PREHOOK: Input: default@inputtbl1
@@ -179,9 +179,9 @@ PREHOOK: Output: default@outputtbl1
POSTHOOK: query: insert overwrite table outputTbl1 partition (ds)
SELECT *
FROM (
- SELECT key, count(1) as values, ds from inputTbl1 group by key, ds
+ SELECT key, count(1) as `values`, ds from inputTbl1 group by key, ds
UNION ALL
- SELECT key, count(1) as values, ds from inputTbl1 group by key, ds
+ SELECT key, count(1) as `values`, ds from inputTbl1 group by key, ds
) a
POSTHOOK: type: QUERY
POSTHOOK: Input: default@inputtbl1
@@ -251,31 +251,31 @@ ds=13
ds=17
ds=18
ds=28
-PREHOOK: query: select * from outputTbl1 where ds = '11' order by key, values
+PREHOOK: query: select * from outputTbl1 where ds = '11' order by key, `values`
PREHOOK: type: QUERY
PREHOOK: Input: default@outputtbl1
PREHOOK: Input: default@outputtbl1@ds=11
#### A masked pattern was here ####
-POSTHOOK: query: select * from outputTbl1 where ds = '11' order by key, values
+POSTHOOK: query: select * from outputTbl1 where ds = '11' order by key, `values`
POSTHOOK: type: QUERY
POSTHOOK: Input: default@outputtbl1
POSTHOOK: Input: default@outputtbl1@ds=11
#### A masked pattern was here ####
1 1 11
1 1 11
-PREHOOK: query: select * from outputTbl1 where ds = '18' order by key, values
+PREHOOK: query: select * from outputTbl1 where ds = '18' order by key, `values`
PREHOOK: type: QUERY
PREHOOK: Input: default@outputtbl1
PREHOOK: Input: default@outputtbl1@ds=18
#### A masked pattern was here ####
-POSTHOOK: query: select * from outputTbl1 where ds = '18' order by key, values
+POSTHOOK: query: select * from outputTbl1 where ds = '18' order by key, `values`
POSTHOOK: type: QUERY
POSTHOOK: Input: default@outputtbl1
POSTHOOK: Input: default@outputtbl1@ds=18
#### A masked pattern was here ####
8 1 18
8 1 18
-PREHOOK: query: select * from outputTbl1 where ds is not null order by key, values, ds
+PREHOOK: query: select * from outputTbl1 where ds is not null order by key, `values`, ds
PREHOOK: type: QUERY
PREHOOK: Input: default@outputtbl1
PREHOOK: Input: default@outputtbl1@ds=11
@@ -285,7 +285,7 @@ PREHOOK: Input: default@outputtbl1@ds=17
PREHOOK: Input: default@outputtbl1@ds=18
PREHOOK: Input: default@outputtbl1@ds=28
#### A masked pattern was here ####
-POSTHOOK: query: select * from outputTbl1 where ds is not null order by key, values, ds
+POSTHOOK: query: select * from outputTbl1 where ds is not null order by key, `values`, ds
POSTHOOK: type: QUERY
POSTHOOK: Input: default@outputtbl1
POSTHOOK: Input: default@outputtbl1@ds=11
Modified: hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_19.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_19.q.out?rev=1666021&r1=1666020&r2=1666021&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_19.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_19.q.out Wed Mar 11 21:50:22 2015
@@ -30,11 +30,11 @@ create table inputTbl1(key string, val s
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@inputTbl1
-PREHOOK: query: create table outputTbl1(key string, values bigint) stored as textfile
+PREHOOK: query: create table outputTbl1(key string, `values` bigint) stored as textfile
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@outputTbl1
-POSTHOOK: query: create table outputTbl1(key string, values bigint) stored as textfile
+POSTHOOK: query: create table outputTbl1(key string, `values` bigint) stored as textfile
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@outputTbl1
@@ -48,20 +48,20 @@ POSTHOOK: type: LOAD
POSTHOOK: Output: default@inputtbl1
PREHOOK: query: explain
insert overwrite table outputTbl1
-SELECT a.key, a.values
+SELECT a.key, a.`values`
FROM (
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
UNION ALL
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
) a
PREHOOK: type: QUERY
POSTHOOK: query: explain
insert overwrite table outputTbl1
-SELECT a.key, a.values
+SELECT a.key, a.`values`
FROM (
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
UNION ALL
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
) a
POSTHOOK: type: QUERY
STAGE DEPENDENCIES:
@@ -157,21 +157,21 @@ STAGE PLANS:
name: default.outputtbl1
PREHOOK: query: insert overwrite table outputTbl1
-SELECT a.key, a.values
+SELECT a.key, a.`values`
FROM (
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
UNION ALL
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
) a
PREHOOK: type: QUERY
PREHOOK: Input: default@inputtbl1
PREHOOK: Output: default@outputtbl1
POSTHOOK: query: insert overwrite table outputTbl1
-SELECT a.key, a.values
+SELECT a.key, a.`values`
FROM (
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
UNION ALL
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
) a
POSTHOOK: type: QUERY
POSTHOOK: Input: default@inputtbl1
@@ -235,21 +235,21 @@ POSTHOOK: Input: default@outputtbl1
PREHOOK: query: -- filter should be fine
explain
insert overwrite table outputTbl1
-SELECT a.key, a.values
+SELECT a.key, a.`values`
FROM (
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
UNION ALL
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
) a where a.key = 7
PREHOOK: type: QUERY
POSTHOOK: query: -- filter should be fine
explain
insert overwrite table outputTbl1
-SELECT a.key, a.values
+SELECT a.key, a.`values`
FROM (
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
UNION ALL
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
) a where a.key = 7
POSTHOOK: type: QUERY
STAGE DEPENDENCIES:
@@ -351,21 +351,21 @@ STAGE PLANS:
name: default.outputtbl1
PREHOOK: query: insert overwrite table outputTbl1
-SELECT a.key, a.values
+SELECT a.key, a.`values`
FROM (
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
UNION ALL
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
) a where a.key = 7
PREHOOK: type: QUERY
PREHOOK: Input: default@inputtbl1
PREHOOK: Output: default@outputtbl1
POSTHOOK: query: insert overwrite table outputTbl1
-SELECT a.key, a.values
+SELECT a.key, a.`values`
FROM (
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
UNION ALL
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
) a where a.key = 7
POSTHOOK: type: QUERY
POSTHOOK: Input: default@inputtbl1
@@ -385,26 +385,26 @@ POSTHOOK: Input: default@outputtbl1
PREHOOK: query: -- filters and sub-queries should be fine
explain
insert overwrite table outputTbl1
-select key, values from
+select key, `values` from
(
-SELECT a.key + a.key as key, a.values
+SELECT a.key + a.key as key, a.`values`
FROM (
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
UNION ALL
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
) a
) b where b.key >= 7
PREHOOK: type: QUERY
POSTHOOK: query: -- filters and sub-queries should be fine
explain
insert overwrite table outputTbl1
-select key, values from
+select key, `values` from
(
-SELECT a.key + a.key as key, a.values
+SELECT a.key + a.key as key, a.`values`
FROM (
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
UNION ALL
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
) a
) b where b.key >= 7
POSTHOOK: type: QUERY
@@ -515,26 +515,26 @@ STAGE PLANS:
name: default.outputtbl1
PREHOOK: query: insert overwrite table outputTbl1
-select key, values from
+select key, `values` from
(
-SELECT a.key + a.key as key, a.values
+SELECT a.key + a.key as key, a.`values`
FROM (
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
UNION ALL
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
) a
) b where b.key >= 7
PREHOOK: type: QUERY
PREHOOK: Input: default@inputtbl1
PREHOOK: Output: default@outputtbl1
POSTHOOK: query: insert overwrite table outputTbl1
-select key, values from
+select key, `values` from
(
-SELECT a.key + a.key as key, a.values
+SELECT a.key + a.key as key, a.`values`
FROM (
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
UNION ALL
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
) a
) b where b.key >= 7
POSTHOOK: type: QUERY
@@ -542,11 +542,11 @@ POSTHOOK: Input: default@inputtbl1
POSTHOOK: Output: default@outputtbl1
POSTHOOK: Lineage: outputtbl1.key EXPRESSION [(inputtbl1)inputtbl1.FieldSchema(name:key, type:string, comment:null), (inputtbl1)inputtbl1.FieldSchema(name:key, type:string, comment:null), ]
POSTHOOK: Lineage: outputtbl1.values EXPRESSION [(inputtbl1)inputtbl1.null, (inputtbl1)inputtbl1.null, ]
-PREHOOK: query: select * from outputTbl1 order by key, values
+PREHOOK: query: select * from outputTbl1 order by key, `values`
PREHOOK: type: QUERY
PREHOOK: Input: default@outputtbl1
#### A masked pattern was here ####
-POSTHOOK: query: select * from outputTbl1 order by key, values
+POSTHOOK: query: select * from outputTbl1 order by key, `values`
POSTHOOK: type: QUERY
POSTHOOK: Input: default@outputtbl1
#### A masked pattern was here ####
Modified: hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_2.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_2.q.out?rev=1666021&r1=1666020&r2=1666021&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_2.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_2.q.out Wed Mar 11 21:50:22 2015
@@ -28,11 +28,11 @@ create table inputTbl1(key string, val s
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@inputTbl1
-PREHOOK: query: create table outputTbl1(key string, values bigint) stored as textfile
+PREHOOK: query: create table outputTbl1(key string, `values` bigint) stored as textfile
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@outputTbl1
-POSTHOOK: query: create table outputTbl1(key string, values bigint) stored as textfile
+POSTHOOK: query: create table outputTbl1(key string, `values` bigint) stored as textfile
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@outputTbl1
@@ -48,22 +48,22 @@ PREHOOK: query: explain
insert overwrite table outputTbl1
SELECT *
FROM (
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
UNION ALL
- SELECT key, 1 as values from inputTbl1
+ SELECT key, 1 as `values` from inputTbl1
UNION ALL
- SELECT key, 2 as values from inputTbl1
+ SELECT key, 2 as `values` from inputTbl1
) a
PREHOOK: type: QUERY
POSTHOOK: query: explain
insert overwrite table outputTbl1
SELECT *
FROM (
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
UNION ALL
- SELECT key, 1 as values from inputTbl1
+ SELECT key, 1 as `values` from inputTbl1
UNION ALL
- SELECT key, 2 as values from inputTbl1
+ SELECT key, 2 as `values` from inputTbl1
) a
POSTHOOK: type: QUERY
STAGE DEPENDENCIES:
@@ -162,11 +162,11 @@ STAGE PLANS:
PREHOOK: query: insert overwrite table outputTbl1
SELECT *
FROM (
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
UNION ALL
- SELECT key, 1 as values from inputTbl1
+ SELECT key, 1 as `values` from inputTbl1
UNION ALL
- SELECT key, 2 as values from inputTbl1
+ SELECT key, 2 as `values` from inputTbl1
) a
PREHOOK: type: QUERY
PREHOOK: Input: default@inputtbl1
@@ -174,11 +174,11 @@ PREHOOK: Output: default@outputtbl1
POSTHOOK: query: insert overwrite table outputTbl1
SELECT *
FROM (
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
UNION ALL
- SELECT key, 1 as values from inputTbl1
+ SELECT key, 1 as `values` from inputTbl1
UNION ALL
- SELECT key, 2 as values from inputTbl1
+ SELECT key, 2 as `values` from inputTbl1
) a
POSTHOOK: type: QUERY
POSTHOOK: Input: default@inputtbl1
@@ -221,11 +221,11 @@ Bucket Columns: []
Sort Columns: []
Storage Desc Params:
serialization.format 1
-PREHOOK: query: select * from outputTbl1 order by key, values
+PREHOOK: query: select * from outputTbl1 order by key, `values`
PREHOOK: type: QUERY
PREHOOK: Input: default@outputtbl1
#### A masked pattern was here ####
-POSTHOOK: query: select * from outputTbl1 order by key, values
+POSTHOOK: query: select * from outputTbl1 order by key, `values`
POSTHOOK: type: QUERY
POSTHOOK: Input: default@outputtbl1
#### A masked pattern was here ####
Modified: hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_20.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_20.q.out?rev=1666021&r1=1666020&r2=1666021&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_20.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_20.q.out Wed Mar 11 21:50:22 2015
@@ -28,11 +28,11 @@ create table inputTbl1(key string, val s
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@inputTbl1
-PREHOOK: query: create table outputTbl1(values bigint, key string) stored as textfile
+PREHOOK: query: create table outputTbl1(`values` bigint, key string) stored as textfile
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@outputTbl1
-POSTHOOK: query: create table outputTbl1(values bigint, key string) stored as textfile
+POSTHOOK: query: create table outputTbl1(`values` bigint, key string) stored as textfile
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@outputTbl1
@@ -46,20 +46,20 @@ POSTHOOK: type: LOAD
POSTHOOK: Output: default@inputtbl1
PREHOOK: query: explain
insert overwrite table outputTbl1
-SELECT a.values, a.key
+SELECT a.`values`, a.key
FROM (
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
UNION ALL
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
) a
PREHOOK: type: QUERY
POSTHOOK: query: explain
insert overwrite table outputTbl1
-SELECT a.values, a.key
+SELECT a.`values`, a.key
FROM (
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
UNION ALL
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
) a
POSTHOOK: type: QUERY
STAGE DEPENDENCIES:
@@ -163,21 +163,21 @@ STAGE PLANS:
name: default.outputtbl1
PREHOOK: query: insert overwrite table outputTbl1
-SELECT a.values, a.key
+SELECT a.`values`, a.key
FROM (
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
UNION ALL
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
) a
PREHOOK: type: QUERY
PREHOOK: Input: default@inputtbl1
PREHOOK: Output: default@outputtbl1
POSTHOOK: query: insert overwrite table outputTbl1
-SELECT a.values, a.key
+SELECT a.`values`, a.key
FROM (
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
UNION ALL
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
) a
POSTHOOK: type: QUERY
POSTHOOK: Input: default@inputtbl1
@@ -220,11 +220,11 @@ Bucket Columns: []
Sort Columns: []
Storage Desc Params:
serialization.format 1
-PREHOOK: query: select * from outputTbl1 order by key, values
+PREHOOK: query: select * from outputTbl1 order by key, `values`
PREHOOK: type: QUERY
PREHOOK: Input: default@outputtbl1
#### A masked pattern was here ####
-POSTHOOK: query: select * from outputTbl1 order by key, values
+POSTHOOK: query: select * from outputTbl1 order by key, `values`
POSTHOOK: type: QUERY
POSTHOOK: Input: default@outputtbl1
#### A masked pattern was here ####
Modified: hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_21.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_21.q.out?rev=1666021&r1=1666020&r2=1666021&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_21.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_21.q.out Wed Mar 11 21:50:22 2015
@@ -48,18 +48,18 @@ PREHOOK: query: explain
insert overwrite table outputTbl1
SELECT a.key
FROM (
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
UNION ALL
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
) a
PREHOOK: type: QUERY
POSTHOOK: query: explain
insert overwrite table outputTbl1
SELECT a.key
FROM (
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
UNION ALL
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
) a
POSTHOOK: type: QUERY
STAGE DEPENDENCIES:
@@ -151,9 +151,9 @@ STAGE PLANS:
PREHOOK: query: insert overwrite table outputTbl1
SELECT a.key
FROM (
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
UNION ALL
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
) a
PREHOOK: type: QUERY
PREHOOK: Input: default@inputtbl1
@@ -161,9 +161,9 @@ PREHOOK: Output: default@outputtbl1
POSTHOOK: query: insert overwrite table outputTbl1
SELECT a.key
FROM (
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
UNION ALL
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
) a
POSTHOOK: type: QUERY
POSTHOOK: Input: default@inputtbl1
Modified: hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_22.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_22.q.out?rev=1666021&r1=1666020&r2=1666021&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_22.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_22.q.out Wed Mar 11 21:50:22 2015
@@ -26,11 +26,11 @@ create table inputTbl1(key string, val s
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@inputTbl1
-PREHOOK: query: create table outputTbl1(key string, values bigint, values2 bigint) stored as textfile
+PREHOOK: query: create table outputTbl1(key string, `values` bigint, values2 bigint) stored as textfile
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@outputTbl1
-POSTHOOK: query: create table outputTbl1(key string, values bigint, values2 bigint) stored as textfile
+POSTHOOK: query: create table outputTbl1(key string, `values` bigint, values2 bigint) stored as textfile
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@outputTbl1
@@ -44,20 +44,20 @@ POSTHOOK: type: LOAD
POSTHOOK: Output: default@inputtbl1
PREHOOK: query: explain
insert overwrite table outputTbl1
-SELECT a.key, a.values, a.values
+SELECT a.key, a.`values`, a.`values`
FROM (
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
UNION ALL
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
) a
PREHOOK: type: QUERY
POSTHOOK: query: explain
insert overwrite table outputTbl1
-SELECT a.key, a.values, a.values
+SELECT a.key, a.`values`, a.`values`
FROM (
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
UNION ALL
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
) a
POSTHOOK: type: QUERY
STAGE DEPENDENCIES:
@@ -161,21 +161,21 @@ STAGE PLANS:
name: default.outputtbl1
PREHOOK: query: insert overwrite table outputTbl1
-SELECT a.key, a.values, a.values
+SELECT a.key, a.`values`, a.`values`
FROM (
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
UNION ALL
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
) a
PREHOOK: type: QUERY
PREHOOK: Input: default@inputtbl1
PREHOOK: Output: default@outputtbl1
POSTHOOK: query: insert overwrite table outputTbl1
-SELECT a.key, a.values, a.values
+SELECT a.key, a.`values`, a.`values`
FROM (
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
UNION ALL
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
) a
POSTHOOK: type: QUERY
POSTHOOK: Input: default@inputtbl1
@@ -240,20 +240,20 @@ POSTHOOK: Input: default@outputtbl1
8 2 2
PREHOOK: query: explain
insert overwrite table outputTbl1
-SELECT a.key, concat(a.values, a.values), concat(a.values, a.values)
+SELECT a.key, concat(a.`values`, a.`values`), concat(a.`values`, a.`values`)
FROM (
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
UNION ALL
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
) a
PREHOOK: type: QUERY
POSTHOOK: query: explain
insert overwrite table outputTbl1
-SELECT a.key, concat(a.values, a.values), concat(a.values, a.values)
+SELECT a.key, concat(a.`values`, a.`values`), concat(a.`values`, a.`values`)
FROM (
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
UNION ALL
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
) a
POSTHOOK: type: QUERY
STAGE DEPENDENCIES:
@@ -357,21 +357,21 @@ STAGE PLANS:
name: default.outputtbl1
PREHOOK: query: insert overwrite table outputTbl1
-SELECT a.key, concat(a.values, a.values), concat(a.values, a.values)
+SELECT a.key, concat(a.`values`, a.`values`), concat(a.`values`, a.`values`)
FROM (
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
UNION ALL
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
) a
PREHOOK: type: QUERY
PREHOOK: Input: default@inputtbl1
PREHOOK: Output: default@outputtbl1
POSTHOOK: query: insert overwrite table outputTbl1
-SELECT a.key, concat(a.values, a.values), concat(a.values, a.values)
+SELECT a.key, concat(a.`values`, a.`values`), concat(a.`values`, a.`values`)
FROM (
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
UNION ALL
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
) a
POSTHOOK: type: QUERY
POSTHOOK: Input: default@inputtbl1
@@ -379,11 +379,11 @@ POSTHOOK: Output: default@outputtbl1
POSTHOOK: Lineage: outputtbl1.key EXPRESSION [(inputtbl1)inputtbl1.FieldSchema(name:key, type:string, comment:null), (inputtbl1)inputtbl1.FieldSchema(name:key, type:string, comment:null), ]
POSTHOOK: Lineage: outputtbl1.values EXPRESSION [(inputtbl1)inputtbl1.null, (inputtbl1)inputtbl1.null, ]
POSTHOOK: Lineage: outputtbl1.values2 EXPRESSION [(inputtbl1)inputtbl1.null, (inputtbl1)inputtbl1.null, ]
-PREHOOK: query: select * from outputTbl1 order by key, values
+PREHOOK: query: select * from outputTbl1 order by key, `values`
PREHOOK: type: QUERY
PREHOOK: Input: default@outputtbl1
#### A masked pattern was here ####
-POSTHOOK: query: select * from outputTbl1 order by key, values
+POSTHOOK: query: select * from outputTbl1 order by key, `values`
POSTHOOK: type: QUERY
POSTHOOK: Input: default@outputtbl1
#### A masked pattern was here ####
Modified: hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_23.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_23.q.out?rev=1666021&r1=1666020&r2=1666021&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_23.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_23.q.out Wed Mar 11 21:50:22 2015
@@ -28,11 +28,11 @@ create table inputTbl1(key string, val s
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@inputTbl1
-PREHOOK: query: create table outputTbl1(key string, values bigint) stored as textfile
+PREHOOK: query: create table outputTbl1(key string, `values` bigint) stored as textfile
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@outputTbl1
-POSTHOOK: query: create table outputTbl1(key string, values bigint) stored as textfile
+POSTHOOK: query: create table outputTbl1(key string, `values` bigint) stored as textfile
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@outputTbl1
@@ -48,20 +48,20 @@ PREHOOK: query: explain
insert overwrite table outputTbl1
SELECT *
FROM (
- SELECT key, count(1) as values from
+ SELECT key, count(1) as `values` from
(SELECT a.key, b.val from inputTbl1 a join inputTbl1 b on a.key=b.key) subq group by key
UNION ALL
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
) subq2
PREHOOK: type: QUERY
POSTHOOK: query: explain
insert overwrite table outputTbl1
SELECT *
FROM (
- SELECT key, count(1) as values from
+ SELECT key, count(1) as `values` from
(SELECT a.key, b.val from inputTbl1 a join inputTbl1 b on a.key=b.key) subq group by key
UNION ALL
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
) subq2
POSTHOOK: type: QUERY
STAGE DEPENDENCIES:
@@ -195,10 +195,10 @@ STAGE PLANS:
PREHOOK: query: insert overwrite table outputTbl1
SELECT *
FROM (
- SELECT key, count(1) as values from
+ SELECT key, count(1) as `values` from
(SELECT a.key, b.val from inputTbl1 a join inputTbl1 b on a.key=b.key) subq group by key
UNION ALL
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
) subq2
PREHOOK: type: QUERY
PREHOOK: Input: default@inputtbl1
@@ -206,10 +206,10 @@ PREHOOK: Output: default@outputtbl1
POSTHOOK: query: insert overwrite table outputTbl1
SELECT *
FROM (
- SELECT key, count(1) as values from
+ SELECT key, count(1) as `values` from
(SELECT a.key, b.val from inputTbl1 a join inputTbl1 b on a.key=b.key) subq group by key
UNION ALL
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
) subq2
POSTHOOK: type: QUERY
POSTHOOK: Input: default@inputtbl1
@@ -252,11 +252,11 @@ Bucket Columns: []
Sort Columns: []
Storage Desc Params:
serialization.format 1
-PREHOOK: query: select * from outputTbl1 order by key, values
+PREHOOK: query: select * from outputTbl1 order by key, `values`
PREHOOK: type: QUERY
PREHOOK: Input: default@outputtbl1
#### A masked pattern was here ####
-POSTHOOK: query: select * from outputTbl1 order by key, values
+POSTHOOK: query: select * from outputTbl1 order by key, `values`
POSTHOOK: type: QUERY
POSTHOOK: Input: default@outputtbl1
#### A masked pattern was here ####
Modified: hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_24.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_24.q.out?rev=1666021&r1=1666020&r2=1666021&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_24.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_24.q.out Wed Mar 11 21:50:22 2015
@@ -24,11 +24,11 @@ create table inputTbl1(key string, val s
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@inputTbl1
-PREHOOK: query: create table outputTbl1(key double, values bigint) stored as textfile
+PREHOOK: query: create table outputTbl1(key double, `values` bigint) stored as textfile
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@outputTbl1
-POSTHOOK: query: create table outputTbl1(key double, values bigint) stored as textfile
+POSTHOOK: query: create table outputTbl1(key double, `values` bigint) stored as textfile
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@outputTbl1
@@ -44,18 +44,18 @@ PREHOOK: query: EXPLAIN
INSERT OVERWRITE TABLE outputTbl1
SELECT * FROM
(
- SELECT CAST(key AS DOUBLE) AS key, count(1) as values FROM inputTbl1 group by key
+ SELECT CAST(key AS DOUBLE) AS key, count(1) as `values` FROM inputTbl1 group by key
UNION ALL
- SELECT CAST(key AS BIGINT) AS key, count(1) as values FROM inputTbl1 group by key
+ SELECT CAST(key AS BIGINT) AS key, count(1) as `values` FROM inputTbl1 group by key
) a
PREHOOK: type: QUERY
POSTHOOK: query: EXPLAIN
INSERT OVERWRITE TABLE outputTbl1
SELECT * FROM
(
- SELECT CAST(key AS DOUBLE) AS key, count(1) as values FROM inputTbl1 group by key
+ SELECT CAST(key AS DOUBLE) AS key, count(1) as `values` FROM inputTbl1 group by key
UNION ALL
- SELECT CAST(key AS BIGINT) AS key, count(1) as values FROM inputTbl1 group by key
+ SELECT CAST(key AS BIGINT) AS key, count(1) as `values` FROM inputTbl1 group by key
) a
POSTHOOK: type: QUERY
STAGE DEPENDENCIES:
@@ -161,9 +161,9 @@ STAGE PLANS:
PREHOOK: query: INSERT OVERWRITE TABLE outputTbl1
SELECT * FROM
(
- SELECT CAST(key AS DOUBLE) AS key, count(1) as values FROM inputTbl1 group by key
+ SELECT CAST(key AS DOUBLE) AS key, count(1) as `values` FROM inputTbl1 group by key
UNION ALL
- SELECT CAST(key AS BIGINT) AS key, count(1) as values FROM inputTbl1 group by key
+ SELECT CAST(key AS BIGINT) AS key, count(1) as `values` FROM inputTbl1 group by key
) a
PREHOOK: type: QUERY
PREHOOK: Input: default@inputtbl1
@@ -171,9 +171,9 @@ PREHOOK: Output: default@outputtbl1
POSTHOOK: query: INSERT OVERWRITE TABLE outputTbl1
SELECT * FROM
(
- SELECT CAST(key AS DOUBLE) AS key, count(1) as values FROM inputTbl1 group by key
+ SELECT CAST(key AS DOUBLE) AS key, count(1) as `values` FROM inputTbl1 group by key
UNION ALL
- SELECT CAST(key AS BIGINT) AS key, count(1) as values FROM inputTbl1 group by key
+ SELECT CAST(key AS BIGINT) AS key, count(1) as `values` FROM inputTbl1 group by key
) a
POSTHOOK: type: QUERY
POSTHOOK: Input: default@inputtbl1
@@ -216,11 +216,11 @@ Bucket Columns: []
Sort Columns: []
Storage Desc Params:
serialization.format 1
-PREHOOK: query: select * from outputTbl1 order by key, values
+PREHOOK: query: select * from outputTbl1 order by key, `values`
PREHOOK: type: QUERY
PREHOOK: Input: default@outputtbl1
#### A masked pattern was here ####
-POSTHOOK: query: select * from outputTbl1 order by key, values
+POSTHOOK: query: select * from outputTbl1 order by key, `values`
POSTHOOK: type: QUERY
POSTHOOK: Input: default@outputtbl1
#### A masked pattern was here ####
Modified: hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_25.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_25.q.out?rev=1666021&r1=1666020&r2=1666021&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_25.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_25.q.out Wed Mar 11 21:50:22 2015
@@ -26,27 +26,27 @@ create table inputTbl1(key string, val s
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@inputTbl1
-PREHOOK: query: create table outputTbl1(key string, values bigint) partitioned by (ds string) stored as textfile
+PREHOOK: query: create table outputTbl1(key string, `values` bigint) partitioned by (ds string) stored as textfile
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@outputTbl1
-POSTHOOK: query: create table outputTbl1(key string, values bigint) partitioned by (ds string) stored as textfile
+POSTHOOK: query: create table outputTbl1(key string, `values` bigint) partitioned by (ds string) stored as textfile
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@outputTbl1
-PREHOOK: query: create table outputTbl2(key string, values bigint) partitioned by (ds string) stored as textfile
+PREHOOK: query: create table outputTbl2(key string, `values` bigint) partitioned by (ds string) stored as textfile
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@outputTbl2
-POSTHOOK: query: create table outputTbl2(key string, values bigint) partitioned by (ds string) stored as textfile
+POSTHOOK: query: create table outputTbl2(key string, `values` bigint) partitioned by (ds string) stored as textfile
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@outputTbl2
-PREHOOK: query: create table outputTbl3(key string, values bigint) partitioned by (ds string,hr string) stored as textfile
+PREHOOK: query: create table outputTbl3(key string, `values` bigint) partitioned by (ds string,hr string) stored as textfile
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@outputTbl3
-POSTHOOK: query: create table outputTbl3(key string, values bigint) partitioned by (ds string,hr string) stored as textfile
+POSTHOOK: query: create table outputTbl3(key string, `values` bigint) partitioned by (ds string,hr string) stored as textfile
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@outputTbl3
@@ -62,18 +62,18 @@ PREHOOK: query: explain
insert overwrite table outputTbl1 partition(ds='2004')
SELECT *
FROM (
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
UNION ALL
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
) a
PREHOOK: type: QUERY
POSTHOOK: query: explain
insert overwrite table outputTbl1 partition(ds='2004')
SELECT *
FROM (
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
UNION ALL
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
) a
POSTHOOK: type: QUERY
STAGE DEPENDENCIES:
@@ -173,9 +173,9 @@ STAGE PLANS:
PREHOOK: query: insert overwrite table outputTbl1 partition(ds='2004')
SELECT *
FROM (
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
UNION ALL
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
) a
PREHOOK: type: QUERY
PREHOOK: Input: default@inputtbl1
@@ -183,9 +183,9 @@ PREHOOK: Output: default@outputtbl1@ds=2
POSTHOOK: query: insert overwrite table outputTbl1 partition(ds='2004')
SELECT *
FROM (
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
UNION ALL
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
) a
POSTHOOK: type: QUERY
POSTHOOK: Input: default@inputtbl1
@@ -233,12 +233,12 @@ Bucket Columns: []
Sort Columns: []
Storage Desc Params:
serialization.format 1
-PREHOOK: query: select * from outputTbl1 order by key, values
+PREHOOK: query: select * from outputTbl1 order by key, `values`
PREHOOK: type: QUERY
PREHOOK: Input: default@outputtbl1
PREHOOK: Input: default@outputtbl1@ds=2004
#### A masked pattern was here ####
-POSTHOOK: query: select * from outputTbl1 order by key, values
+POSTHOOK: query: select * from outputTbl1 order by key, `values`
POSTHOOK: type: QUERY
POSTHOOK: Input: default@outputtbl1
POSTHOOK: Input: default@outputtbl1@ds=2004
Modified: hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_3.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_3.q.out?rev=1666021&r1=1666020&r2=1666021&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_3.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_3.q.out Wed Mar 11 21:50:22 2015
@@ -28,11 +28,11 @@ create table inputTbl1(key string, val s
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@inputTbl1
-PREHOOK: query: create table outputTbl1(key string, values bigint) stored as textfile
+PREHOOK: query: create table outputTbl1(key string, `values` bigint) stored as textfile
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@outputTbl1
-POSTHOOK: query: create table outputTbl1(key string, values bigint) stored as textfile
+POSTHOOK: query: create table outputTbl1(key string, `values` bigint) stored as textfile
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@outputTbl1
@@ -48,22 +48,22 @@ PREHOOK: query: explain
insert overwrite table outputTbl1
SELECT *
FROM (
- SELECT key, 1 as values from inputTbl1
+ SELECT key, 1 as `values` from inputTbl1
UNION ALL
- SELECT key, 2 as values from inputTbl1
+ SELECT key, 2 as `values` from inputTbl1
UNION ALL
- SELECT key, 3 as values from inputTbl1
+ SELECT key, 3 as `values` from inputTbl1
) a
PREHOOK: type: QUERY
POSTHOOK: query: explain
insert overwrite table outputTbl1
SELECT *
FROM (
- SELECT key, 1 as values from inputTbl1
+ SELECT key, 1 as `values` from inputTbl1
UNION ALL
- SELECT key, 2 as values from inputTbl1
+ SELECT key, 2 as `values` from inputTbl1
UNION ALL
- SELECT key, 3 as values from inputTbl1
+ SELECT key, 3 as `values` from inputTbl1
) a
POSTHOOK: type: QUERY
STAGE DEPENDENCIES:
@@ -151,11 +151,11 @@ STAGE PLANS:
PREHOOK: query: insert overwrite table outputTbl1
SELECT *
FROM (
- SELECT key, 1 as values from inputTbl1
+ SELECT key, 1 as `values` from inputTbl1
UNION ALL
- SELECT key, 2 as values from inputTbl1
+ SELECT key, 2 as `values` from inputTbl1
UNION ALL
- SELECT key, 3 as values from inputTbl1
+ SELECT key, 3 as `values` from inputTbl1
) a
PREHOOK: type: QUERY
PREHOOK: Input: default@inputtbl1
@@ -163,11 +163,11 @@ PREHOOK: Output: default@outputtbl1
POSTHOOK: query: insert overwrite table outputTbl1
SELECT *
FROM (
- SELECT key, 1 as values from inputTbl1
+ SELECT key, 1 as `values` from inputTbl1
UNION ALL
- SELECT key, 2 as values from inputTbl1
+ SELECT key, 2 as `values` from inputTbl1
UNION ALL
- SELECT key, 3 as values from inputTbl1
+ SELECT key, 3 as `values` from inputTbl1
) a
POSTHOOK: type: QUERY
POSTHOOK: Input: default@inputtbl1
@@ -210,11 +210,11 @@ Bucket Columns: []
Sort Columns: []
Storage Desc Params:
serialization.format 1
-PREHOOK: query: select * from outputTbl1 order by key, values
+PREHOOK: query: select * from outputTbl1 order by key, `values`
PREHOOK: type: QUERY
PREHOOK: Input: default@outputtbl1
#### A masked pattern was here ####
-POSTHOOK: query: select * from outputTbl1 order by key, values
+POSTHOOK: query: select * from outputTbl1 order by key, `values`
POSTHOOK: type: QUERY
POSTHOOK: Input: default@outputtbl1
#### A masked pattern was here ####
Modified: hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_4.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_4.q.out?rev=1666021&r1=1666020&r2=1666021&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_4.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_4.q.out Wed Mar 11 21:50:22 2015
@@ -26,11 +26,11 @@ create table inputTbl1(key string, val s
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@inputTbl1
-PREHOOK: query: create table outputTbl1(key string, values bigint) stored as textfile
+PREHOOK: query: create table outputTbl1(key string, `values` bigint) stored as textfile
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@outputTbl1
-POSTHOOK: query: create table outputTbl1(key string, values bigint) stored as textfile
+POSTHOOK: query: create table outputTbl1(key string, `values` bigint) stored as textfile
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@outputTbl1
@@ -46,18 +46,18 @@ PREHOOK: query: explain
insert overwrite table outputTbl1
SELECT *
FROM (
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
UNION ALL
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
) a
PREHOOK: type: QUERY
POSTHOOK: query: explain
insert overwrite table outputTbl1
SELECT *
FROM (
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
UNION ALL
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
) a
POSTHOOK: type: QUERY
STAGE DEPENDENCIES:
@@ -199,9 +199,9 @@ STAGE PLANS:
PREHOOK: query: insert overwrite table outputTbl1
SELECT *
FROM (
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
UNION ALL
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
) a
PREHOOK: type: QUERY
PREHOOK: Input: default@inputtbl1
@@ -209,9 +209,9 @@ PREHOOK: Output: default@outputtbl1
POSTHOOK: query: insert overwrite table outputTbl1
SELECT *
FROM (
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
UNION ALL
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
) a
POSTHOOK: type: QUERY
POSTHOOK: Input: default@inputtbl1
@@ -254,11 +254,11 @@ Bucket Columns: []
Sort Columns: []
Storage Desc Params:
serialization.format 1
-PREHOOK: query: select * from outputTbl1 order by key, values
+PREHOOK: query: select * from outputTbl1 order by key, `values`
PREHOOK: type: QUERY
PREHOOK: Input: default@outputtbl1
#### A masked pattern was here ####
-POSTHOOK: query: select * from outputTbl1 order by key, values
+POSTHOOK: query: select * from outputTbl1 order by key, `values`
POSTHOOK: type: QUERY
POSTHOOK: Input: default@outputtbl1
#### A masked pattern was here ####
Modified: hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_5.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_5.q.out?rev=1666021&r1=1666020&r2=1666021&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_5.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_5.q.out Wed Mar 11 21:50:22 2015
@@ -30,11 +30,11 @@ create table inputTbl1(key string, val s
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@inputTbl1
-PREHOOK: query: create table outputTbl1(key string, values bigint) stored as textfile
+PREHOOK: query: create table outputTbl1(key string, `values` bigint) stored as textfile
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@outputTbl1
-POSTHOOK: query: create table outputTbl1(key string, values bigint) stored as textfile
+POSTHOOK: query: create table outputTbl1(key string, `values` bigint) stored as textfile
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@outputTbl1
@@ -50,22 +50,22 @@ PREHOOK: query: explain
insert overwrite table outputTbl1
SELECT *
FROM (
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
UNION ALL
- SELECT key, 1 as values from inputTbl1
+ SELECT key, 1 as `values` from inputTbl1
UNION ALL
- SELECT key, 2 as values from inputTbl1
+ SELECT key, 2 as `values` from inputTbl1
) a
PREHOOK: type: QUERY
POSTHOOK: query: explain
insert overwrite table outputTbl1
SELECT *
FROM (
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
UNION ALL
- SELECT key, 1 as values from inputTbl1
+ SELECT key, 1 as `values` from inputTbl1
UNION ALL
- SELECT key, 2 as values from inputTbl1
+ SELECT key, 2 as `values` from inputTbl1
) a
POSTHOOK: type: QUERY
STAGE DEPENDENCIES:
@@ -208,11 +208,11 @@ STAGE PLANS:
PREHOOK: query: insert overwrite table outputTbl1
SELECT *
FROM (
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
UNION ALL
- SELECT key, 1 as values from inputTbl1
+ SELECT key, 1 as `values` from inputTbl1
UNION ALL
- SELECT key, 2 as values from inputTbl1
+ SELECT key, 2 as `values` from inputTbl1
) a
PREHOOK: type: QUERY
PREHOOK: Input: default@inputtbl1
@@ -220,11 +220,11 @@ PREHOOK: Output: default@outputtbl1
POSTHOOK: query: insert overwrite table outputTbl1
SELECT *
FROM (
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
UNION ALL
- SELECT key, 1 as values from inputTbl1
+ SELECT key, 1 as `values` from inputTbl1
UNION ALL
- SELECT key, 2 as values from inputTbl1
+ SELECT key, 2 as `values` from inputTbl1
) a
POSTHOOK: type: QUERY
POSTHOOK: Input: default@inputtbl1
@@ -267,11 +267,11 @@ Bucket Columns: []
Sort Columns: []
Storage Desc Params:
serialization.format 1
-PREHOOK: query: select * from outputTbl1 order by key, values
+PREHOOK: query: select * from outputTbl1 order by key, `values`
PREHOOK: type: QUERY
PREHOOK: Input: default@outputtbl1
#### A masked pattern was here ####
-POSTHOOK: query: select * from outputTbl1 order by key, values
+POSTHOOK: query: select * from outputTbl1 order by key, `values`
POSTHOOK: type: QUERY
POSTHOOK: Input: default@outputtbl1
#### A masked pattern was here ####
Modified: hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_6.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_6.q.out?rev=1666021&r1=1666020&r2=1666021&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_6.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_6.q.out Wed Mar 11 21:50:22 2015
@@ -20,19 +20,19 @@ create table inputTbl1(key string, val s
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@inputTbl1
-PREHOOK: query: create table outputTbl1(key string, values bigint) stored as textfile
+PREHOOK: query: create table outputTbl1(key string, `values` bigint) stored as textfile
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@outputTbl1
-POSTHOOK: query: create table outputTbl1(key string, values bigint) stored as textfile
+POSTHOOK: query: create table outputTbl1(key string, `values` bigint) stored as textfile
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@outputTbl1
-PREHOOK: query: create table outputTbl2(key string, values bigint) stored as textfile
+PREHOOK: query: create table outputTbl2(key string, `values` bigint) stored as textfile
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@outputTbl2
-POSTHOOK: query: create table outputTbl2(key string, values bigint) stored as textfile
+POSTHOOK: query: create table outputTbl2(key string, `values` bigint) stored as textfile
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@outputTbl2
@@ -46,18 +46,18 @@ POSTHOOK: type: LOAD
POSTHOOK: Output: default@inputtbl1
PREHOOK: query: explain
FROM (
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
UNION ALL
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
) a
insert overwrite table outputTbl1 select *
insert overwrite table outputTbl2 select *
PREHOOK: type: QUERY
POSTHOOK: query: explain
FROM (
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
UNION ALL
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
) a
insert overwrite table outputTbl1 select *
insert overwrite table outputTbl2 select *
@@ -205,9 +205,9 @@ STAGE PLANS:
serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
PREHOOK: query: FROM (
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
UNION ALL
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
) a
insert overwrite table outputTbl1 select *
insert overwrite table outputTbl2 select *
@@ -216,9 +216,9 @@ PREHOOK: Input: default@inputtbl1
PREHOOK: Output: default@outputtbl1
PREHOOK: Output: default@outputtbl2
POSTHOOK: query: FROM (
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
UNION ALL
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
) a
insert overwrite table outputTbl1 select *
insert overwrite table outputTbl2 select *
@@ -230,11 +230,11 @@ POSTHOOK: Lineage: outputtbl1.key EXPRES
POSTHOOK: Lineage: outputtbl1.values EXPRESSION [(inputtbl1)inputtbl1.null, (inputtbl1)inputtbl1.null, ]
POSTHOOK: Lineage: outputtbl2.key EXPRESSION [(inputtbl1)inputtbl1.FieldSchema(name:key, type:string, comment:null), (inputtbl1)inputtbl1.FieldSchema(name:key, type:string, comment:null), ]
POSTHOOK: Lineage: outputtbl2.values EXPRESSION [(inputtbl1)inputtbl1.null, (inputtbl1)inputtbl1.null, ]
-PREHOOK: query: select * from outputTbl1 order by key, values
+PREHOOK: query: select * from outputTbl1 order by key, `values`
PREHOOK: type: QUERY
PREHOOK: Input: default@outputtbl1
#### A masked pattern was here ####
-POSTHOOK: query: select * from outputTbl1 order by key, values
+POSTHOOK: query: select * from outputTbl1 order by key, `values`
POSTHOOK: type: QUERY
POSTHOOK: Input: default@outputtbl1
#### A masked pattern was here ####
@@ -248,11 +248,11 @@ POSTHOOK: Input: default@outputtbl1
7 1
8 2
8 2
-PREHOOK: query: select * from outputTbl2 order by key, values
+PREHOOK: query: select * from outputTbl2 order by key, `values`
PREHOOK: type: QUERY
PREHOOK: Input: default@outputtbl2
#### A masked pattern was here ####
-POSTHOOK: query: select * from outputTbl2 order by key, values
+POSTHOOK: query: select * from outputTbl2 order by key, `values`
POSTHOOK: type: QUERY
POSTHOOK: Input: default@outputtbl2
#### A masked pattern was here ####
Modified: hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_6_subq.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_6_subq.q.out?rev=1666021&r1=1666020&r2=1666021&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_6_subq.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_6_subq.q.out Wed Mar 11 21:50:22 2015
@@ -20,19 +20,19 @@ create table inputTbl1(key string, val s
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@inputTbl1
-PREHOOK: query: create table outputTbl1(key string, values bigint) stored as textfile
+PREHOOK: query: create table outputTbl1(key string, `values` bigint) stored as textfile
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@outputTbl1
-POSTHOOK: query: create table outputTbl1(key string, values bigint) stored as textfile
+POSTHOOK: query: create table outputTbl1(key string, `values` bigint) stored as textfile
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@outputTbl1
-PREHOOK: query: create table outputTbl2(key string, values bigint) stored as textfile
+PREHOOK: query: create table outputTbl2(key string, `values` bigint) stored as textfile
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@outputTbl2
-POSTHOOK: query: create table outputTbl2(key string, values bigint) stored as textfile
+POSTHOOK: query: create table outputTbl2(key string, `values` bigint) stored as textfile
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@outputTbl2
@@ -47,9 +47,9 @@ POSTHOOK: Output: default@inputtbl1
PREHOOK: query: explain
FROM (
select * from(
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
UNION ALL
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
)subq
) a
insert overwrite table outputTbl1 select *
@@ -58,9 +58,9 @@ PREHOOK: type: QUERY
POSTHOOK: query: explain
FROM (
select * from(
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
UNION ALL
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
)subq
) a
insert overwrite table outputTbl1 select *
@@ -210,9 +210,9 @@ STAGE PLANS:
PREHOOK: query: FROM (
select * from(
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
UNION ALL
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
)subq
) a
insert overwrite table outputTbl1 select *
@@ -223,9 +223,9 @@ PREHOOK: Output: default@outputtbl1
PREHOOK: Output: default@outputtbl2
POSTHOOK: query: FROM (
select * from(
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
UNION ALL
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
)subq
) a
insert overwrite table outputTbl1 select *
@@ -238,11 +238,11 @@ POSTHOOK: Lineage: outputtbl1.key EXPRES
POSTHOOK: Lineage: outputtbl1.values EXPRESSION [(inputtbl1)inputtbl1.null, (inputtbl1)inputtbl1.null, ]
POSTHOOK: Lineage: outputtbl2.key EXPRESSION [(inputtbl1)inputtbl1.FieldSchema(name:key, type:string, comment:null), (inputtbl1)inputtbl1.FieldSchema(name:key, type:string, comment:null), ]
POSTHOOK: Lineage: outputtbl2.values EXPRESSION [(inputtbl1)inputtbl1.null, (inputtbl1)inputtbl1.null, ]
-PREHOOK: query: select * from outputTbl1 order by key, values
+PREHOOK: query: select * from outputTbl1 order by key, `values`
PREHOOK: type: QUERY
PREHOOK: Input: default@outputtbl1
#### A masked pattern was here ####
-POSTHOOK: query: select * from outputTbl1 order by key, values
+POSTHOOK: query: select * from outputTbl1 order by key, `values`
POSTHOOK: type: QUERY
POSTHOOK: Input: default@outputtbl1
#### A masked pattern was here ####
@@ -256,11 +256,11 @@ POSTHOOK: Input: default@outputtbl1
7 1
8 2
8 2
-PREHOOK: query: select * from outputTbl2 order by key, values
+PREHOOK: query: select * from outputTbl2 order by key, `values`
PREHOOK: type: QUERY
PREHOOK: Input: default@outputtbl2
#### A masked pattern was here ####
-POSTHOOK: query: select * from outputTbl2 order by key, values
+POSTHOOK: query: select * from outputTbl2 order by key, `values`
POSTHOOK: type: QUERY
POSTHOOK: Input: default@outputtbl2
#### A masked pattern was here ####
Modified: hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_7.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_7.q.out?rev=1666021&r1=1666020&r2=1666021&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_7.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_7.q.out Wed Mar 11 21:50:22 2015
@@ -30,11 +30,11 @@ create table inputTbl1(key string, val s
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@inputTbl1
-PREHOOK: query: create table outputTbl1(key string, values bigint) stored as rcfile
+PREHOOK: query: create table outputTbl1(key string, `values` bigint) stored as rcfile
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@outputTbl1
-POSTHOOK: query: create table outputTbl1(key string, values bigint) stored as rcfile
+POSTHOOK: query: create table outputTbl1(key string, `values` bigint) stored as rcfile
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@outputTbl1
@@ -50,18 +50,18 @@ PREHOOK: query: explain
insert overwrite table outputTbl1
SELECT *
FROM (
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
UNION ALL
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
) a
PREHOOK: type: QUERY
POSTHOOK: query: explain
insert overwrite table outputTbl1
SELECT *
FROM (
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
UNION ALL
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
) a
POSTHOOK: type: QUERY
STAGE DEPENDENCIES:
@@ -159,9 +159,9 @@ STAGE PLANS:
PREHOOK: query: insert overwrite table outputTbl1
SELECT *
FROM (
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
UNION ALL
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
) a
PREHOOK: type: QUERY
PREHOOK: Input: default@inputtbl1
@@ -169,9 +169,9 @@ PREHOOK: Output: default@outputtbl1
POSTHOOK: query: insert overwrite table outputTbl1
SELECT *
FROM (
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
UNION ALL
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
) a
POSTHOOK: type: QUERY
POSTHOOK: Input: default@inputtbl1
@@ -214,11 +214,11 @@ Bucket Columns: []
Sort Columns: []
Storage Desc Params:
serialization.format 1
-PREHOOK: query: select * from outputTbl1 order by key, values
+PREHOOK: query: select * from outputTbl1 order by key, `values`
PREHOOK: type: QUERY
PREHOOK: Input: default@outputtbl1
#### A masked pattern was here ####
-POSTHOOK: query: select * from outputTbl1 order by key, values
+POSTHOOK: query: select * from outputTbl1 order by key, `values`
POSTHOOK: type: QUERY
POSTHOOK: Input: default@outputtbl1
#### A masked pattern was here ####
Modified: hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_8.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_8.q.out?rev=1666021&r1=1666020&r2=1666021&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_8.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_8.q.out Wed Mar 11 21:50:22 2015
@@ -32,11 +32,11 @@ create table inputTbl1(key string, val s
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@inputTbl1
-PREHOOK: query: create table outputTbl1(key string, values bigint) stored as rcfile
+PREHOOK: query: create table outputTbl1(key string, `values` bigint) stored as rcfile
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@outputTbl1
-POSTHOOK: query: create table outputTbl1(key string, values bigint) stored as rcfile
+POSTHOOK: query: create table outputTbl1(key string, `values` bigint) stored as rcfile
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@outputTbl1
@@ -52,22 +52,22 @@ PREHOOK: query: explain
insert overwrite table outputTbl1
SELECT *
FROM (
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
UNION ALL
- SELECT key, 1 as values from inputTbl1
+ SELECT key, 1 as `values` from inputTbl1
UNION ALL
- SELECT key, 2 as values from inputTbl1
+ SELECT key, 2 as `values` from inputTbl1
) a
PREHOOK: type: QUERY
POSTHOOK: query: explain
insert overwrite table outputTbl1
SELECT *
FROM (
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
UNION ALL
- SELECT key, 1 as values from inputTbl1
+ SELECT key, 1 as `values` from inputTbl1
UNION ALL
- SELECT key, 2 as values from inputTbl1
+ SELECT key, 2 as `values` from inputTbl1
) a
POSTHOOK: type: QUERY
STAGE DEPENDENCIES:
@@ -166,11 +166,11 @@ STAGE PLANS:
PREHOOK: query: insert overwrite table outputTbl1
SELECT *
FROM (
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
UNION ALL
- SELECT key, 1 as values from inputTbl1
+ SELECT key, 1 as `values` from inputTbl1
UNION ALL
- SELECT key, 2 as values from inputTbl1
+ SELECT key, 2 as `values` from inputTbl1
) a
PREHOOK: type: QUERY
PREHOOK: Input: default@inputtbl1
@@ -178,11 +178,11 @@ PREHOOK: Output: default@outputtbl1
POSTHOOK: query: insert overwrite table outputTbl1
SELECT *
FROM (
- SELECT key, count(1) as values from inputTbl1 group by key
+ SELECT key, count(1) as `values` from inputTbl1 group by key
UNION ALL
- SELECT key, 1 as values from inputTbl1
+ SELECT key, 1 as `values` from inputTbl1
UNION ALL
- SELECT key, 2 as values from inputTbl1
+ SELECT key, 2 as `values` from inputTbl1
) a
POSTHOOK: type: QUERY
POSTHOOK: Input: default@inputtbl1
@@ -225,11 +225,11 @@ Bucket Columns: []
Sort Columns: []
Storage Desc Params:
serialization.format 1
-PREHOOK: query: select * from outputTbl1 order by key, values
+PREHOOK: query: select * from outputTbl1 order by key, `values`
PREHOOK: type: QUERY
PREHOOK: Input: default@outputtbl1
#### A masked pattern was here ####
-POSTHOOK: query: select * from outputTbl1 order by key, values
+POSTHOOK: query: select * from outputTbl1 order by key, `values`
POSTHOOK: type: QUERY
POSTHOOK: Input: default@outputtbl1
#### A masked pattern was here ####
Modified: hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_9.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_9.q.out?rev=1666021&r1=1666020&r2=1666021&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_9.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_9.q.out Wed Mar 11 21:50:22 2015
@@ -30,11 +30,11 @@ create table inputTbl1(key string, val s
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@inputTbl1
-PREHOOK: query: create table outputTbl1(key string, values bigint) stored as rcfile
+PREHOOK: query: create table outputTbl1(key string, `values` bigint) stored as rcfile
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@outputTbl1
-POSTHOOK: query: create table outputTbl1(key string, values bigint) stored as rcfile
+POSTHOOK: query: create table outputTbl1(key string, `values` bigint) stored as rcfile
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@outputTbl1
@@ -50,12 +50,12 @@ PREHOOK: query: explain
insert overwrite table outputTbl1
SELECT * FROM
(
-select key, count(1) as values from inputTbl1 group by key
+select key, count(1) as `values` from inputTbl1 group by key
union all
select * FROM (
- SELECT key, 1 as values from inputTbl1
+ SELECT key, 1 as `values` from inputTbl1
UNION ALL
- SELECT key, 2 as values from inputTbl1
+ SELECT key, 2 as `values` from inputTbl1
) a
)b
PREHOOK: type: QUERY
@@ -63,12 +63,12 @@ POSTHOOK: query: explain
insert overwrite table outputTbl1
SELECT * FROM
(
-select key, count(1) as values from inputTbl1 group by key
+select key, count(1) as `values` from inputTbl1 group by key
union all
select * FROM (
- SELECT key, 1 as values from inputTbl1
+ SELECT key, 1 as `values` from inputTbl1
UNION ALL
- SELECT key, 2 as values from inputTbl1
+ SELECT key, 2 as `values` from inputTbl1
) a
)b
POSTHOOK: type: QUERY
@@ -209,12 +209,12 @@ STAGE PLANS:
PREHOOK: query: insert overwrite table outputTbl1
SELECT * FROM
(
-select key, count(1) as values from inputTbl1 group by key
+select key, count(1) as `values` from inputTbl1 group by key
union all
select * FROM (
- SELECT key, 1 as values from inputTbl1
+ SELECT key, 1 as `values` from inputTbl1
UNION ALL
- SELECT key, 2 as values from inputTbl1
+ SELECT key, 2 as `values` from inputTbl1
) a
)b
PREHOOK: type: QUERY
@@ -223,12 +223,12 @@ PREHOOK: Output: default@outputtbl1
POSTHOOK: query: insert overwrite table outputTbl1
SELECT * FROM
(
-select key, count(1) as values from inputTbl1 group by key
+select key, count(1) as `values` from inputTbl1 group by key
union all
select * FROM (
- SELECT key, 1 as values from inputTbl1
+ SELECT key, 1 as `values` from inputTbl1
UNION ALL
- SELECT key, 2 as values from inputTbl1
+ SELECT key, 2 as `values` from inputTbl1
) a
)b
POSTHOOK: type: QUERY
@@ -272,11 +272,11 @@ Bucket Columns: []
Sort Columns: []
Storage Desc Params:
serialization.format 1
-PREHOOK: query: select * from outputTbl1 order by key, values
+PREHOOK: query: select * from outputTbl1 order by key, `values`
PREHOOK: type: QUERY
PREHOOK: Input: default@outputtbl1
#### A masked pattern was here ####
-POSTHOOK: query: select * from outputTbl1 order by key, values
+POSTHOOK: query: select * from outputTbl1 order by key, `values`
POSTHOOK: type: QUERY
POSTHOOK: Input: default@outputtbl1
#### A masked pattern was here ####
Modified: hive/branches/cbo/ql/src/test/results/clientpositive/vector_decimal_10_0.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/vector_decimal_10_0.q.out?rev=1666021&r1=1666020&r2=1666021&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/vector_decimal_10_0.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/vector_decimal_10_0.q.out Wed Mar 11 21:50:22 2015
@@ -2,9 +2,9 @@ PREHOOK: query: DROP TABLE IF EXISTS dec
PREHOOK: type: DROPTABLE
POSTHOOK: query: DROP TABLE IF EXISTS decimal_txt
POSTHOOK: type: DROPTABLE
-PREHOOK: query: DROP TABLE IF EXISTS decimal
+PREHOOK: query: DROP TABLE IF EXISTS `decimal`
PREHOOK: type: DROPTABLE
-POSTHOOK: query: DROP TABLE IF EXISTS decimal
+POSTHOOK: query: DROP TABLE IF EXISTS `decimal`
POSTHOOK: type: DROPTABLE
PREHOOK: query: CREATE TABLE decimal_txt (dec decimal)
PREHOOK: type: CREATETABLE
@@ -22,21 +22,21 @@ POSTHOOK: query: LOAD DATA LOCAL INPATH
POSTHOOK: type: LOAD
#### A masked pattern was here ####
POSTHOOK: Output: default@decimal_txt
-PREHOOK: query: CREATE TABLE DECIMAL STORED AS ORC AS SELECT * FROM decimal_txt
+PREHOOK: query: CREATE TABLE `DECIMAL` STORED AS ORC AS SELECT * FROM decimal_txt
PREHOOK: type: CREATETABLE_AS_SELECT
PREHOOK: Input: default@decimal_txt
PREHOOK: Output: database:default
PREHOOK: Output: default@DECIMAL
-POSTHOOK: query: CREATE TABLE DECIMAL STORED AS ORC AS SELECT * FROM decimal_txt
+POSTHOOK: query: CREATE TABLE `DECIMAL` STORED AS ORC AS SELECT * FROM decimal_txt
POSTHOOK: type: CREATETABLE_AS_SELECT
POSTHOOK: Input: default@decimal_txt
POSTHOOK: Output: database:default
POSTHOOK: Output: default@DECIMAL
PREHOOK: query: EXPLAIN
-SELECT dec FROM DECIMAL order by dec
+SELECT dec FROM `DECIMAL` order by dec
PREHOOK: type: QUERY
POSTHOOK: query: EXPLAIN
-SELECT dec FROM DECIMAL order by dec
+SELECT dec FROM `DECIMAL` order by dec
POSTHOOK: type: QUERY
STAGE DEPENDENCIES:
Stage-1 is a root stage
@@ -77,11 +77,11 @@ STAGE PLANS:
Processor Tree:
ListSink
-PREHOOK: query: SELECT dec FROM DECIMAL order by dec
+PREHOOK: query: SELECT dec FROM `DECIMAL` order by dec
PREHOOK: type: QUERY
PREHOOK: Input: default@decimal
#### A masked pattern was here ####
-POSTHOOK: query: SELECT dec FROM DECIMAL order by dec
+POSTHOOK: query: SELECT dec FROM `DECIMAL` order by dec
POSTHOOK: type: QUERY
POSTHOOK: Input: default@decimal
#### A masked pattern was here ####
@@ -95,11 +95,11 @@ POSTHOOK: query: DROP TABLE DECIMAL_txt
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@decimal_txt
POSTHOOK: Output: default@decimal_txt
-PREHOOK: query: DROP TABLE DECIMAL
+PREHOOK: query: DROP TABLE `DECIMAL`
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@decimal
PREHOOK: Output: default@decimal
-POSTHOOK: query: DROP TABLE DECIMAL
+POSTHOOK: query: DROP TABLE `DECIMAL`
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@decimal
POSTHOOK: Output: default@decimal
Modified: hive/branches/cbo/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java
URL: http://svn.apache.org/viewvc/hive/branches/cbo/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java?rev=1666021&r1=1666020&r2=1666021&view=diff
==============================================================================
--- hive/branches/cbo/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java (original)
+++ hive/branches/cbo/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java Wed Mar 11 21:50:22 2015
@@ -704,18 +704,20 @@ public class Hadoop23Shims extends Hadoo
//Attempt extended Acl operations only if its enabled, 8791but don't fail the operation regardless.
try {
AclStatus aclStatus = ((Hadoop23FileStatus) sourceStatus).getAclStatus();
- List<AclEntry> aclEntries = aclStatus.getEntries();
- removeBaseAclEntries(aclEntries);
+ if (aclStatus != null) {
+ List<AclEntry> aclEntries = aclStatus.getEntries();
+ removeBaseAclEntries(aclEntries);
- //the ACL api's also expect the tradition user/group/other permission in the form of ACL
- FsPermission sourcePerm = sourceStatus.getFileStatus().getPermission();
- aclEntries.add(newAclEntry(AclEntryScope.ACCESS, AclEntryType.USER, sourcePerm.getUserAction()));
- aclEntries.add(newAclEntry(AclEntryScope.ACCESS, AclEntryType.GROUP, sourcePerm.getGroupAction()));
- aclEntries.add(newAclEntry(AclEntryScope.ACCESS, AclEntryType.OTHER, sourcePerm.getOtherAction()));
+ //the ACL api's also expect the tradition user/group/other permission in the form of ACL
+ FsPermission sourcePerm = sourceStatus.getFileStatus().getPermission();
+ aclEntries.add(newAclEntry(AclEntryScope.ACCESS, AclEntryType.USER, sourcePerm.getUserAction()));
+ aclEntries.add(newAclEntry(AclEntryScope.ACCESS, AclEntryType.GROUP, sourcePerm.getGroupAction()));
+ aclEntries.add(newAclEntry(AclEntryScope.ACCESS, AclEntryType.OTHER, sourcePerm.getOtherAction()));
- //construct the -setfacl command
- String aclEntry = Joiner.on(",").join(aclStatus.getEntries());
- run(fsShell, new String[]{"-setfacl", "-R", "--set", aclEntry, target.toString()});
+ //construct the -setfacl command
+ String aclEntry = Joiner.on(",").join(aclStatus.getEntries());
+ run(fsShell, new String[]{"-setfacl", "-R", "--set", aclEntry, target.toString()});
+ }
} catch (Exception e) {
LOG.info("Skipping ACL inheritance: File system for path " + target + " " +
"does not support ACLs but dfs.namenode.acls.enabled is set to true: " + e, e);
Modified: hive/branches/cbo/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/JIRAService.java
URL: http://svn.apache.org/viewvc/hive/branches/cbo/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/JIRAService.java?rev=1666021&r1=1666020&r2=1666021&view=diff
==============================================================================
--- hive/branches/cbo/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/JIRAService.java (original)
+++ hive/branches/cbo/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/JIRAService.java Wed Mar 11 21:50:22 2015
@@ -18,13 +18,12 @@
*/
package org.apache.hive.ptest.execution;
+import java.io.File;
import java.io.IOException;
import java.net.URL;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.SortedSet;
+import java.util.*;
+import org.apache.commons.cli.*;
import org.apache.commons.io.FilenameUtils;
import org.apache.hive.ptest.api.server.TestLogger;
import org.apache.hive.ptest.execution.conf.Context;
@@ -50,13 +49,15 @@ import org.apache.http.protocol.BasicHtt
import org.apache.http.protocol.ExecutionContext;
import org.apache.http.protocol.HttpContext;
import org.codehaus.jackson.map.ObjectMapper;
+import org.codehaus.jackson.JsonFactory;
+import org.codehaus.jackson.JsonParser;
+import org.codehaus.jackson.JsonToken;
import org.slf4j.Logger;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Joiner;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
class JIRAService {
static final int MAX_MESSAGES = 200;
@@ -71,6 +72,15 @@ class JIRAService {
private final String mJenkinsURL;
private final String mLogsURL;
+ private static final String OPT_HELP_SHORT = "h";
+ private static final String OPT_HELP_LONG = "help";
+ private static final String OPT_USER_SHORT = "u";
+ private static final String OPT_USER_LONG = "user";
+ private static final String OPT_PASS_SHORT = "p";
+ private static final String OPT_PASS_LONG = "password";
+ private static final String OPT_FILE_SHORT = "f";
+ private static final String OPT_FILE_LONG = "file";
+
public JIRAService(Logger logger, TestConfiguration configuration, String buildTag) {
mLogger = logger;
mName = configuration.getJiraName();
@@ -277,22 +287,148 @@ class JIRAService {
}
return result.trim();
}
+
+ private static void assertRequired(CommandLine commandLine, String[] requiredOptions) throws IllegalArgumentException {
+ for(String requiredOption : requiredOptions) {
+ if(!commandLine.hasOption(requiredOption)) {
+ throw new IllegalArgumentException("--" + requiredOption + " is required");
+ }
+ }
+ }
+
+ private static final String FIELD_BUILD_STATUS = "buildStatus";
+ private static final String FIELD_BUILD_TAG = "buildTag";
+ private static final String FIELD_LOGS_URL = "logsURL";
+ private static final String FIELD_JENKINS_URL = "jenkinsURL";
+ private static final String FIELD_PATCH_URL = "patchUrl";
+ private static final String FIELD_JIRA_NAME = "jiraName";
+ private static final String FIELD_JIRA_URL = "jiraUrl";
+ private static final String FIELD_REPO = "repository";
+ private static final String FIELD_REPO_NAME = "repositoryName";
+ private static final String FIELD_REPO_BRANCH = "branch";
+ private static final String FIELD_NUM_TESTS_EXECUTED = "numTestsExecuted";
+ private static final String FIELD_FAILED_TESTS = "failedTests";
+ private static final String FIELD_MESSAGES = "messages";
+ private static final String FIELD_JIRA_USER = "jiraUser";
+ private static final String FIELD_JIRA_PASS= "jiraPassword";
+
+ private static Map<String, Class> supportedJsonFields = new HashMap<String, Class>() {
+ {
+ put(FIELD_BUILD_STATUS, Integer.class);
+ put(FIELD_BUILD_TAG, String.class);
+ put(FIELD_LOGS_URL, String.class);
+ put(FIELD_JENKINS_URL, String.class);
+ put(FIELD_PATCH_URL, String.class);
+ put(FIELD_JIRA_NAME, String.class);
+ put(FIELD_JIRA_URL, String.class);
+ put(FIELD_REPO, String.class);
+ put(FIELD_REPO_NAME, String.class);
+ put(FIELD_REPO_BRANCH, String.class);
+ put(FIELD_NUM_TESTS_EXECUTED, Integer.class);
+ put(FIELD_FAILED_TESTS, SortedSet.class);
+ put(FIELD_MESSAGES, List.class);
+ }
+ };
+
+ private static Map<String, Object> parseJsonFile(String jsonFile) throws IOException {
+ JsonFactory jsonFactory = new JsonFactory();
+ JsonParser jsonParser = jsonFactory.createJsonParser(new File(jsonFile));
+ Map<String, Object> values = new HashMap<String, Object>();
+
+ while (jsonParser.nextToken() != JsonToken.END_OBJECT) {
+ String fieldName = jsonParser.getCurrentName();
+ if (supportedJsonFields.containsKey(fieldName)) {
+ jsonParser.nextToken();
+
+ Class clazz = supportedJsonFields.get(fieldName);
+ if (clazz == String.class) {
+ values.put(fieldName, jsonParser.getText());
+ } else if (clazz == Integer.class) {
+ values.put(fieldName, Integer.valueOf(jsonParser.getText()));
+ } else if (clazz == SortedSet.class) {
+ SortedSet<String> failedTests = new TreeSet<String>();
+ while (jsonParser.nextToken() != JsonToken.END_ARRAY) {
+ failedTests.add(jsonParser.getText());
+ }
+
+ values.put(fieldName, failedTests);
+ } else if (clazz == List.class) {
+ List<String> messages = new ArrayList<String>();
+ while (jsonParser.nextToken() != JsonToken.END_ARRAY) {
+ messages.add(jsonParser.getText());
+ }
+
+ values.put(fieldName, messages);
+ }
+ }
+ }
+
+ jsonParser.close();
+ return values;
+ }
+
+ private static CommandLine parseCommandLine(String[] args) throws ParseException {
+ CommandLineParser parser = new GnuParser();
+
+ Options options = new Options();
+ options.addOption(OPT_HELP_SHORT, OPT_HELP_LONG, false, "Display help text and exit");
+ options.addOption(OPT_USER_SHORT, OPT_USER_LONG, true, "Jira username.");
+ options.addOption(OPT_PASS_SHORT, OPT_PASS_LONG, true, "Jira password.");
+ options.addOption(OPT_FILE_SHORT, OPT_FILE_LONG, true, "Pathname to file (JSON format) that will be post as Jira comment.");
+
+ CommandLine cmd = parser.parse(options, args);
+
+ // If help option is requested, then display help and exit
+ if (cmd.hasOption(OPT_HELP_LONG)) {
+ new HelpFormatter().printHelp(JIRAService.class.getName(), options, true);
+ return null;
+ }
+
+ assertRequired(cmd, new String[]{
+ OPT_USER_LONG,
+ OPT_PASS_LONG,
+ OPT_FILE_LONG
+ });
+
+ return cmd;
+ }
+
public static void main(String[] args) throws Exception {
- TestLogger logger = new TestLogger(System.err, TestLogger.LEVEL.TRACE);
+ CommandLine cmd = null;
+
+ try {
+ cmd = parseCommandLine(args);
+ } catch(ParseException e) {
+ System.out.println("Error parsing command arguments: " + e.getMessage());
+ System.exit(1);
+ }
+
+ // If null is returned, then help message was displayed in parseCommandLine method
+ if (cmd == null) {
+ System.exit(0);
+ }
+
+ Map<String, Object> jsonValues = parseJsonFile(cmd.getOptionValue(OPT_FILE_LONG));
+
Map<String, String> context = Maps.newHashMap();
- context.put("jiraUrl", "https://issues.apache.org/jira");
- context.put("jiraUser", "hiveqa");
- context.put("jiraPassword", "password goes here");
- context.put("branch", "trunk");
- context.put("repository", "repo");
- context.put("repositoryName", "repoName");
- context.put("antArgs", "-Dsome=thing");
- context.put("logsURL", "http://ec2-174-129-184-35.compute-1.amazonaws.com/logs");
+ context.put(FIELD_JIRA_URL, (String)jsonValues.get(FIELD_JIRA_URL));
+ context.put(FIELD_JIRA_USER, cmd.getOptionValue(OPT_USER_LONG));
+ context.put(FIELD_JIRA_PASS, cmd.getOptionValue(OPT_PASS_LONG));
+ context.put(FIELD_LOGS_URL, (String)jsonValues.get(FIELD_LOGS_URL));
+ context.put(FIELD_REPO, (String)jsonValues.get(FIELD_REPO));
+ context.put(FIELD_REPO_NAME, (String)jsonValues.get(FIELD_REPO_NAME));
+ context.put(FIELD_REPO_BRANCH, (String)jsonValues.get(FIELD_REPO_BRANCH));
+ context.put(FIELD_JENKINS_URL, (String)jsonValues.get(FIELD_JENKINS_URL));
+
+ TestLogger logger = new TestLogger(System.err, TestLogger.LEVEL.TRACE);
TestConfiguration configuration = new TestConfiguration(new Context(context), logger);
- configuration.setJiraName("HIVE-4892");
- JIRAService service = new JIRAService(logger, configuration, "test-123");
- List<String> messages = Lists.newArrayList("msg1", "msg2");
- SortedSet<String> failedTests = Sets.newTreeSet(Collections.singleton("failed"));
- service.postComment(false, 5, failedTests, messages);
+ configuration.setJiraName((String)jsonValues.get(FIELD_JIRA_NAME));
+ configuration.setPatch((String)jsonValues.get(FIELD_PATCH_URL));
+
+ JIRAService service = new JIRAService(logger, configuration, (String)jsonValues.get(FIELD_BUILD_TAG));
+ List<String> messages = (List)jsonValues.get(FIELD_MESSAGES);
+ SortedSet<String> failedTests = (SortedSet)jsonValues.get(FIELD_FAILED_TESTS);
+ boolean error = (Integer)jsonValues.get(FIELD_BUILD_STATUS) == 0 ? false : true;
+ service.postComment(error, (Integer)jsonValues.get(FIELD_NUM_TESTS_EXECUTED), failedTests, messages);
}
}
\ No newline at end of file