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 2013/04/05 12:34:11 UTC
svn commit: r1464915 [5/5] - in /hive/branches/HIVE-4115: ./
common/src/java/org/apache/hadoop/hive/common/
common/src/java/org/apache/hadoop/hive/conf/ conf/ data/files/
hcatalog/build-support/ant/ hcatalog/historical/branches/
hcatalog/historical/sit...
Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/union_remove_3.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/union_remove_3.q.out?rev=1464915&r1=1464914&r2=1464915&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/clientpositive/union_remove_3.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/clientpositive/union_remove_3.q.out Fri Apr 5 10:34:08 2013
@@ -84,24 +84,17 @@ STAGE PLANS:
expressions:
expr: _col0
type: string
- expr: _col1
- type: int
+ expr: UDFToLong(_col1)
+ type: bigint
outputColumnNames: _col0, _col1
- Select Operator
- expressions:
- expr: _col0
- type: string
- expr: UDFToLong(_col1)
- type: bigint
- outputColumnNames: _col0, _col1
- File Output Operator
- compressed: false
- GlobalTableId: 1
- table:
- input format: org.apache.hadoop.mapred.TextInputFormat
- output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
- serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
- name: default.outputtbl1
+ File Output Operator
+ compressed: false
+ GlobalTableId: 1
+ table:
+ input format: org.apache.hadoop.mapred.TextInputFormat
+ output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+ serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+ name: default.outputtbl1
null-subquery1-subquery2:a-subquery1-subquery2:inputtbl1
TableScan
alias: inputtbl1
@@ -117,24 +110,17 @@ STAGE PLANS:
expressions:
expr: _col0
type: string
- expr: _col1
- type: int
+ expr: UDFToLong(_col1)
+ type: bigint
outputColumnNames: _col0, _col1
- Select Operator
- expressions:
- expr: _col0
- type: string
- expr: UDFToLong(_col1)
- type: bigint
- outputColumnNames: _col0, _col1
- File Output Operator
- compressed: false
- GlobalTableId: 1
- table:
- input format: org.apache.hadoop.mapred.TextInputFormat
- output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
- serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
- name: default.outputtbl1
+ File Output Operator
+ compressed: false
+ GlobalTableId: 1
+ table:
+ input format: org.apache.hadoop.mapred.TextInputFormat
+ output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+ serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+ name: default.outputtbl1
null-subquery2:a-subquery2:inputtbl1
TableScan
alias: inputtbl1
@@ -150,24 +136,17 @@ STAGE PLANS:
expressions:
expr: _col0
type: string
- expr: _col1
- type: int
+ expr: UDFToLong(_col1)
+ type: bigint
outputColumnNames: _col0, _col1
- Select Operator
- expressions:
- expr: _col0
- type: string
- expr: UDFToLong(_col1)
- type: bigint
- outputColumnNames: _col0, _col1
- File Output Operator
- compressed: false
- GlobalTableId: 1
- table:
- input format: org.apache.hadoop.mapred.TextInputFormat
- output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
- serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
- name: default.outputtbl1
+ File Output Operator
+ compressed: false
+ GlobalTableId: 1
+ table:
+ input format: org.apache.hadoop.mapred.TextInputFormat
+ output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+ serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+ name: default.outputtbl1
Stage: Stage-0
Move Operator
@@ -179,7 +158,6 @@ STAGE PLANS:
serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
name: default.outputtbl1
-
PREHOOK: query: insert overwrite table outputTbl1
SELECT *
FROM (
Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/union_remove_4.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/union_remove_4.q.out?rev=1464915&r1=1464914&r2=1464915&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/clientpositive/union_remove_4.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/clientpositive/union_remove_4.q.out Fri Apr 5 10:34:08 2013
@@ -115,21 +115,14 @@ STAGE PLANS:
expr: _col1
type: bigint
outputColumnNames: _col0, _col1
- Select Operator
- expressions:
- expr: _col0
- type: string
- expr: _col1
- type: bigint
- outputColumnNames: _col0, _col1
- File Output Operator
- compressed: false
- GlobalTableId: 1
- table:
- input format: org.apache.hadoop.mapred.TextInputFormat
- output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
- serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
- name: default.outputtbl1
+ File Output Operator
+ compressed: false
+ GlobalTableId: 1
+ table:
+ input format: org.apache.hadoop.mapred.TextInputFormat
+ output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+ serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+ name: default.outputtbl1
Stage: Stage-6
Conditional Operator
@@ -231,21 +224,14 @@ STAGE PLANS:
expr: _col1
type: bigint
outputColumnNames: _col0, _col1
- Select Operator
- expressions:
- expr: _col0
- type: string
- expr: _col1
- type: bigint
- outputColumnNames: _col0, _col1
- File Output Operator
- compressed: false
- GlobalTableId: 1
- table:
- input format: org.apache.hadoop.mapred.TextInputFormat
- output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
- serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
- name: default.outputtbl1
+ File Output Operator
+ compressed: false
+ GlobalTableId: 1
+ table:
+ input format: org.apache.hadoop.mapred.TextInputFormat
+ output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+ serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+ name: default.outputtbl1
PREHOOK: query: insert overwrite table outputTbl1
Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/union_remove_5.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/union_remove_5.q.out?rev=1464915&r1=1464914&r2=1464915&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/clientpositive/union_remove_5.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/clientpositive/union_remove_5.q.out Fri Apr 5 10:34:08 2013
@@ -85,31 +85,17 @@ STAGE PLANS:
expressions:
expr: key
type: string
- expr: 2
- type: int
+ expr: UDFToLong(2)
+ type: bigint
outputColumnNames: _col0, _col1
- Select Operator
- expressions:
- expr: _col0
- type: string
- expr: UDFToLong(_col1)
- type: bigint
- outputColumnNames: _col0, _col1
- Select Operator
- expressions:
- expr: _col0
- type: string
- expr: _col1
- type: bigint
- outputColumnNames: _col0, _col1
- File Output Operator
- compressed: false
- GlobalTableId: 1
- table:
- input format: org.apache.hadoop.mapred.TextInputFormat
- output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
- serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
- name: default.outputtbl1
+ File Output Operator
+ compressed: false
+ GlobalTableId: 1
+ table:
+ input format: org.apache.hadoop.mapred.TextInputFormat
+ output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+ serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+ name: default.outputtbl1
Stage: Stage-6
Conditional Operator
@@ -211,11 +197,26 @@ STAGE PLANS:
expr: _col1
type: bigint
outputColumnNames: _col0, _col1
+ File Output Operator
+ compressed: false
+ GlobalTableId: 1
+ table:
+ input format: org.apache.hadoop.mapred.TextInputFormat
+ output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+ serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+ name: default.outputtbl1
+
+ Stage: Stage-8
+ Map Reduce
+ Alias -> Map Operator Tree:
+ null-subquery1-subquery2:a-subquery1-subquery2:inputtbl1
+ TableScan
+ alias: inputtbl1
Select Operator
expressions:
- expr: _col0
+ expr: key
type: string
- expr: _col1
+ expr: UDFToLong(1)
type: bigint
outputColumnNames: _col0, _col1
File Output Operator
@@ -227,42 +228,6 @@ STAGE PLANS:
serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
name: default.outputtbl1
- Stage: Stage-8
- Map Reduce
- Alias -> Map Operator Tree:
- null-subquery1-subquery2:a-subquery1-subquery2:inputtbl1
- TableScan
- alias: inputtbl1
- Select Operator
- expressions:
- expr: key
- type: string
- expr: 1
- type: int
- outputColumnNames: _col0, _col1
- Select Operator
- expressions:
- expr: _col0
- type: string
- expr: UDFToLong(_col1)
- type: bigint
- outputColumnNames: _col0, _col1
- Select Operator
- expressions:
- expr: _col0
- type: string
- expr: _col1
- type: bigint
- outputColumnNames: _col0, _col1
- File Output Operator
- compressed: false
- GlobalTableId: 1
- table:
- input format: org.apache.hadoop.mapred.TextInputFormat
- output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
- serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
- name: default.outputtbl1
-
PREHOOK: query: insert overwrite table outputTbl1
SELECT *
Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/union_remove_7.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/union_remove_7.q.out?rev=1464915&r1=1464914&r2=1464915&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/clientpositive/union_remove_7.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/clientpositive/union_remove_7.q.out Fri Apr 5 10:34:08 2013
@@ -114,21 +114,14 @@ STAGE PLANS:
expr: _col1
type: bigint
outputColumnNames: _col0, _col1
- Select Operator
- expressions:
- expr: _col0
- type: string
- expr: _col1
- type: bigint
- outputColumnNames: _col0, _col1
- File Output Operator
- compressed: false
- GlobalTableId: 1
- table:
- input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat
- output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat
- serde: org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe
- name: default.outputtbl1
+ File Output Operator
+ compressed: false
+ GlobalTableId: 1
+ table:
+ input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat
+ output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat
+ serde: org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe
+ name: default.outputtbl1
Stage: Stage-0
Move Operator
@@ -189,21 +182,14 @@ STAGE PLANS:
expr: _col1
type: bigint
outputColumnNames: _col0, _col1
- Select Operator
- expressions:
- expr: _col0
- type: string
- expr: _col1
- type: bigint
- outputColumnNames: _col0, _col1
- File Output Operator
- compressed: false
- GlobalTableId: 1
- table:
- input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat
- output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat
- serde: org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe
- name: default.outputtbl1
+ File Output Operator
+ compressed: false
+ GlobalTableId: 1
+ table:
+ input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat
+ output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat
+ serde: org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe
+ name: default.outputtbl1
PREHOOK: query: insert overwrite table outputTbl1
Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/union_remove_8.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/union_remove_8.q.out?rev=1464915&r1=1464914&r2=1464915&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/clientpositive/union_remove_8.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/clientpositive/union_remove_8.q.out Fri Apr 5 10:34:08 2013
@@ -82,31 +82,17 @@ STAGE PLANS:
expressions:
expr: key
type: string
- expr: 2
- type: int
+ expr: UDFToLong(2)
+ type: bigint
outputColumnNames: _col0, _col1
- Select Operator
- expressions:
- expr: _col0
- type: string
- expr: UDFToLong(_col1)
- type: bigint
- outputColumnNames: _col0, _col1
- Select Operator
- expressions:
- expr: _col0
- type: string
- expr: _col1
- type: bigint
- outputColumnNames: _col0, _col1
- File Output Operator
- compressed: false
- GlobalTableId: 1
- table:
- input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat
- output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat
- serde: org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe
- name: default.outputtbl1
+ File Output Operator
+ compressed: false
+ GlobalTableId: 1
+ table:
+ input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat
+ output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat
+ serde: org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe
+ name: default.outputtbl1
Stage: Stage-0
Move Operator
@@ -167,11 +153,26 @@ STAGE PLANS:
expr: _col1
type: bigint
outputColumnNames: _col0, _col1
+ File Output Operator
+ compressed: false
+ GlobalTableId: 1
+ table:
+ input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat
+ output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat
+ serde: org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe
+ name: default.outputtbl1
+
+ Stage: Stage-3
+ Map Reduce
+ Alias -> Map Operator Tree:
+ null-subquery1-subquery2:a-subquery1-subquery2:inputtbl1
+ TableScan
+ alias: inputtbl1
Select Operator
expressions:
- expr: _col0
+ expr: key
type: string
- expr: _col1
+ expr: UDFToLong(1)
type: bigint
outputColumnNames: _col0, _col1
File Output Operator
@@ -183,42 +184,6 @@ STAGE PLANS:
serde: org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe
name: default.outputtbl1
- Stage: Stage-3
- Map Reduce
- Alias -> Map Operator Tree:
- null-subquery1-subquery2:a-subquery1-subquery2:inputtbl1
- TableScan
- alias: inputtbl1
- Select Operator
- expressions:
- expr: key
- type: string
- expr: 1
- type: int
- outputColumnNames: _col0, _col1
- Select Operator
- expressions:
- expr: _col0
- type: string
- expr: UDFToLong(_col1)
- type: bigint
- outputColumnNames: _col0, _col1
- Select Operator
- expressions:
- expr: _col0
- type: string
- expr: _col1
- type: bigint
- outputColumnNames: _col0, _col1
- File Output Operator
- compressed: false
- GlobalTableId: 1
- table:
- input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat
- output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat
- serde: org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe
- name: default.outputtbl1
-
PREHOOK: query: insert overwrite table outputTbl1
SELECT *
Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/union_remove_9.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/union_remove_9.q.out?rev=1464915&r1=1464914&r2=1464915&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/clientpositive/union_remove_9.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/clientpositive/union_remove_9.q.out Fri Apr 5 10:34:08 2013
@@ -96,31 +96,17 @@ STAGE PLANS:
expressions:
expr: _col0
type: string
- expr: _col1
- type: int
+ expr: UDFToLong(_col1)
+ type: bigint
outputColumnNames: _col0, _col1
- Select Operator
- expressions:
- expr: _col0
- type: string
- expr: UDFToLong(_col1)
- type: bigint
- outputColumnNames: _col0, _col1
- Select Operator
- expressions:
- expr: _col0
- type: string
- expr: _col1
- type: bigint
- outputColumnNames: _col0, _col1
- File Output Operator
- compressed: false
- GlobalTableId: 1
- table:
- input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat
- output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat
- serde: org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe
- name: default.outputtbl1
+ File Output Operator
+ compressed: false
+ GlobalTableId: 1
+ table:
+ input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat
+ output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat
+ serde: org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe
+ name: default.outputtbl1
null-subquery2:b-subquery2-subquery2:a-subquery2:inputtbl1
TableScan
alias: inputtbl1
@@ -136,31 +122,17 @@ STAGE PLANS:
expressions:
expr: _col0
type: string
- expr: _col1
- type: int
+ expr: UDFToLong(_col1)
+ type: bigint
outputColumnNames: _col0, _col1
- Select Operator
- expressions:
- expr: _col0
- type: string
- expr: UDFToLong(_col1)
- type: bigint
- outputColumnNames: _col0, _col1
- Select Operator
- expressions:
- expr: _col0
- type: string
- expr: _col1
- type: bigint
- outputColumnNames: _col0, _col1
- File Output Operator
- compressed: false
- GlobalTableId: 1
- table:
- input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat
- output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat
- serde: org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe
- name: default.outputtbl1
+ File Output Operator
+ compressed: false
+ GlobalTableId: 1
+ table:
+ input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat
+ output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat
+ serde: org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe
+ name: default.outputtbl1
Stage: Stage-6
Conditional Operator
@@ -242,21 +214,14 @@ STAGE PLANS:
expr: _col1
type: bigint
outputColumnNames: _col0, _col1
- Select Operator
- expressions:
- expr: _col0
- type: string
- expr: _col1
- type: bigint
- outputColumnNames: _col0, _col1
- File Output Operator
- compressed: false
- GlobalTableId: 1
- table:
- input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat
- output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat
- serde: org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe
- name: default.outputtbl1
+ File Output Operator
+ compressed: false
+ GlobalTableId: 1
+ table:
+ input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat
+ output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat
+ serde: org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe
+ name: default.outputtbl1
PREHOOK: query: insert overwrite table outputTbl1
Modified: hive/branches/HIVE-4115/ql/src/test/results/compiler/errors/wrong_distinct2.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/compiler/errors/wrong_distinct2.q.out?rev=1464915&r1=1464914&r2=1464915&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/compiler/errors/wrong_distinct2.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/compiler/errors/wrong_distinct2.q.out Fri Apr 5 10:34:08 2013
@@ -1 +1 @@
-Parse Error: line 2:60 missing EOF at '(' near 'substr'
+Parse Error: line 2:45 cannot recognize input near 'DISTINCT' 'substr' '(' in select expression
Modified: hive/branches/HIVE-4115/serde/src/java/org/apache/hadoop/hive/serde2/RegexSerDe.java
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/serde/src/java/org/apache/hadoop/hive/serde2/RegexSerDe.java?rev=1464915&r1=1464914&r2=1464915&view=diff
==============================================================================
--- hive/branches/HIVE-4115/serde/src/java/org/apache/hadoop/hive/serde2/RegexSerDe.java (original)
+++ hive/branches/HIVE-4115/serde/src/java/org/apache/hadoop/hive/serde2/RegexSerDe.java Fri Apr 5 10:34:08 2013
@@ -17,6 +17,7 @@
*/
package org.apache.hadoop.hive.serde2;
+import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -49,7 +50,7 @@ import org.apache.hadoop.io.Writable;
* but has more than expected groups, the additional groups are just ignored.
*
* NOTE: Regex SerDe supports primitive column types such as TINYINT, SMALLINT,
- * INT, BIGINT, FLOAT, DOUBLE, STRING and BOOLEAN
+ * INT, BIGINT, FLOAT, DOUBLE, STRING, BOOLEAN and DECIMAL
*
*
* NOTE: This implementation uses javaStringObjectInspector for STRING. A
@@ -133,6 +134,8 @@ public class RegexSerDe extends Abstract
columnOIs.add(PrimitiveObjectInspectorFactory.javaDoubleObjectInspector);
} else if (typeName.equals(serdeConstants.BOOLEAN_TYPE_NAME)) {
columnOIs.add(PrimitiveObjectInspectorFactory.javaBooleanObjectInspector);
+ } else if (typeName.equals(serdeConstants.DECIMAL_TYPE_NAME)) {
+ columnOIs.add(PrimitiveObjectInspectorFactory.javaBigDecimalObjectInspector);
} else {
throw new SerDeException(getClass().getName()
+ " doesn't allow column [" + c + "] named "
@@ -225,7 +228,11 @@ public class RegexSerDe extends Abstract
} else if (typeName.equals(serdeConstants.BOOLEAN_TYPE_NAME)) {
Boolean b;
b = Boolean.valueOf(t);
- row.set(c,b);
+ row.set(c, b);
+ } else if (typeName.equals(serdeConstants.DECIMAL_TYPE_NAME)) {
+ BigDecimal bd;
+ bd = new BigDecimal(t);
+ row.set(c, bd);
}
} catch (RuntimeException e) {
partialMatchedRowsCount++;
Modified: hive/branches/HIVE-4115/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ObjectInspectorConverters.java
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ObjectInspectorConverters.java?rev=1464915&r1=1464914&r2=1464915&view=diff
==============================================================================
--- hive/branches/HIVE-4115/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ObjectInspectorConverters.java (original)
+++ hive/branches/HIVE-4115/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ObjectInspectorConverters.java Fri Apr 5 10:34:08 2013
@@ -24,6 +24,7 @@ import java.util.Map;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.JavaStringObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectInspectorConverter;
+import org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectInspectorFactory;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.SettableBigDecimalObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.SettableBinaryObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.SettableBooleanObjectInspector;
@@ -149,6 +150,29 @@ public final class ObjectInspectorConver
}
}
+ // Return the settable equivalent object inspector for primitive categories
+ // For eg: for table T containing partitions p1 and p2 (possibly different
+ // from the table T), return the settable inspector for T. The inspector for
+ // T is settable recursively i.e all the nested fields are also settable.
+ private static ObjectInspector getSettableConvertedOI(
+ ObjectInspector inputOI) {
+ switch (inputOI.getCategory()) {
+ case PRIMITIVE:
+ PrimitiveObjectInspector primInputOI = (PrimitiveObjectInspector) inputOI;
+ return PrimitiveObjectInspectorFactory.
+ getPrimitiveWritableObjectInspector(primInputOI.getPrimitiveCategory());
+ case STRUCT:
+ return inputOI;
+ case LIST:
+ return inputOI;
+ case MAP:
+ return inputOI;
+ default:
+ throw new RuntimeException("Hive internal error: desired OI of "
+ + inputOI.getTypeName() + " not supported yet.");
+ }
+ }
+
public static ObjectInspector getConvertedOI(
ObjectInspector inputOI,
ObjectInspector outputOI) {
@@ -173,7 +197,8 @@ public final class ObjectInspectorConver
for (StructField listField : listFields) {
structFieldNames.add(listField.getFieldName());
- structFieldObjectInspectors.add(listField.getFieldObjectInspector());
+ structFieldObjectInspectors.add(
+ getSettableConvertedOI(listField.getFieldObjectInspector()));
}
StandardStructObjectInspector structStandardOutputOI = ObjectInspectorFactory
Modified: hive/branches/HIVE-4115/service/src/java/org/apache/hive/service/cli/operation/SQLOperation.java
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/service/src/java/org/apache/hive/service/cli/operation/SQLOperation.java?rev=1464915&r1=1464914&r2=1464915&view=diff
==============================================================================
--- hive/branches/HIVE-4115/service/src/java/org/apache/hive/service/cli/operation/SQLOperation.java (original)
+++ hive/branches/HIVE-4115/service/src/java/org/apache/hive/service/cli/operation/SQLOperation.java Fri Apr 5 10:34:08 2013
@@ -35,6 +35,7 @@ import org.apache.hadoop.hive.ql.process
import org.apache.hadoop.hive.ql.session.SessionState;
import org.apache.hadoop.hive.serde.serdeConstants;
import org.apache.hadoop.hive.serde2.SerDe;
+import org.apache.hadoop.hive.serde2.SerDeUtils;
import org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe;
import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspectorUtils;
@@ -198,12 +199,17 @@ public class SQLOperation extends Execut
private static Object convertLazyToJava(Object o, ObjectInspector oi) {
Object obj = ObjectInspectorUtils.copyToStandardObject(o, oi, ObjectInspectorCopyOption.JAVA);
+ if (obj == null) {
+ return null;
+ }
+ if(oi.getTypeName().equals(serdeConstants.BINARY_TYPE_NAME)) {
+ return new String((byte[])obj);
+ }
// for now, expose non-primitive as a string
// TODO: expose non-primitive as a structured object while maintaining JDBC compliance
- if (obj != null && oi.getCategory() != ObjectInspector.Category.PRIMITIVE) {
- obj = obj.toString();
+ if (oi.getCategory() != ObjectInspector.Category.PRIMITIVE) {
+ return SerDeUtils.getJSONString(o, oi);
}
-
return obj;
}