You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by rh...@apache.org on 2014/03/31 23:01:18 UTC
svn commit: r1583462 [2/2] - in /hive/trunk:
metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/
metastore/src/java/org/apache/hadoop/hive/metastore/
ql/src/java/org/apache/hadoop/hive/ql/exec/
ql/src/java/org/apache/hadoop/hive...
Modified: hive/trunk/ql/src/test/results/clientpositive/stats11.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/stats11.q.out?rev=1583462&r1=1583461&r2=1583462&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/stats11.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/stats11.q.out Mon Mar 31 21:01:16 2014
@@ -442,6 +442,7 @@ STAGE PLANS:
numFiles 4
numRows 0
partition_columns ds
+ partition_columns.types string
rawDataSize 0
serialization.ddl struct srcbucket_mapjoin_part { i32 key, string value}
serialization.format 1
@@ -461,6 +462,7 @@ STAGE PLANS:
#### A masked pattern was here ####
name default.srcbucket_mapjoin_part
partition_columns ds
+ partition_columns.types string
serialization.ddl struct srcbucket_mapjoin_part { i32 key, string value}
serialization.format 1
serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -1043,6 +1045,7 @@ STAGE PLANS:
numFiles 4
numRows 0
partition_columns ds
+ partition_columns.types string
rawDataSize 0
serialization.ddl struct srcbucket_mapjoin_part { i32 key, string value}
serialization.format 1
@@ -1062,6 +1065,7 @@ STAGE PLANS:
#### A masked pattern was here ####
name default.srcbucket_mapjoin_part
partition_columns ds
+ partition_columns.types string
serialization.ddl struct srcbucket_mapjoin_part { i32 key, string value}
serialization.format 1
serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
Modified: hive/trunk/ql/src/test/results/clientpositive/stats12.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/stats12.q.out?rev=1583462&r1=1583461&r2=1583462&view=diff
==============================================================================
Files hive/trunk/ql/src/test/results/clientpositive/stats12.q.out (original) and hive/trunk/ql/src/test/results/clientpositive/stats12.q.out Mon Mar 31 21:01:16 2014 differ
Modified: hive/trunk/ql/src/test/results/clientpositive/stats13.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/stats13.q.out?rev=1583462&r1=1583461&r2=1583462&view=diff
==============================================================================
Files hive/trunk/ql/src/test/results/clientpositive/stats13.q.out (original) and hive/trunk/ql/src/test/results/clientpositive/stats13.q.out Mon Mar 31 21:01:16 2014 differ
Modified: hive/trunk/ql/src/test/results/clientpositive/transform_ppr1.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/transform_ppr1.q.out?rev=1583462&r1=1583461&r2=1583462&view=diff
==============================================================================
Files hive/trunk/ql/src/test/results/clientpositive/transform_ppr1.q.out (original) and hive/trunk/ql/src/test/results/clientpositive/transform_ppr1.q.out Mon Mar 31 21:01:16 2014 differ
Modified: hive/trunk/ql/src/test/results/clientpositive/transform_ppr2.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/transform_ppr2.q.out?rev=1583462&r1=1583461&r2=1583462&view=diff
==============================================================================
Files hive/trunk/ql/src/test/results/clientpositive/transform_ppr2.q.out (original) and hive/trunk/ql/src/test/results/clientpositive/transform_ppr2.q.out Mon Mar 31 21:01:16 2014 differ
Modified: hive/trunk/ql/src/test/results/clientpositive/union22.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/union22.q.out?rev=1583462&r1=1583461&r2=1583462&view=diff
==============================================================================
Files hive/trunk/ql/src/test/results/clientpositive/union22.q.out (original) and hive/trunk/ql/src/test/results/clientpositive/union22.q.out Mon Mar 31 21:01:16 2014 differ
Modified: hive/trunk/ql/src/test/results/clientpositive/union_ppr.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/union_ppr.q.out?rev=1583462&r1=1583461&r2=1583462&view=diff
==============================================================================
Files hive/trunk/ql/src/test/results/clientpositive/union_ppr.q.out (original) and hive/trunk/ql/src/test/results/clientpositive/union_ppr.q.out Mon Mar 31 21:01:16 2014 differ
Modified: hive/trunk/ql/src/test/results/compiler/plan/input2.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/input2.q.xml?rev=1583462&r1=1583461&r2=1583462&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/input2.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/input2.q.xml Mon Mar 31 21:01:16 2014
@@ -1166,6 +1166,10 @@
<string>default<char code="#0"/>default</string>
</void>
<void method="put">
+ <string>partition_columns.types</string>
+ <string>string:string</string>
+ </void>
+ <void method="put">
<string>partition_columns</string>
<string>ds/hr</string>
</void>
@@ -1337,6 +1341,10 @@
<string>key,value</string>
</void>
<void method="put">
+ <string>partition_columns.types</string>
+ <string>string:string</string>
+ </void>
+ <void method="put">
<string>columns.comments</string>
<string>default<char code="#0"/>default</string>
</void>
Modified: hive/trunk/ql/src/test/results/compiler/plan/input3.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/input3.q.xml?rev=1583462&r1=1583461&r2=1583462&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/input3.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/input3.q.xml Mon Mar 31 21:01:16 2014
@@ -1225,6 +1225,10 @@
<string>default<char code="#0"/>default</string>
</void>
<void method="put">
+ <string>partition_columns.types</string>
+ <string>string:string</string>
+ </void>
+ <void method="put">
<string>partition_columns</string>
<string>ds/hr</string>
</void>
@@ -1396,6 +1400,10 @@
<string>key,value</string>
</void>
<void method="put">
+ <string>partition_columns.types</string>
+ <string>string:string</string>
+ </void>
+ <void method="put">
<string>columns.comments</string>
<string>default<char code="#0"/>default</string>
</void>
@@ -1563,6 +1571,10 @@
<string>key,value</string>
</void>
<void method="put">
+ <string>partition_columns.types</string>
+ <string>string:string</string>
+ </void>
+ <void method="put">
<string>columns.comments</string>
<string>default<char code="#0"/>default</string>
</void>
Modified: hive/trunk/ql/src/test/results/compiler/plan/input_part1.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/input_part1.q.xml?rev=1583462&r1=1583461&r2=1583462&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/input_part1.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/input_part1.q.xml Mon Mar 31 21:01:16 2014
@@ -47,6 +47,10 @@
<string>key,value</string>
</void>
<void method="put">
+ <string>partition_columns.types</string>
+ <string>string:string</string>
+ </void>
+ <void method="put">
<string>COLUMN_STATS_ACCURATE</string>
<string>true</string>
</void>
@@ -139,6 +143,10 @@
<string>key,value</string>
</void>
<void method="put">
+ <string>partition_columns.types</string>
+ <string>string:string</string>
+ </void>
+ <void method="put">
<string>columns.comments</string>
<string>default<char code="#0"/>default</string>
</void>
@@ -818,6 +826,10 @@
<string>key,value</string>
</void>
<void method="put">
+ <string>partition_columns.types</string>
+ <string>string:string</string>
+ </void>
+ <void method="put">
<string>COLUMN_STATS_ACCURATE</string>
<string>true</string>
</void>
Modified: hive/trunk/ql/src/test/results/compiler/plan/sample1.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/sample1.q.xml?rev=1583462&r1=1583461&r2=1583462&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/sample1.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/sample1.q.xml Mon Mar 31 21:01:16 2014
@@ -47,6 +47,10 @@
<string>key,value</string>
</void>
<void method="put">
+ <string>partition_columns.types</string>
+ <string>string:string</string>
+ </void>
+ <void method="put">
<string>COLUMN_STATS_ACCURATE</string>
<string>true</string>
</void>
@@ -139,6 +143,10 @@
<string>key,value</string>
</void>
<void method="put">
+ <string>partition_columns.types</string>
+ <string>string:string</string>
+ </void>
+ <void method="put">
<string>columns.comments</string>
<string>default<char code="#0"/>default</string>
</void>
@@ -907,6 +915,10 @@
<string>key,value</string>
</void>
<void method="put">
+ <string>partition_columns.types</string>
+ <string>string:string</string>
+ </void>
+ <void method="put">
<string>COLUMN_STATS_ACCURATE</string>
<string>true</string>
</void>
Modified: hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/JavaHiveVarcharObjectInspector.java
URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/JavaHiveVarcharObjectInspector.java?rev=1583462&r1=1583461&r2=1583462&view=diff
==============================================================================
--- hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/JavaHiveVarcharObjectInspector.java (original)
+++ hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/JavaHiveVarcharObjectInspector.java Mon Mar 31 21:01:16 2014
@@ -68,23 +68,18 @@ implements SettableHiveVarcharObjectInsp
@Override
public Object set(Object o, HiveVarchar value) {
- HiveVarchar setValue = (HiveVarchar)o;
if (BaseCharUtils.doesPrimitiveMatchTypeParams(
value, (VarcharTypeInfo)typeInfo)) {
- setValue.setValue(value);
+ return o = value;
} else {
// Otherwise value may be too long, convert to appropriate value based on params
- setValue.setValue(value, getMaxLength());
+ return o = new HiveVarchar(value, getMaxLength());
}
-
- return setValue;
}
@Override
public Object set(Object o, String value) {
- HiveVarchar convertedValue = (HiveVarchar)o;
- convertedValue.setValue(value, getMaxLength());
- return convertedValue;
+ return o = new HiveVarchar(value, getMaxLength());
}
@Override