You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by zs...@apache.org on 2008/09/20 01:56:35 UTC
svn commit: r697291 [22/31] - in /hadoop/core/trunk: ./
src/contrib/hive/cli/src/java/org/apache/hadoop/hive/cli/
src/contrib/hive/metastore/if/
src/contrib/hive/metastore/src/gen-javabean/org/apache/hadoop/hive/metastore/api/
src/contrib/hive/metastor...
Modified: hadoop/core/trunk/src/contrib/hive/ql/src/test/results/clientpositive/subq.q.out
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/hive/ql/src/test/results/clientpositive/subq.q.out?rev=697291&r1=697290&r2=697291&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/hive/ql/src/test/results/clientpositive/subq.q.out (original)
+++ hadoop/core/trunk/src/contrib/hive/ql/src/test/results/clientpositive/subq.q.out Fri Sep 19 16:56:30 2008
@@ -1,42 +1,43 @@
-ABSTRACT SYNTAX TREE:
- (TOK_QUERY (TOK_FROM (TOK_SUBQUERY (TOK_QUERY (TOK_FROM (TOK_TABREF src)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_ALLCOLREF src))) (TOK_WHERE (< (TOK_COLREF src key) 100)))) unioninput)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR '../../../../build/contrib/hive/ql/test/data/warehouse/union.out')) (TOK_SELECT (TOK_SELEXPR (TOK_ALLCOLREF unioninput)))))
-
-STAGE DEPENDENCIES:
- Stage-1 is a root stage
- Stage-0 depends on stages: Stage-1
-
-STAGE PLANS:
- Stage: Stage-1
- Map Reduce
- Alias -> Map Operator Tree:
- unioninput:src
- Filter Operator
- predicate:
- expr: (key < 100)
- type: class java.lang.Boolean
- Select Operator
- expressions:
- expr: key
- type: class java.lang.String
- expr: value
- type: class java.lang.String
- Select Operator
- expressions:
- expr: 0
- type: class java.lang.String
- expr: 1
- type: class java.lang.String
- File Output Operator
- table:
- input format: org.apache.hadoop.mapred.TextInputFormat
- output format: org.apache.hadoop.hive.ql.io.IgnoreKeyTextOutputFormat
-
- Stage: Stage-0
- Move Operator
- files:
- destination: ../../../../build/contrib/hive/ql/test/data/warehouse/union.out
- hdfs directory:
-
+ABSTRACT SYNTAX TREE:
+ (TOK_QUERY (TOK_FROM (TOK_SUBQUERY (TOK_QUERY (TOK_FROM (TOK_TABREF src)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_ALLCOLREF src))) (TOK_WHERE (< (TOK_COLREF src key) 100)))) unioninput)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR '../../../../build/contrib/hive/ql/test/data/warehouse/union.out')) (TOK_SELECT (TOK_SELEXPR (TOK_ALLCOLREF unioninput)))))
+
+STAGE DEPENDENCIES:
+ Stage-1 is a root stage
+ Stage-0 depends on stages: Stage-1
+
+STAGE PLANS:
+ Stage: Stage-1
+ Map Reduce
+ Alias -> Map Operator Tree:
+ unioninput:src
+ Filter Operator
+ predicate:
+ expr: (key < 100)
+ type: Boolean
+ Select Operator
+ expressions:
+ expr: key
+ type: string
+ expr: value
+ type: string
+ Select Operator
+ expressions:
+ expr: 0
+ type: string
+ expr: 1
+ type: string
+ File Output Operator
+ table:
+ input format: org.apache.hadoop.mapred.TextInputFormat
+ output format: org.apache.hadoop.hive.ql.io.IgnoreKeyTextOutputFormat
+
+ Stage: Stage-0
+ Move Operator
+ files:
+ destination: ../../../../build/contrib/hive/ql/test/data/warehouse/union.out
+ hdfs directory:
+
+
86val_86
27val_27
98val_98
Modified: hadoop/core/trunk/src/contrib/hive/ql/src/test/results/clientpositive/udf1.q.out
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/hive/ql/src/test/results/clientpositive/udf1.q.out?rev=697291&r1=697290&r2=697291&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/hive/ql/src/test/results/clientpositive/udf1.q.out (original)
+++ hadoop/core/trunk/src/contrib/hive/ql/src/test/results/clientpositive/udf1.q.out Fri Sep 19 16:56:30 2008
@@ -1,70 +1,72 @@
-ABSTRACT SYNTAX TREE:
- (TOK_QUERY (TOK_FROM (TOK_TABREF src)) (TOK_INSERT (TOK_DESTINATION (TOK_TAB dest1)) (TOK_SELECT (TOK_SELEXPR (LIKE 'a' '%a%')) (TOK_SELEXPR (LIKE 'b' '%a%')) (TOK_SELEXPR (LIKE 'ab' '%a%')) (TOK_SELEXPR (LIKE 'ab' '%a_')) (TOK_SELEXPR (LIKE '%_' '\%\_')) (TOK_SELEXPR (LIKE 'ab' '\%\_')) (TOK_SELEXPR (LIKE 'ab' '_a%')) (TOK_SELEXPR (LIKE 'ab' 'a')) (TOK_SELEXPR (RLIKE '' '.*')) (TOK_SELEXPR (RLIKE 'a' '[ab]')) (TOK_SELEXPR (RLIKE '' '[ab]')) (TOK_SELEXPR (RLIKE 'hadoop' '[a-z]*')) (TOK_SELEXPR (RLIKE 'hadoop' 'o*')) (TOK_SELEXPR (TOK_FUNCTION REGEXP_REPLACE 'abc' 'b' 'c')) (TOK_SELEXPR (TOK_FUNCTION REGEXP_REPLACE 'abc' 'z' 'a')) (TOK_SELEXPR (TOK_FUNCTION REGEXP_REPLACE 'abbbb' 'bb' 'b')) (TOK_SELEXPR (TOK_FUNCTION REGEXP_REPLACE 'hadoop' '(.)[a-z]*' '$1ive'))) (TOK_WHERE (= (TOK_COLREF src key) 86))))
-
-STAGE DEPENDENCIES:
- Stage-1 is a root stage
- Stage-0 depends on stages: Stage-1
-
-STAGE PLANS:
- Stage: Stage-1
- Map Reduce
- Alias -> Map Operator Tree:
- src
- Filter Operator
- predicate:
- expr: (key = 86)
- type: class java.lang.Boolean
- Select Operator
- expressions:
- expr: ('a' like '%a%')
- type: class java.lang.Boolean
- expr: ('b' like '%a%')
- type: class java.lang.Boolean
- expr: ('ab' like '%a%')
- type: class java.lang.Boolean
- expr: ('ab' like '%a_')
- type: class java.lang.Boolean
- expr: ('%_' like '\%\_')
- type: class java.lang.Boolean
- expr: ('ab' like '\%\_')
- type: class java.lang.Boolean
- expr: ('ab' like '_a%')
- type: class java.lang.Boolean
- expr: ('ab' like 'a')
- type: class java.lang.Boolean
- expr: ('' regexp '.*')
- type: class java.lang.Boolean
- expr: ('a' regexp '[ab]')
- type: class java.lang.Boolean
- expr: ('' regexp '[ab]')
- type: class java.lang.Boolean
- expr: ('hadoop' regexp '[a-z]*')
- type: class java.lang.Boolean
- expr: ('hadoop' regexp 'o*')
- type: class java.lang.Boolean
- expr: regexp_replace('abc', 'b', 'c')
- type: class java.lang.String
- expr: regexp_replace('abc', 'z', 'a')
- type: class java.lang.String
- expr: regexp_replace('abbbb', 'bb', 'b')
- type: class java.lang.String
- expr: regexp_replace('hadoop', '(.)[a-z]*', '$1ive')
- type: class java.lang.String
- File Output Operator
- table:
- name: dest1
- serde: org.apache.hadoop.hive.serde.simple_meta.MetadataTypedColumnsetSerDe
- input format: org.apache.hadoop.mapred.TextInputFormat
- output format: org.apache.hadoop.hive.ql.io.IgnoreKeyTextOutputFormat
-
- Stage: Stage-0
- Move Operator
- tables:
- table:
- name: dest1
- serde: org.apache.hadoop.hive.serde.simple_meta.MetadataTypedColumnsetSerDe
- input format: org.apache.hadoop.mapred.TextInputFormat
- output format: org.apache.hadoop.hive.ql.io.IgnoreKeyTextOutputFormat
- replace:
-
-true false true true true false false false true true false true false acc abc abb hive
+ABSTRACT SYNTAX TREE:
+ (TOK_QUERY (TOK_FROM (TOK_TABREF src)) (TOK_INSERT (TOK_DESTINATION (TOK_TAB dest1)) (TOK_SELECT (TOK_SELEXPR (LIKE 'a' '%a%')) (TOK_SELEXPR (LIKE 'b' '%a%')) (TOK_SELEXPR (LIKE 'ab' '%a%')) (TOK_SELEXPR (LIKE 'ab' '%a_')) (TOK_SELEXPR (LIKE '%_' '\%\_')) (TOK_SELEXPR (LIKE 'ab' '\%\_')) (TOK_SELEXPR (LIKE 'ab' '_a%')) (TOK_SELEXPR (LIKE 'ab' 'a')) (TOK_SELEXPR (RLIKE '' '.*')) (TOK_SELEXPR (RLIKE 'a' '[ab]')) (TOK_SELEXPR (RLIKE '' '[ab]')) (TOK_SELEXPR (RLIKE 'hadoop' '[a-z]*')) (TOK_SELEXPR (RLIKE 'hadoop' 'o*')) (TOK_SELEXPR (TOK_FUNCTION REGEXP_REPLACE 'abc' 'b' 'c')) (TOK_SELEXPR (TOK_FUNCTION REGEXP_REPLACE 'abc' 'z' 'a')) (TOK_SELEXPR (TOK_FUNCTION REGEXP_REPLACE 'abbbb' 'bb' 'b')) (TOK_SELEXPR (TOK_FUNCTION REGEXP_REPLACE 'hadoop' '(.)[a-z]*' '$1ive'))) (TOK_WHERE (= (TOK_COLREF src key) 86))))
+
+STAGE DEPENDENCIES:
+ Stage-1 is a root stage
+ Stage-0 depends on stages: Stage-1
+
+STAGE PLANS:
+ Stage: Stage-1
+ Map Reduce
+ Alias -> Map Operator Tree:
+ src
+ Filter Operator
+ predicate:
+ expr: (key = 86)
+ type: Boolean
+ Select Operator
+ expressions:
+ expr: ('a' like '%a%')
+ type: Boolean
+ expr: ('b' like '%a%')
+ type: Boolean
+ expr: ('ab' like '%a%')
+ type: Boolean
+ expr: ('ab' like '%a_')
+ type: Boolean
+ expr: ('%_' like '\%\_')
+ type: Boolean
+ expr: ('ab' like '\%\_')
+ type: Boolean
+ expr: ('ab' like '_a%')
+ type: Boolean
+ expr: ('ab' like 'a')
+ type: Boolean
+ expr: ('' regexp '.*')
+ type: Boolean
+ expr: ('a' regexp '[ab]')
+ type: Boolean
+ expr: ('' regexp '[ab]')
+ type: Boolean
+ expr: ('hadoop' regexp '[a-z]*')
+ type: Boolean
+ expr: ('hadoop' regexp 'o*')
+ type: Boolean
+ expr: regexp_replace('abc', 'b', 'c')
+ type: string
+ expr: regexp_replace('abc', 'z', 'a')
+ type: string
+ expr: regexp_replace('abbbb', 'bb', 'b')
+ type: string
+ expr: regexp_replace('hadoop', '(.)[a-z]*', '$1ive')
+ type: string
+ File Output Operator
+ table:
+ name: dest1
+ serde: simple_meta
+ input format: org.apache.hadoop.mapred.TextInputFormat
+ output format: org.apache.hadoop.hive.ql.io.IgnoreKeyTextOutputFormat
+
+ Stage: Stage-0
+ Move Operator
+ tables:
+ table:
+ name: dest1
+ serde: simple_meta
+ input format: org.apache.hadoop.mapred.TextInputFormat
+ output format: org.apache.hadoop.hive.ql.io.IgnoreKeyTextOutputFormat
+ replace:
+
+
+true false true true true false false false true true false true false acc abc abb hive
+
Modified: hadoop/core/trunk/src/contrib/hive/ql/src/test/results/clientpositive/union.q.out
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/hive/ql/src/test/results/clientpositive/union.q.out?rev=697291&r1=697290&r2=697291&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/hive/ql/src/test/results/clientpositive/union.q.out (original)
+++ hadoop/core/trunk/src/contrib/hive/ql/src/test/results/clientpositive/union.q.out Fri Sep 19 16:56:30 2008
@@ -1,63 +1,64 @@
-ABSTRACT SYNTAX TREE:
- (TOK_QUERY (TOK_FROM (TOK_SUBQUERY (TOK_UNION (TOK_QUERY (TOK_FROM (TOK_TABREF src)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_COLREF src key)) (TOK_SELEXPR (TOK_COLREF src value))) (TOK_WHERE (< (TOK_COLREF src key) 100)))) (TOK_QUERY (TOK_FROM (TOK_TABREF src)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_ALLCOLREF src))) (TOK_WHERE (> (TOK_COLREF src key) 100))))) unioninput)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR '../../../../build/contrib/hive/ql/test/data/warehouse/union.out')) (TOK_SELECT (TOK_SELEXPR (TOK_ALLCOLREF unioninput)))))
-
-STAGE DEPENDENCIES:
- Stage-1 is a root stage
- Stage-0 depends on stages: Stage-1
-
-STAGE PLANS:
- Stage: Stage-1
- Map Reduce
- Alias -> Map Operator Tree:
- null-subquery1:unioninput-subquery1:src
- Filter Operator
- predicate:
- expr: (key < 100)
- type: class java.lang.Boolean
- Select Operator
- expressions:
- expr: key
- type: class java.lang.String
- expr: value
- type: class java.lang.String
- Select Operator
- expressions:
- expr: 0
- type: class java.lang.String
- expr: 1
- type: class java.lang.String
- File Output Operator
- table:
- input format: org.apache.hadoop.mapred.TextInputFormat
- output format: org.apache.hadoop.hive.ql.io.IgnoreKeyTextOutputFormat
- null-subquery2:unioninput-subquery2:src
- Filter Operator
- predicate:
- expr: (key > 100)
- type: class java.lang.Boolean
- Select Operator
- expressions:
- expr: key
- type: class java.lang.String
- expr: value
- type: class java.lang.String
- Select Operator
- expressions:
- expr: 0
- type: class java.lang.String
- expr: 1
- type: class java.lang.String
- File Output Operator
- table:
- input format: org.apache.hadoop.mapred.TextInputFormat
- output format: org.apache.hadoop.hive.ql.io.IgnoreKeyTextOutputFormat
-
- Stage: Stage-0
- Move Operator
- files:
- destination: ../../../../build/contrib/hive/ql/test/data/warehouse/union.out
- hdfs directory:
-
+ABSTRACT SYNTAX TREE:
+ (TOK_QUERY (TOK_FROM (TOK_SUBQUERY (TOK_UNION (TOK_QUERY (TOK_FROM (TOK_TABREF src)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_COLREF src key)) (TOK_SELEXPR (TOK_COLREF src value))) (TOK_WHERE (< (TOK_COLREF src key) 100)))) (TOK_QUERY (TOK_FROM (TOK_TABREF src)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_ALLCOLREF src))) (TOK_WHERE (> (TOK_COLREF src key) 100))))) unioninput)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR '../../../../build/contrib/hive/ql/test/data/warehouse/union.out')) (TOK_SELECT (TOK_SELEXPR (TOK_ALLCOLREF unioninput)))))
+
+STAGE DEPENDENCIES:
+ Stage-1 is a root stage
+ Stage-0 depends on stages: Stage-1
+
+STAGE PLANS:
+ Stage: Stage-1
+ Map Reduce
+ Alias -> Map Operator Tree:
+ null-subquery1:unioninput-subquery1:src
+ Filter Operator
+ predicate:
+ expr: (key < 100)
+ type: Boolean
+ Select Operator
+ expressions:
+ expr: key
+ type: string
+ expr: value
+ type: string
+ Select Operator
+ expressions:
+ expr: 0
+ type: string
+ expr: 1
+ type: string
+ File Output Operator
+ table:
+ input format: org.apache.hadoop.mapred.TextInputFormat
+ output format: org.apache.hadoop.hive.ql.io.IgnoreKeyTextOutputFormat
+ null-subquery2:unioninput-subquery2:src
+ Filter Operator
+ predicate:
+ expr: (key > 100)
+ type: Boolean
+ Select Operator
+ expressions:
+ expr: key
+ type: string
+ expr: value
+ type: string
+ Select Operator
+ expressions:
+ expr: 0
+ type: string
+ expr: 1
+ type: string
+ File Output Operator
+ table:
+ input format: org.apache.hadoop.mapred.TextInputFormat
+ output format: org.apache.hadoop.hive.ql.io.IgnoreKeyTextOutputFormat
+
+ Stage: Stage-0
+ Move Operator
+ files:
+ destination: ../../../../build/contrib/hive/ql/test/data/warehouse/union.out
+ hdfs directory:
+
+
238val_238
86val_86
311val_311
Modified: hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/cast1.q.xml
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/cast1.q.xml?rev=697291&r1=697290&r2=697291&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/cast1.q.xml (original)
+++ hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/cast1.q.xml Fri Sep 19 16:56:30 2008
@@ -31,10 +31,13 @@
<boolean>true</boolean>
</void>
<void property="sourceDir">
- <string>/tmp/hive-athusoo/387148964.10000.insclause-0</string>
+ <string>/tmp/hive-zshao/920573802.10000.insclause-0</string>
</void>
<void property="table">
<object id="tableDesc0" class="org.apache.hadoop.hive.ql.plan.tableDesc">
+ <void property="deserializerClass">
+ <class>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</class>
+ </void>
<void property="inputFileFormatClass">
<class>org.apache.hadoop.mapred.TextInputFormat</class>
</void>
@@ -81,13 +84,10 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/home/athusoo/apacheprojects/hadoop-core-trunk_ws3/build/contrib/hive/ql/test/data/warehouse/dest1</string>
+ <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/dest1</string>
</void>
</object>
</void>
- <void property="serdeClass">
- <class>org.apache.hadoop.hive.serde.simple_meta.MetadataTypedColumnsetSerDe</class>
- </void>
<void property="serdeClassName">
<string>simple_meta</string>
</void>
@@ -128,7 +128,7 @@
<void property="conf">
<object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc">
<void property="dirName">
- <string>/tmp/hive-athusoo/387148964.10000.insclause-0</string>
+ <string>/tmp/hive-zshao/920573802.10000.insclause-0</string>
</void>
<void property="tableInfo">
<object idref="tableDesc0"/>
@@ -145,7 +145,11 @@
<string>0</string>
</void>
<void property="type">
- <object id="TypeInfo0" class="org.apache.hadoop.hive.ql.parse.TypeInfo"/>
+ <object id="PrimitiveTypeInfo0" class="org.apache.hadoop.hive.ql.typeinfo.PrimitiveTypeInfo">
+ <void property="primitiveClass">
+ <class>java.lang.String</class>
+ </void>
+ </object>
</void>
</object>
</void>
@@ -155,7 +159,7 @@
<string>1</string>
</void>
<void property="type">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -165,7 +169,7 @@
<string>2</string>
</void>
<void property="type">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -175,7 +179,7 @@
<string>3</string>
</void>
<void property="type">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -185,7 +189,7 @@
<string>4</string>
</void>
<void property="type">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -195,7 +199,7 @@
<string>5</string>
</void>
<void property="type">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -205,7 +209,7 @@
<string>6</string>
</void>
<void property="type">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -244,7 +248,11 @@
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc">
<void property="typeInfo">
- <object id="TypeInfo1" class="org.apache.hadoop.hive.ql.parse.TypeInfo"/>
+ <object id="PrimitiveTypeInfo1" class="org.apache.hadoop.hive.ql.typeinfo.PrimitiveTypeInfo">
+ <void property="primitiveClass">
+ <class>java.lang.Integer</class>
+ </void>
+ </object>
</void>
<void property="value">
<int>3</int>
@@ -254,7 +262,7 @@
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc">
<void property="typeInfo">
- <object idref="TypeInfo1"/>
+ <object idref="PrimitiveTypeInfo1"/>
</void>
<void property="value">
<int>2</int>
@@ -264,7 +272,7 @@
</object>
</void>
<void property="typeInfo">
- <object idref="TypeInfo1"/>
+ <object idref="PrimitiveTypeInfo1"/>
</void>
</object>
</void>
@@ -291,7 +299,11 @@
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc">
<void property="typeInfo">
- <object id="TypeInfo2" class="org.apache.hadoop.hive.ql.parse.TypeInfo"/>
+ <object id="PrimitiveTypeInfo2" class="org.apache.hadoop.hive.ql.typeinfo.PrimitiveTypeInfo">
+ <void property="primitiveClass">
+ <class>java.lang.Double</class>
+ </void>
+ </object>
</void>
<void property="value">
<double>3.0</double>
@@ -318,7 +330,7 @@
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc">
<void property="typeInfo">
- <object idref="TypeInfo1"/>
+ <object idref="PrimitiveTypeInfo1"/>
</void>
<void property="value">
<int>2</int>
@@ -328,14 +340,14 @@
</object>
</void>
<void property="typeInfo">
- <object idref="TypeInfo2"/>
+ <object idref="PrimitiveTypeInfo2"/>
</void>
</object>
</void>
</object>
</void>
<void property="typeInfo">
- <object idref="TypeInfo2"/>
+ <object idref="PrimitiveTypeInfo2"/>
</void>
</object>
</void>
@@ -379,7 +391,7 @@
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc">
<void property="typeInfo">
- <object idref="TypeInfo1"/>
+ <object idref="PrimitiveTypeInfo1"/>
</void>
<void property="value">
<int>3</int>
@@ -389,14 +401,14 @@
</object>
</void>
<void property="typeInfo">
- <object idref="TypeInfo2"/>
+ <object idref="PrimitiveTypeInfo2"/>
</void>
</object>
</void>
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc">
<void property="typeInfo">
- <object idref="TypeInfo2"/>
+ <object idref="PrimitiveTypeInfo2"/>
</void>
<void property="value">
<double>2.0</double>
@@ -406,7 +418,7 @@
</object>
</void>
<void property="typeInfo">
- <object idref="TypeInfo2"/>
+ <object idref="PrimitiveTypeInfo2"/>
</void>
</object>
</void>
@@ -433,7 +445,7 @@
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc">
<void property="typeInfo">
- <object idref="TypeInfo2"/>
+ <object idref="PrimitiveTypeInfo2"/>
</void>
<void property="value">
<double>3.0</double>
@@ -443,7 +455,7 @@
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc">
<void property="typeInfo">
- <object idref="TypeInfo2"/>
+ <object idref="PrimitiveTypeInfo2"/>
</void>
<void property="value">
<double>2.0</double>
@@ -453,7 +465,7 @@
</object>
</void>
<void property="typeInfo">
- <object idref="TypeInfo2"/>
+ <object idref="PrimitiveTypeInfo2"/>
</void>
</object>
</void>
@@ -480,7 +492,7 @@
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc">
<void property="typeInfo">
- <object idref="TypeInfo1"/>
+ <object idref="PrimitiveTypeInfo1"/>
</void>
<void property="value">
<int>3</int>
@@ -507,7 +519,7 @@
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc">
<void property="typeInfo">
- <object idref="TypeInfo2"/>
+ <object idref="PrimitiveTypeInfo2"/>
</void>
<void property="value">
<double>2.0</double>
@@ -517,14 +529,14 @@
</object>
</void>
<void property="typeInfo">
- <object idref="TypeInfo1"/>
+ <object idref="PrimitiveTypeInfo1"/>
</void>
</object>
</void>
</object>
</void>
<void property="typeInfo">
- <object idref="TypeInfo1"/>
+ <object idref="PrimitiveTypeInfo1"/>
</void>
</object>
</void>
@@ -548,7 +560,7 @@
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc">
<void property="typeInfo">
- <object idref="TypeInfo1"/>
+ <object idref="PrimitiveTypeInfo1"/>
</void>
<void property="value">
<int>1</int>
@@ -558,7 +570,11 @@
</object>
</void>
<void property="typeInfo">
- <object id="TypeInfo3" class="org.apache.hadoop.hive.ql.parse.TypeInfo"/>
+ <object id="PrimitiveTypeInfo3" class="org.apache.hadoop.hive.ql.typeinfo.PrimitiveTypeInfo">
+ <void property="primitiveClass">
+ <class>java.lang.Boolean</class>
+ </void>
+ </object>
</void>
</object>
</void>
@@ -582,7 +598,7 @@
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc">
<void property="typeInfo">
- <object idref="TypeInfo3"/>
+ <object idref="PrimitiveTypeInfo3"/>
</void>
<void property="value">
<boolean>true</boolean>
@@ -592,7 +608,7 @@
</object>
</void>
<void property="typeInfo">
- <object idref="TypeInfo1"/>
+ <object idref="PrimitiveTypeInfo1"/>
</void>
</object>
</void>
@@ -639,14 +655,14 @@
<string>key</string>
</void>
<void property="typeInfo">
- <object id="TypeInfo4" class="org.apache.hadoop.hive.ql.parse.TypeInfo"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc">
<void property="typeInfo">
- <object idref="TypeInfo1"/>
+ <object idref="PrimitiveTypeInfo1"/>
</void>
<void property="value">
<int>86</int>
@@ -656,7 +672,7 @@
</object>
</void>
<void property="typeInfo">
- <object idref="TypeInfo3"/>
+ <object idref="PrimitiveTypeInfo3"/>
</void>
</object>
</void>
@@ -672,7 +688,7 @@
<string>key</string>
</void>
<void property="type">
- <object idref="TypeInfo4"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -682,7 +698,7 @@
<string>value</string>
</void>
<void property="type">
- <object class="org.apache.hadoop.hive.ql.parse.TypeInfo"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -708,7 +724,7 @@
<void property="pathToAliases">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/home/athusoo/apacheprojects/hadoop-core-trunk_ws3/build/contrib/hive/ql/test/data/warehouse/src</string>
+ <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src</string>
<object class="java.util.ArrayList">
<void method="add">
<string>src</string>
@@ -720,13 +736,16 @@
<void property="pathToPartitionInfo">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/home/athusoo/apacheprojects/hadoop-core-trunk_ws3/build/contrib/hive/ql/test/data/warehouse/src</string>
+ <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src</string>
<object class="org.apache.hadoop.hive.ql.plan.partitionDesc">
<void property="partSpec">
<object class="java.util.LinkedHashMap"/>
</void>
<void property="tableDesc">
<object class="org.apache.hadoop.hive.ql.plan.tableDesc">
+ <void property="deserializerClass">
+ <class>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</class>
+ </void>
<void property="inputFileFormatClass">
<class>org.apache.hadoop.mapred.TextInputFormat</class>
</void>
@@ -773,13 +792,10 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/home/athusoo/apacheprojects/hadoop-core-trunk_ws3/build/contrib/hive/ql/test/data/warehouse/src</string>
+ <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src</string>
</void>
</object>
</void>
- <void property="serdeClass">
- <class>org.apache.hadoop.hive.serde.simple_meta.MetadataTypedColumnsetSerDe</class>
- </void>
<void property="serdeClassName">
<string>simple_meta</string>
</void>
Modified: hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/groupby1.q.xml
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/groupby1.q.xml?rev=697291&r1=697290&r2=697291&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/groupby1.q.xml (original)
+++ hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/groupby1.q.xml Fri Sep 19 16:56:30 2008
@@ -35,10 +35,13 @@
<boolean>true</boolean>
</void>
<void property="sourceDir">
- <string>/tmp/hive-athusoo/701551716.10000.insclause-0</string>
+ <string>/tmp/hive-zshao/782548333.10000.insclause-0</string>
</void>
<void property="table">
<object id="tableDesc0" class="org.apache.hadoop.hive.ql.plan.tableDesc">
+ <void property="deserializerClass">
+ <class>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</class>
+ </void>
<void property="inputFileFormatClass">
<class>org.apache.hadoop.mapred.TextInputFormat</class>
</void>
@@ -85,13 +88,10 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/home/athusoo/apacheprojects/hadoop-core-trunk_ws3/build/contrib/hive/ql/test/data/warehouse/dest1</string>
+ <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/dest1</string>
</void>
</object>
</void>
- <void property="serdeClass">
- <class>org.apache.hadoop.hive.serde.simple_meta.MetadataTypedColumnsetSerDe</class>
- </void>
<void property="serdeClassName">
<string>simple_meta</string>
</void>
@@ -122,7 +122,7 @@
<void property="aliasToWork">
<object class="java.util.HashMap">
<void method="put">
- <string>/tmp/hive-athusoo/701551716.10001</string>
+ <string>/tmp/hive-zshao/782548333.10001</string>
<object class="org.apache.hadoop.hive.ql.exec.ReduceSinkOperator">
<void property="conf">
<object class="org.apache.hadoop.hive.ql.plan.reduceSinkDesc">
@@ -134,7 +134,36 @@
<string>0</string>
</void>
<void property="typeInfo">
- <object id="TypeInfo0" class="org.apache.hadoop.hive.ql.parse.TypeInfo"/>
+ <object id="PrimitiveTypeInfo0" class="org.apache.hadoop.hive.ql.typeinfo.PrimitiveTypeInfo">
+ <void property="primitiveClass">
+ <class>java.lang.String</class>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ <void property="keySerializeInfo">
+ <object class="org.apache.hadoop.hive.ql.plan.tableDesc">
+ <void property="deserializerClass">
+ <class>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</class>
+ </void>
+ <void property="inputFileFormatClass">
+ <class>org.apache.hadoop.mapred.TextInputFormat</class>
+ </void>
+ <void property="outputFileFormatClass">
+ <class>org.apache.hadoop.hive.ql.io.IgnoreKeyTextOutputFormat</class>
+ </void>
+ <void property="properties">
+ <object class="java.util.Properties">
+ <void method="put">
+ <string>columns</string>
+ <string>0</string>
+ </void>
+ <void method="put">
+ <string>serialization.format</string>
+ <string>1</string>
</void>
</object>
</void>
@@ -154,7 +183,32 @@
<string>1</string>
</void>
<void property="typeInfo">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ <void property="valueSerializeInfo">
+ <object class="org.apache.hadoop.hive.ql.plan.tableDesc">
+ <void property="deserializerClass">
+ <class>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</class>
+ </void>
+ <void property="inputFileFormatClass">
+ <class>org.apache.hadoop.mapred.TextInputFormat</class>
+ </void>
+ <void property="outputFileFormatClass">
+ <class>org.apache.hadoop.hive.ql.io.IgnoreKeyTextOutputFormat</class>
+ </void>
+ <void property="properties">
+ <object class="java.util.Properties">
+ <void method="put">
+ <string>columns</string>
+ <string>0</string>
+ </void>
+ <void method="put">
+ <string>serialization.format</string>
+ <string>1</string>
</void>
</object>
</void>
@@ -172,7 +226,7 @@
<string>KEY.0</string>
</void>
<void property="type">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -182,7 +236,7 @@
<string>VALUE.0</string>
</void>
<void property="type">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -197,10 +251,10 @@
<void property="pathToAliases">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>/tmp/hive-athusoo/701551716.10001</string>
+ <string>/tmp/hive-zshao/782548333.10001</string>
<object class="java.util.ArrayList">
<void method="add">
- <string>/tmp/hive-athusoo/701551716.10001</string>
+ <string>/tmp/hive-zshao/782548333.10001</string>
</void>
</object>
</void>
@@ -209,10 +263,13 @@
<void property="pathToPartitionInfo">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>/tmp/hive-athusoo/701551716.10001</string>
+ <string>/tmp/hive-zshao/782548333.10001</string>
<object class="org.apache.hadoop.hive.ql.plan.partitionDesc">
<void property="tableDesc">
<object id="tableDesc1" class="org.apache.hadoop.hive.ql.plan.tableDesc">
+ <void property="deserializerClass">
+ <class>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</class>
+ </void>
<void property="inputFileFormatClass">
<class>org.apache.hadoop.mapred.TextInputFormat</class>
</void>
@@ -231,9 +288,6 @@
</void>
</object>
</void>
- <void property="serdeClass">
- <class>org.apache.hadoop.hive.serde.simple_meta.MetadataTypedColumnsetSerDe</class>
- </void>
</object>
</void>
</object>
@@ -253,7 +307,7 @@
<void property="conf">
<object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc">
<void property="dirName">
- <string>/tmp/hive-athusoo/701551716.10000.insclause-0</string>
+ <string>/tmp/hive-zshao/782548333.10000.insclause-0</string>
</void>
<void property="tableInfo">
<object idref="tableDesc0"/>
@@ -270,7 +324,7 @@
<string>0</string>
</void>
<void property="type">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -280,7 +334,7 @@
<string>1</string>
</void>
<void property="type">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -302,7 +356,7 @@
<string>0</string>
</void>
<void property="typeInfo">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -312,7 +366,7 @@
<string>1</string>
</void>
<void property="typeInfo">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -348,7 +402,7 @@
<string>VALUE.0</string>
</void>
<void property="typeInfo">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -366,7 +420,7 @@
<string>KEY.0</string>
</void>
<void property="typeInfo">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -389,7 +443,7 @@
<string>0</string>
</void>
<void property="type">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -399,7 +453,7 @@
<string>1</string>
</void>
<void property="type">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -434,7 +488,43 @@
<void property="keyCols">
<object class="java.util.ArrayList">
<void method="add">
- <object class="org.apache.hadoop.hive.ql.plan.exprNodeNullDesc"/>
+ <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc">
+ <void property="typeInfo">
+ <object id="PrimitiveTypeInfo1" class="org.apache.hadoop.hive.ql.typeinfo.PrimitiveTypeInfo">
+ <void property="primitiveClass">
+ <class>java.lang.Integer</class>
+ </void>
+ </object>
+ </void>
+ <void property="value">
+ <int>0</int>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ <void property="keySerializeInfo">
+ <object class="org.apache.hadoop.hive.ql.plan.tableDesc">
+ <void property="deserializerClass">
+ <class>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</class>
+ </void>
+ <void property="inputFileFormatClass">
+ <class>org.apache.hadoop.mapred.TextInputFormat</class>
+ </void>
+ <void property="outputFileFormatClass">
+ <class>org.apache.hadoop.hive.ql.io.IgnoreKeyTextOutputFormat</class>
+ </void>
+ <void property="properties">
+ <object class="java.util.Properties">
+ <void method="put">
+ <string>columns</string>
+ <string>0</string>
+ </void>
+ <void method="put">
+ <string>serialization.format</string>
+ <string>1</string>
+ </void>
+ </object>
</void>
</object>
</void>
@@ -452,7 +542,7 @@
<string>key</string>
</void>
<void property="typeInfo">
- <object id="TypeInfo1" class="org.apache.hadoop.hive.ql.parse.TypeInfo"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -462,7 +552,7 @@
<string>value</string>
</void>
<void property="typeInfo">
- <object id="TypeInfo2" class="org.apache.hadoop.hive.ql.parse.TypeInfo"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -472,7 +562,7 @@
<string>key</string>
</void>
<void property="typeInfo">
- <object idref="TypeInfo1"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -502,14 +592,14 @@
<string>value</string>
</void>
<void property="typeInfo">
- <object idref="TypeInfo2"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc">
<void property="typeInfo">
- <object class="org.apache.hadoop.hive.ql.parse.TypeInfo"/>
+ <object idref="PrimitiveTypeInfo1"/>
</void>
<void property="value">
<int>4</int>
@@ -519,7 +609,32 @@
</object>
</void>
<void property="typeInfo">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ <void property="valueSerializeInfo">
+ <object class="org.apache.hadoop.hive.ql.plan.tableDesc">
+ <void property="deserializerClass">
+ <class>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</class>
+ </void>
+ <void property="inputFileFormatClass">
+ <class>org.apache.hadoop.mapred.TextInputFormat</class>
+ </void>
+ <void property="outputFileFormatClass">
+ <class>org.apache.hadoop.hive.ql.io.IgnoreKeyTextOutputFormat</class>
+ </void>
+ <void property="properties">
+ <object class="java.util.Properties">
+ <void method="put">
+ <string>columns</string>
+ <string>0,1,2,3</string>
+ </void>
+ <void method="put">
+ <string>serialization.format</string>
+ <string>1</string>
</void>
</object>
</void>
@@ -537,7 +652,7 @@
<string>VALUE.0</string>
</void>
<void property="type">
- <object idref="TypeInfo1"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -547,7 +662,7 @@
<string>VALUE.1</string>
</void>
<void property="type">
- <object idref="TypeInfo2"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -557,7 +672,7 @@
<string>VALUE.2</string>
</void>
<void property="type">
- <object idref="TypeInfo1"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -567,7 +682,7 @@
<string>VALUE.3</string>
</void>
<void property="type">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -589,7 +704,7 @@
<string>key</string>
</void>
<void property="type">
- <object idref="TypeInfo1"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -599,7 +714,7 @@
<string>value</string>
</void>
<void property="type">
- <object idref="TypeInfo2"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -614,7 +729,7 @@
<void property="pathToAliases">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/home/athusoo/apacheprojects/hadoop-core-trunk_ws3/build/contrib/hive/ql/test/data/warehouse/src</string>
+ <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src</string>
<object class="java.util.ArrayList">
<void method="add">
<string>src</string>
@@ -626,13 +741,16 @@
<void property="pathToPartitionInfo">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/home/athusoo/apacheprojects/hadoop-core-trunk_ws3/build/contrib/hive/ql/test/data/warehouse/src</string>
+ <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src</string>
<object class="org.apache.hadoop.hive.ql.plan.partitionDesc">
<void property="partSpec">
<object class="java.util.LinkedHashMap"/>
</void>
<void property="tableDesc">
<object class="org.apache.hadoop.hive.ql.plan.tableDesc">
+ <void property="deserializerClass">
+ <class>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</class>
+ </void>
<void property="inputFileFormatClass">
<class>org.apache.hadoop.mapred.TextInputFormat</class>
</void>
@@ -679,13 +797,10 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/home/athusoo/apacheprojects/hadoop-core-trunk_ws3/build/contrib/hive/ql/test/data/warehouse/src</string>
+ <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src</string>
</void>
</object>
</void>
- <void property="serdeClass">
- <class>org.apache.hadoop.hive.serde.simple_meta.MetadataTypedColumnsetSerDe</class>
- </void>
<void property="serdeClassName">
<string>simple_meta</string>
</void>
@@ -708,7 +823,7 @@
<void property="conf">
<object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc">
<void property="dirName">
- <string>/tmp/hive-athusoo/701551716.10001</string>
+ <string>/tmp/hive-zshao/782548333.10001</string>
</void>
<void property="tableInfo">
<object idref="tableDesc1"/>
@@ -725,7 +840,7 @@
<string>0</string>
</void>
<void property="type">
- <object idref="TypeInfo1"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -735,7 +850,7 @@
<string>1</string>
</void>
<void property="type">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -764,7 +879,7 @@
<string>VALUE.3</string>
</void>
<void property="typeInfo">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -782,7 +897,7 @@
<string>VALUE.2</string>
</void>
<void property="typeInfo">
- <object idref="TypeInfo1"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
Modified: hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/groupby2.q.xml
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/groupby2.q.xml?rev=697291&r1=697290&r2=697291&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/groupby2.q.xml (original)
+++ hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/groupby2.q.xml Fri Sep 19 16:56:30 2008
@@ -35,10 +35,13 @@
<boolean>true</boolean>
</void>
<void property="sourceDir">
- <string>/tmp/hive-athusoo/568862461.10000.insclause-0</string>
+ <string>/tmp/hive-zshao/708847402.10000.insclause-0</string>
</void>
<void property="table">
<object id="tableDesc0" class="org.apache.hadoop.hive.ql.plan.tableDesc">
+ <void property="deserializerClass">
+ <class>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</class>
+ </void>
<void property="inputFileFormatClass">
<class>org.apache.hadoop.mapred.TextInputFormat</class>
</void>
@@ -85,13 +88,10 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/home/athusoo/apacheprojects/hadoop-core-trunk_ws3/build/contrib/hive/ql/test/data/warehouse/dest1</string>
+ <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/dest1</string>
</void>
</object>
</void>
- <void property="serdeClass">
- <class>org.apache.hadoop.hive.serde.simple_meta.MetadataTypedColumnsetSerDe</class>
- </void>
<void property="serdeClassName">
<string>simple_meta</string>
</void>
@@ -122,7 +122,7 @@
<void property="aliasToWork">
<object class="java.util.HashMap">
<void method="put">
- <string>/tmp/hive-athusoo/568862461.10001</string>
+ <string>/tmp/hive-zshao/708847402.10001</string>
<object class="org.apache.hadoop.hive.ql.exec.ReduceSinkOperator">
<void property="conf">
<object class="org.apache.hadoop.hive.ql.plan.reduceSinkDesc">
@@ -134,7 +134,36 @@
<string>0</string>
</void>
<void property="typeInfo">
- <object id="TypeInfo0" class="org.apache.hadoop.hive.ql.parse.TypeInfo"/>
+ <object id="PrimitiveTypeInfo0" class="org.apache.hadoop.hive.ql.typeinfo.PrimitiveTypeInfo">
+ <void property="primitiveClass">
+ <class>java.lang.String</class>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ <void property="keySerializeInfo">
+ <object class="org.apache.hadoop.hive.ql.plan.tableDesc">
+ <void property="deserializerClass">
+ <class>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</class>
+ </void>
+ <void property="inputFileFormatClass">
+ <class>org.apache.hadoop.mapred.TextInputFormat</class>
+ </void>
+ <void property="outputFileFormatClass">
+ <class>org.apache.hadoop.hive.ql.io.IgnoreKeyTextOutputFormat</class>
+ </void>
+ <void property="properties">
+ <object class="java.util.Properties">
+ <void method="put">
+ <string>columns</string>
+ <string>0</string>
+ </void>
+ <void method="put">
+ <string>serialization.format</string>
+ <string>1</string>
</void>
</object>
</void>
@@ -154,7 +183,7 @@
<string>1</string>
</void>
<void property="typeInfo">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -164,7 +193,32 @@
<string>2</string>
</void>
<void property="typeInfo">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ <void property="valueSerializeInfo">
+ <object class="org.apache.hadoop.hive.ql.plan.tableDesc">
+ <void property="deserializerClass">
+ <class>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</class>
+ </void>
+ <void property="inputFileFormatClass">
+ <class>org.apache.hadoop.mapred.TextInputFormat</class>
+ </void>
+ <void property="outputFileFormatClass">
+ <class>org.apache.hadoop.hive.ql.io.IgnoreKeyTextOutputFormat</class>
+ </void>
+ <void property="properties">
+ <object class="java.util.Properties">
+ <void method="put">
+ <string>columns</string>
+ <string>0,1</string>
+ </void>
+ <void method="put">
+ <string>serialization.format</string>
+ <string>1</string>
</void>
</object>
</void>
@@ -182,7 +236,7 @@
<string>KEY.0</string>
</void>
<void property="type">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -192,7 +246,7 @@
<string>VALUE.0</string>
</void>
<void property="type">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -202,7 +256,7 @@
<string>VALUE.1</string>
</void>
<void property="type">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -217,10 +271,10 @@
<void property="pathToAliases">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>/tmp/hive-athusoo/568862461.10001</string>
+ <string>/tmp/hive-zshao/708847402.10001</string>
<object class="java.util.ArrayList">
<void method="add">
- <string>/tmp/hive-athusoo/568862461.10001</string>
+ <string>/tmp/hive-zshao/708847402.10001</string>
</void>
</object>
</void>
@@ -229,10 +283,13 @@
<void property="pathToPartitionInfo">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>/tmp/hive-athusoo/568862461.10001</string>
+ <string>/tmp/hive-zshao/708847402.10001</string>
<object class="org.apache.hadoop.hive.ql.plan.partitionDesc">
<void property="tableDesc">
<object id="tableDesc1" class="org.apache.hadoop.hive.ql.plan.tableDesc">
+ <void property="deserializerClass">
+ <class>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</class>
+ </void>
<void property="inputFileFormatClass">
<class>org.apache.hadoop.mapred.TextInputFormat</class>
</void>
@@ -251,9 +308,6 @@
</void>
</object>
</void>
- <void property="serdeClass">
- <class>org.apache.hadoop.hive.serde.simple_meta.MetadataTypedColumnsetSerDe</class>
- </void>
</object>
</void>
</object>
@@ -273,7 +327,7 @@
<void property="conf">
<object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc">
<void property="dirName">
- <string>/tmp/hive-athusoo/568862461.10000.insclause-0</string>
+ <string>/tmp/hive-zshao/708847402.10000.insclause-0</string>
</void>
<void property="tableInfo">
<object idref="tableDesc0"/>
@@ -290,7 +344,7 @@
<string>0</string>
</void>
<void property="type">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -300,7 +354,7 @@
<string>1</string>
</void>
<void property="type">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -310,7 +364,7 @@
<string>2</string>
</void>
<void property="type">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -332,7 +386,7 @@
<string>0</string>
</void>
<void property="typeInfo">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -342,7 +396,7 @@
<string>1</string>
</void>
<void property="typeInfo">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -372,7 +426,7 @@
<string>0</string>
</void>
<void property="typeInfo">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -382,14 +436,14 @@
<string>2</string>
</void>
<void property="typeInfo">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
</object>
</void>
<void property="typeInfo">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -425,7 +479,7 @@
<string>VALUE.0</string>
</void>
<void property="typeInfo">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -446,7 +500,7 @@
<string>VALUE.1</string>
</void>
<void property="typeInfo">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -464,7 +518,7 @@
<string>KEY.0</string>
</void>
<void property="typeInfo">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -487,7 +541,7 @@
<string>0</string>
</void>
<void property="type">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -497,7 +551,7 @@
<string>1</string>
</void>
<void property="type">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -507,7 +561,7 @@
<string>2</string>
</void>
<void property="type">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -567,14 +621,18 @@
<string>value</string>
</void>
<void property="typeInfo">
- <object id="TypeInfo1" class="org.apache.hadoop.hive.ql.parse.TypeInfo"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc">
<void property="typeInfo">
- <object id="TypeInfo2" class="org.apache.hadoop.hive.ql.parse.TypeInfo"/>
+ <object id="PrimitiveTypeInfo1" class="org.apache.hadoop.hive.ql.typeinfo.PrimitiveTypeInfo">
+ <void property="primitiveClass">
+ <class>java.lang.Integer</class>
+ </void>
+ </object>
</void>
<void property="value">
<int>4</int>
@@ -584,7 +642,32 @@
</object>
</void>
<void property="typeInfo">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ <void property="keySerializeInfo">
+ <object class="org.apache.hadoop.hive.ql.plan.tableDesc">
+ <void property="deserializerClass">
+ <class>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</class>
+ </void>
+ <void property="inputFileFormatClass">
+ <class>org.apache.hadoop.mapred.TextInputFormat</class>
+ </void>
+ <void property="outputFileFormatClass">
+ <class>org.apache.hadoop.hive.ql.io.IgnoreKeyTextOutputFormat</class>
+ </void>
+ <void property="properties">
+ <object class="java.util.Properties">
+ <void method="put">
+ <string>columns</string>
+ <string>0</string>
+ </void>
+ <void method="put">
+ <string>serialization.format</string>
+ <string>1</string>
</void>
</object>
</void>
@@ -604,7 +687,7 @@
<string>key</string>
</void>
<void property="typeInfo">
- <object id="TypeInfo3" class="org.apache.hadoop.hive.ql.parse.TypeInfo"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -614,7 +697,7 @@
<string>value</string>
</void>
<void property="typeInfo">
- <object idref="TypeInfo1"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -647,14 +730,14 @@
<string>key</string>
</void>
<void property="typeInfo">
- <object idref="TypeInfo3"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc">
<void property="typeInfo">
- <object idref="TypeInfo2"/>
+ <object idref="PrimitiveTypeInfo1"/>
</void>
<void property="value">
<int>0</int>
@@ -664,7 +747,7 @@
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc">
<void property="typeInfo">
- <object idref="TypeInfo2"/>
+ <object idref="PrimitiveTypeInfo1"/>
</void>
<void property="value">
<int>1</int>
@@ -674,7 +757,32 @@
</object>
</void>
<void property="typeInfo">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ <void property="valueSerializeInfo">
+ <object class="org.apache.hadoop.hive.ql.plan.tableDesc">
+ <void property="deserializerClass">
+ <class>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</class>
+ </void>
+ <void property="inputFileFormatClass">
+ <class>org.apache.hadoop.mapred.TextInputFormat</class>
+ </void>
+ <void property="outputFileFormatClass">
+ <class>org.apache.hadoop.hive.ql.io.IgnoreKeyTextOutputFormat</class>
+ </void>
+ <void property="properties">
+ <object class="java.util.Properties">
+ <void method="put">
+ <string>columns</string>
+ <string>0,1,2</string>
+ </void>
+ <void method="put">
+ <string>serialization.format</string>
+ <string>1</string>
</void>
</object>
</void>
@@ -692,7 +800,7 @@
<string>KEY.0</string>
</void>
<void property="type">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -702,7 +810,7 @@
<string>VALUE.0</string>
</void>
<void property="type">
- <object idref="TypeInfo3"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -712,7 +820,7 @@
<string>VALUE.1</string>
</void>
<void property="type">
- <object idref="TypeInfo1"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -722,7 +830,7 @@
<string>VALUE.2</string>
</void>
<void property="type">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -744,7 +852,7 @@
<string>key</string>
</void>
<void property="type">
- <object idref="TypeInfo3"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -754,7 +862,7 @@
<string>value</string>
</void>
<void property="type">
- <object idref="TypeInfo1"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -769,7 +877,7 @@
<void property="pathToAliases">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/home/athusoo/apacheprojects/hadoop-core-trunk_ws3/build/contrib/hive/ql/test/data/warehouse/src</string>
+ <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src</string>
<object class="java.util.ArrayList">
<void method="add">
<string>src</string>
@@ -781,13 +889,16 @@
<void property="pathToPartitionInfo">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/home/athusoo/apacheprojects/hadoop-core-trunk_ws3/build/contrib/hive/ql/test/data/warehouse/src</string>
+ <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src</string>
<object class="org.apache.hadoop.hive.ql.plan.partitionDesc">
<void property="partSpec">
<object class="java.util.LinkedHashMap"/>
</void>
<void property="tableDesc">
<object class="org.apache.hadoop.hive.ql.plan.tableDesc">
+ <void property="deserializerClass">
+ <class>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</class>
+ </void>
<void property="inputFileFormatClass">
<class>org.apache.hadoop.mapred.TextInputFormat</class>
</void>
@@ -834,13 +945,10 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/home/athusoo/apacheprojects/hadoop-core-trunk_ws3/build/contrib/hive/ql/test/data/warehouse/src</string>
+ <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src</string>
</void>
</object>
</void>
- <void property="serdeClass">
- <class>org.apache.hadoop.hive.serde.simple_meta.MetadataTypedColumnsetSerDe</class>
- </void>
<void property="serdeClassName">
<string>simple_meta</string>
</void>
@@ -863,7 +971,7 @@
<void property="conf">
<object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc">
<void property="dirName">
- <string>/tmp/hive-athusoo/568862461.10001</string>
+ <string>/tmp/hive-zshao/708847402.10001</string>
</void>
<void property="tableInfo">
<object idref="tableDesc1"/>
@@ -880,7 +988,7 @@
<string>0</string>
</void>
<void property="type">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -890,7 +998,7 @@
<string>1</string>
</void>
<void property="type">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -900,7 +1008,7 @@
<string>2</string>
</void>
<void property="type">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -932,7 +1040,7 @@
<string>KEY.0</string>
</void>
<void property="typeInfo">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -953,7 +1061,7 @@
<string>KEY.0</string>
</void>
<void property="typeInfo">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -971,7 +1079,7 @@
<string>VALUE.2</string>
</void>
<void property="typeInfo">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>