You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by am...@apache.org on 2014/09/15 13:35:03 UTC
svn commit: r1625000 [1/3] - in /hive/trunk:
contrib/src/test/results/clientpositive/
ql/src/test/queries/clientpositive/ ql/src/test/results/clientnegative/
ql/src/test/results/clientpositive/ ql/src/test/results/compiler/plan/
serde/if/test/ serde/sr...
Author: amareshwari
Date: Mon Sep 15 11:35:02 2014
New Revision: 1625000
URL: http://svn.apache.org/r1625000
Log:
HIVE-7936. Support for handling Thrift Union types (Suma Shivaprasad via amareshwari)
Added:
hive/trunk/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/PropValueUnion.java
hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ThriftObjectInspectorUtils.java
hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ThriftUnionObjectInspector.java
Modified:
hive/trunk/contrib/src/test/results/clientpositive/udf_example_arraymapstruct.q.out
hive/trunk/ql/src/test/queries/clientpositive/input_lazyserde.q
hive/trunk/ql/src/test/results/clientnegative/describe_xpath1.q.out
hive/trunk/ql/src/test/results/clientnegative/describe_xpath2.q.out
hive/trunk/ql/src/test/results/clientpositive/case_sensitivity.q.out
hive/trunk/ql/src/test/results/clientpositive/columnarserde_create_shortcut.q.out
hive/trunk/ql/src/test/results/clientpositive/input17.q.out
hive/trunk/ql/src/test/results/clientpositive/input5.q.out
hive/trunk/ql/src/test/results/clientpositive/input_columnarserde.q.out
hive/trunk/ql/src/test/results/clientpositive/input_dynamicserde.q.out
hive/trunk/ql/src/test/results/clientpositive/input_lazyserde.q.out
hive/trunk/ql/src/test/results/clientpositive/input_testxpath.q.out
hive/trunk/ql/src/test/results/clientpositive/input_testxpath2.q.out
hive/trunk/ql/src/test/results/clientpositive/input_testxpath3.q.out
hive/trunk/ql/src/test/results/clientpositive/input_testxpath4.q.out
hive/trunk/ql/src/test/results/clientpositive/inputddl8.q.out
hive/trunk/ql/src/test/results/clientpositive/join_thrift.q.out
hive/trunk/ql/src/test/results/clientpositive/udf_case_thrift.q.out
hive/trunk/ql/src/test/results/clientpositive/udf_coalesce.q.out
hive/trunk/ql/src/test/results/clientpositive/udf_isnull_isnotnull.q.out
hive/trunk/ql/src/test/results/clientpositive/udf_size.q.out
hive/trunk/ql/src/test/results/clientpositive/union21.q.out
hive/trunk/ql/src/test/results/compiler/plan/case_sensitivity.q.xml
hive/trunk/ql/src/test/results/compiler/plan/input5.q.xml
hive/trunk/ql/src/test/results/compiler/plan/input_testxpath.q.xml
hive/trunk/ql/src/test/results/compiler/plan/input_testxpath2.q.xml
hive/trunk/serde/if/test/complex.thrift
hive/trunk/serde/src/gen/thrift/gen-cpp/complex_types.cpp
hive/trunk/serde/src/gen/thrift/gen-cpp/complex_types.h
hive/trunk/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/Complex.java
hive/trunk/serde/src/gen/thrift/gen-py/complex/ttypes.py
hive/trunk/serde/src/gen/thrift/gen-rb/complex_types.rb
hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ObjectInspectorFactory.java
hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ReflectionStructObjectInspector.java
hive/trunk/serde/src/test/org/apache/hadoop/hive/serde2/objectinspector/TestObjectInspectorUtils.java
hive/trunk/serde/src/test/org/apache/hadoop/hive/serde2/objectinspector/TestThriftObjectInspectors.java
hive/trunk/serde/src/test/org/apache/hadoop/hive/serde2/thrift_test/CreateSequenceFile.java
Modified: hive/trunk/contrib/src/test/results/clientpositive/udf_example_arraymapstruct.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/contrib/src/test/results/clientpositive/udf_example_arraymapstruct.q.out?rev=1625000&r1=1624999&r2=1625000&view=diff
==============================================================================
--- hive/trunk/contrib/src/test/results/clientpositive/udf_example_arraymapstruct.q.out (original)
+++ hive/trunk/contrib/src/test/results/clientpositive/udf_example_arraymapstruct.q.out Mon Sep 15 11:35:02 2014
@@ -34,14 +34,14 @@ STAGE PLANS:
Map Operator Tree:
TableScan
alias: src_thrift
- Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 11 Data size: 3070 Basic stats: COMPLETE Column stats: NONE
Select Operator
expressions: example_arraysum(lint) (type: double), example_mapconcat(mstringstring) (type: string), example_structprint(lintstring[0]) (type: string)
outputColumnNames: _col0, _col1, _col2
- Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 11 Data size: 3070 Basic stats: COMPLETE Column stats: NONE
File Output Operator
compressed: false
- Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 11 Data size: 3070 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/trunk/ql/src/test/queries/clientpositive/input_lazyserde.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/input_lazyserde.q?rev=1625000&r1=1624999&r2=1625000&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/input_lazyserde.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/input_lazyserde.q Mon Sep 15 11:35:02 2014
@@ -1,5 +1,6 @@
-- SORT_QUERY_RESULTS
+DROP TABLE dest1;
CREATE TABLE dest1(a array<int>, b array<string>, c map<string,string>, d int, e string)
ROW FORMAT DELIMITED
FIELDS TERMINATED BY '1'
@@ -32,5 +33,21 @@ SELECT * from dest1;
CREATE TABLE destBin(a UNIONTYPE<int, double, array<string>, struct<col1:int,col2:string>>) ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe' STORED AS SEQUENCEFILE;
INSERT OVERWRITE TABLE destBin SELECT create_union( CASE WHEN key < 100 THEN 0 WHEN key < 200 THEN 1 WHEN key < 300 THEN 2 WHEN key < 400 THEN 3 ELSE 0 END, key, 2.0, array("one","two"), struct(5,"five")) FROM srcbucket2;
-SELECT * from destBin ORDER BY a;
+SELECT * from destBin;
DROP TABLE destBin;
+
+DROP TABLE dest2;
+DROP TABLE dest3;
+
+CREATE TABLE dest2 (a map<string,map<string,map<string,uniontype<int, bigint, string, double, boolean, array<string>, map<string,string>>>>>)
+ ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe' STORED AS SEQUENCEFILE;
+INSERT OVERWRITE TABLE dest2 SELECT src_thrift.attributes FROM src_thrift;
+SELECT a from dest2 limit 10;
+
+CREATE TABLE dest3 (
+unionfield1 uniontype<int, bigint, string, double, boolean, array<string>, map<string,string>>,
+unionfield2 uniontype<int, bigint, string, double, boolean, array<string>, map<string,string>>,
+unionfield3 uniontype<int, bigint, string, double, boolean, array<string>, map<string,string>>
+) ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe' STORED AS SEQUENCEFILE;
+INSERT OVERWRITE TABLE dest3 SELECT src_thrift.unionField1,src_thrift.unionField2,src_thrift.unionField3 from src_thrift;
+SELECT unionfield1, unionField2, unionfield3 from dest3 limit 10;
Modified: hive/trunk/ql/src/test/results/clientnegative/describe_xpath1.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientnegative/describe_xpath1.q.out?rev=1625000&r1=1624999&r2=1625000&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientnegative/describe_xpath1.q.out (original)
+++ hive/trunk/ql/src/test/results/clientnegative/describe_xpath1.q.out Mon Sep 15 11:35:02 2014
@@ -1,4 +1,4 @@
PREHOOK: query: describe src_thrift.$elem$
PREHOOK: type: DESCTABLE
PREHOOK: Input: default@src_thrift
-FAILED: Execution Error, return code 1 from org.apache.hadoop.hive.ql.exec.DDLTask. cannot find field $elem$ from [private int org.apache.hadoop.hive.serde2.thrift.test.Complex.aint, private java.lang.String org.apache.hadoop.hive.serde2.thrift.test.Complex.aString, private java.util.List org.apache.hadoop.hive.serde2.thrift.test.Complex.lint, private java.util.List org.apache.hadoop.hive.serde2.thrift.test.Complex.lString, private java.util.List org.apache.hadoop.hive.serde2.thrift.test.Complex.lintString, private java.util.Map org.apache.hadoop.hive.serde2.thrift.test.Complex.mStringString]
+FAILED: Execution Error, return code 1 from org.apache.hadoop.hive.ql.exec.DDLTask. cannot find field $elem$ from [private int org.apache.hadoop.hive.serde2.thrift.test.Complex.aint, private java.lang.String org.apache.hadoop.hive.serde2.thrift.test.Complex.aString, private java.util.List org.apache.hadoop.hive.serde2.thrift.test.Complex.lint, private java.util.List org.apache.hadoop.hive.serde2.thrift.test.Complex.lString, private java.util.List org.apache.hadoop.hive.serde2.thrift.test.Complex.lintString, private java.util.Map org.apache.hadoop.hive.serde2.thrift.test.Complex.mStringString, private java.util.Map org.apache.hadoop.hive.serde2.thrift.test.Complex.attributes, private org.apache.hadoop.hive.serde2.thrift.test.PropValueUnion org.apache.hadoop.hive.serde2.thrift.test.Complex.unionField1, private org.apache.hadoop.hive.serde2.thrift.test.PropValueUnion org.apache.hadoop.hive.serde2.thrift.test.Complex.unionField2, private org.apache.hadoop.hive.serde2.thrift.test.PropVal
ueUnion org.apache.hadoop.hive.serde2.thrift.test.Complex.unionField3]
Modified: hive/trunk/ql/src/test/results/clientnegative/describe_xpath2.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientnegative/describe_xpath2.q.out?rev=1625000&r1=1624999&r2=1625000&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientnegative/describe_xpath2.q.out (original)
+++ hive/trunk/ql/src/test/results/clientnegative/describe_xpath2.q.out Mon Sep 15 11:35:02 2014
@@ -1,4 +1,4 @@
PREHOOK: query: describe src_thrift.$key$
PREHOOK: type: DESCTABLE
PREHOOK: Input: default@src_thrift
-FAILED: Execution Error, return code 1 from org.apache.hadoop.hive.ql.exec.DDLTask. cannot find field $key$ from [private int org.apache.hadoop.hive.serde2.thrift.test.Complex.aint, private java.lang.String org.apache.hadoop.hive.serde2.thrift.test.Complex.aString, private java.util.List org.apache.hadoop.hive.serde2.thrift.test.Complex.lint, private java.util.List org.apache.hadoop.hive.serde2.thrift.test.Complex.lString, private java.util.List org.apache.hadoop.hive.serde2.thrift.test.Complex.lintString, private java.util.Map org.apache.hadoop.hive.serde2.thrift.test.Complex.mStringString]
+FAILED: Execution Error, return code 1 from org.apache.hadoop.hive.ql.exec.DDLTask. cannot find field $key$ from [private int org.apache.hadoop.hive.serde2.thrift.test.Complex.aint, private java.lang.String org.apache.hadoop.hive.serde2.thrift.test.Complex.aString, private java.util.List org.apache.hadoop.hive.serde2.thrift.test.Complex.lint, private java.util.List org.apache.hadoop.hive.serde2.thrift.test.Complex.lString, private java.util.List org.apache.hadoop.hive.serde2.thrift.test.Complex.lintString, private java.util.Map org.apache.hadoop.hive.serde2.thrift.test.Complex.mStringString, private java.util.Map org.apache.hadoop.hive.serde2.thrift.test.Complex.attributes, private org.apache.hadoop.hive.serde2.thrift.test.PropValueUnion org.apache.hadoop.hive.serde2.thrift.test.Complex.unionField1, private org.apache.hadoop.hive.serde2.thrift.test.PropValueUnion org.apache.hadoop.hive.serde2.thrift.test.Complex.unionField2, private org.apache.hadoop.hive.serde2.thrift.test.PropValu
eUnion org.apache.hadoop.hive.serde2.thrift.test.Complex.unionField3]
Modified: hive/trunk/ql/src/test/results/clientpositive/case_sensitivity.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/case_sensitivity.q.out?rev=1625000&r1=1624999&r2=1625000&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/case_sensitivity.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/case_sensitivity.q.out Mon Sep 15 11:35:02 2014
@@ -30,17 +30,17 @@ STAGE PLANS:
Map Operator Tree:
TableScan
alias: src_thrift
- Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 11 Data size: 3070 Basic stats: COMPLETE Column stats: NONE
Filter Operator
predicate: (lint[0] > 0) (type: boolean)
- Statistics: Num rows: 3 Data size: 437 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 3 Data size: 837 Basic stats: COMPLETE Column stats: NONE
Select Operator
expressions: lint[1] (type: int), lintstring[0].MYSTRING (type: string)
outputColumnNames: _col0, _col1
- Statistics: Num rows: 3 Data size: 437 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 3 Data size: 837 Basic stats: COMPLETE Column stats: NONE
File Output Operator
compressed: false
- Statistics: Num rows: 3 Data size: 437 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 3 Data size: 837 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/trunk/ql/src/test/results/clientpositive/columnarserde_create_shortcut.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/columnarserde_create_shortcut.q.out?rev=1625000&r1=1624999&r2=1625000&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/columnarserde_create_shortcut.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/columnarserde_create_shortcut.q.out Mon Sep 15 11:35:02 2014
@@ -29,24 +29,24 @@ STAGE PLANS:
Map Operator Tree:
TableScan
alias: src_thrift
- Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 11 Data size: 3070 Basic stats: COMPLETE Column stats: NONE
Select Operator
expressions: lint (type: array<int>), lstring (type: array<string>), mstringstring (type: map<string,string>), aint (type: int), astring (type: string)
outputColumnNames: _col0, _col1, _col2, _col3, _col4
- Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 11 Data size: 3070 Basic stats: COMPLETE Column stats: NONE
Reduce Output Operator
sort order:
Map-reduce partition columns: 1 (type: int)
- Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 11 Data size: 3070 Basic stats: COMPLETE Column stats: NONE
value expressions: _col0 (type: array<int>), _col1 (type: array<string>), _col2 (type: map<string,string>), _col3 (type: int), _col4 (type: string)
Reduce Operator Tree:
Select Operator
expressions: VALUE._col0 (type: array<int>), VALUE._col1 (type: array<string>), VALUE._col2 (type: map<string,string>), VALUE._col3 (type: int), VALUE._col4 (type: string)
outputColumnNames: _col0, _col1, _col2, _col3, _col4
- Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 11 Data size: 3070 Basic stats: COMPLETE Column stats: NONE
File Output Operator
compressed: false
- Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 11 Data size: 3070 Basic stats: COMPLETE Column stats: NONE
table:
input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat
output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat
Modified: hive/trunk/ql/src/test/results/clientpositive/input17.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/input17.q.out?rev=1625000&r1=1624999&r2=1625000&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/input17.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/input17.q.out Mon Sep 15 11:35:02 2014
@@ -35,32 +35,32 @@ STAGE PLANS:
Map Operator Tree:
TableScan
alias: src_thrift
- Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 11 Data size: 3070 Basic stats: COMPLETE Column stats: NONE
Select Operator
expressions: (aint + lint[0]) (type: int), lintstring[0] (type: struct<myint:int,mystring:string,underscore_int:int>)
outputColumnNames: _col0, _col1
- Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 11 Data size: 3070 Basic stats: COMPLETE Column stats: NONE
Transform Operator
command: cat
output info:
input format: org.apache.hadoop.mapred.TextInputFormat
output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
- Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 11 Data size: 3070 Basic stats: COMPLETE Column stats: NONE
Reduce Output Operator
key expressions: _col0 (type: string)
sort order: +
Map-reduce partition columns: _col0 (type: string)
- Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 11 Data size: 3070 Basic stats: COMPLETE Column stats: NONE
value expressions: _col0 (type: string), _col1 (type: string)
Reduce Operator Tree:
Select Operator
expressions: UDFToInteger(VALUE._col0) (type: int), VALUE._col1 (type: string)
outputColumnNames: _col0, _col1
- Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 11 Data size: 3070 Basic stats: COMPLETE Column stats: NONE
File Output Operator
compressed: false
- Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 11 Data size: 3070 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/trunk/ql/src/test/results/clientpositive/input5.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/input5.q.out?rev=1625000&r1=1624999&r2=1625000&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/input5.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/input5.q.out Mon Sep 15 11:35:02 2014
@@ -35,32 +35,32 @@ STAGE PLANS:
Map Operator Tree:
TableScan
alias: src_thrift
- Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 11 Data size: 3070 Basic stats: COMPLETE Column stats: NONE
Select Operator
expressions: lint (type: array<int>), lintstring (type: array<struct<myint:int,mystring:string,underscore_int:int>>)
outputColumnNames: _col0, _col1
- Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 11 Data size: 3070 Basic stats: COMPLETE Column stats: NONE
Transform Operator
command: cat
output info:
input format: org.apache.hadoop.mapred.TextInputFormat
output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
- Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 11 Data size: 3070 Basic stats: COMPLETE Column stats: NONE
Reduce Output Operator
key expressions: _col0 (type: string)
sort order: +
Map-reduce partition columns: _col0 (type: string)
- Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 11 Data size: 3070 Basic stats: COMPLETE Column stats: NONE
value expressions: _col0 (type: string), _col1 (type: string)
Reduce Operator Tree:
Select Operator
expressions: VALUE._col0 (type: string), VALUE._col1 (type: string)
outputColumnNames: _col0, _col1
- Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 11 Data size: 3070 Basic stats: COMPLETE Column stats: NONE
File Output Operator
compressed: false
- Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 11 Data size: 3070 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/trunk/ql/src/test/results/clientpositive/input_columnarserde.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/input_columnarserde.q.out?rev=1625000&r1=1624999&r2=1625000&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/input_columnarserde.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/input_columnarserde.q.out Mon Sep 15 11:35:02 2014
@@ -35,24 +35,24 @@ STAGE PLANS:
Map Operator Tree:
TableScan
alias: src_thrift
- Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 11 Data size: 3070 Basic stats: COMPLETE Column stats: NONE
Select Operator
expressions: lint (type: array<int>), lstring (type: array<string>), mstringstring (type: map<string,string>), aint (type: int), astring (type: string)
outputColumnNames: _col0, _col1, _col2, _col3, _col4
- Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 11 Data size: 3070 Basic stats: COMPLETE Column stats: NONE
Reduce Output Operator
sort order:
Map-reduce partition columns: 1 (type: int)
- Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 11 Data size: 3070 Basic stats: COMPLETE Column stats: NONE
value expressions: _col0 (type: array<int>), _col1 (type: array<string>), _col2 (type: map<string,string>), _col3 (type: int), _col4 (type: string)
Reduce Operator Tree:
Select Operator
expressions: VALUE._col0 (type: array<int>), VALUE._col1 (type: array<string>), VALUE._col2 (type: map<string,string>), VALUE._col3 (type: int), VALUE._col4 (type: string)
outputColumnNames: _col0, _col1, _col2, _col3, _col4
- Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 11 Data size: 3070 Basic stats: COMPLETE Column stats: NONE
File Output Operator
compressed: false
- Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 11 Data size: 3070 Basic stats: COMPLETE Column stats: NONE
table:
input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat
output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat
Modified: hive/trunk/ql/src/test/results/clientpositive/input_dynamicserde.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/input_dynamicserde.q.out?rev=1625000&r1=1624999&r2=1625000&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/input_dynamicserde.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/input_dynamicserde.q.out Mon Sep 15 11:35:02 2014
@@ -42,14 +42,14 @@ STAGE PLANS:
Map Operator Tree:
TableScan
alias: src_thrift
- Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 11 Data size: 3070 Basic stats: COMPLETE Column stats: NONE
Select Operator
expressions: lint (type: array<int>), lstring (type: array<string>), mstringstring (type: map<string,string>), aint (type: int), astring (type: string)
outputColumnNames: _col0, _col1, _col2, _col3, _col4
- Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 11 Data size: 3070 Basic stats: COMPLETE Column stats: NONE
File Output Operator
compressed: false
- Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 11 Data size: 3070 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/trunk/ql/src/test/results/clientpositive/input_lazyserde.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/input_lazyserde.q.out?rev=1625000&r1=1624999&r2=1625000&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/input_lazyserde.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/input_lazyserde.q.out Mon Sep 15 11:35:02 2014
@@ -1,6 +1,12 @@
PREHOOK: query: -- SORT_QUERY_RESULTS
-CREATE TABLE dest1(a array<int>, b array<string>, c map<string,string>, d int, e string)
+DROP TABLE dest1
+PREHOOK: type: DROPTABLE
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+DROP TABLE dest1
+POSTHOOK: type: DROPTABLE
+PREHOOK: query: CREATE TABLE dest1(a array<int>, b array<string>, c map<string,string>, d int, e string)
ROW FORMAT DELIMITED
FIELDS TERMINATED BY '1'
COLLECTION ITEMS TERMINATED BY '2'
@@ -10,9 +16,7 @@ STORED AS TEXTFILE
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@dest1
-POSTHOOK: query: -- SORT_QUERY_RESULTS
-
-CREATE TABLE dest1(a array<int>, b array<string>, c map<string,string>, d int, e string)
+POSTHOOK: query: CREATE TABLE dest1(a array<int>, b array<string>, c map<string,string>, d int, e string)
ROW FORMAT DELIMITED
FIELDS TERMINATED BY '1'
COLLECTION ITEMS TERMINATED BY '2'
@@ -41,24 +45,24 @@ STAGE PLANS:
Map Operator Tree:
TableScan
alias: src_thrift
- Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 11 Data size: 3070 Basic stats: COMPLETE Column stats: NONE
Select Operator
expressions: lint (type: array<int>), lstring (type: array<string>), mstringstring (type: map<string,string>), aint (type: int), astring (type: string)
outputColumnNames: _col0, _col1, _col2, _col3, _col4
- Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 11 Data size: 3070 Basic stats: COMPLETE Column stats: NONE
Reduce Output Operator
sort order:
Map-reduce partition columns: 1 (type: int)
- Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 11 Data size: 3070 Basic stats: COMPLETE Column stats: NONE
value expressions: _col0 (type: array<int>), _col1 (type: array<string>), _col2 (type: map<string,string>), _col3 (type: int), _col4 (type: string)
Reduce Operator Tree:
Select Operator
expressions: VALUE._col0 (type: array<int>), VALUE._col1 (type: array<string>), VALUE._col2 (type: map<string,string>), VALUE._col3 (type: int), VALUE._col4 (type: string)
outputColumnNames: _col0, _col1, _col2, _col3, _col4
- Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 11 Data size: 3070 Basic stats: COMPLETE Column stats: NONE
File Output Operator
compressed: false
- Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 11 Data size: 3070 Basic stats: COMPLETE Column stats: NONE
table:
input format: org.apache.hadoop.mapred.TextInputFormat
output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -236,11 +240,11 @@ POSTHOOK: type: QUERY
POSTHOOK: Input: default@srcbucket2
POSTHOOK: Output: default@destbin
POSTHOOK: Lineage: destbin.a EXPRESSION [(srcbucket2)srcbucket2.FieldSchema(name:key, type:int, comment:null), ]
-PREHOOK: query: SELECT * from destBin ORDER BY a
+PREHOOK: query: SELECT * from destBin
PREHOOK: type: QUERY
PREHOOK: Input: default@destbin
#### A masked pattern was here ####
-POSTHOOK: query: SELECT * from destBin ORDER BY a
+POSTHOOK: query: SELECT * from destBin
POSTHOOK: type: QUERY
POSTHOOK: Input: default@destbin
#### A masked pattern was here ####
@@ -752,3 +756,93 @@ POSTHOOK: query: DROP TABLE destBin
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@destbin
POSTHOOK: Output: default@destbin
+PREHOOK: query: DROP TABLE dest2
+PREHOOK: type: DROPTABLE
+POSTHOOK: query: DROP TABLE dest2
+POSTHOOK: type: DROPTABLE
+PREHOOK: query: DROP TABLE dest3
+PREHOOK: type: DROPTABLE
+POSTHOOK: query: DROP TABLE dest3
+POSTHOOK: type: DROPTABLE
+PREHOOK: query: CREATE TABLE dest2 (a map<string,map<string,map<string,uniontype<int, bigint, string, double, boolean, array<string>, map<string,string>>>>>)
+ ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe' STORED AS SEQUENCEFILE
+PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:default
+PREHOOK: Output: default@dest2
+POSTHOOK: query: CREATE TABLE dest2 (a map<string,map<string,map<string,uniontype<int, bigint, string, double, boolean, array<string>, map<string,string>>>>>)
+ ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe' STORED AS SEQUENCEFILE
+POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@dest2
+PREHOOK: query: INSERT OVERWRITE TABLE dest2 SELECT src_thrift.attributes FROM src_thrift
+PREHOOK: type: QUERY
+PREHOOK: Input: default@src_thrift
+PREHOOK: Output: default@dest2
+POSTHOOK: query: INSERT OVERWRITE TABLE dest2 SELECT src_thrift.attributes FROM src_thrift
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src_thrift
+POSTHOOK: Output: default@dest2
+POSTHOOK: Lineage: dest2.a SIMPLE [(src_thrift)src_thrift.FieldSchema(name:attributes, type:map<string,map<string,map<string,uniontype<int,bigint,string,double,boolean,array<string>,map<string,string>>>>>, comment:from deserializer), ]
+PREHOOK: query: SELECT a from dest2 limit 10
+PREHOOK: type: QUERY
+PREHOOK: Input: default@dest2
+#### A masked pattern was here ####
+POSTHOOK: query: SELECT a from dest2 limit 10
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@dest2
+#### A masked pattern was here ####
+{"key_0":{"erVal0":{"value_0":{3:1.0}}}}
+{"key_1":{"erVal1":{"value_1":{3:1.0}}}}
+{"key_2":{"erVal2":{"value_2":{3:1.0}}}}
+{"key_3":{"erVal3":{"value_3":{3:1.0}}}}
+{"key_4":{"erVal4":{"value_4":{3:1.0}}}}
+{"key_5":{"erVal5":{"value_5":{3:1.0}}}}
+{"key_6":{"erVal6":{"value_6":{3:1.0}}}}
+{"key_7":{"erVal7":{"value_7":{3:1.0}}}}
+{"key_8":{"erVal8":{"value_8":{3:1.0}}}}
+{"key_9":{"erVal9":{"value_9":{3:1.0}}}}
+PREHOOK: query: CREATE TABLE dest3 (
+unionfield1 uniontype<int, bigint, string, double, boolean, array<string>, map<string,string>>,
+unionfield2 uniontype<int, bigint, string, double, boolean, array<string>, map<string,string>>,
+unionfield3 uniontype<int, bigint, string, double, boolean, array<string>, map<string,string>>
+) ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe' STORED AS SEQUENCEFILE
+PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:default
+PREHOOK: Output: default@dest3
+POSTHOOK: query: CREATE TABLE dest3 (
+unionfield1 uniontype<int, bigint, string, double, boolean, array<string>, map<string,string>>,
+unionfield2 uniontype<int, bigint, string, double, boolean, array<string>, map<string,string>>,
+unionfield3 uniontype<int, bigint, string, double, boolean, array<string>, map<string,string>>
+) ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe' STORED AS SEQUENCEFILE
+POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@dest3
+PREHOOK: query: INSERT OVERWRITE TABLE dest3 SELECT src_thrift.unionField1,src_thrift.unionField2,src_thrift.unionField3 from src_thrift
+PREHOOK: type: QUERY
+PREHOOK: Input: default@src_thrift
+PREHOOK: Output: default@dest3
+POSTHOOK: query: INSERT OVERWRITE TABLE dest3 SELECT src_thrift.unionField1,src_thrift.unionField2,src_thrift.unionField3 from src_thrift
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src_thrift
+POSTHOOK: Output: default@dest3
+POSTHOOK: Lineage: dest3.unionfield1 SIMPLE [(src_thrift)src_thrift.FieldSchema(name:unionfield1, type:uniontype<int,bigint,string,double,boolean,array<string>,map<string,string>>, comment:from deserializer), ]
+POSTHOOK: Lineage: dest3.unionfield2 SIMPLE [(src_thrift)src_thrift.FieldSchema(name:unionfield2, type:uniontype<int,bigint,string,double,boolean,array<string>,map<string,string>>, comment:from deserializer), ]
+POSTHOOK: Lineage: dest3.unionfield3 SIMPLE [(src_thrift)src_thrift.FieldSchema(name:unionfield3, type:uniontype<int,bigint,string,double,boolean,array<string>,map<string,string>>, comment:from deserializer), ]
+PREHOOK: query: SELECT unionfield1, unionField2, unionfield3 from dest3 limit 10
+PREHOOK: type: QUERY
+PREHOOK: Input: default@dest3
+#### A masked pattern was here ####
+POSTHOOK: query: SELECT unionfield1, unionField2, unionfield3 from dest3 limit 10
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@dest3
+#### A masked pattern was here ####
+{2:"test0"} {6:{"key_0":"value_0"}} {5:["0","0","0"]}
+{2:"test1"} {6:{"key_1":"value_1"}} {5:["10","100","1000"]}
+{2:"test2"} {6:{"key_2":"value_2"}} {5:["20","200","2000"]}
+{2:"test3"} {6:{"key_3":"value_3"}} {5:["30","300","3000"]}
+{2:"test4"} {6:{"key_4":"value_4"}} {5:["40","400","4000"]}
+{2:"test5"} {6:{"key_5":"value_5"}} {5:["50","500","5000"]}
+{2:"test6"} {6:{"key_6":"value_6"}} {5:["60","600","6000"]}
+{2:"test7"} {6:{"key_7":"value_7"}} {5:["70","700","7000"]}
+{2:"test8"} {6:{"key_8":"value_8"}} {5:["80","800","8000"]}
+{2:"test9"} {6:{"key_9":"value_9"}} {5:["90","900","9000"]}
Modified: hive/trunk/ql/src/test/results/clientpositive/input_testxpath.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/input_testxpath.q.out?rev=1625000&r1=1624999&r2=1625000&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/input_testxpath.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/input_testxpath.q.out Mon Sep 15 11:35:02 2014
@@ -30,14 +30,14 @@ STAGE PLANS:
Map Operator Tree:
TableScan
alias: src_thrift
- Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 11 Data size: 3070 Basic stats: COMPLETE Column stats: NONE
Select Operator
expressions: lint[1] (type: int), lintstring[0].mystring (type: string), mstringstring['key_2'] (type: string)
outputColumnNames: _col0, _col1, _col2
- Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 11 Data size: 3070 Basic stats: COMPLETE Column stats: NONE
File Output Operator
compressed: false
- Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 11 Data size: 3070 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/trunk/ql/src/test/results/clientpositive/input_testxpath2.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/input_testxpath2.q.out?rev=1625000&r1=1624999&r2=1625000&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/input_testxpath2.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/input_testxpath2.q.out Mon Sep 15 11:35:02 2014
@@ -30,17 +30,17 @@ STAGE PLANS:
Map Operator Tree:
TableScan
alias: src_thrift
- Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 11 Data size: 3070 Basic stats: COMPLETE Column stats: NONE
Filter Operator
predicate: (lint is not null and (not mstringstring is null)) (type: boolean)
- Statistics: Num rows: 3 Data size: 437 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 3 Data size: 837 Basic stats: COMPLETE Column stats: NONE
Select Operator
expressions: size(lint) (type: int), size(lintstring) (type: int), size(mstringstring) (type: int)
outputColumnNames: _col0, _col1, _col2
- Statistics: Num rows: 3 Data size: 437 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 3 Data size: 837 Basic stats: COMPLETE Column stats: NONE
File Output Operator
compressed: false
- Statistics: Num rows: 3 Data size: 437 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 3 Data size: 837 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/trunk/ql/src/test/results/clientpositive/input_testxpath3.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/input_testxpath3.q.out?rev=1625000&r1=1624999&r2=1625000&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/input_testxpath3.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/input_testxpath3.q.out Mon Sep 15 11:35:02 2014
@@ -16,14 +16,14 @@ STAGE PLANS:
Map Operator Tree:
TableScan
alias: src_thrift
- Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 11 Data size: 3070 Basic stats: COMPLETE Column stats: NONE
Select Operator
expressions: mstringstring['key_9'] (type: string), lintstring.myint (type: array<int>)
outputColumnNames: _col0, _col1
- Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 11 Data size: 3070 Basic stats: COMPLETE Column stats: NONE
File Output Operator
compressed: false
- Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 11 Data size: 3070 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/trunk/ql/src/test/results/clientpositive/input_testxpath4.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/input_testxpath4.q.out?rev=1625000&r1=1624999&r2=1625000&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/input_testxpath4.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/input_testxpath4.q.out Mon Sep 15 11:35:02 2014
@@ -22,17 +22,17 @@ STAGE PLANS:
Map Operator Tree:
TableScan
alias: src_thrift
- Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 11 Data size: 3070 Basic stats: COMPLETE Column stats: NONE
Filter Operator
predicate: ((mstringstring['key_9'] is not null and lintstring.myint is not null) and lintstring is not null) (type: boolean)
- Statistics: Num rows: 2 Data size: 292 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 2 Data size: 558 Basic stats: COMPLETE Column stats: NONE
Select Operator
expressions: mstringstring['key_9'] (type: string), lintstring.myint (type: array<int>)
outputColumnNames: _col0, _col1
- Statistics: Num rows: 2 Data size: 292 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 2 Data size: 558 Basic stats: COMPLETE Column stats: NONE
File Output Operator
compressed: false
- Statistics: Num rows: 2 Data size: 292 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 2 Data size: 558 Basic stats: COMPLETE Column stats: NONE
table:
input format: org.apache.hadoop.mapred.TextInputFormat
output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -94,17 +94,17 @@ STAGE PLANS:
Map Operator Tree:
TableScan
alias: src_thrift
- Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 11 Data size: 3070 Basic stats: COMPLETE Column stats: NONE
Filter Operator
predicate: ((mstringstring['key_9'] is not null and lintstring.myint is not null) and lintstring is not null) (type: boolean)
- Statistics: Num rows: 2 Data size: 292 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 2 Data size: 558 Basic stats: COMPLETE Column stats: NONE
Select Operator
expressions: mstringstring['key_9'] (type: string), lintstring.myint (type: array<int>)
outputColumnNames: _col0, _col1
- Statistics: Num rows: 2 Data size: 292 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 2 Data size: 558 Basic stats: COMPLETE Column stats: NONE
File Output Operator
compressed: false
- Statistics: Num rows: 2 Data size: 292 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 2 Data size: 558 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/trunk/ql/src/test/results/clientpositive/inputddl8.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/inputddl8.q.out?rev=1625000&r1=1624999&r2=1625000&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/inputddl8.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/inputddl8.q.out Mon Sep 15 11:35:02 2014
@@ -30,6 +30,10 @@ lint array<int>
lstring array<string> from deserializer
lintstring array<struct<myint:int,mystring:string,underscore_int:int>> from deserializer
mstringstring map<string,string> from deserializer
+attributes map<string,map<string,map<string,uniontype<int,bigint,string,double,boolean,array<string>,map<string,string>>>>> from deserializer
+unionfield1 uniontype<int,bigint,string,double,boolean,array<string>,map<string,string>> from deserializer
+unionfield2 uniontype<int,bigint,string,double,boolean,array<string>,map<string,string>> from deserializer
+unionfield3 uniontype<int,bigint,string,double,boolean,array<string>,map<string,string>> from deserializer
ds string
country string
Modified: hive/trunk/ql/src/test/results/clientpositive/join_thrift.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/join_thrift.q.out?rev=1625000&r1=1624999&r2=1625000&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/join_thrift.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/join_thrift.q.out Mon Sep 15 11:35:02 2014
@@ -10,6 +10,10 @@ lint array<int>
lstring array<string> from deserializer
lintstring array<struct<myint:int,mystring:string,underscore_int:int>> from deserializer
mstringstring map<string,string> from deserializer
+attributes map<string,map<string,map<string,uniontype<int,bigint,string,double,boolean,array<string>,map<string,string>>>>> from deserializer
+unionfield1 uniontype<int,bigint,string,double,boolean,array<string>,map<string,string>> from deserializer
+unionfield2 uniontype<int,bigint,string,double,boolean,array<string>,map<string,string>> from deserializer
+unionfield3 uniontype<int,bigint,string,double,boolean,array<string>,map<string,string>> from deserializer
PREHOOK: query: EXPLAIN
SELECT s1.aint, s2.lintstring
FROM src_thrift s1
@@ -32,27 +36,27 @@ STAGE PLANS:
Map Operator Tree:
TableScan
alias: s2
- Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 11 Data size: 3070 Basic stats: COMPLETE Column stats: NONE
Filter Operator
predicate: aint is not null (type: boolean)
- Statistics: Num rows: 6 Data size: 875 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 6 Data size: 1674 Basic stats: COMPLETE Column stats: NONE
Reduce Output Operator
key expressions: aint (type: int)
sort order: +
Map-reduce partition columns: aint (type: int)
- Statistics: Num rows: 6 Data size: 875 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 6 Data size: 1674 Basic stats: COMPLETE Column stats: NONE
value expressions: lintstring (type: array<struct<myint:int,mystring:string,underscore_int:int>>)
TableScan
alias: s1
- Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 11 Data size: 3070 Basic stats: COMPLETE Column stats: NONE
Filter Operator
predicate: aint is not null (type: boolean)
- Statistics: Num rows: 6 Data size: 875 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 6 Data size: 1674 Basic stats: COMPLETE Column stats: NONE
Reduce Output Operator
key expressions: aint (type: int)
sort order: +
Map-reduce partition columns: aint (type: int)
- Statistics: Num rows: 6 Data size: 875 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 6 Data size: 1674 Basic stats: COMPLETE Column stats: NONE
Reduce Operator Tree:
Join Operator
condition map:
@@ -60,15 +64,15 @@ STAGE PLANS:
condition expressions:
0 {KEY.reducesinkkey0}
1 {VALUE._col3}
- outputColumnNames: _col0, _col13
- Statistics: Num rows: 6 Data size: 962 Basic stats: COMPLETE Column stats: NONE
+ outputColumnNames: _col0, _col17
+ Statistics: Num rows: 6 Data size: 1841 Basic stats: COMPLETE Column stats: NONE
Select Operator
- expressions: _col0 (type: int), _col13 (type: array<struct<myint:int,mystring:string,underscore_int:int>>)
+ expressions: _col0 (type: int), _col17 (type: array<struct<myint:int,mystring:string,underscore_int:int>>)
outputColumnNames: _col0, _col1
- Statistics: Num rows: 6 Data size: 962 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 6 Data size: 1841 Basic stats: COMPLETE Column stats: NONE
File Output Operator
compressed: false
- Statistics: Num rows: 6 Data size: 962 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 6 Data size: 1841 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/trunk/ql/src/test/results/clientpositive/udf_case_thrift.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/udf_case_thrift.q.out?rev=1625000&r1=1624999&r2=1625000&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/udf_case_thrift.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/udf_case_thrift.q.out Mon Sep 15 11:35:02 2014
@@ -45,11 +45,11 @@ STAGE PLANS:
TableScan
alias: src_thrift
Row Limit Per Split: 3
- Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 11 Data size: 3070 Basic stats: COMPLETE Column stats: NONE
Select Operator
expressions: CASE (lint[0]) WHEN (0) THEN ((lint[0] + 1)) WHEN (1) THEN ((lint[0] + 2)) WHEN (2) THEN (100) ELSE (5) END (type: int), CASE (lstring[0]) WHEN ('0') THEN ('zero') WHEN ('10') THEN (concat(lstring[0], ' is ten')) ELSE ('default') END (type: string), CASE (lstring[0]) WHEN ('0') THEN (lstring) ELSE (null) END[0] (type: string)
outputColumnNames: _col0, _col1, _col2
- Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 11 Data size: 3070 Basic stats: COMPLETE Column stats: NONE
ListSink
PREHOOK: query: SELECT CASE src_thrift.lint[0]
Modified: hive/trunk/ql/src/test/results/clientpositive/udf_coalesce.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/udf_coalesce.q.out?rev=1625000&r1=1624999&r2=1625000&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/udf_coalesce.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/udf_coalesce.q.out Mon Sep 15 11:35:02 2014
@@ -138,11 +138,11 @@ STAGE PLANS:
Processor Tree:
TableScan
alias: src_thrift
- Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 11 Data size: 3070 Basic stats: COMPLETE Column stats: NONE
Select Operator
expressions: COALESCE(lint[1],999) (type: int), COALESCE(lintstring[0].mystring,'999') (type: string), COALESCE(mstringstring['key_2'],'999') (type: string)
outputColumnNames: _col0, _col1, _col2
- Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 11 Data size: 3070 Basic stats: COMPLETE Column stats: NONE
ListSink
PREHOOK: query: SELECT COALESCE(src_thrift.lint[1], 999),
Modified: hive/trunk/ql/src/test/results/clientpositive/udf_isnull_isnotnull.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/udf_isnull_isnotnull.q.out?rev=1625000&r1=1624999&r2=1625000&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/udf_isnull_isnotnull.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/udf_isnull_isnotnull.q.out Mon Sep 15 11:35:02 2014
@@ -95,17 +95,17 @@ STAGE PLANS:
Processor Tree:
TableScan
alias: src_thrift
- Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 11 Data size: 3070 Basic stats: COMPLETE Column stats: NONE
Filter Operator
predicate: (lint is not null and (not mstringstring is null)) (type: boolean)
- Statistics: Num rows: 3 Data size: 437 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 3 Data size: 837 Basic stats: COMPLETE Column stats: NONE
Select Operator
expressions: lint is not null (type: boolean), lintstring is not null (type: boolean), mstringstring is not null (type: boolean)
outputColumnNames: _col0, _col1, _col2
- Statistics: Num rows: 3 Data size: 437 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 3 Data size: 837 Basic stats: COMPLETE Column stats: NONE
Limit
Number of rows: 1
- Statistics: Num rows: 1 Data size: 145 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 1 Data size: 279 Basic stats: COMPLETE Column stats: NONE
ListSink
PREHOOK: query: FROM src_thrift
Modified: hive/trunk/ql/src/test/results/clientpositive/udf_size.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/udf_size.q.out?rev=1625000&r1=1624999&r2=1625000&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/udf_size.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/udf_size.q.out Mon Sep 15 11:35:02 2014
@@ -36,17 +36,17 @@ STAGE PLANS:
Processor Tree:
TableScan
alias: src_thrift
- Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 11 Data size: 3070 Basic stats: COMPLETE Column stats: NONE
Filter Operator
predicate: (lint is not null and (not mstringstring is null)) (type: boolean)
- Statistics: Num rows: 3 Data size: 437 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 3 Data size: 837 Basic stats: COMPLETE Column stats: NONE
Select Operator
expressions: size(lint) (type: int), size(lintstring) (type: int), size(mstringstring) (type: int), size(null) (type: int)
outputColumnNames: _col0, _col1, _col2, _col3
- Statistics: Num rows: 3 Data size: 437 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 3 Data size: 837 Basic stats: COMPLETE Column stats: NONE
Limit
Number of rows: 1
- Statistics: Num rows: 1 Data size: 145 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 1 Data size: 279 Basic stats: COMPLETE Column stats: NONE
ListSink
PREHOOK: query: FROM src_thrift
Modified: hive/trunk/ql/src/test/results/clientpositive/union21.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/union21.q.out?rev=1625000&r1=1624999&r2=1625000&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/union21.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/union21.q.out Mon Sep 15 11:35:02 2014
@@ -44,17 +44,17 @@ STAGE PLANS:
Map Operator Tree:
TableScan
alias: src_thrift
- Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 11 Data size: 3070 Basic stats: COMPLETE Column stats: NONE
Select Operator
expressions: astring (type: string)
outputColumnNames: _col0
- Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 11 Data size: 3070 Basic stats: COMPLETE Column stats: NONE
Union
- Statistics: Num rows: 1522 Data size: 56336 Basic stats: COMPLETE Column stats: PARTIAL
+ Statistics: Num rows: 1522 Data size: 59264 Basic stats: COMPLETE Column stats: PARTIAL
Select Operator
expressions: _col0 (type: string)
outputColumnNames: _col0
- Statistics: Num rows: 1522 Data size: 56336 Basic stats: COMPLETE Column stats: PARTIAL
+ Statistics: Num rows: 1522 Data size: 59264 Basic stats: COMPLETE Column stats: PARTIAL
Group By Operator
aggregations: count(1)
keys: _col0 (type: string)
@@ -69,17 +69,17 @@ STAGE PLANS:
value expressions: _col1 (type: bigint)
TableScan
alias: src_thrift
- Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 11 Data size: 3070 Basic stats: COMPLETE Column stats: NONE
Select Operator
expressions: lstring[0] (type: string)
outputColumnNames: _col0
- Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 11 Data size: 3070 Basic stats: COMPLETE Column stats: NONE
Union
- Statistics: Num rows: 1522 Data size: 56336 Basic stats: COMPLETE Column stats: PARTIAL
+ Statistics: Num rows: 1522 Data size: 59264 Basic stats: COMPLETE Column stats: PARTIAL
Select Operator
expressions: _col0 (type: string)
outputColumnNames: _col0
- Statistics: Num rows: 1522 Data size: 56336 Basic stats: COMPLETE Column stats: PARTIAL
+ Statistics: Num rows: 1522 Data size: 59264 Basic stats: COMPLETE Column stats: PARTIAL
Group By Operator
aggregations: count(1)
keys: _col0 (type: string)
@@ -100,11 +100,11 @@ STAGE PLANS:
outputColumnNames: _col0
Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
Union
- Statistics: Num rows: 1522 Data size: 56336 Basic stats: COMPLETE Column stats: PARTIAL
+ Statistics: Num rows: 1522 Data size: 59264 Basic stats: COMPLETE Column stats: PARTIAL
Select Operator
expressions: _col0 (type: string)
outputColumnNames: _col0
- Statistics: Num rows: 1522 Data size: 56336 Basic stats: COMPLETE Column stats: PARTIAL
+ Statistics: Num rows: 1522 Data size: 59264 Basic stats: COMPLETE Column stats: PARTIAL
Group By Operator
aggregations: count(1)
keys: _col0 (type: string)
@@ -125,11 +125,11 @@ STAGE PLANS:
outputColumnNames: _col0
Statistics: Num rows: 500 Data size: 42500 Basic stats: COMPLETE Column stats: COMPLETE
Union
- Statistics: Num rows: 1522 Data size: 56336 Basic stats: COMPLETE Column stats: PARTIAL
+ Statistics: Num rows: 1522 Data size: 59264 Basic stats: COMPLETE Column stats: PARTIAL
Select Operator
expressions: _col0 (type: string)
outputColumnNames: _col0
- Statistics: Num rows: 1522 Data size: 56336 Basic stats: COMPLETE Column stats: PARTIAL
+ Statistics: Num rows: 1522 Data size: 59264 Basic stats: COMPLETE Column stats: PARTIAL
Group By Operator
aggregations: count(1)
keys: _col0 (type: string)
@@ -150,11 +150,11 @@ STAGE PLANS:
outputColumnNames: _col0
Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
Union
- Statistics: Num rows: 1522 Data size: 56336 Basic stats: COMPLETE Column stats: PARTIAL
+ Statistics: Num rows: 1522 Data size: 59264 Basic stats: COMPLETE Column stats: PARTIAL
Select Operator
expressions: _col0 (type: string)
outputColumnNames: _col0
- Statistics: Num rows: 1522 Data size: 56336 Basic stats: COMPLETE Column stats: PARTIAL
+ Statistics: Num rows: 1522 Data size: 59264 Basic stats: COMPLETE Column stats: PARTIAL
Group By Operator
aggregations: count(1)
keys: _col0 (type: string)
Modified: hive/trunk/ql/src/test/results/compiler/plan/case_sensitivity.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/case_sensitivity.q.xml?rev=1625000&r1=1624999&r2=1625000&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/case_sensitivity.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/case_sensitivity.q.xml Mon Sep 15 11:35:02 2014
@@ -629,7 +629,7 @@
</void>
<void method="put">
<string>totalSize</string>
- <string>1606</string>
+ <string>3070</string>
</void>
<void method="put">
<string>bucket_count</string>
@@ -983,7 +983,7 @@
<object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFOPGreaterThan"/>
</void>
<void property="typeInfo">
- <object class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
+ <object id="PrimitiveTypeInfo2" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
<void property="typeName">
<string>boolean</string>
</void>
@@ -1132,7 +1132,7 @@
<string>src_thrift</string>
</void>
<void property="type">
- <object class="org.apache.hadoop.hive.serde2.typeinfo.ListTypeInfo">
+ <object id="ListTypeInfo2" class="org.apache.hadoop.hive.serde2.typeinfo.ListTypeInfo">
<void property="listElementTypeInfo">
<object idref="PrimitiveTypeInfo0"/>
</void>
@@ -1155,7 +1155,7 @@
<string>src_thrift</string>
</void>
<void property="type">
- <object class="org.apache.hadoop.hive.serde2.typeinfo.MapTypeInfo">
+ <object id="MapTypeInfo0" class="org.apache.hadoop.hive.serde2.typeinfo.MapTypeInfo">
<void property="mapKeyTypeInfo">
<object idref="PrimitiveTypeInfo0"/>
</void>
@@ -1171,6 +1171,125 @@
</void>
<void method="add">
<object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="internalName">
+ <string>attributes</string>
+ </void>
+ <void property="tabAlias">
+ <string>src_thrift</string>
+ </void>
+ <void property="type">
+ <object class="org.apache.hadoop.hive.serde2.typeinfo.MapTypeInfo">
+ <void property="mapKeyTypeInfo">
+ <object idref="PrimitiveTypeInfo0"/>
+ </void>
+ <void property="mapValueTypeInfo">
+ <object class="org.apache.hadoop.hive.serde2.typeinfo.MapTypeInfo">
+ <void property="mapKeyTypeInfo">
+ <object idref="PrimitiveTypeInfo0"/>
+ </void>
+ <void property="mapValueTypeInfo">
+ <object class="org.apache.hadoop.hive.serde2.typeinfo.MapTypeInfo">
+ <void property="mapKeyTypeInfo">
+ <object idref="PrimitiveTypeInfo0"/>
+ </void>
+ <void property="mapValueTypeInfo">
+ <object id="UnionTypeInfo0" class="org.apache.hadoop.hive.serde2.typeinfo.UnionTypeInfo">
+ <void property="allUnionObjectTypeInfos">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <object idref="PrimitiveTypeInfo1"/>
+ </void>
+ <void method="add">
+ <object id="PrimitiveTypeInfo3" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
+ <void property="typeName">
+ <string>bigint</string>
+ </void>
+ </object>
+ </void>
+ <void method="add">
+ <object idref="PrimitiveTypeInfo0"/>
+ </void>
+ <void method="add">
+ <object class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
+ <void property="typeName">
+ <string>double</string>
+ </void>
+ </object>
+ </void>
+ <void method="add">
+ <object idref="PrimitiveTypeInfo2"/>
+ </void>
+ <void method="add">
+ <object idref="ListTypeInfo2"/>
+ </void>
+ <void method="add">
+ <object idref="MapTypeInfo0"/>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ <void property="typeName">
+ <string>map<string,map<string,map<string,uniontype<int,bigint,string,double,boolean,array<string>,map<string,string>>>>></string>
+ </void>
+ </object>
+ </void>
+ <void method="add">
+ <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="internalName">
+ <string>unionfield1</string>
+ </void>
+ <void property="tabAlias">
+ <string>src_thrift</string>
+ </void>
+ <void property="type">
+ <object idref="UnionTypeInfo0"/>
+ </void>
+ <void property="typeName">
+ <string>uniontype<int,bigint,string,double,boolean,array<string>,map<string,string>></string>
+ </void>
+ </object>
+ </void>
+ <void method="add">
+ <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="internalName">
+ <string>unionfield2</string>
+ </void>
+ <void property="tabAlias">
+ <string>src_thrift</string>
+ </void>
+ <void property="type">
+ <object idref="UnionTypeInfo0"/>
+ </void>
+ <void property="typeName">
+ <string>uniontype<int,bigint,string,double,boolean,array<string>,map<string,string>></string>
+ </void>
+ </object>
+ </void>
+ <void method="add">
+ <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="internalName">
+ <string>unionfield3</string>
+ </void>
+ <void property="tabAlias">
+ <string>src_thrift</string>
+ </void>
+ <void property="type">
+ <object idref="UnionTypeInfo0"/>
+ </void>
+ <void property="typeName">
+ <string>uniontype<int,bigint,string,double,boolean,array<string>,map<string,string>></string>
+ </void>
+ </object>
+ </void>
+ <void method="add">
+ <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
<void property="hiddenVirtualCol">
<boolean>true</boolean>
</void>
@@ -1181,11 +1300,7 @@
<string>src_thrift</string>
</void>
<void property="type">
- <object id="PrimitiveTypeInfo2" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
- <void property="typeName">
- <string>bigint</string>
- </void>
- </object>
+ <object idref="PrimitiveTypeInfo3"/>
</void>
<void property="typeName">
<string>bigint</string>
@@ -1240,13 +1355,13 @@
<void property="allStructFieldTypeInfos">
<object class="java.util.ArrayList">
<void method="add">
- <object idref="PrimitiveTypeInfo2"/>
+ <object idref="PrimitiveTypeInfo3"/>
</void>
<void method="add">
<object idref="PrimitiveTypeInfo1"/>
</void>
<void method="add">
- <object idref="PrimitiveTypeInfo2"/>
+ <object idref="PrimitiveTypeInfo3"/>
</void>
</object>
</void>
@@ -1340,7 +1455,7 @@
</void>
<void method="put">
<string>totalSize</string>
- <string>1606</string>
+ <string>3070</string>
</void>
<void method="put">
<string>bucket_count</string>
Modified: hive/trunk/ql/src/test/results/compiler/plan/input5.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/input5.q.xml?rev=1625000&r1=1624999&r2=1625000&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/input5.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/input5.q.xml Mon Sep 15 11:35:02 2014
@@ -279,7 +279,7 @@
</void>
<void method="put">
<string>totalSize</string>
- <string>1606</string>
+ <string>3070</string>
</void>
<void method="put">
<string>bucket_count</string>
@@ -955,7 +955,7 @@
<string>src_thrift</string>
</void>
<void property="type">
- <object class="org.apache.hadoop.hive.serde2.typeinfo.ListTypeInfo">
+ <object id="ListTypeInfo2" class="org.apache.hadoop.hive.serde2.typeinfo.ListTypeInfo">
<void property="listElementTypeInfo">
<object idref="PrimitiveTypeInfo0"/>
</void>
@@ -991,7 +991,7 @@
<string>src_thrift</string>
</void>
<void property="type">
- <object class="org.apache.hadoop.hive.serde2.typeinfo.MapTypeInfo">
+ <object id="MapTypeInfo0" class="org.apache.hadoop.hive.serde2.typeinfo.MapTypeInfo">
<void property="mapKeyTypeInfo">
<object idref="PrimitiveTypeInfo0"/>
</void>
@@ -1007,6 +1007,129 @@
</void>
<void method="add">
<object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="internalName">
+ <string>attributes</string>
+ </void>
+ <void property="tabAlias">
+ <string>src_thrift</string>
+ </void>
+ <void property="type">
+ <object class="org.apache.hadoop.hive.serde2.typeinfo.MapTypeInfo">
+ <void property="mapKeyTypeInfo">
+ <object idref="PrimitiveTypeInfo0"/>
+ </void>
+ <void property="mapValueTypeInfo">
+ <object class="org.apache.hadoop.hive.serde2.typeinfo.MapTypeInfo">
+ <void property="mapKeyTypeInfo">
+ <object idref="PrimitiveTypeInfo0"/>
+ </void>
+ <void property="mapValueTypeInfo">
+ <object class="org.apache.hadoop.hive.serde2.typeinfo.MapTypeInfo">
+ <void property="mapKeyTypeInfo">
+ <object idref="PrimitiveTypeInfo0"/>
+ </void>
+ <void property="mapValueTypeInfo">
+ <object id="UnionTypeInfo0" class="org.apache.hadoop.hive.serde2.typeinfo.UnionTypeInfo">
+ <void property="allUnionObjectTypeInfos">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <object idref="PrimitiveTypeInfo1"/>
+ </void>
+ <void method="add">
+ <object id="PrimitiveTypeInfo2" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
+ <void property="typeName">
+ <string>bigint</string>
+ </void>
+ </object>
+ </void>
+ <void method="add">
+ <object idref="PrimitiveTypeInfo0"/>
+ </void>
+ <void method="add">
+ <object class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
+ <void property="typeName">
+ <string>double</string>
+ </void>
+ </object>
+ </void>
+ <void method="add">
+ <object class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
+ <void property="typeName">
+ <string>boolean</string>
+ </void>
+ </object>
+ </void>
+ <void method="add">
+ <object idref="ListTypeInfo2"/>
+ </void>
+ <void method="add">
+ <object idref="MapTypeInfo0"/>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ <void property="typeName">
+ <string>map<string,map<string,map<string,uniontype<int,bigint,string,double,boolean,array<string>,map<string,string>>>>></string>
+ </void>
+ </object>
+ </void>
+ <void method="add">
+ <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="internalName">
+ <string>unionfield1</string>
+ </void>
+ <void property="tabAlias">
+ <string>src_thrift</string>
+ </void>
+ <void property="type">
+ <object idref="UnionTypeInfo0"/>
+ </void>
+ <void property="typeName">
+ <string>uniontype<int,bigint,string,double,boolean,array<string>,map<string,string>></string>
+ </void>
+ </object>
+ </void>
+ <void method="add">
+ <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="internalName">
+ <string>unionfield2</string>
+ </void>
+ <void property="tabAlias">
+ <string>src_thrift</string>
+ </void>
+ <void property="type">
+ <object idref="UnionTypeInfo0"/>
+ </void>
+ <void property="typeName">
+ <string>uniontype<int,bigint,string,double,boolean,array<string>,map<string,string>></string>
+ </void>
+ </object>
+ </void>
+ <void method="add">
+ <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="internalName">
+ <string>unionfield3</string>
+ </void>
+ <void property="tabAlias">
+ <string>src_thrift</string>
+ </void>
+ <void property="type">
+ <object idref="UnionTypeInfo0"/>
+ </void>
+ <void property="typeName">
+ <string>uniontype<int,bigint,string,double,boolean,array<string>,map<string,string>></string>
+ </void>
+ </object>
+ </void>
+ <void method="add">
+ <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
<void property="hiddenVirtualCol">
<boolean>true</boolean>
</void>
@@ -1017,11 +1140,7 @@
<string>src_thrift</string>
</void>
<void property="type">
- <object id="PrimitiveTypeInfo2" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
- <void property="typeName">
- <string>bigint</string>
- </void>
- </object>
+ <object idref="PrimitiveTypeInfo2"/>
</void>
<void property="typeName">
<string>bigint</string>
@@ -1176,7 +1295,7 @@
</void>
<void method="put">
<string>totalSize</string>
- <string>1606</string>
+ <string>3070</string>
</void>
<void method="put">
<string>bucket_count</string>
Modified: hive/trunk/ql/src/test/results/compiler/plan/input_testxpath.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/input_testxpath.q.xml?rev=1625000&r1=1624999&r2=1625000&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/input_testxpath.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/input_testxpath.q.xml Mon Sep 15 11:35:02 2014
@@ -131,7 +131,7 @@
</void>
<void method="put">
<string>totalSize</string>
- <string>1606</string>
+ <string>3070</string>
</void>
<void method="put">
<string>bucket_count</string>
@@ -691,7 +691,7 @@
<string>src_thrift</string>
</void>
<void property="type">
- <object class="org.apache.hadoop.hive.serde2.typeinfo.ListTypeInfo">
+ <object id="ListTypeInfo2" class="org.apache.hadoop.hive.serde2.typeinfo.ListTypeInfo">
<void property="listElementTypeInfo">
<object idref="PrimitiveTypeInfo1"/>
</void>
@@ -736,6 +736,129 @@
</void>
<void method="add">
<object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="internalName">
+ <string>attributes</string>
+ </void>
+ <void property="tabAlias">
+ <string>src_thrift</string>
+ </void>
+ <void property="type">
+ <object class="org.apache.hadoop.hive.serde2.typeinfo.MapTypeInfo">
+ <void property="mapKeyTypeInfo">
+ <object idref="PrimitiveTypeInfo1"/>
+ </void>
+ <void property="mapValueTypeInfo">
+ <object class="org.apache.hadoop.hive.serde2.typeinfo.MapTypeInfo">
+ <void property="mapKeyTypeInfo">
+ <object idref="PrimitiveTypeInfo1"/>
+ </void>
+ <void property="mapValueTypeInfo">
+ <object class="org.apache.hadoop.hive.serde2.typeinfo.MapTypeInfo">
+ <void property="mapKeyTypeInfo">
+ <object idref="PrimitiveTypeInfo1"/>
+ </void>
+ <void property="mapValueTypeInfo">
+ <object id="UnionTypeInfo0" class="org.apache.hadoop.hive.serde2.typeinfo.UnionTypeInfo">
+ <void property="allUnionObjectTypeInfos">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <object idref="PrimitiveTypeInfo0"/>
+ </void>
+ <void method="add">
+ <object id="PrimitiveTypeInfo2" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
+ <void property="typeName">
+ <string>bigint</string>
+ </void>
+ </object>
+ </void>
+ <void method="add">
+ <object idref="PrimitiveTypeInfo1"/>
+ </void>
+ <void method="add">
+ <object class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
+ <void property="typeName">
+ <string>double</string>
+ </void>
+ </object>
+ </void>
+ <void method="add">
+ <object class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
+ <void property="typeName">
+ <string>boolean</string>
+ </void>
+ </object>
+ </void>
+ <void method="add">
+ <object idref="ListTypeInfo2"/>
+ </void>
+ <void method="add">
+ <object idref="MapTypeInfo0"/>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ <void property="typeName">
+ <string>map<string,map<string,map<string,uniontype<int,bigint,string,double,boolean,array<string>,map<string,string>>>>></string>
+ </void>
+ </object>
+ </void>
+ <void method="add">
+ <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="internalName">
+ <string>unionfield1</string>
+ </void>
+ <void property="tabAlias">
+ <string>src_thrift</string>
+ </void>
+ <void property="type">
+ <object idref="UnionTypeInfo0"/>
+ </void>
+ <void property="typeName">
+ <string>uniontype<int,bigint,string,double,boolean,array<string>,map<string,string>></string>
+ </void>
+ </object>
+ </void>
+ <void method="add">
+ <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="internalName">
+ <string>unionfield2</string>
+ </void>
+ <void property="tabAlias">
+ <string>src_thrift</string>
+ </void>
+ <void property="type">
+ <object idref="UnionTypeInfo0"/>
+ </void>
+ <void property="typeName">
+ <string>uniontype<int,bigint,string,double,boolean,array<string>,map<string,string>></string>
+ </void>
+ </object>
+ </void>
+ <void method="add">
+ <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="internalName">
+ <string>unionfield3</string>
+ </void>
+ <void property="tabAlias">
+ <string>src_thrift</string>
+ </void>
+ <void property="type">
+ <object idref="UnionTypeInfo0"/>
+ </void>
+ <void property="typeName">
+ <string>uniontype<int,bigint,string,double,boolean,array<string>,map<string,string>></string>
+ </void>
+ </object>
+ </void>
+ <void method="add">
+ <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
<void property="hiddenVirtualCol">
<boolean>true</boolean>
</void>
@@ -746,11 +869,7 @@
<string>src_thrift</string>
</void>
<void property="type">
- <object id="PrimitiveTypeInfo2" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
- <void property="typeName">
- <string>bigint</string>
- </void>
- </object>
+ <object idref="PrimitiveTypeInfo2"/>
</void>
<void property="typeName">
<string>bigint</string>
@@ -902,7 +1021,7 @@
</void>
<void method="put">
<string>totalSize</string>
- <string>1606</string>
+ <string>3070</string>
</void>
<void method="put">
<string>bucket_count</string>