You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by br...@apache.org on 2014/08/30 08:44:53 UTC
svn commit: r1621416 [10/11] - in /hive/branches/spark: ./
common/src/java/org/apache/hadoop/hive/common/
common/src/java/org/apache/hadoop/hive/conf/
contrib/src/test/results/clientnegative/
contrib/src/test/results/clientpositive/ hbase-handler/src/t...
Modified: hive/branches/spark/ql/src/test/results/clientpositive/tez/vectorized_timestamp_funcs.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/tez/vectorized_timestamp_funcs.q.out?rev=1621416&r1=1621415&r2=1621416&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/tez/vectorized_timestamp_funcs.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/tez/vectorized_timestamp_funcs.q.out Sat Aug 30 06:44:46 2014
@@ -106,15 +106,15 @@ STAGE PLANS:
Map Operator Tree:
TableScan
alias: alltypesorc_string
- Statistics: Num rows: 40 Data size: 622 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 40 Data size: 5694 Basic stats: COMPLETE Column stats: NONE
Select Operator
expressions: to_unix_timestamp(ctimestamp1) (type: bigint), year(ctimestamp1) (type: int), month(ctimestamp1) (type: int), day(ctimestamp1) (type: int), dayofmonth(ctimestamp1) (type: int), weekofyear(ctimestamp1) (type: int), hour(ctimestamp1) (type: int), minute(ctimestamp1) (type: int), second(ctimestamp1) (type: int)
outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8
- Statistics: Num rows: 40 Data size: 622 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 40 Data size: 5694 Basic stats: COMPLETE Column stats: NONE
Reduce Output Operator
key expressions: _col0 (type: bigint)
sort order: +
- Statistics: Num rows: 40 Data size: 622 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 40 Data size: 5694 Basic stats: COMPLETE Column stats: NONE
value expressions: _col1 (type: int), _col2 (type: int), _col3 (type: int), _col4 (type: int), _col5 (type: int), _col6 (type: int), _col7 (type: int), _col8 (type: int)
Execution mode: vectorized
Reducer 2
@@ -122,10 +122,10 @@ STAGE PLANS:
Select Operator
expressions: KEY.reducesinkkey0 (type: bigint), VALUE._col0 (type: int), VALUE._col1 (type: int), VALUE._col2 (type: int), VALUE._col3 (type: int), VALUE._col4 (type: int), VALUE._col5 (type: int), VALUE._col6 (type: int), VALUE._col7 (type: int)
outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8
- Statistics: Num rows: 40 Data size: 622 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 40 Data size: 5694 Basic stats: COMPLETE Column stats: NONE
File Output Operator
compressed: false
- Statistics: Num rows: 40 Data size: 622 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 40 Data size: 5694 Basic stats: COMPLETE Column stats: NONE
table:
input format: org.apache.hadoop.mapred.TextInputFormat
output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -249,15 +249,15 @@ STAGE PLANS:
Map Operator Tree:
TableScan
alias: alltypesorc_string
- Statistics: Num rows: 40 Data size: 622 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 40 Data size: 5694 Basic stats: COMPLETE Column stats: NONE
Select Operator
expressions: to_unix_timestamp(stimestamp1) (type: bigint), year(stimestamp1) (type: int), month(stimestamp1) (type: int), day(stimestamp1) (type: int), dayofmonth(stimestamp1) (type: int), weekofyear(stimestamp1) (type: int), hour(stimestamp1) (type: int), minute(stimestamp1) (type: int), second(stimestamp1) (type: int)
outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8
- Statistics: Num rows: 40 Data size: 622 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 40 Data size: 5694 Basic stats: COMPLETE Column stats: NONE
Reduce Output Operator
key expressions: _col0 (type: bigint)
sort order: +
- Statistics: Num rows: 40 Data size: 622 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 40 Data size: 5694 Basic stats: COMPLETE Column stats: NONE
value expressions: _col1 (type: int), _col2 (type: int), _col3 (type: int), _col4 (type: int), _col5 (type: int), _col6 (type: int), _col7 (type: int), _col8 (type: int)
Execution mode: vectorized
Reducer 2
@@ -265,10 +265,10 @@ STAGE PLANS:
Select Operator
expressions: KEY.reducesinkkey0 (type: bigint), VALUE._col0 (type: int), VALUE._col1 (type: int), VALUE._col2 (type: int), VALUE._col3 (type: int), VALUE._col4 (type: int), VALUE._col5 (type: int), VALUE._col6 (type: int), VALUE._col7 (type: int)
outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8
- Statistics: Num rows: 40 Data size: 622 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 40 Data size: 5694 Basic stats: COMPLETE Column stats: NONE
File Output Operator
compressed: false
- Statistics: Num rows: 40 Data size: 622 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 40 Data size: 5694 Basic stats: COMPLETE Column stats: NONE
table:
input format: org.apache.hadoop.mapred.TextInputFormat
output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -392,15 +392,15 @@ STAGE PLANS:
Map Operator Tree:
TableScan
alias: alltypesorc_string
- Statistics: Num rows: 40 Data size: 622 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 40 Data size: 5694 Basic stats: COMPLETE Column stats: NONE
Select Operator
expressions: (to_unix_timestamp(ctimestamp1) = to_unix_timestamp(stimestamp1)) (type: boolean), (year(ctimestamp1) = year(stimestamp1)) (type: boolean), (month(ctimestamp1) = month(stimestamp1)) (type: boolean), (day(ctimestamp1) = day(stimestamp1)) (type: boolean), (dayofmonth(ctimestamp1) = dayofmonth(stimestamp1)) (type: boolean), (weekofyear(ctimestamp1) = weekofyear(stimestamp1)) (type: boolean), (hour(ctimestamp1) = hour(stimestamp1)) (type: boolean), (minute(ctimestamp1) = minute(stimestamp1)) (type: boolean), (second(ctimestamp1) = second(stimestamp1)) (type: boolean)
outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8
- Statistics: Num rows: 40 Data size: 622 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 40 Data size: 5694 Basic stats: COMPLETE Column stats: NONE
Reduce Output Operator
key expressions: _col0 (type: boolean)
sort order: +
- Statistics: Num rows: 40 Data size: 622 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 40 Data size: 5694 Basic stats: COMPLETE Column stats: NONE
value expressions: _col1 (type: boolean), _col2 (type: boolean), _col3 (type: boolean), _col4 (type: boolean), _col5 (type: boolean), _col6 (type: boolean), _col7 (type: boolean), _col8 (type: boolean)
Execution mode: vectorized
Reducer 2
@@ -408,10 +408,10 @@ STAGE PLANS:
Select Operator
expressions: KEY.reducesinkkey0 (type: boolean), VALUE._col0 (type: boolean), VALUE._col1 (type: boolean), VALUE._col2 (type: boolean), VALUE._col3 (type: boolean), VALUE._col4 (type: boolean), VALUE._col5 (type: boolean), VALUE._col6 (type: boolean), VALUE._col7 (type: boolean)
outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8
- Statistics: Num rows: 40 Data size: 622 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 40 Data size: 5694 Basic stats: COMPLETE Column stats: NONE
File Output Operator
compressed: false
- Statistics: Num rows: 40 Data size: 622 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 40 Data size: 5694 Basic stats: COMPLETE Column stats: NONE
table:
input format: org.apache.hadoop.mapred.TextInputFormat
output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -539,15 +539,15 @@ STAGE PLANS:
Map Operator Tree:
TableScan
alias: alltypesorc_wrong
- Statistics: Num rows: 1 Data size: 698 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 1 Data size: 103 Basic stats: COMPLETE Column stats: NONE
Select Operator
expressions: to_unix_timestamp(stimestamp1) (type: bigint), year(stimestamp1) (type: int), month(stimestamp1) (type: int), day(stimestamp1) (type: int), dayofmonth(stimestamp1) (type: int), weekofyear(stimestamp1) (type: int), hour(stimestamp1) (type: int), minute(stimestamp1) (type: int), second(stimestamp1) (type: int)
outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8
- Statistics: Num rows: 1 Data size: 698 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 1 Data size: 103 Basic stats: COMPLETE Column stats: NONE
Reduce Output Operator
key expressions: _col0 (type: bigint)
sort order: +
- Statistics: Num rows: 1 Data size: 698 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 1 Data size: 103 Basic stats: COMPLETE Column stats: NONE
value expressions: _col1 (type: int), _col2 (type: int), _col3 (type: int), _col4 (type: int), _col5 (type: int), _col6 (type: int), _col7 (type: int), _col8 (type: int)
Execution mode: vectorized
Reducer 2
@@ -555,10 +555,10 @@ STAGE PLANS:
Select Operator
expressions: KEY.reducesinkkey0 (type: bigint), VALUE._col0 (type: int), VALUE._col1 (type: int), VALUE._col2 (type: int), VALUE._col3 (type: int), VALUE._col4 (type: int), VALUE._col5 (type: int), VALUE._col6 (type: int), VALUE._col7 (type: int)
outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8
- Statistics: Num rows: 1 Data size: 698 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 1 Data size: 103 Basic stats: COMPLETE Column stats: NONE
File Output Operator
compressed: false
- Statistics: Num rows: 1 Data size: 698 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 1 Data size: 103 Basic stats: COMPLETE Column stats: NONE
table:
input format: org.apache.hadoop.mapred.TextInputFormat
output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
Modified: hive/branches/spark/ql/src/test/results/clientpositive/touch.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/touch.q.out?rev=1621416&r1=1621415&r2=1621416&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/touch.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/touch.q.out Sat Aug 30 06:44:46 2014
@@ -1,89 +1,95 @@
-PREHOOK: query: drop table tstsrc
-PREHOOK: type: DROPTABLE
-POSTHOOK: query: drop table tstsrc
-POSTHOOK: type: DROPTABLE
-PREHOOK: query: drop table tstsrcpart
-PREHOOK: type: DROPTABLE
-POSTHOOK: query: drop table tstsrcpart
-POSTHOOK: type: DROPTABLE
-PREHOOK: query: create table tstsrc like src
+PREHOOK: query: create database tc
+PREHOOK: type: CREATEDATABASE
+PREHOOK: Output: database:tc
+POSTHOOK: query: create database tc
+POSTHOOK: type: CREATEDATABASE
+POSTHOOK: Output: database:tc
+PREHOOK: query: create table tc.tstsrc like default.src
PREHOOK: type: CREATETABLE
-PREHOOK: Output: database:default
-PREHOOK: Output: default@tstsrc
-POSTHOOK: query: create table tstsrc like src
+PREHOOK: Output: database:tc
+PREHOOK: Output: tc@tstsrc
+POSTHOOK: query: create table tc.tstsrc like default.src
POSTHOOK: type: CREATETABLE
-POSTHOOK: Output: database:default
-POSTHOOK: Output: default@tstsrc
-PREHOOK: query: insert overwrite table tstsrc select key, value from src
+POSTHOOK: Output: database:tc
+POSTHOOK: Output: tc@tstsrc
+PREHOOK: query: insert overwrite table tc.tstsrc select key, value from default.src
PREHOOK: type: QUERY
PREHOOK: Input: default@src
-PREHOOK: Output: default@tstsrc
-POSTHOOK: query: insert overwrite table tstsrc select key, value from src
+PREHOOK: Output: tc@tstsrc
+POSTHOOK: query: insert overwrite table tc.tstsrc select key, value from default.src
POSTHOOK: type: QUERY
POSTHOOK: Input: default@src
-POSTHOOK: Output: default@tstsrc
+POSTHOOK: Output: tc@tstsrc
POSTHOOK: Lineage: tstsrc.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
POSTHOOK: Lineage: tstsrc.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
-PREHOOK: query: create table tstsrcpart like srcpart
+PREHOOK: query: create table tc.tstsrcpart like default.srcpart
PREHOOK: type: CREATETABLE
-PREHOOK: Output: database:default
-PREHOOK: Output: default@tstsrcpart
-POSTHOOK: query: create table tstsrcpart like srcpart
+PREHOOK: Output: database:tc
+PREHOOK: Output: tc@tstsrcpart
+POSTHOOK: query: create table tc.tstsrcpart like default.srcpart
POSTHOOK: type: CREATETABLE
-POSTHOOK: Output: database:default
-POSTHOOK: Output: default@tstsrcpart
-PREHOOK: query: insert overwrite table tstsrcpart partition (ds='2008-04-08', hr='12')
-select key, value from srcpart where ds='2008-04-08' and hr='12'
+POSTHOOK: Output: database:tc
+POSTHOOK: Output: tc@tstsrcpart
+PREHOOK: query: insert overwrite table tc.tstsrcpart partition (ds='2008-04-08', hr='12')
+select key, value from default.srcpart where ds='2008-04-08' and hr='12'
PREHOOK: type: QUERY
PREHOOK: Input: default@srcpart
PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
-PREHOOK: Output: default@tstsrcpart@ds=2008-04-08/hr=12
-POSTHOOK: query: insert overwrite table tstsrcpart partition (ds='2008-04-08', hr='12')
-select key, value from srcpart where ds='2008-04-08' and hr='12'
+PREHOOK: Output: tc@tstsrcpart@ds=2008-04-08/hr=12
+POSTHOOK: query: insert overwrite table tc.tstsrcpart partition (ds='2008-04-08', hr='12')
+select key, value from default.srcpart where ds='2008-04-08' and hr='12'
POSTHOOK: type: QUERY
POSTHOOK: Input: default@srcpart
POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
-POSTHOOK: Output: default@tstsrcpart@ds=2008-04-08/hr=12
+POSTHOOK: Output: tc@tstsrcpart@ds=2008-04-08/hr=12
POSTHOOK: Lineage: tstsrcpart PARTITION(ds=2008-04-08,hr=12).key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ]
POSTHOOK: Lineage: tstsrcpart PARTITION(ds=2008-04-08,hr=12).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
-PREHOOK: query: ALTER TABLE tstsrc TOUCH
+PREHOOK: query: ALTER TABLE tc.tstsrc TOUCH
PREHOOK: type: ALTERTABLE_TOUCH
-PREHOOK: Input: default@tstsrc
-PREHOOK: Output: default@tstsrc
-POSTHOOK: query: ALTER TABLE tstsrc TOUCH
+PREHOOK: Input: tc@tstsrc
+PREHOOK: Output: tc@tstsrc
+POSTHOOK: query: ALTER TABLE tc.tstsrc TOUCH
POSTHOOK: type: ALTERTABLE_TOUCH
-POSTHOOK: Input: default@tstsrc
-POSTHOOK: Output: default@tstsrc
-PREHOOK: query: ALTER TABLE tstsrcpart TOUCH
+POSTHOOK: Input: tc@tstsrc
+POSTHOOK: Output: tc@tstsrc
+PREHOOK: query: ALTER TABLE tc.tstsrcpart TOUCH
PREHOOK: type: ALTERTABLE_TOUCH
-PREHOOK: Input: default@tstsrcpart
-PREHOOK: Output: default@tstsrcpart
-POSTHOOK: query: ALTER TABLE tstsrcpart TOUCH
+PREHOOK: Input: tc@tstsrcpart
+PREHOOK: Output: tc@tstsrcpart
+POSTHOOK: query: ALTER TABLE tc.tstsrcpart TOUCH
POSTHOOK: type: ALTERTABLE_TOUCH
-POSTHOOK: Input: default@tstsrcpart
-POSTHOOK: Output: default@tstsrcpart
-PREHOOK: query: ALTER TABLE tstsrcpart TOUCH PARTITION (ds='2008-04-08', hr='12')
+POSTHOOK: Input: tc@tstsrcpart
+POSTHOOK: Output: tc@tstsrcpart
+PREHOOK: query: ALTER TABLE tc.tstsrcpart TOUCH PARTITION (ds='2008-04-08', hr='12')
PREHOOK: type: ALTERTABLE_TOUCH
-PREHOOK: Input: default@tstsrcpart
-PREHOOK: Output: default@tstsrcpart@ds=2008-04-08/hr=12
-POSTHOOK: query: ALTER TABLE tstsrcpart TOUCH PARTITION (ds='2008-04-08', hr='12')
+PREHOOK: Input: tc@tstsrcpart
+PREHOOK: Output: tc@tstsrcpart@ds=2008-04-08/hr=12
+POSTHOOK: query: ALTER TABLE tc.tstsrcpart TOUCH PARTITION (ds='2008-04-08', hr='12')
POSTHOOK: type: ALTERTABLE_TOUCH
-POSTHOOK: Input: default@tstsrcpart
-POSTHOOK: Input: default@tstsrcpart@ds=2008-04-08/hr=12
-POSTHOOK: Output: default@tstsrcpart@ds=2008-04-08/hr=12
-PREHOOK: query: drop table tstsrc
+POSTHOOK: Input: tc@tstsrcpart
+POSTHOOK: Input: tc@tstsrcpart@ds=2008-04-08/hr=12
+POSTHOOK: Output: tc@tstsrcpart@ds=2008-04-08/hr=12
+PREHOOK: query: drop table tc.tstsrc
PREHOOK: type: DROPTABLE
-PREHOOK: Input: default@tstsrc
-PREHOOK: Output: default@tstsrc
-POSTHOOK: query: drop table tstsrc
+PREHOOK: Input: tc@tstsrc
+PREHOOK: Output: tc@tstsrc
+POSTHOOK: query: drop table tc.tstsrc
POSTHOOK: type: DROPTABLE
-POSTHOOK: Input: default@tstsrc
-POSTHOOK: Output: default@tstsrc
-PREHOOK: query: drop table tstsrcpart
+POSTHOOK: Input: tc@tstsrc
+POSTHOOK: Output: tc@tstsrc
+PREHOOK: query: drop table tc.tstsrcpart
PREHOOK: type: DROPTABLE
-PREHOOK: Input: default@tstsrcpart
-PREHOOK: Output: default@tstsrcpart
-POSTHOOK: query: drop table tstsrcpart
+PREHOOK: Input: tc@tstsrcpart
+PREHOOK: Output: tc@tstsrcpart
+POSTHOOK: query: drop table tc.tstsrcpart
POSTHOOK: type: DROPTABLE
-POSTHOOK: Input: default@tstsrcpart
-POSTHOOK: Output: default@tstsrcpart
+POSTHOOK: Input: tc@tstsrcpart
+POSTHOOK: Output: tc@tstsrcpart
+PREHOOK: query: drop database tc
+PREHOOK: type: DROPDATABASE
+PREHOOK: Input: database:tc
+PREHOOK: Output: database:tc
+POSTHOOK: query: drop database tc
+POSTHOOK: type: DROPDATABASE
+POSTHOOK: Input: database:tc
+POSTHOOK: Output: database:tc
Modified: hive/branches/spark/ql/src/test/results/clientpositive/union24.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/union24.q.out?rev=1621416&r1=1621415&r2=1621416&view=diff
==============================================================================
Files hive/branches/spark/ql/src/test/results/clientpositive/union24.q.out (original) and hive/branches/spark/ql/src/test/results/clientpositive/union24.q.out Sat Aug 30 06:44:46 2014 differ
Modified: hive/branches/spark/ql/src/test/results/clientpositive/union25.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/union25.q.out?rev=1621416&r1=1621415&r2=1621416&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/union25.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/union25.q.out Sat Aug 30 06:44:46 2014
@@ -210,7 +210,7 @@ STAGE PLANS:
input format: org.apache.hadoop.mapred.TextInputFormat
output format: org.apache.hadoop.hive.ql.io.IgnoreKeyTextOutputFormat
serde name: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
- name: tmp_unionall
+ name: default.tmp_unionall
Stage: Stage-3
Stats-Aggr Operator
Modified: hive/branches/spark/ql/src/test/results/clientpositive/union27.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/union27.q.out?rev=1621416&r1=1621415&r2=1621416&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/union27.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/union27.q.out Sat Aug 30 06:44:46 2014
@@ -2,24 +2,33 @@ PREHOOK: query: -- SORT_BEFORE_DIFF
create table jackson_sev_same as select * from src
PREHOOK: type: CREATETABLE_AS_SELECT
PREHOOK: Input: default@src
+PREHOOK: Output: database:default
+PREHOOK: Output: default@jackson_sev_same
POSTHOOK: query: -- SORT_BEFORE_DIFF
create table jackson_sev_same as select * from src
POSTHOOK: type: CREATETABLE_AS_SELECT
POSTHOOK: Input: default@src
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@jackson_sev_same
PREHOOK: query: create table dim_pho as select * from src
PREHOOK: type: CREATETABLE_AS_SELECT
PREHOOK: Input: default@src
+PREHOOK: Output: database:default
+PREHOOK: Output: default@dim_pho
POSTHOOK: query: create table dim_pho as select * from src
POSTHOOK: type: CREATETABLE_AS_SELECT
POSTHOOK: Input: default@src
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@dim_pho
PREHOOK: query: create table jackson_sev_add as select * from src
PREHOOK: type: CREATETABLE_AS_SELECT
PREHOOK: Input: default@src
+PREHOOK: Output: database:default
+PREHOOK: Output: default@jackson_sev_add
POSTHOOK: query: create table jackson_sev_add as select * from src
POSTHOOK: type: CREATETABLE_AS_SELECT
POSTHOOK: Input: default@src
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@jackson_sev_add
PREHOOK: query: explain select b.* from jackson_sev_same a join (select * from dim_pho union all select * from jackson_sev_add)b on a.key=b.key and b.key=97
PREHOOK: type: QUERY
Modified: hive/branches/spark/ql/src/test/results/clientpositive/union31.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/union31.q.out?rev=1621416&r1=1621415&r2=1621416&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/union31.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/union31.q.out Sat Aug 30 06:44:46 2014
@@ -13,16 +13,22 @@ POSTHOOK: type: DROPTABLE
PREHOOK: query: create table t1 as select * from src where key < 10
PREHOOK: type: CREATETABLE_AS_SELECT
PREHOOK: Input: default@src
+PREHOOK: Output: database:default
+PREHOOK: Output: default@t1
POSTHOOK: query: create table t1 as select * from src where key < 10
POSTHOOK: type: CREATETABLE_AS_SELECT
POSTHOOK: Input: default@src
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@t1
PREHOOK: query: create table t2 as select * from src where key < 10
PREHOOK: type: CREATETABLE_AS_SELECT
PREHOOK: Input: default@src
+PREHOOK: Output: database:default
+PREHOOK: Output: default@t2
POSTHOOK: query: create table t2 as select * from src where key < 10
POSTHOOK: type: CREATETABLE_AS_SELECT
POSTHOOK: Input: default@src
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@t2
PREHOOK: query: create table t3(key string, cnt int)
PREHOOK: type: CREATETABLE
@@ -598,16 +604,22 @@ POSTHOOK: Output: default@t2
PREHOOK: query: create table t1 as select * from src where key < 10
PREHOOK: type: CREATETABLE_AS_SELECT
PREHOOK: Input: default@src
+PREHOOK: Output: database:default
+PREHOOK: Output: default@t1
POSTHOOK: query: create table t1 as select * from src where key < 10
POSTHOOK: type: CREATETABLE_AS_SELECT
POSTHOOK: Input: default@src
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@t1
PREHOOK: query: create table t2 as select key, count(1) as cnt from src where key < 10 group by key
PREHOOK: type: CREATETABLE_AS_SELECT
PREHOOK: Input: default@src
+PREHOOK: Output: database:default
+PREHOOK: Output: default@t2
POSTHOOK: query: create table t2 as select key, count(1) as cnt from src where key < 10 group by key
POSTHOOK: type: CREATETABLE_AS_SELECT
POSTHOOK: Input: default@src
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@t2
PREHOOK: query: create table t7(c1 string, cnt int)
PREHOOK: type: CREATETABLE
Modified: hive/branches/spark/ql/src/test/results/clientpositive/union32.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/union32.q.out?rev=1621416&r1=1621415&r2=1621416&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/union32.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/union32.q.out Sat Aug 30 06:44:46 2014
@@ -6,6 +6,8 @@ PREHOOK: query: -- SORT_QUERY_RESULTS
CREATE TABLE t1 AS SELECT * FROM src WHERE key < 10
PREHOOK: type: CREATETABLE_AS_SELECT
PREHOOK: Input: default@src
+PREHOOK: Output: database:default
+PREHOOK: Output: default@t1
POSTHOOK: query: -- SORT_QUERY_RESULTS
-- This tests various union queries which have columns on one side of the query
@@ -14,13 +16,17 @@ POSTHOOK: query: -- SORT_QUERY_RESULTS
CREATE TABLE t1 AS SELECT * FROM src WHERE key < 10
POSTHOOK: type: CREATETABLE_AS_SELECT
POSTHOOK: Input: default@src
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@t1
PREHOOK: query: CREATE TABLE t2 AS SELECT * FROM src WHERE key < 10
PREHOOK: type: CREATETABLE_AS_SELECT
PREHOOK: Input: default@src
+PREHOOK: Output: database:default
+PREHOOK: Output: default@t2
POSTHOOK: query: CREATE TABLE t2 AS SELECT * FROM src WHERE key < 10
POSTHOOK: type: CREATETABLE_AS_SELECT
POSTHOOK: Input: default@src
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@t2
PREHOOK: query: -- Test simple union with double
EXPLAIN
Modified: hive/branches/spark/ql/src/test/results/clientpositive/union_top_level.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/union_top_level.q.out?rev=1621416&r1=1621415&r2=1621416&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/union_top_level.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/union_top_level.q.out Sat Aug 30 06:44:46 2014
@@ -580,7 +580,7 @@ STAGE PLANS:
input format: org.apache.hadoop.mapred.TextInputFormat
output format: org.apache.hadoop.hive.ql.io.IgnoreKeyTextOutputFormat
serde name: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
- name: union_top
+ name: default.union_top
Stage: Stage-3
Stats-Aggr Operator
@@ -693,6 +693,8 @@ union all
select key, 2 as value from src where key % 3 == 2 limit 3
PREHOOK: type: CREATETABLE_AS_SELECT
PREHOOK: Input: default@src
+PREHOOK: Output: database:default
+PREHOOK: Output: default@union_top
POSTHOOK: query: create table union_top as
select key, 0 as value from src where key % 3 == 0 limit 3
union all
@@ -701,6 +703,7 @@ union all
select key, 2 as value from src where key % 3 == 2 limit 3
POSTHOOK: type: CREATETABLE_AS_SELECT
POSTHOOK: Input: default@src
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@union_top
PREHOOK: query: select * from union_top
PREHOOK: type: QUERY
@@ -1305,7 +1308,7 @@ union all
select `src`.`key`, 1 as `value` from `default`.`src` where `src`.`key` % 3 == 1 limit 3
union all
select `src`.`key`, 2 as `value` from `default`.`src` where `src`.`key` % 3 == 2 limit 3
- name: union_top_view
+ name: default.union_top_view
original text: select key, 0 as value from src where key % 3 == 0 limit 3
union all
select key, 1 as value from src where key % 3 == 1 limit 3
@@ -1320,6 +1323,8 @@ union all
select key, 2 as value from src where key % 3 == 2 limit 3
PREHOOK: type: CREATEVIEW
PREHOOK: Input: default@src
+PREHOOK: Output: database:default
+PREHOOK: Output: default@union_top_view
POSTHOOK: query: create view union_top_view as
select key, 0 as value from src where key % 3 == 0 limit 3
union all
@@ -1328,6 +1333,7 @@ union all
select key, 2 as value from src where key % 3 == 2 limit 3
POSTHOOK: type: CREATEVIEW
POSTHOOK: Input: default@src
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@union_top_view
PREHOOK: query: select * from union_top_view
PREHOOK: type: QUERY
Modified: hive/branches/spark/ql/src/test/results/clientpositive/unset_table_view_property.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/unset_table_view_property.q.out?rev=1621416&r1=1621415&r2=1621416&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/unset_table_view_property.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/unset_table_view_property.q.out Sat Aug 30 06:44:46 2014
@@ -1,29 +1,35 @@
-PREHOOK: query: CREATE TABLE testTable(col1 INT, col2 INT)
+PREHOOK: query: CREATE DATABASE vt
+PREHOOK: type: CREATEDATABASE
+PREHOOK: Output: database:vt
+POSTHOOK: query: CREATE DATABASE vt
+POSTHOOK: type: CREATEDATABASE
+POSTHOOK: Output: database:vt
+PREHOOK: query: CREATE TABLE vt.testTable(col1 INT, col2 INT)
PREHOOK: type: CREATETABLE
-PREHOOK: Output: database:default
-PREHOOK: Output: default@testTable
-POSTHOOK: query: CREATE TABLE testTable(col1 INT, col2 INT)
+PREHOOK: Output: database:vt
+PREHOOK: Output: vt@testTable
+POSTHOOK: query: CREATE TABLE vt.testTable(col1 INT, col2 INT)
POSTHOOK: type: CREATETABLE
-POSTHOOK: Output: database:default
-POSTHOOK: Output: default@testTable
-PREHOOK: query: SHOW TBLPROPERTIES testTable
+POSTHOOK: Output: database:vt
+POSTHOOK: Output: vt@testTable
+PREHOOK: query: SHOW TBLPROPERTIES vt.testTable
PREHOOK: type: SHOW_TBLPROPERTIES
-POSTHOOK: query: SHOW TBLPROPERTIES testTable
+POSTHOOK: query: SHOW TBLPROPERTIES vt.testTable
POSTHOOK: type: SHOW_TBLPROPERTIES
#### A masked pattern was here ####
PREHOOK: query: -- UNSET TABLE PROPERTIES
-ALTER TABLE testTable SET TBLPROPERTIES ('a'='1', 'c'='3')
+ALTER TABLE vt.testTable SET TBLPROPERTIES ('a'='1', 'c'='3')
PREHOOK: type: ALTERTABLE_PROPERTIES
-PREHOOK: Input: default@testtable
-PREHOOK: Output: default@testtable
+PREHOOK: Input: vt@testtable
+PREHOOK: Output: vt@testtable
POSTHOOK: query: -- UNSET TABLE PROPERTIES
-ALTER TABLE testTable SET TBLPROPERTIES ('a'='1', 'c'='3')
+ALTER TABLE vt.testTable SET TBLPROPERTIES ('a'='1', 'c'='3')
POSTHOOK: type: ALTERTABLE_PROPERTIES
-POSTHOOK: Input: default@testtable
-POSTHOOK: Output: default@testtable
-PREHOOK: query: SHOW TBLPROPERTIES testTable
+POSTHOOK: Input: vt@testtable
+POSTHOOK: Output: vt@testtable
+PREHOOK: query: SHOW TBLPROPERTIES vt.testTable
PREHOOK: type: SHOW_TBLPROPERTIES
-POSTHOOK: query: SHOW TBLPROPERTIES testTable
+POSTHOOK: query: SHOW TBLPROPERTIES vt.testTable
POSTHOOK: type: SHOW_TBLPROPERTIES
COLUMN_STATS_ACCURATE false
a 1
@@ -35,18 +41,18 @@ rawDataSize -1
totalSize 0
#### A masked pattern was here ####
PREHOOK: query: -- UNSET all the properties
-ALTER TABLE testTable UNSET TBLPROPERTIES ('a', 'c')
+ALTER TABLE vt.testTable UNSET TBLPROPERTIES ('a', 'c')
PREHOOK: type: ALTERTABLE_PROPERTIES
-PREHOOK: Input: default@testtable
-PREHOOK: Output: default@testtable
+PREHOOK: Input: vt@testtable
+PREHOOK: Output: vt@testtable
POSTHOOK: query: -- UNSET all the properties
-ALTER TABLE testTable UNSET TBLPROPERTIES ('a', 'c')
+ALTER TABLE vt.testTable UNSET TBLPROPERTIES ('a', 'c')
POSTHOOK: type: ALTERTABLE_PROPERTIES
-POSTHOOK: Input: default@testtable
-POSTHOOK: Output: default@testtable
-PREHOOK: query: SHOW TBLPROPERTIES testTable
+POSTHOOK: Input: vt@testtable
+POSTHOOK: Output: vt@testtable
+PREHOOK: query: SHOW TBLPROPERTIES vt.testTable
PREHOOK: type: SHOW_TBLPROPERTIES
-POSTHOOK: query: SHOW TBLPROPERTIES testTable
+POSTHOOK: query: SHOW TBLPROPERTIES vt.testTable
POSTHOOK: type: SHOW_TBLPROPERTIES
COLUMN_STATS_ACCURATE false
#### A masked pattern was here ####
@@ -55,17 +61,17 @@ numRows -1
rawDataSize -1
totalSize 0
#### A masked pattern was here ####
-PREHOOK: query: ALTER TABLE testTable SET TBLPROPERTIES ('a'='1', 'c'='3', 'd'='4')
+PREHOOK: query: ALTER TABLE vt.testTable SET TBLPROPERTIES ('a'='1', 'c'='3', 'd'='4')
PREHOOK: type: ALTERTABLE_PROPERTIES
-PREHOOK: Input: default@testtable
-PREHOOK: Output: default@testtable
-POSTHOOK: query: ALTER TABLE testTable SET TBLPROPERTIES ('a'='1', 'c'='3', 'd'='4')
+PREHOOK: Input: vt@testtable
+PREHOOK: Output: vt@testtable
+POSTHOOK: query: ALTER TABLE vt.testTable SET TBLPROPERTIES ('a'='1', 'c'='3', 'd'='4')
POSTHOOK: type: ALTERTABLE_PROPERTIES
-POSTHOOK: Input: default@testtable
-POSTHOOK: Output: default@testtable
-PREHOOK: query: SHOW TBLPROPERTIES testTable
+POSTHOOK: Input: vt@testtable
+POSTHOOK: Output: vt@testtable
+PREHOOK: query: SHOW TBLPROPERTIES vt.testTable
PREHOOK: type: SHOW_TBLPROPERTIES
-POSTHOOK: query: SHOW TBLPROPERTIES testTable
+POSTHOOK: query: SHOW TBLPROPERTIES vt.testTable
POSTHOOK: type: SHOW_TBLPROPERTIES
COLUMN_STATS_ACCURATE false
a 1
@@ -78,18 +84,18 @@ rawDataSize -1
totalSize 0
#### A masked pattern was here ####
PREHOOK: query: -- UNSET a subset of the properties
-ALTER TABLE testTable UNSET TBLPROPERTIES ('a', 'd')
+ALTER TABLE vt.testTable UNSET TBLPROPERTIES ('a', 'd')
PREHOOK: type: ALTERTABLE_PROPERTIES
-PREHOOK: Input: default@testtable
-PREHOOK: Output: default@testtable
+PREHOOK: Input: vt@testtable
+PREHOOK: Output: vt@testtable
POSTHOOK: query: -- UNSET a subset of the properties
-ALTER TABLE testTable UNSET TBLPROPERTIES ('a', 'd')
+ALTER TABLE vt.testTable UNSET TBLPROPERTIES ('a', 'd')
POSTHOOK: type: ALTERTABLE_PROPERTIES
-POSTHOOK: Input: default@testtable
-POSTHOOK: Output: default@testtable
-PREHOOK: query: SHOW TBLPROPERTIES testTable
+POSTHOOK: Input: vt@testtable
+POSTHOOK: Output: vt@testtable
+PREHOOK: query: SHOW TBLPROPERTIES vt.testTable
PREHOOK: type: SHOW_TBLPROPERTIES
-POSTHOOK: query: SHOW TBLPROPERTIES testTable
+POSTHOOK: query: SHOW TBLPROPERTIES vt.testTable
POSTHOOK: type: SHOW_TBLPROPERTIES
COLUMN_STATS_ACCURATE false
c 3
@@ -100,18 +106,18 @@ rawDataSize -1
totalSize 0
#### A masked pattern was here ####
PREHOOK: query: -- the same property being UNSET multiple times
-ALTER TABLE testTable UNSET TBLPROPERTIES ('c', 'c', 'c')
+ALTER TABLE vt.testTable UNSET TBLPROPERTIES ('c', 'c', 'c')
PREHOOK: type: ALTERTABLE_PROPERTIES
-PREHOOK: Input: default@testtable
-PREHOOK: Output: default@testtable
+PREHOOK: Input: vt@testtable
+PREHOOK: Output: vt@testtable
POSTHOOK: query: -- the same property being UNSET multiple times
-ALTER TABLE testTable UNSET TBLPROPERTIES ('c', 'c', 'c')
+ALTER TABLE vt.testTable UNSET TBLPROPERTIES ('c', 'c', 'c')
POSTHOOK: type: ALTERTABLE_PROPERTIES
-POSTHOOK: Input: default@testtable
-POSTHOOK: Output: default@testtable
-PREHOOK: query: SHOW TBLPROPERTIES testTable
+POSTHOOK: Input: vt@testtable
+POSTHOOK: Output: vt@testtable
+PREHOOK: query: SHOW TBLPROPERTIES vt.testTable
PREHOOK: type: SHOW_TBLPROPERTIES
-POSTHOOK: query: SHOW TBLPROPERTIES testTable
+POSTHOOK: query: SHOW TBLPROPERTIES vt.testTable
POSTHOOK: type: SHOW_TBLPROPERTIES
COLUMN_STATS_ACCURATE false
#### A masked pattern was here ####
@@ -120,17 +126,17 @@ numRows -1
rawDataSize -1
totalSize 0
#### A masked pattern was here ####
-PREHOOK: query: ALTER TABLE testTable SET TBLPROPERTIES ('a'='1', 'b' = '2', 'c'='3', 'd'='4')
+PREHOOK: query: ALTER TABLE vt.testTable SET TBLPROPERTIES ('a'='1', 'b' = '2', 'c'='3', 'd'='4')
PREHOOK: type: ALTERTABLE_PROPERTIES
-PREHOOK: Input: default@testtable
-PREHOOK: Output: default@testtable
-POSTHOOK: query: ALTER TABLE testTable SET TBLPROPERTIES ('a'='1', 'b' = '2', 'c'='3', 'd'='4')
+PREHOOK: Input: vt@testtable
+PREHOOK: Output: vt@testtable
+POSTHOOK: query: ALTER TABLE vt.testTable SET TBLPROPERTIES ('a'='1', 'b' = '2', 'c'='3', 'd'='4')
POSTHOOK: type: ALTERTABLE_PROPERTIES
-POSTHOOK: Input: default@testtable
-POSTHOOK: Output: default@testtable
-PREHOOK: query: SHOW TBLPROPERTIES testTable
+POSTHOOK: Input: vt@testtable
+POSTHOOK: Output: vt@testtable
+PREHOOK: query: SHOW TBLPROPERTIES vt.testTable
PREHOOK: type: SHOW_TBLPROPERTIES
-POSTHOOK: query: SHOW TBLPROPERTIES testTable
+POSTHOOK: query: SHOW TBLPROPERTIES vt.testTable
POSTHOOK: type: SHOW_TBLPROPERTIES
COLUMN_STATS_ACCURATE false
a 1
@@ -144,18 +150,18 @@ rawDataSize -1
totalSize 0
#### A masked pattern was here ####
PREHOOK: query: -- UNSET a subset of the properties and some non-existed properties using IF EXISTS
-ALTER TABLE testTable UNSET TBLPROPERTIES IF EXISTS ('b', 'd', 'b', 'f')
+ALTER TABLE vt.testTable UNSET TBLPROPERTIES IF EXISTS ('b', 'd', 'b', 'f')
PREHOOK: type: ALTERTABLE_PROPERTIES
-PREHOOK: Input: default@testtable
-PREHOOK: Output: default@testtable
+PREHOOK: Input: vt@testtable
+PREHOOK: Output: vt@testtable
POSTHOOK: query: -- UNSET a subset of the properties and some non-existed properties using IF EXISTS
-ALTER TABLE testTable UNSET TBLPROPERTIES IF EXISTS ('b', 'd', 'b', 'f')
+ALTER TABLE vt.testTable UNSET TBLPROPERTIES IF EXISTS ('b', 'd', 'b', 'f')
POSTHOOK: type: ALTERTABLE_PROPERTIES
-POSTHOOK: Input: default@testtable
-POSTHOOK: Output: default@testtable
-PREHOOK: query: SHOW TBLPROPERTIES testTable
+POSTHOOK: Input: vt@testtable
+POSTHOOK: Output: vt@testtable
+PREHOOK: query: SHOW TBLPROPERTIES vt.testTable
PREHOOK: type: SHOW_TBLPROPERTIES
-POSTHOOK: query: SHOW TBLPROPERTIES testTable
+POSTHOOK: query: SHOW TBLPROPERTIES vt.testTable
POSTHOOK: type: SHOW_TBLPROPERTIES
COLUMN_STATS_ACCURATE false
a 1
@@ -167,18 +173,18 @@ rawDataSize -1
totalSize 0
#### A masked pattern was here ####
PREHOOK: query: -- UNSET a subset of the properties and some non-existed properties using IF EXISTS
-ALTER TABLE testTable UNSET TBLPROPERTIES IF EXISTS ('b', 'd', 'c', 'f', 'x', 'y', 'z')
+ALTER TABLE vt.testTable UNSET TBLPROPERTIES IF EXISTS ('b', 'd', 'c', 'f', 'x', 'y', 'z')
PREHOOK: type: ALTERTABLE_PROPERTIES
-PREHOOK: Input: default@testtable
-PREHOOK: Output: default@testtable
+PREHOOK: Input: vt@testtable
+PREHOOK: Output: vt@testtable
POSTHOOK: query: -- UNSET a subset of the properties and some non-existed properties using IF EXISTS
-ALTER TABLE testTable UNSET TBLPROPERTIES IF EXISTS ('b', 'd', 'c', 'f', 'x', 'y', 'z')
+ALTER TABLE vt.testTable UNSET TBLPROPERTIES IF EXISTS ('b', 'd', 'c', 'f', 'x', 'y', 'z')
POSTHOOK: type: ALTERTABLE_PROPERTIES
-POSTHOOK: Input: default@testtable
-POSTHOOK: Output: default@testtable
-PREHOOK: query: SHOW TBLPROPERTIES testTable
+POSTHOOK: Input: vt@testtable
+POSTHOOK: Output: vt@testtable
+PREHOOK: query: SHOW TBLPROPERTIES vt.testTable
PREHOOK: type: SHOW_TBLPROPERTIES
-POSTHOOK: query: SHOW TBLPROPERTIES testTable
+POSTHOOK: query: SHOW TBLPROPERTIES vt.testTable
POSTHOOK: type: SHOW_TBLPROPERTIES
COLUMN_STATS_ACCURATE false
a 1
@@ -188,57 +194,68 @@ numRows -1
rawDataSize -1
totalSize 0
#### A masked pattern was here ####
+PREHOOK: query: DROP TABLE vt.testTable
+PREHOOK: type: DROPTABLE
+PREHOOK: Input: vt@testtable
+PREHOOK: Output: vt@testtable
+POSTHOOK: query: DROP TABLE vt.testTable
+POSTHOOK: type: DROPTABLE
+POSTHOOK: Input: vt@testtable
+POSTHOOK: Output: vt@testtable
PREHOOK: query: -- UNSET VIEW PROPERTIES
-CREATE VIEW testView AS SELECT value FROM src WHERE key=86
+CREATE VIEW vt.testView AS SELECT value FROM src WHERE key=86
PREHOOK: type: CREATEVIEW
PREHOOK: Input: default@src
+PREHOOK: Output: database:vt
+PREHOOK: Output: vt@testView
POSTHOOK: query: -- UNSET VIEW PROPERTIES
-CREATE VIEW testView AS SELECT value FROM src WHERE key=86
+CREATE VIEW vt.testView AS SELECT value FROM src WHERE key=86
POSTHOOK: type: CREATEVIEW
POSTHOOK: Input: default@src
-POSTHOOK: Output: default@testView
-PREHOOK: query: ALTER VIEW testView SET TBLPROPERTIES ('propA'='100', 'propB'='200')
+POSTHOOK: Output: database:vt
+POSTHOOK: Output: vt@testView
+PREHOOK: query: ALTER VIEW vt.testView SET TBLPROPERTIES ('propA'='100', 'propB'='200')
PREHOOK: type: ALTERVIEW_PROPERTIES
-PREHOOK: Input: default@testview
-PREHOOK: Output: default@testview
-POSTHOOK: query: ALTER VIEW testView SET TBLPROPERTIES ('propA'='100', 'propB'='200')
+PREHOOK: Input: vt@testview
+PREHOOK: Output: vt@testview
+POSTHOOK: query: ALTER VIEW vt.testView SET TBLPROPERTIES ('propA'='100', 'propB'='200')
POSTHOOK: type: ALTERVIEW_PROPERTIES
-POSTHOOK: Input: default@testview
-POSTHOOK: Output: default@testview
-PREHOOK: query: SHOW TBLPROPERTIES testView
+POSTHOOK: Input: vt@testview
+POSTHOOK: Output: vt@testview
+PREHOOK: query: SHOW TBLPROPERTIES vt.testView
PREHOOK: type: SHOW_TBLPROPERTIES
-POSTHOOK: query: SHOW TBLPROPERTIES testView
+POSTHOOK: query: SHOW TBLPROPERTIES vt.testView
POSTHOOK: type: SHOW_TBLPROPERTIES
#### A masked pattern was here ####
propA 100
propB 200
#### A masked pattern was here ####
PREHOOK: query: -- UNSET all the properties
-ALTER VIEW testView UNSET TBLPROPERTIES ('propA', 'propB')
+ALTER VIEW vt.testView UNSET TBLPROPERTIES ('propA', 'propB')
PREHOOK: type: ALTERVIEW_PROPERTIES
-PREHOOK: Input: default@testview
-PREHOOK: Output: default@testview
+PREHOOK: Input: vt@testview
+PREHOOK: Output: vt@testview
POSTHOOK: query: -- UNSET all the properties
-ALTER VIEW testView UNSET TBLPROPERTIES ('propA', 'propB')
+ALTER VIEW vt.testView UNSET TBLPROPERTIES ('propA', 'propB')
POSTHOOK: type: ALTERVIEW_PROPERTIES
-POSTHOOK: Input: default@testview
-POSTHOOK: Output: default@testview
-PREHOOK: query: SHOW TBLPROPERTIES testView
+POSTHOOK: Input: vt@testview
+POSTHOOK: Output: vt@testview
+PREHOOK: query: SHOW TBLPROPERTIES vt.testView
PREHOOK: type: SHOW_TBLPROPERTIES
-POSTHOOK: query: SHOW TBLPROPERTIES testView
+POSTHOOK: query: SHOW TBLPROPERTIES vt.testView
POSTHOOK: type: SHOW_TBLPROPERTIES
#### A masked pattern was here ####
-PREHOOK: query: ALTER VIEW testView SET TBLPROPERTIES ('propA'='100', 'propC'='300', 'propD'='400')
+PREHOOK: query: ALTER VIEW vt.testView SET TBLPROPERTIES ('propA'='100', 'propC'='300', 'propD'='400')
PREHOOK: type: ALTERVIEW_PROPERTIES
-PREHOOK: Input: default@testview
-PREHOOK: Output: default@testview
-POSTHOOK: query: ALTER VIEW testView SET TBLPROPERTIES ('propA'='100', 'propC'='300', 'propD'='400')
+PREHOOK: Input: vt@testview
+PREHOOK: Output: vt@testview
+POSTHOOK: query: ALTER VIEW vt.testView SET TBLPROPERTIES ('propA'='100', 'propC'='300', 'propD'='400')
POSTHOOK: type: ALTERVIEW_PROPERTIES
-POSTHOOK: Input: default@testview
-POSTHOOK: Output: default@testview
-PREHOOK: query: SHOW TBLPROPERTIES testView
+POSTHOOK: Input: vt@testview
+POSTHOOK: Output: vt@testview
+PREHOOK: query: SHOW TBLPROPERTIES vt.testView
PREHOOK: type: SHOW_TBLPROPERTIES
-POSTHOOK: query: SHOW TBLPROPERTIES testView
+POSTHOOK: query: SHOW TBLPROPERTIES vt.testView
POSTHOOK: type: SHOW_TBLPROPERTIES
#### A masked pattern was here ####
propA 100
@@ -246,48 +263,48 @@ propC 300
propD 400
#### A masked pattern was here ####
PREHOOK: query: -- UNSET a subset of the properties
-ALTER VIEW testView UNSET TBLPROPERTIES ('propA', 'propC')
+ALTER VIEW vt.testView UNSET TBLPROPERTIES ('propA', 'propC')
PREHOOK: type: ALTERVIEW_PROPERTIES
-PREHOOK: Input: default@testview
-PREHOOK: Output: default@testview
+PREHOOK: Input: vt@testview
+PREHOOK: Output: vt@testview
POSTHOOK: query: -- UNSET a subset of the properties
-ALTER VIEW testView UNSET TBLPROPERTIES ('propA', 'propC')
+ALTER VIEW vt.testView UNSET TBLPROPERTIES ('propA', 'propC')
POSTHOOK: type: ALTERVIEW_PROPERTIES
-POSTHOOK: Input: default@testview
-POSTHOOK: Output: default@testview
-PREHOOK: query: SHOW TBLPROPERTIES testView
+POSTHOOK: Input: vt@testview
+POSTHOOK: Output: vt@testview
+PREHOOK: query: SHOW TBLPROPERTIES vt.testView
PREHOOK: type: SHOW_TBLPROPERTIES
-POSTHOOK: query: SHOW TBLPROPERTIES testView
+POSTHOOK: query: SHOW TBLPROPERTIES vt.testView
POSTHOOK: type: SHOW_TBLPROPERTIES
#### A masked pattern was here ####
propD 400
#### A masked pattern was here ####
PREHOOK: query: -- the same property being UNSET multiple times
-ALTER VIEW testView UNSET TBLPROPERTIES ('propD', 'propD', 'propD')
+ALTER VIEW vt.testView UNSET TBLPROPERTIES ('propD', 'propD', 'propD')
PREHOOK: type: ALTERVIEW_PROPERTIES
-PREHOOK: Input: default@testview
-PREHOOK: Output: default@testview
+PREHOOK: Input: vt@testview
+PREHOOK: Output: vt@testview
POSTHOOK: query: -- the same property being UNSET multiple times
-ALTER VIEW testView UNSET TBLPROPERTIES ('propD', 'propD', 'propD')
+ALTER VIEW vt.testView UNSET TBLPROPERTIES ('propD', 'propD', 'propD')
POSTHOOK: type: ALTERVIEW_PROPERTIES
-POSTHOOK: Input: default@testview
-POSTHOOK: Output: default@testview
-PREHOOK: query: SHOW TBLPROPERTIES testView
+POSTHOOK: Input: vt@testview
+POSTHOOK: Output: vt@testview
+PREHOOK: query: SHOW TBLPROPERTIES vt.testView
PREHOOK: type: SHOW_TBLPROPERTIES
-POSTHOOK: query: SHOW TBLPROPERTIES testView
+POSTHOOK: query: SHOW TBLPROPERTIES vt.testView
POSTHOOK: type: SHOW_TBLPROPERTIES
#### A masked pattern was here ####
-PREHOOK: query: ALTER VIEW testView SET TBLPROPERTIES ('propA'='100', 'propB' = '200', 'propC'='300', 'propD'='400')
+PREHOOK: query: ALTER VIEW vt.testView SET TBLPROPERTIES ('propA'='100', 'propB' = '200', 'propC'='300', 'propD'='400')
PREHOOK: type: ALTERVIEW_PROPERTIES
-PREHOOK: Input: default@testview
-PREHOOK: Output: default@testview
-POSTHOOK: query: ALTER VIEW testView SET TBLPROPERTIES ('propA'='100', 'propB' = '200', 'propC'='300', 'propD'='400')
+PREHOOK: Input: vt@testview
+PREHOOK: Output: vt@testview
+POSTHOOK: query: ALTER VIEW vt.testView SET TBLPROPERTIES ('propA'='100', 'propB' = '200', 'propC'='300', 'propD'='400')
POSTHOOK: type: ALTERVIEW_PROPERTIES
-POSTHOOK: Input: default@testview
-POSTHOOK: Output: default@testview
-PREHOOK: query: SHOW TBLPROPERTIES testView
+POSTHOOK: Input: vt@testview
+POSTHOOK: Output: vt@testview
+PREHOOK: query: SHOW TBLPROPERTIES vt.testView
PREHOOK: type: SHOW_TBLPROPERTIES
-POSTHOOK: query: SHOW TBLPROPERTIES testView
+POSTHOOK: query: SHOW TBLPROPERTIES vt.testView
POSTHOOK: type: SHOW_TBLPROPERTIES
#### A masked pattern was here ####
propA 100
@@ -296,37 +313,53 @@ propC 300
propD 400
#### A masked pattern was here ####
PREHOOK: query: -- UNSET a subset of the properties and some non-existed properties using IF EXISTS
-ALTER VIEW testView UNSET TBLPROPERTIES IF EXISTS ('propC', 'propD', 'propD', 'propC', 'propZ')
+ALTER VIEW vt.testView UNSET TBLPROPERTIES IF EXISTS ('propC', 'propD', 'propD', 'propC', 'propZ')
PREHOOK: type: ALTERVIEW_PROPERTIES
-PREHOOK: Input: default@testview
-PREHOOK: Output: default@testview
+PREHOOK: Input: vt@testview
+PREHOOK: Output: vt@testview
POSTHOOK: query: -- UNSET a subset of the properties and some non-existed properties using IF EXISTS
-ALTER VIEW testView UNSET TBLPROPERTIES IF EXISTS ('propC', 'propD', 'propD', 'propC', 'propZ')
+ALTER VIEW vt.testView UNSET TBLPROPERTIES IF EXISTS ('propC', 'propD', 'propD', 'propC', 'propZ')
POSTHOOK: type: ALTERVIEW_PROPERTIES
-POSTHOOK: Input: default@testview
-POSTHOOK: Output: default@testview
-PREHOOK: query: SHOW TBLPROPERTIES testView
+POSTHOOK: Input: vt@testview
+POSTHOOK: Output: vt@testview
+PREHOOK: query: SHOW TBLPROPERTIES vt.testView
PREHOOK: type: SHOW_TBLPROPERTIES
-POSTHOOK: query: SHOW TBLPROPERTIES testView
+POSTHOOK: query: SHOW TBLPROPERTIES vt.testView
POSTHOOK: type: SHOW_TBLPROPERTIES
#### A masked pattern was here ####
propA 100
propB 200
#### A masked pattern was here ####
PREHOOK: query: -- UNSET a subset of the properties and some non-existed properties using IF EXISTS
-ALTER VIEW testView UNSET TBLPROPERTIES IF EXISTS ('propB', 'propC', 'propD', 'propF')
+ALTER VIEW vt.testView UNSET TBLPROPERTIES IF EXISTS ('propB', 'propC', 'propD', 'propF')
PREHOOK: type: ALTERVIEW_PROPERTIES
-PREHOOK: Input: default@testview
-PREHOOK: Output: default@testview
+PREHOOK: Input: vt@testview
+PREHOOK: Output: vt@testview
POSTHOOK: query: -- UNSET a subset of the properties and some non-existed properties using IF EXISTS
-ALTER VIEW testView UNSET TBLPROPERTIES IF EXISTS ('propB', 'propC', 'propD', 'propF')
+ALTER VIEW vt.testView UNSET TBLPROPERTIES IF EXISTS ('propB', 'propC', 'propD', 'propF')
POSTHOOK: type: ALTERVIEW_PROPERTIES
-POSTHOOK: Input: default@testview
-POSTHOOK: Output: default@testview
-PREHOOK: query: SHOW TBLPROPERTIES testView
+POSTHOOK: Input: vt@testview
+POSTHOOK: Output: vt@testview
+PREHOOK: query: SHOW TBLPROPERTIES vt.testView
PREHOOK: type: SHOW_TBLPROPERTIES
-POSTHOOK: query: SHOW TBLPROPERTIES testView
+POSTHOOK: query: SHOW TBLPROPERTIES vt.testView
POSTHOOK: type: SHOW_TBLPROPERTIES
#### A masked pattern was here ####
propA 100
#### A masked pattern was here ####
+PREHOOK: query: DROP VIEW vt.testView
+PREHOOK: type: DROPVIEW
+PREHOOK: Input: vt@testview
+PREHOOK: Output: vt@testview
+POSTHOOK: query: DROP VIEW vt.testView
+POSTHOOK: type: DROPVIEW
+POSTHOOK: Input: vt@testview
+POSTHOOK: Output: vt@testview
+PREHOOK: query: DROP DATABASE vt
+PREHOOK: type: DROPDATABASE
+PREHOOK: Input: database:vt
+PREHOOK: Output: database:vt
+POSTHOOK: query: DROP DATABASE vt
+POSTHOOK: type: DROPDATABASE
+POSTHOOK: Input: database:vt
+POSTHOOK: Output: database:vt
Modified: hive/branches/spark/ql/src/test/results/clientpositive/updateAccessTime.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/updateAccessTime.q.out?rev=1621416&r1=1621415&r2=1621416&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/updateAccessTime.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/updateAccessTime.q.out Sat Aug 30 06:44:46 2014
@@ -5,9 +5,12 @@ POSTHOOK: type: DROPTABLE
PREHOOK: query: create table tstsrc as select * from src
PREHOOK: type: CREATETABLE_AS_SELECT
PREHOOK: Input: default@src
+PREHOOK: Output: database:default
+PREHOOK: Output: default@tstsrc
POSTHOOK: query: create table tstsrc as select * from src
POSTHOOK: type: CREATETABLE_AS_SELECT
POSTHOOK: Input: default@src
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@tstsrc
PREHOOK: query: desc extended tstsrc
PREHOOK: type: DESCTABLE
Modified: hive/branches/spark/ql/src/test/results/clientpositive/varchar_nested_types.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/varchar_nested_types.q.out?rev=1621416&r1=1621415&r2=1621416&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/varchar_nested_types.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/varchar_nested_types.q.out Sat Aug 30 06:44:46 2014
@@ -164,11 +164,14 @@ create table varchar_nested_cta as
select * from varchar_nested_struct
PREHOOK: type: CREATETABLE_AS_SELECT
PREHOOK: Input: default@varchar_nested_struct
+PREHOOK: Output: database:default
+PREHOOK: Output: default@varchar_nested_cta
POSTHOOK: query: -- nested type with create table as
create table varchar_nested_cta as
select * from varchar_nested_struct
POSTHOOK: type: CREATETABLE_AS_SELECT
POSTHOOK: Input: default@varchar_nested_struct
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@varchar_nested_cta
PREHOOK: query: describe varchar_nested_cta
PREHOOK: type: DESCTABLE
@@ -191,11 +194,14 @@ create table varchar_nested_view as
select * from varchar_nested_struct
PREHOOK: type: CREATETABLE_AS_SELECT
PREHOOK: Input: default@varchar_nested_struct
+PREHOOK: Output: database:default
+PREHOOK: Output: default@varchar_nested_view
POSTHOOK: query: -- nested type with view
create table varchar_nested_view as
select * from varchar_nested_struct
POSTHOOK: type: CREATETABLE_AS_SELECT
POSTHOOK: Input: default@varchar_nested_struct
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@varchar_nested_view
PREHOOK: query: describe varchar_nested_view
PREHOOK: type: DESCTABLE
Modified: hive/branches/spark/ql/src/test/results/clientpositive/vector_between_in.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/vector_between_in.q.out?rev=1621416&r1=1621415&r2=1621416&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/vector_between_in.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/vector_between_in.q.out Sat Aug 30 06:44:46 2014
@@ -1,9 +1,12 @@
PREHOOK: query: CREATE TABLE decimal_date_test STORED AS ORC AS SELECT cdouble, CAST (((cdouble*22.1)/37) AS DECIMAL(20,10)) AS cdecimal1, CAST (((cdouble*9.3)/13) AS DECIMAL(23,14)) AS cdecimal2, CAST(CAST((CAST(cint AS BIGINT) *ctinyint) AS TIMESTAMP) AS DATE) AS cdate FROM alltypesorc ORDER BY cdate
PREHOOK: type: CREATETABLE_AS_SELECT
PREHOOK: Input: default@alltypesorc
+PREHOOK: Output: database:default
+PREHOOK: Output: default@decimal_date_test
POSTHOOK: query: CREATE TABLE decimal_date_test STORED AS ORC AS SELECT cdouble, CAST (((cdouble*22.1)/37) AS DECIMAL(20,10)) AS cdecimal1, CAST (((cdouble*9.3)/13) AS DECIMAL(23,14)) AS cdecimal2, CAST(CAST((CAST(cint AS BIGINT) *ctinyint) AS TIMESTAMP) AS DATE) AS cdate FROM alltypesorc ORDER BY cdate
POSTHOOK: type: CREATETABLE_AS_SELECT
POSTHOOK: Input: default@alltypesorc
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@decimal_date_test
PREHOOK: query: EXPLAIN SELECT cdate FROM decimal_date_test WHERE cdate IN (CAST("1969-10-26" AS DATE), CAST("1969-07-14" AS DATE)) ORDER BY cdate
PREHOOK: type: QUERY
Modified: hive/branches/spark/ql/src/test/results/clientpositive/vector_decimal_aggregate.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/vector_decimal_aggregate.q.out?rev=1621416&r1=1621415&r2=1621416&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/vector_decimal_aggregate.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/vector_decimal_aggregate.q.out Sat Aug 30 06:44:46 2014
@@ -5,6 +5,8 @@ PREHOOK: query: CREATE TABLE decimal_vgb
FROM alltypesorc
PREHOOK: type: CREATETABLE_AS_SELECT
PREHOOK: Input: default@alltypesorc
+PREHOOK: Output: database:default
+PREHOOK: Output: default@decimal_vgby
POSTHOOK: query: CREATE TABLE decimal_vgby STORED AS ORC AS
SELECT cdouble, CAST (((cdouble*22.1)/37) AS DECIMAL(20,10)) AS cdecimal1,
CAST (((cdouble*9.3)/13) AS DECIMAL(23,14)) AS cdecimal2,
@@ -12,6 +14,7 @@ POSTHOOK: query: CREATE TABLE decimal_vg
FROM alltypesorc
POSTHOOK: type: CREATETABLE_AS_SELECT
POSTHOOK: Input: default@alltypesorc
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@decimal_vgby
PREHOOK: query: EXPLAIN SELECT cint,
COUNT(cdecimal1), MAX(cdecimal1), MIN(cdecimal1), SUM(cdecimal1), AVG(cdecimal1), STDDEV_POP(cdecimal1), STDDEV_SAMP(cdecimal1),
Modified: hive/branches/spark/ql/src/test/results/clientpositive/vector_decimal_expressions.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/vector_decimal_expressions.q.out?rev=1621416&r1=1621415&r2=1621416&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/vector_decimal_expressions.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/vector_decimal_expressions.q.out Sat Aug 30 06:44:46 2014
@@ -1,9 +1,12 @@
PREHOOK: query: CREATE TABLE decimal_test STORED AS ORC AS SELECT cdouble, CAST (((cdouble*22.1)/37) AS DECIMAL(20,10)) AS cdecimal1, CAST (((cdouble*9.3)/13) AS DECIMAL(23,14)) AS cdecimal2 FROM alltypesorc
PREHOOK: type: CREATETABLE_AS_SELECT
PREHOOK: Input: default@alltypesorc
+PREHOOK: Output: database:default
+PREHOOK: Output: default@decimal_test
POSTHOOK: query: CREATE TABLE decimal_test STORED AS ORC AS SELECT cdouble, CAST (((cdouble*22.1)/37) AS DECIMAL(20,10)) AS cdecimal1, CAST (((cdouble*9.3)/13) AS DECIMAL(23,14)) AS cdecimal2 FROM alltypesorc
POSTHOOK: type: CREATETABLE_AS_SELECT
POSTHOOK: Input: default@alltypesorc
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@decimal_test
PREHOOK: query: EXPLAIN SELECT cdecimal1 + cdecimal2, cdecimal1 - (2*cdecimal2), ((cdecimal1+2.34)/cdecimal2), (cdecimal1 * (cdecimal2/3.4)), cdecimal1 % 10, CAST(cdecimal1 AS INT), CAST(cdecimal2 AS SMALLINT), CAST(cdecimal2 AS TINYINT), CAST(cdecimal1 AS BIGINT), CAST (cdecimal1 AS BOOLEAN), CAST(cdecimal2 AS DOUBLE), CAST(cdecimal1 AS FLOAT), CAST(cdecimal2 AS STRING), CAST(cdecimal1 AS TIMESTAMP) FROM decimal_test WHERE cdecimal1 > 0 AND cdecimal1 < 12345.5678 AND cdecimal2 != 0 AND cdecimal2 > 1000 AND cdouble IS NOT NULL LIMIT 10
PREHOOK: type: QUERY
Modified: hive/branches/spark/ql/src/test/results/clientpositive/vector_decimal_mapjoin.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/vector_decimal_mapjoin.q.out?rev=1621416&r1=1621415&r2=1621416&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/vector_decimal_mapjoin.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/vector_decimal_mapjoin.q.out Sat Aug 30 06:44:46 2014
@@ -5,6 +5,8 @@ PREHOOK: query: CREATE TABLE decimal_map
FROM alltypesorc
PREHOOK: type: CREATETABLE_AS_SELECT
PREHOOK: Input: default@alltypesorc
+PREHOOK: Output: database:default
+PREHOOK: Output: default@decimal_mapjoin
POSTHOOK: query: CREATE TABLE decimal_mapjoin STORED AS ORC AS
SELECT cdouble, CAST (((cdouble*22.1)/37) AS DECIMAL(20,10)) AS cdecimal1,
CAST (((cdouble*9.3)/13) AS DECIMAL(23,14)) AS cdecimal2,
@@ -12,6 +14,7 @@ POSTHOOK: query: CREATE TABLE decimal_ma
FROM alltypesorc
POSTHOOK: type: CREATETABLE_AS_SELECT
POSTHOOK: Input: default@alltypesorc
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@decimal_mapjoin
PREHOOK: query: EXPLAIN SELECT l.cint, r.cint, l.cdecimal1, r.cdecimal2
FROM decimal_mapjoin l
Modified: hive/branches/spark/ql/src/test/results/clientpositive/vector_decimal_math_funcs.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/vector_decimal_math_funcs.q.out?rev=1621416&r1=1621415&r2=1621416&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/vector_decimal_math_funcs.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/vector_decimal_math_funcs.q.out Sat Aug 30 06:44:46 2014
@@ -1,9 +1,12 @@
PREHOOK: query: CREATE TABLE decimal_test STORED AS ORC AS SELECT cbigint, cdouble, CAST (((cdouble*22.1)/37) AS DECIMAL(20,10)) AS cdecimal1, CAST (((cdouble*9.3)/13) AS DECIMAL(23,14)) AS cdecimal2 FROM alltypesorc
PREHOOK: type: CREATETABLE_AS_SELECT
PREHOOK: Input: default@alltypesorc
+PREHOOK: Output: database:default
+PREHOOK: Output: default@decimal_test
POSTHOOK: query: CREATE TABLE decimal_test STORED AS ORC AS SELECT cbigint, cdouble, CAST (((cdouble*22.1)/37) AS DECIMAL(20,10)) AS cdecimal1, CAST (((cdouble*9.3)/13) AS DECIMAL(23,14)) AS cdecimal2 FROM alltypesorc
POSTHOOK: type: CREATETABLE_AS_SELECT
POSTHOOK: Input: default@alltypesorc
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@decimal_test
PREHOOK: query: -- Test math functions in vectorized mode to verify they run correctly end-to-end.
Modified: hive/branches/spark/ql/src/test/results/clientpositive/vectorization_decimal_date.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/vectorization_decimal_date.q.out?rev=1621416&r1=1621415&r2=1621416&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/vectorization_decimal_date.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/vectorization_decimal_date.q.out Sat Aug 30 06:44:46 2014
@@ -1,9 +1,12 @@
PREHOOK: query: CREATE TABLE date_decimal_test STORED AS ORC AS SELECT cint, cdouble, CAST (CAST (cint AS TIMESTAMP) AS DATE) AS cdate, CAST (((cdouble*22.1)/37) AS DECIMAL(20,10)) AS cdecimal FROM alltypesorc
PREHOOK: type: CREATETABLE_AS_SELECT
PREHOOK: Input: default@alltypesorc
+PREHOOK: Output: database:default
+PREHOOK: Output: default@date_decimal_test
POSTHOOK: query: CREATE TABLE date_decimal_test STORED AS ORC AS SELECT cint, cdouble, CAST (CAST (cint AS TIMESTAMP) AS DATE) AS cdate, CAST (((cdouble*22.1)/37) AS DECIMAL(20,10)) AS cdecimal FROM alltypesorc
POSTHOOK: type: CREATETABLE_AS_SELECT
POSTHOOK: Input: default@alltypesorc
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@date_decimal_test
PREHOOK: query: EXPLAIN SELECT cdate, cdecimal from date_decimal_test where cint IS NOT NULL AND cdouble IS NOT NULL LIMIT 10
PREHOOK: type: QUERY
Modified: hive/branches/spark/ql/src/test/results/clientpositive/vectorized_ptf.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/vectorized_ptf.q.out?rev=1621416&r1=1621415&r2=1621416&view=diff
==============================================================================
Files hive/branches/spark/ql/src/test/results/clientpositive/vectorized_ptf.q.out (original) and hive/branches/spark/ql/src/test/results/clientpositive/vectorized_ptf.q.out Sat Aug 30 06:44:46 2014 differ
Modified: hive/branches/spark/ql/src/test/results/clientpositive/view.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/view.q.out?rev=1621416&r1=1621415&r2=1621416&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/view.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/view.q.out Sat Aug 30 06:44:46 2014
@@ -54,77 +54,101 @@ PREHOOK: query: -- relative reference, n
CREATE VIEW v1 AS SELECT * FROM table1
PREHOOK: type: CREATEVIEW
PREHOOK: Input: db1@table1
+PREHOOK: Output: database:db1
+PREHOOK: Output: db1@v1
POSTHOOK: query: -- relative reference, no alias
CREATE VIEW v1 AS SELECT * FROM table1
POSTHOOK: type: CREATEVIEW
POSTHOOK: Input: db1@table1
+POSTHOOK: Output: database:db1
POSTHOOK: Output: db1@v1
PREHOOK: query: -- relative reference, aliased
CREATE VIEW v2 AS SELECT t1.* FROM table1 t1
PREHOOK: type: CREATEVIEW
PREHOOK: Input: db1@table1
+PREHOOK: Output: database:db1
+PREHOOK: Output: db1@v2
POSTHOOK: query: -- relative reference, aliased
CREATE VIEW v2 AS SELECT t1.* FROM table1 t1
POSTHOOK: type: CREATEVIEW
POSTHOOK: Input: db1@table1
+POSTHOOK: Output: database:db1
POSTHOOK: Output: db1@v2
PREHOOK: query: -- relative reference, multiple tables
CREATE VIEW v3 AS SELECT t1.*, t2.key k FROM table1 t1 JOIN table2 t2 ON t1.key = t2.key
PREHOOK: type: CREATEVIEW
PREHOOK: Input: db1@table1
PREHOOK: Input: db1@table2
+PREHOOK: Output: database:db1
+PREHOOK: Output: db1@v3
POSTHOOK: query: -- relative reference, multiple tables
CREATE VIEW v3 AS SELECT t1.*, t2.key k FROM table1 t1 JOIN table2 t2 ON t1.key = t2.key
POSTHOOK: type: CREATEVIEW
POSTHOOK: Input: db1@table1
POSTHOOK: Input: db1@table2
+POSTHOOK: Output: database:db1
POSTHOOK: Output: db1@v3
PREHOOK: query: -- absolute reference, no alias
CREATE VIEW v4 AS SELECT * FROM db1.table1
PREHOOK: type: CREATEVIEW
PREHOOK: Input: db1@table1
+PREHOOK: Output: database:db1
+PREHOOK: Output: db1@v4
POSTHOOK: query: -- absolute reference, no alias
CREATE VIEW v4 AS SELECT * FROM db1.table1
POSTHOOK: type: CREATEVIEW
POSTHOOK: Input: db1@table1
+POSTHOOK: Output: database:db1
POSTHOOK: Output: db1@v4
PREHOOK: query: -- absolute reference, aliased
CREATE VIEW v5 AS SELECT t1.* FROM db1.table1 t1
PREHOOK: type: CREATEVIEW
PREHOOK: Input: db1@table1
+PREHOOK: Output: database:db1
+PREHOOK: Output: db1@v5
POSTHOOK: query: -- absolute reference, aliased
CREATE VIEW v5 AS SELECT t1.* FROM db1.table1 t1
POSTHOOK: type: CREATEVIEW
POSTHOOK: Input: db1@table1
+POSTHOOK: Output: database:db1
POSTHOOK: Output: db1@v5
PREHOOK: query: -- absolute reference, multiple tables
CREATE VIEW v6 AS SELECT t1.*, t2.key k FROM db1.table1 t1 JOIN db1.table2 t2 ON t1.key = t2.key
PREHOOK: type: CREATEVIEW
PREHOOK: Input: db1@table1
PREHOOK: Input: db1@table2
+PREHOOK: Output: database:db1
+PREHOOK: Output: db1@v6
POSTHOOK: query: -- absolute reference, multiple tables
CREATE VIEW v6 AS SELECT t1.*, t2.key k FROM db1.table1 t1 JOIN db1.table2 t2 ON t1.key = t2.key
POSTHOOK: type: CREATEVIEW
POSTHOOK: Input: db1@table1
POSTHOOK: Input: db1@table2
+POSTHOOK: Output: database:db1
POSTHOOK: Output: db1@v6
PREHOOK: query: -- relative reference, explicit column
CREATE VIEW v7 AS SELECT key from table1
PREHOOK: type: CREATEVIEW
PREHOOK: Input: db1@table1
+PREHOOK: Output: database:db1
+PREHOOK: Output: db1@v7
POSTHOOK: query: -- relative reference, explicit column
CREATE VIEW v7 AS SELECT key from table1
POSTHOOK: type: CREATEVIEW
POSTHOOK: Input: db1@table1
+POSTHOOK: Output: database:db1
POSTHOOK: Output: db1@v7
PREHOOK: query: -- absolute reference, explicit column
CREATE VIEW v8 AS SELECT key from db1.table1
PREHOOK: type: CREATEVIEW
PREHOOK: Input: db1@table1
+PREHOOK: Output: database:db1
+PREHOOK: Output: db1@v8
POSTHOOK: query: -- absolute reference, explicit column
CREATE VIEW v8 AS SELECT key from db1.table1
POSTHOOK: type: CREATEVIEW
POSTHOOK: Input: db1@table1
+POSTHOOK: Output: database:db1
POSTHOOK: Output: db1@v8
PREHOOK: query: CREATE DATABASE db2
PREHOOK: type: CREATEDATABASE
Modified: hive/branches/spark/ql/src/test/results/clientpositive/view_cast.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/view_cast.q.out?rev=1621416&r1=1621415&r2=1621416&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/view_cast.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/view_cast.q.out Sat Aug 30 06:44:46 2014
@@ -56,9 +56,12 @@ POSTHOOK: type: DROPVIEW
PREHOOK: query: CREATE VIEW aa_view_tw AS SELECT ks_uid, sr_id, act, at_ks_uid, at_sr_uid, from_unixtime(CAST(CAST( tstamp as BIGINT)/1000 AS BIGINT),'yyyyMMdd') AS act_date, from_unixtime(CAST(CAST( original_tstamp AS BIGINT)/1000 AS BIGINT),'yyyyMMdd') AS content_creation_date FROM atab WHERE dt='20130312' AND nt='tw' AND ks_uid != at_ks_uid
PREHOOK: type: CREATEVIEW
PREHOOK: Input: default@atab
+PREHOOK: Output: database:default
+PREHOOK: Output: default@aa_view_tw
POSTHOOK: query: CREATE VIEW aa_view_tw AS SELECT ks_uid, sr_id, act, at_ks_uid, at_sr_uid, from_unixtime(CAST(CAST( tstamp as BIGINT)/1000 AS BIGINT),'yyyyMMdd') AS act_date, from_unixtime(CAST(CAST( original_tstamp AS BIGINT)/1000 AS BIGINT),'yyyyMMdd') AS content_creation_date FROM atab WHERE dt='20130312' AND nt='tw' AND ks_uid != at_ks_uid
POSTHOOK: type: CREATEVIEW
POSTHOOK: Input: default@atab
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@aa_view_tw
PREHOOK: query: DROP VIEW IF EXISTS joined_aa_view_tw
PREHOOK: type: DROPVIEW
@@ -69,11 +72,14 @@ PREHOOK: type: CREATEVIEW
PREHOOK: Input: default@aa_view_tw
PREHOOK: Input: default@atab
PREHOOK: Input: default@mstab
+PREHOOK: Output: database:default
+PREHOOK: Output: default@joined_aa_view_tw
POSTHOOK: query: CREATE VIEW joined_aa_view_tw AS SELECT aa.ks_uid, aa.sr_id, aa.act, at_sr_uid, aa.act_date, aa.at_ks_uid, aa.content_creation_date, coalesce( other.ksc, 10.0) AS at_ksc, coalesce( self.ksc , 10.0 ) AS self_ksc FROM aa_view_tw aa LEFT OUTER JOIN ( SELECT ks_uid, csc AS ksc FROM mstab WHERE dt='20130311' ) self ON ( CAST(aa.ks_uid AS BIGINT) = CAST(self.ks_uid AS BIGINT) ) LEFT OUTER JOIN ( SELECT ks_uid, csc AS ksc FROM mstab WHERE dt='20130311' ) other ON ( CAST(aa.at_ks_uid AS BIGINT) = CAST(other.ks_uid AS BIGINT) )
POSTHOOK: type: CREATEVIEW
POSTHOOK: Input: default@aa_view_tw
POSTHOOK: Input: default@atab
POSTHOOK: Input: default@mstab
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@joined_aa_view_tw
PREHOOK: query: SELECT * FROM joined_aa_view_tw
PREHOOK: type: QUERY
Modified: hive/branches/spark/ql/src/test/results/clientpositive/view_inputs.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/view_inputs.q.out?rev=1621416&r1=1621415&r2=1621416&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/view_inputs.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/view_inputs.q.out Sat Aug 30 06:44:46 2014
@@ -3,20 +3,26 @@ PREHOOK: query: -- Tests that selecting
CREATE VIEW test_view1 AS SELECT * FROM src
PREHOOK: type: CREATEVIEW
PREHOOK: Input: default@src
+PREHOOK: Output: database:default
+PREHOOK: Output: default@test_view1
POSTHOOK: query: -- Tests that selecting from a view and another view that selects from that same view
CREATE VIEW test_view1 AS SELECT * FROM src
POSTHOOK: type: CREATEVIEW
POSTHOOK: Input: default@src
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@test_view1
PREHOOK: query: CREATE VIEW test_view2 AS SELECT * FROM test_view1
PREHOOK: type: CREATEVIEW
PREHOOK: Input: default@src
PREHOOK: Input: default@test_view1
+PREHOOK: Output: database:default
+PREHOOK: Output: default@test_view2
POSTHOOK: query: CREATE VIEW test_view2 AS SELECT * FROM test_view1
POSTHOOK: type: CREATEVIEW
POSTHOOK: Input: default@src
POSTHOOK: Input: default@test_view1
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@test_view2
PREHOOK: query: SELECT COUNT(*) FROM test_view1 a JOIN test_view2 b ON a.key = b.key
PREHOOK: type: QUERY
Modified: hive/branches/spark/ql/src/test/results/clientpositive/windowing.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/windowing.q.out?rev=1621416&r1=1621415&r2=1621416&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/windowing.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/windowing.q.out Sat Aug 30 06:44:46 2014
@@ -1024,6 +1024,8 @@ from part
group by p_mfgr, p_brand
PREHOOK: type: CREATEVIEW
PREHOOK: Input: default@part
+PREHOOK: Output: database:default
+PREHOOK: Output: default@mfgr_price_view
POSTHOOK: query: -- 22. testViewAsTableInputWithWindowing
create view IF NOT EXISTS mfgr_price_view as
select p_mfgr, p_brand,
@@ -1032,6 +1034,7 @@ from part
group by p_mfgr, p_brand
POSTHOOK: type: CREATEVIEW
POSTHOOK: Input: default@part
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@mfgr_price_view
PREHOOK: query: select *
from (
@@ -1113,6 +1116,8 @@ from part
window w1 as (distribute by p_mfgr sort by p_name rows between 2 preceding and current row)
PREHOOK: type: CREATEVIEW
PREHOOK: Input: default@part
+PREHOOK: Output: database:default
+PREHOOK: Output: default@mfgr_brand_price_view
POSTHOOK: query: -- 23. testCreateViewWithWindowingQuery
create view IF NOT EXISTS mfgr_brand_price_view as
select p_mfgr, p_brand,
@@ -1121,6 +1126,7 @@ from part
window w1 as (distribute by p_mfgr sort by p_name rows between 2 preceding and current row)
POSTHOOK: type: CREATEVIEW
POSTHOOK: Input: default@part
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@mfgr_brand_price_view
PREHOOK: query: select * from mfgr_brand_price_view
PREHOOK: type: QUERY
Modified: hive/branches/spark/ql/src/test/results/clientpositive/windowing_navfn.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/windowing_navfn.q.out?rev=1621416&r1=1621415&r2=1621416&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/windowing_navfn.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/windowing_navfn.q.out Sat Aug 30 06:44:46 2014
@@ -614,6 +614,8 @@ SELECT explode(
) s1 lateral view explode(barr) arr as b
PREHOOK: type: CREATETABLE_AS_SELECT
PREHOOK: Input: default@src
+PREHOOK: Output: database:default
+PREHOOK: Output: default@wtest
POSTHOOK: query: create table wtest as
select a, b
from
@@ -628,6 +630,7 @@ SELECT explode(
) s1 lateral view explode(barr) arr as b
POSTHOOK: type: CREATETABLE_AS_SELECT
POSTHOOK: Input: default@src
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@wtest
PREHOOK: query: select a, b,
first_value(b) over (partition by a order by b rows between 1 preceding and 1 following ) ,
Modified: hive/branches/spark/ql/src/test/results/clientpositive/windowing_streaming.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/windowing_streaming.q.out?rev=1621416&r1=1621415&r2=1621416&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/windowing_streaming.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/windowing_streaming.q.out Sat Aug 30 06:44:46 2014
@@ -347,10 +347,13 @@ PREHOOK: query: create table sB ROW FORM
select * from (select ctinyint, cdouble, rank() over(partition by ctinyint order by cdouble) r from alltypesorc) a where r < 5
PREHOOK: type: CREATETABLE_AS_SELECT
PREHOOK: Input: default@alltypesorc
+PREHOOK: Output: database:default
+PREHOOK: Output: default@sB
POSTHOOK: query: create table sB ROW FORMAT DELIMITED FIELDS TERMINATED BY ',' STORED AS TEXTFILE as
select * from (select ctinyint, cdouble, rank() over(partition by ctinyint order by cdouble) r from alltypesorc) a where r < 5
POSTHOOK: type: CREATETABLE_AS_SELECT
POSTHOOK: Input: default@alltypesorc
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@sB
PREHOOK: query: select * from sB
where ctinyint is null
@@ -412,10 +415,13 @@ PREHOOK: query: create table sD ROW FORM
select * from (select ctinyint, cdouble, rank() over(partition by ctinyint order by cdouble) r from alltypesorc) a where r < 5
PREHOOK: type: CREATETABLE_AS_SELECT
PREHOOK: Input: default@alltypesorc
+PREHOOK: Output: database:default
+PREHOOK: Output: default@sD
POSTHOOK: query: create table sD ROW FORMAT DELIMITED FIELDS TERMINATED BY ',' STORED AS TEXTFILE as
select * from (select ctinyint, cdouble, rank() over(partition by ctinyint order by cdouble) r from alltypesorc) a where r < 5
POSTHOOK: type: CREATETABLE_AS_SELECT
POSTHOOK: Input: default@alltypesorc
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@sD
PREHOOK: query: select * from sD
where ctinyint is null
Modified: hive/branches/spark/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/JavaHiveCharObjectInspector.java
URL: http://svn.apache.org/viewvc/hive/branches/spark/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/JavaHiveCharObjectInspector.java?rev=1621416&r1=1621415&r2=1621416&view=diff
==============================================================================
--- hive/branches/spark/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/JavaHiveCharObjectInspector.java (original)
+++ hive/branches/spark/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/JavaHiveCharObjectInspector.java Sat Aug 30 06:44:46 2014
@@ -64,15 +64,16 @@ public class JavaHiveCharObjectInspector
}
public Object set(Object o, HiveChar value) {
- HiveChar setValue = (HiveChar) o;
- setValue.setValue(value, getMaxLength());
- return setValue;
+ if (BaseCharUtils.doesPrimitiveMatchTypeParams(value,
+ (CharTypeInfo) typeInfo)) {
+ return value;
+ } else {
+ return new HiveChar(value, getMaxLength());
+ }
}
public Object set(Object o, String value) {
- HiveChar setValue = (HiveChar) o;
- setValue.setValue(value, getMaxLength());
- return setValue;
+ return new HiveChar(value, getMaxLength());
}
public Object create(HiveChar value) {
Modified: hive/branches/spark/service/if/TCLIService.thrift
URL: http://svn.apache.org/viewvc/hive/branches/spark/service/if/TCLIService.thrift?rev=1621416&r1=1621415&r2=1621416&view=diff
==============================================================================
--- hive/branches/spark/service/if/TCLIService.thrift (original)
+++ hive/branches/spark/service/if/TCLIService.thrift Sat Aug 30 06:44:46 2014
@@ -1054,6 +1054,9 @@ struct TFetchResultsReq {
// Max number of rows that should be returned in
// the rowset.
3: required i64 maxRows
+
+ // The type of a fetch results request. 0 represents Query output. 1 represents Log
+ 4: optional i16 fetchType = 0
}
struct TFetchResultsResp {
Modified: hive/branches/spark/service/src/gen/thrift/gen-cpp/TCLIService_types.cpp
URL: http://svn.apache.org/viewvc/hive/branches/spark/service/src/gen/thrift/gen-cpp/TCLIService_types.cpp?rev=1621416&r1=1621415&r2=1621416&view=diff
==============================================================================
--- hive/branches/spark/service/src/gen/thrift/gen-cpp/TCLIService_types.cpp (original)
+++ hive/branches/spark/service/src/gen/thrift/gen-cpp/TCLIService_types.cpp Sat Aug 30 06:44:46 2014
@@ -6137,8 +6137,8 @@ void swap(TGetResultSetMetadataResp &a,
swap(a.__isset, b.__isset);
}
-const char* TFetchResultsReq::ascii_fingerprint = "1B96A8C05BA9DD699FC8CD842240ABDE";
-const uint8_t TFetchResultsReq::binary_fingerprint[16] = {0x1B,0x96,0xA8,0xC0,0x5B,0xA9,0xDD,0x69,0x9F,0xC8,0xCD,0x84,0x22,0x40,0xAB,0xDE};
+const char* TFetchResultsReq::ascii_fingerprint = "B4CB1E4F8F8F4D50183DD372AD11753A";
+const uint8_t TFetchResultsReq::binary_fingerprint[16] = {0xB4,0xCB,0x1E,0x4F,0x8F,0x8F,0x4D,0x50,0x18,0x3D,0xD3,0x72,0xAD,0x11,0x75,0x3A};
uint32_t TFetchResultsReq::read(::apache::thrift::protocol::TProtocol* iprot) {
@@ -6189,6 +6189,14 @@ uint32_t TFetchResultsReq::read(::apache
xfer += iprot->skip(ftype);
}
break;
+ case 4:
+ if (ftype == ::apache::thrift::protocol::T_I16) {
+ xfer += iprot->readI16(this->fetchType);
+ this->__isset.fetchType = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
default:
xfer += iprot->skip(ftype);
break;
@@ -6223,6 +6231,11 @@ uint32_t TFetchResultsReq::write(::apach
xfer += oprot->writeI64(this->maxRows);
xfer += oprot->writeFieldEnd();
+ if (this->__isset.fetchType) {
+ xfer += oprot->writeFieldBegin("fetchType", ::apache::thrift::protocol::T_I16, 4);
+ xfer += oprot->writeI16(this->fetchType);
+ xfer += oprot->writeFieldEnd();
+ }
xfer += oprot->writeFieldStop();
xfer += oprot->writeStructEnd();
return xfer;
@@ -6233,6 +6246,8 @@ void swap(TFetchResultsReq &a, TFetchRes
swap(a.operationHandle, b.operationHandle);
swap(a.orientation, b.orientation);
swap(a.maxRows, b.maxRows);
+ swap(a.fetchType, b.fetchType);
+ swap(a.__isset, b.__isset);
}
const char* TFetchResultsResp::ascii_fingerprint = "FC43BC2D6F3B76D4DB0F34226A745C8E";
Modified: hive/branches/spark/service/src/gen/thrift/gen-cpp/TCLIService_types.h
URL: http://svn.apache.org/viewvc/hive/branches/spark/service/src/gen/thrift/gen-cpp/TCLIService_types.h?rev=1621416&r1=1621415&r2=1621416&view=diff
==============================================================================
--- hive/branches/spark/service/src/gen/thrift/gen-cpp/TCLIService_types.h (original)
+++ hive/branches/spark/service/src/gen/thrift/gen-cpp/TCLIService_types.h Sat Aug 30 06:44:46 2014
@@ -3602,14 +3602,18 @@ class TGetResultSetMetadataResp {
void swap(TGetResultSetMetadataResp &a, TGetResultSetMetadataResp &b);
+typedef struct _TFetchResultsReq__isset {
+ _TFetchResultsReq__isset() : fetchType(true) {}
+ bool fetchType;
+} _TFetchResultsReq__isset;
class TFetchResultsReq {
public:
- static const char* ascii_fingerprint; // = "1B96A8C05BA9DD699FC8CD842240ABDE";
- static const uint8_t binary_fingerprint[16]; // = {0x1B,0x96,0xA8,0xC0,0x5B,0xA9,0xDD,0x69,0x9F,0xC8,0xCD,0x84,0x22,0x40,0xAB,0xDE};
+ static const char* ascii_fingerprint; // = "B4CB1E4F8F8F4D50183DD372AD11753A";
+ static const uint8_t binary_fingerprint[16]; // = {0xB4,0xCB,0x1E,0x4F,0x8F,0x8F,0x4D,0x50,0x18,0x3D,0xD3,0x72,0xAD,0x11,0x75,0x3A};
- TFetchResultsReq() : orientation((TFetchOrientation::type)0), maxRows(0) {
+ TFetchResultsReq() : orientation((TFetchOrientation::type)0), maxRows(0), fetchType(0) {
orientation = (TFetchOrientation::type)0;
}
@@ -3619,6 +3623,9 @@ class TFetchResultsReq {
TOperationHandle operationHandle;
TFetchOrientation::type orientation;
int64_t maxRows;
+ int16_t fetchType;
+
+ _TFetchResultsReq__isset __isset;
void __set_operationHandle(const TOperationHandle& val) {
operationHandle = val;
@@ -3632,6 +3639,11 @@ class TFetchResultsReq {
maxRows = val;
}
+ void __set_fetchType(const int16_t val) {
+ fetchType = val;
+ __isset.fetchType = true;
+ }
+
bool operator == (const TFetchResultsReq & rhs) const
{
if (!(operationHandle == rhs.operationHandle))
@@ -3640,6 +3652,10 @@ class TFetchResultsReq {
return false;
if (!(maxRows == rhs.maxRows))
return false;
+ if (__isset.fetchType != rhs.__isset.fetchType)
+ return false;
+ else if (__isset.fetchType && !(fetchType == rhs.fetchType))
+ return false;
return true;
}
bool operator != (const TFetchResultsReq &rhs) const {